Refactor import statement for User model to use lowercase filename, c…

…hanged index to app, cleaned up pacage.json

server/package.json

@@ -1,20 +1,24 @@
 {
-  "name": "server",
+  "name": "nettleship-net-api",
   "version": "1.0.0",
-  "description": "",
-  "main": "src/index.js",
+  "description": "This is the API backend for the nettleship.net website ",
+  "main": "src/app.js",
   "scripts": {
     "test": "jest",
     "test:watch": "jest --watch",
     "test:coverage": "jest --coverage",
-    "start": "node src/index",
-    "dev": "nodemon src/index",
+    "start": "node src/app",
+    "dev": "nodemon src/app",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix"
   },
   "keywords": [],
-  "author": "",
-  "license": "ISC",
+  "author": "Thomas Nettleship",
+  "license": "GPL-3.0",
+  "private": true,
+  "engines": {
+    "node": "22.2.0"
+  },
   "dependencies": {
     "bcryptjs": "^2.4.3",
     "connect-mongo": "^5.1.0",
@@ -41,4 +45,4 @@
     "nodemon": "^3.0.3",
     "supertest": "^7.0.0"
   }
-}
+}

server/src/api/models/index.js

@@ -1,4 +1,4 @@
-const User = require('./User.model.js');
+const User = require('./user.model.js');
 
 module.exports = {
   User,

server/src/index.js → server/src/app.js

@@ -3,9 +3,9 @@ require('dotenv').config();
 const express = require('express');
 
 const corsMiddleware = require('./config/corsOptions.js');
-const db = require('./config/db');
-const sessionConfig = require('./config/sessionConfig');
-const { logger, errorHandler } = require('./api/middlewares');
+const db = require('./config/db.js');
+const sessionConfig = require('./config/sessionConfig.js');
+const { logger, errorHandler } = require('./api/middlewares/index.js');
 
 const app = express();
 const PORT = process.env.PORT || 8000;
@@ -23,7 +23,7 @@ app.use(express.json());
 app.use(sessionConfig);
 
 // Routes
-require('./api/routes')(app);
+require('./api/routes/index.js')(app);
 
 // Error handling middleware
 app.use(errorHandler);

server/tests/integration/userService.test.js

@@ -1,7 +1,23 @@
 const request = require('supertest');
-const app = require('../../src/index');
+const app = require('../../src/app');
 const { User } = require('../../src/api/models');
 const { generateJwt } = require('../../src/api/helpers');
+const nodemailer = require('nodemailer');
+
+let savedEmailText;
+jest.mock('nodemailer', () => {
+  const nodemailerMock = {
+    sendMail: jest.fn((mailOptions, callback) => {
+      savedEmailText = mailOptions.text; // Capture the email text
+      callback(null, {
+        response: '250 Message accepted',
+      });
+    }),
+  };
+  return {
+    createTransport: jest.fn(() => nodemailerMock),
+  };
+})
 
 let token = '';
 let user = null;
@@ -53,6 +69,7 @@ describe('POST /api/users/verify', () => {
     const response = await request(app)
       .post('/api/users/verify')
       .send({ email: '[email protected]' });
+    console.log(response.body);
     expect(response.status).toBe(200);
     expect(response.body.message).toBe('Verification email sent');
     // should check if the email was sent? seems like effort though and if i write a unit test for the email function then i would be testing it twice

server/tests/unit/getAllUsers.test.js

@@ -1,7 +1,7 @@
 const { User } = require('../../src/api/models');
 const { userService } = require('../../src/api/services');
 
-jest.mock('../../src/api/models/User.model.js', () => ({
+jest.mock('../../src/api/models/user.model.js', () => ({
     find: jest.fn().mockResolvedValue([]),
     findById: jest.fn(),
 }));

server/tests/unit/getUserByUsername.test.js

@@ -1,7 +1,7 @@
 const { User } = require('../../src/api/models');
 const { userService } = require('../../src/api/services');
 
-jest.mock('../../src/api/models/User.model.js', () => ({
+jest.mock('../../src/api/models/user.model.js', () => ({
     findOne: jest.fn(),
 }));
 

server/tests/unit/requestVerification.test.js

@@ -6,7 +6,7 @@ jest.mock('jsonwebtoken', () => ({
     sign: jest.fn().mockImplementation(() => 'mockedToken'),
 }));
 
-jest.mock('../../src/api/models/User.model.js', () => ({
+jest.mock('../../src/api/models/user.model.js', () => ({
     findByIdAndUpdate: jest.fn(),
     findById: jest.fn(),
     findOne: jest.fn(),

server/tests/unit/verifyUser.test.js

@@ -6,7 +6,7 @@ jest.mock('jsonwebtoken', () => ({
     decode: jest.fn(),
 }));
 
-jest.mock('../../src/api/models/User.model.js', () => ({
+jest.mock('../../src/api/models/user.model.js', () => ({
     findByIdAndUpdate: jest.fn(),
     findById: jest.fn(),
     findOne: jest.fn(),