From 5909ff99cc1b190e1814f43e102515b6331a2328 Mon Sep 17 00:00:00 2001 From: "C. Fuhrman" Date: Sat, 15 Mar 2025 14:53:37 -0400 Subject: [PATCH] =?UTF-8?q?Renommer=20pour=20plus=20de=20coh=C3=A9rence?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/__tests__/folders.mongodb.test.js | 4 +-- server/__tests__/folders.test.js | 2 +- server/__tests__/users.test.js | 6 ++-- server/app.js | 34 ++++++++++---------- server/auth/modules/simpleauth.js | 2 +- server/controllers/{folders.js => folder.js} | 6 ++-- server/controllers/{images.js => image.js} | 6 ++-- server/controllers/{users.js => user.js} | 6 ++-- server/models/{folders.js => folder.js} | 0 server/models/{images.js => image.js} | 4 +-- server/models/{quizzes.js => quiz.js} | 0 server/models/{users.js => user.js} | 10 +++--- server/routers/{folders.js => folder.js} | 0 server/routers/{images.js => image.js} | 0 server/routers/{users.js => user.js} | 2 +- 15 files changed, 41 insertions(+), 41 deletions(-) rename server/controllers/{folders.js => folder.js} (98%) rename server/controllers/{images.js => image.js} (94%) rename server/controllers/{users.js => user.js} (97%) rename server/models/{folders.js => folder.js} (100%) rename server/models/{images.js => image.js} (96%) rename server/models/{quizzes.js => quiz.js} (100%) rename server/models/{users.js => user.js} (95%) rename server/routers/{folders.js => folder.js} (100%) rename server/routers/{images.js => image.js} (100%) rename server/routers/{users.js => user.js} (90%) diff --git a/server/__tests__/folders.mongodb.test.js b/server/__tests__/folders.mongodb.test.js index 77fd093..3f7e7d7 100644 --- a/server/__tests__/folders.mongodb.test.js +++ b/server/__tests__/folders.mongodb.test.js @@ -1,5 +1,5 @@ -const Folder = require('../models/folders'); -const Quiz = require('../models/quizzes'); +const Folder = require('../models/folder'); +const Quiz = require('../models/quiz'); const db = require('../config/db'); console.log('db:', db); // Debugging line diff --git a/server/__tests__/folders.test.js b/server/__tests__/folders.test.js index acde762..e5828ef 100644 --- a/server/__tests__/folders.test.js +++ b/server/__tests__/folders.test.js @@ -1,4 +1,4 @@ -const Folders = require('../models/folders'); +const Folders = require('../models/folder'); const ObjectId = require('mongodb').ObjectId; const Quizzes = require('../models/quiz'); diff --git a/server/__tests__/users.test.js b/server/__tests__/users.test.js index 7f326ee..c260cb6 100644 --- a/server/__tests__/users.test.js +++ b/server/__tests__/users.test.js @@ -1,12 +1,12 @@ -const Users = require('../models/users'); +const Users = require('../models/user'); const bcrypt = require('bcrypt'); const Quizzes = require('../models/quiz'); -const Folders = require('../models/folders'); +const Folders = require('../models/folder'); const { ObjectId } = require('mongodb'); jest.mock('bcrypt'); jest.mock('../middleware/AppError'); -jest.mock('../models/folders'); +jest.mock('../models/folder'); describe('Users', () => { let users; diff --git a/server/app.js b/server/app.js index 431e854..b0fd760 100644 --- a/server/app.js +++ b/server/app.js @@ -14,38 +14,38 @@ const quiz = require('./models/quiz.js'); const quizModel = new quiz(db); const room = require('./models/room.js'); const roomModel = new room(db); -const folders = require('./models/folders.js'); +const folders = require('./models/folder.js'); const foldersModel = new folders(db, quizModel); -const users = require('./models/users.js'); +const users = require('./models/user.js'); const userModel = new users(db, foldersModel); -const images = require('./models/images.js'); +const images = require('./models/image.js'); const imageModel = new images(db); // instantiate the controllers -const usersController = require('./controllers/users.js'); -const usersControllerInstance = new usersController(userModel); +const usersController = require('./controllers/user.js'); +const userControllerInstance = new usersController(userModel); const roomsController = require('./controllers/room.js'); -const roomsControllerInstance = new roomsController(roomModel); -const foldersController = require('./controllers/folders.js'); -const foldersControllerInstance = new foldersController(foldersModel); +const roomControllerInstance = new roomsController(roomModel); +const foldersController = require('./controllers/folder.js'); +const folderControllerInstance = new foldersController(foldersModel); const quizController = require('./controllers/quiz.js'); const quizControllerInstance = new quizController(quizModel, foldersModel); -const imagesController = require('./controllers/images.js'); -const imagesControllerInstance = new imagesController(imageModel); +const imagesController = require('./controllers/image.js'); +const imageControllerInstance = new imagesController(imageModel); // export the controllers -module.exports.users = usersControllerInstance; -module.exports.rooms = roomsControllerInstance; -module.exports.folders = foldersControllerInstance; +module.exports.users = userControllerInstance; +module.exports.rooms = roomControllerInstance; +module.exports.folders = folderControllerInstance; module.exports.quizzes = quizControllerInstance; -module.exports.images = imagesControllerInstance; +module.exports.images = imageControllerInstance; //import routers (instantiate controllers as side effect) -const userRouter = require('./routers/users.js'); +const userRouter = require('./routers/user.js'); const roomRouter = require('./routers/room.js'); -const folderRouter = require('./routers/folders.js'); +const folderRouter = require('./routers/folder.js'); const quizRouter = require('./routers/quiz.js'); -const imagesRouter = require('./routers/images.js') +const imagesRouter = require('./routers/image.js') const AuthManager = require('./auth/auth-manager.js') const authRouter = require('./routers/auth.js') diff --git a/server/auth/modules/simpleauth.js b/server/auth/modules/simpleauth.js index 5e83ee5..3a1badd 100644 --- a/server/auth/modules/simpleauth.js +++ b/server/auth/modules/simpleauth.js @@ -1,7 +1,7 @@ const jwt = require('../../middleware/jwtToken.js'); const emailer = require('../../config/email.js'); -const model = require('../../models/users.js'); +const model = require('../../models/user.js'); const AppError = require('../../middleware/AppError.js'); const { MISSING_REQUIRED_PARAMETER, LOGIN_CREDENTIALS_ERROR, GENERATE_PASSWORD_ERROR, UPDATE_PASSWORD_ERROR } = require('../../constants/errorCodes'); const { name } = require('../../models/authProvider.js'); diff --git a/server/controllers/folders.js b/server/controllers/folder.js similarity index 98% rename from server/controllers/folders.js rename to server/controllers/folder.js index 87528b3..a9835f0 100644 --- a/server/controllers/folders.js +++ b/server/controllers/folder.js @@ -1,9 +1,9 @@ //controller const AppError = require('../middleware/AppError.js'); -const { MISSING_REQUIRED_PARAMETER, FOLDER_NOT_FOUND, FOLDER_ALREADY_EXISTS, GETTING_FOLDER_ERROR, DELETE_FOLDER_ERROR, UPDATE_FOLDER_ERROR, DUPLICATE_FOLDER_ERROR, COPY_FOLDER_ERROR } = require('../constants/errorCodes'); +const { MISSING_REQUIRED_PARAMETER, FOLDER_NOT_FOUND, FOLDER_ALREADY_EXISTS, GETTING_FOLDER_ERROR, DELETE_FOLDER_ERROR, UPDATE_FOLDER_ERROR, DUPLICATE_FOLDER_ERROR, COPY_FOLDER_ERROR } = require('../constants/errorCodes.js'); // controllers must use arrow functions to bind 'this' to the class instance in order to access class properties as callbacks in Express -class FoldersController { +class FolderController { constructor(foldersModel) { this.folders = foldersModel; @@ -267,4 +267,4 @@ class FoldersController { -module.exports = FoldersController; +module.exports = FolderController; diff --git a/server/controllers/images.js b/server/controllers/image.js similarity index 94% rename from server/controllers/images.js rename to server/controllers/image.js index b77ed96..48e3718 100644 --- a/server/controllers/images.js +++ b/server/controllers/image.js @@ -1,7 +1,7 @@ const AppError = require('../middleware/AppError.js'); -const { MISSING_REQUIRED_PARAMETER, IMAGE_NOT_FOUND } = require('../constants/errorCodes'); +const { MISSING_REQUIRED_PARAMETER, IMAGE_NOT_FOUND } = require('../constants/errorCodes.js'); -class ImagesController { +class ImageController { constructor(imagesModel) { this.images = imagesModel; @@ -52,4 +52,4 @@ class ImagesController { } -module.exports = ImagesController; +module.exports = ImageController; diff --git a/server/controllers/users.js b/server/controllers/user.js similarity index 97% rename from server/controllers/users.js rename to server/controllers/user.js index c6b5dab..f13eab4 100644 --- a/server/controllers/users.js +++ b/server/controllers/user.js @@ -2,10 +2,10 @@ const emailer = require('../config/email.js'); const jwt = require('../middleware/jwtToken.js'); const AppError = require('../middleware/AppError.js'); -const { MISSING_REQUIRED_PARAMETER, LOGIN_CREDENTIALS_ERROR, GENERATE_PASSWORD_ERROR, UPDATE_PASSWORD_ERROR, DELETE_USER_ERROR } = require('../constants/errorCodes'); +const { MISSING_REQUIRED_PARAMETER, LOGIN_CREDENTIALS_ERROR, GENERATE_PASSWORD_ERROR, UPDATE_PASSWORD_ERROR, DELETE_USER_ERROR } = require('../constants/errorCodes.js'); // controllers must use arrow functions to bind 'this' to the class instance in order to access class properties as callbacks in Express -class UsersController { +class UserController { constructor(userModel) { this.users = userModel; @@ -143,4 +143,4 @@ class UsersController { } } -module.exports = UsersController; +module.exports = UserController; diff --git a/server/models/folders.js b/server/models/folder.js similarity index 100% rename from server/models/folders.js rename to server/models/folder.js diff --git a/server/models/images.js b/server/models/image.js similarity index 96% rename from server/models/images.js rename to server/models/image.js index 61edc1a..766c928 100644 --- a/server/models/images.js +++ b/server/models/image.js @@ -1,6 +1,6 @@ const { ObjectId } = require('mongodb'); -class Images { +class Image { constructor(db) { this.db = db; @@ -44,4 +44,4 @@ class Images { } -module.exports = Images; +module.exports = Image; diff --git a/server/models/quizzes.js b/server/models/quiz.js similarity index 100% rename from server/models/quizzes.js rename to server/models/quiz.js diff --git a/server/models/users.js b/server/models/user.js similarity index 95% rename from server/models/users.js rename to server/models/user.js index 1b4c94c..b6ba9a9 100644 --- a/server/models/users.js +++ b/server/models/user.js @@ -1,8 +1,8 @@ const bcrypt = require("bcrypt"); const AppError = require("../middleware/AppError.js"); -const { USER_ALREADY_EXISTS } = require("../constants/errorCodes"); +const { USER_ALREADY_EXISTS } = require("../constants/errorCodes.js"); -class Users { +class User { constructor(db, foldersModel) { this.db = db; @@ -53,7 +53,7 @@ class Users { } async login(email, password) { - console.log(`models/users: login: email: ${email}, password: ${password}`); + console.log(`models/user: login: email: ${email}, password: ${password}`); try { const conn = await this.db.getConnection(); const userCollection = conn.collection("users"); @@ -73,7 +73,7 @@ class Users { error.statusCode = 401; throw error; } - console.log(`models/users: login: FOUND user: ${JSON.stringify(user)}`); + console.log(`models/user: login: FOUND user: ${JSON.stringify(user)}`); return user; } catch (error) { console.error(error); @@ -171,4 +171,4 @@ class Users { } } -module.exports = Users; +module.exports = User; diff --git a/server/routers/folders.js b/server/routers/folder.js similarity index 100% rename from server/routers/folders.js rename to server/routers/folder.js diff --git a/server/routers/images.js b/server/routers/image.js similarity index 100% rename from server/routers/images.js rename to server/routers/image.js diff --git a/server/routers/users.js b/server/routers/user.js similarity index 90% rename from server/routers/users.js rename to server/routers/user.js index f88436d..7d7787a 100644 --- a/server/routers/users.js +++ b/server/routers/user.js @@ -3,7 +3,7 @@ const router = express.Router(); const users = require('../app.js').users; const jwt = require('../middleware/jwtToken.js'); const asyncHandler = require('./routerUtils.js'); -const usersController = require('../controllers/users.js') +const usersController = require('../controllers/user.js') router.post("/register", asyncHandler(users.register)); router.post("/login", asyncHandler(users.login));