refractor backend

backend/.gitignore

@@ -16,3 +16,6 @@ coverage
 
 # ignore Docker files
 docker-compose.*.yml
+
+# ignore firebase files
+firebase-key**.json

backend/package.json

@@ -13,7 +13,12 @@
   "keywords": [
     "fitness",
     "nutrition",
-    "mobile"
+    "mobile",
+    "exercise",
+    "macros",
+    "exercise-tracker",
+    "macro-tracker",
+    "simple"
   ],
   "dependencies": {
     "crypto-js": "^4.2.0",

backend/src/app.ts

@@ -1,7 +1,7 @@
 /* Application setup */
 import express, { Express } from 'express';
 import mongoose from 'mongoose';
-import authRoute from './auth/routes/authRoutes';
+import authRoute from './auth-deprecated/routes/authRoutes';
 import healthCheckRoute from './healthCheck/routes/healthCheckRoutes';
 import { API_URLS_V1 } from './constants';
 import logger from './logging/logger';
@@ -75,18 +75,18 @@ class App {
    * Connect to the MongoDB using the connection URL in the configuration object. Exits with error if connection fails.
    * @returns Returns a promise indicating completion of the async function.
    */
-  public async connectToDatabase(): Promise<void> {
+  public async connectToMongoDB(): Promise<void> {
     /* Get connection URL from environment variables */
     const mongoUrl: string = Config.get('MONGO_DB.CONNECTION_URL');
 
-    /* Try connecting to the database specified by the connection URL, with retries */
+    /* Try connecting to mongodb, with retries */
     let attempts = 0;
     const maxAttempts: number = Config.get('MONGO_DB.CONNECTION_RETRIES');
     const retryTimeout: number = Config.get('MONGO_DB.CONNECTION_RETRY_TIMEOUT');
     while (attempts < maxAttempts) {
       try {
         await mongoose.connect(mongoUrl);
-        logger.info('Successfully connected to MongoDB.');
+        logger.info('Successfully connected to MongoDB');
         return;
       } catch (error) {
         logger.error('Failed to connect to MongoDB: ', error);

backend/src/index.ts

@@ -18,7 +18,7 @@ async function startApp(port: number) {
 
   try {
     /* Wait for the MongoDB connection to be established */
-    await appInstance.connectToDatabase();
+    await appInstance.connectToMongoDB();
 
     /* Start the server after successful database connection */
     await appInstance.startServer(port);

backend/tests/app.test.ts

@@ -25,7 +25,7 @@ describe('App Tests', () => {
     appInstance.closeServer(PORT);
   });
 
-  describe('connectToDatabase', () => {
+  describe('connectToMongoDB', () => {
     it('should successfully connect to MongoDB', async () => {
       /* Set up mocks and spies */
       jest.spyOn(mongoose, 'connect').mockImplementation(() => {
@@ -42,7 +42,7 @@ describe('App Tests', () => {
         });
 
       /* Connect to DB */
-      await appInstance.connectToDatabase();
+      await appInstance.connectToMongoDB();
 
       /* Test against expected */
       expect(mongoose.connect).toHaveBeenCalled();
@@ -64,7 +64,7 @@ describe('App Tests', () => {
       jest.spyOn(logger, 'info');
 
       /* Connect to database */
-      await appInstance.connectToDatabase();
+      await appInstance.connectToMongoDB();
 
       /* Test against expected */
       expect(process.exit).toHaveBeenCalledWith(1);

backend/tests/auth/controllers/authController.test.ts → backend/tests/auth-deprecated/controllers/authController.test.ts

@@ -2,13 +2,13 @@
 import Config from 'simple-app-config';
 import { NextFunction, Request, Response } from 'express';
 import { createRequest, createResponse, MockRequest, MockResponse } from 'node-mocks-http';
-import { User } from '../../../src/auth/models/user';
-import { FailedLoginUser } from '../../../src/auth/models/failedLoginUser';
-import { RefreshToken } from '../../../src/auth/models/refreshToken';
-import { LockedOutUser } from '../../../src/auth/models/lockedOutUser';
-import AuthController from '../../../src/auth/controllers/authController';
+import { User } from '../../../src/auth-deprecated/models/user';
+import { FailedLoginUser } from '../../../src/auth-deprecated/models/failedLoginUser';
+import { RefreshToken } from '../../../src/auth-deprecated/models/refreshToken';
+import { LockedOutUser } from '../../../src/auth-deprecated/models/lockedOutUser';
+import AuthController from '../../../src/auth-deprecated/controllers/authController';
 import { API_URLS_V1, GENERIC_RESPONSES } from '../../../src/constants';
-import { HEADERS, AUTH_RESPONSES } from '../../../src/auth/constants';
+import { HEADERS, AUTH_RESPONSES } from '../../../src/auth-deprecated/constants';
 import CryptoJS from 'crypto-js';
 import mongoose from 'mongoose';
 import jwt from 'jsonwebtoken';

backend/tests/auth/routes/authRoutes.test.ts → backend/tests/auth-deprecated/routes/authRoutes.test.ts

@@ -1,12 +1,12 @@
 /* Unit tests for the auth routes */
 import request from 'supertest';
-import AuthController from '../../../src/auth/controllers/authController';
+import AuthController from '../../../src/auth-deprecated/controllers/authController';
 import { API_URLS_V1, GENERIC_RESPONSES } from '../../../src/constants';
 import App from '../../../src/app';
 import Config from 'simple-app-config';
 
 /* Mock the controller functions */
-jest.mock('../../../src/auth/controllers/authController', () => ({
+jest.mock('../../../src/auth-deprecated/controllers/authController', () => ({
   register: jest.fn().mockImplementation((req, res) => {
     res.sendStatus(201);
   }),