From 89a5146afe49c75bc57b17361acd5e005e06e5cf Mon Sep 17 00:00:00 2001
From: "C. Fuhrman" <christopher.fuhrman@etsmtl.ca>
Date: Wed, 2 Oct 2024 10:32:01 -0400
Subject: [PATCH] order of instantiation in app.js, user needs folder model

---
 server/app.js                | 4 ++--
 server/controllers/images.js | 2 --
 server/controllers/quiz.js   | 3 ---
 server/models/users.js       | 6 +++---
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/server/app.js b/server/app.js
index ec630dd..e53db50 100644
--- a/server/app.js
+++ b/server/app.js
@@ -10,12 +10,12 @@ const { Server } = require("socket.io");
 // instantiate the db
 const db = require('./config/db.js');
 // instantiate the models
-const users = require('./models/users.js');
-const userModel = new users(db);
 const quiz = require('./models/quiz.js');
 const quizModel = new quiz(db);
 const folders = require('./models/folders.js');
 const foldersModel = new folders(db, quizModel);
+const users = require('./models/users.js');
+const userModel = new users(db, foldersModel);
 const images = require('./models/images.js');
 const imageModel = new images(db);
 
diff --git a/server/controllers/images.js b/server/controllers/images.js
index 5eeb1d8..415540e 100644
--- a/server/controllers/images.js
+++ b/server/controllers/images.js
@@ -1,5 +1,3 @@
-const model = require('../models/images.js');
-
 const AppError = require('../middleware/AppError.js');
 const { MISSING_REQUIRED_PARAMETER, IMAGE_NOT_FOUND } = require('../constants/errorCodes');
 
diff --git a/server/controllers/quiz.js b/server/controllers/quiz.js
index 231b8e2..3d4199f 100644
--- a/server/controllers/quiz.js
+++ b/server/controllers/quiz.js
@@ -1,7 +1,4 @@
-// const model = require('../models/quiz.js');
 const emailer = require('../config/email.js');
-//const foldersController = require('./folders.js');
-// const db = require('../config/db.js');
 
 const AppError = require('../middleware/AppError.js');
 const { MISSING_REQUIRED_PARAMETER, NOT_IMPLEMENTED, QUIZ_NOT_FOUND, FOLDER_NOT_FOUND, QUIZ_ALREADY_EXISTS, GETTING_QUIZ_ERROR, DELETE_QUIZ_ERROR, UPDATE_QUIZ_ERROR, MOVING_QUIZ_ERROR, DUPLICATE_QUIZ_ERROR, COPY_QUIZ_ERROR } = require('../constants/errorCodes');
diff --git a/server/models/users.js b/server/models/users.js
index 05d7973..7f995b3 100644
--- a/server/models/users.js
+++ b/server/models/users.js
@@ -2,12 +2,12 @@
 const bcrypt = require('bcrypt');
 const AppError = require('../middleware/AppError.js');
 const { USER_ALREADY_EXISTS } = require('../constants/errorCodes');
-const Folders = require('../models/folders.js');
 
 class Users {
-    constructor(db) {
+    constructor(db, foldersModel) {
         console.log("Users constructor: db", db)
         this.db = db;
+        this.folders = foldersModel;
     }
     
     async hashPassword(password) {
@@ -45,7 +45,7 @@ class Users {
         const userId = result.insertedId.toString();
 
         const folderTitle = 'Dossier par Défaut'; 
-        await Folders.create(folderTitle, userId);
+        await this.folders.create(folderTitle, userId);
 
         return result;
     }