feat: Improve code organization

Dockerfile

@@ -5,10 +5,7 @@ FROM node:18-alpine
 WORKDIR /app
 
 # Copy the current directory contents into the container at /app
-COPY config /app/config
+COPY src /app/src
-COPY lib /app/lib
-COPY sections /app/sections
-COPY index.js /app
 COPY package.json /app
 COPY dotenv /app/.env
 

dotenv

@@ -1,9 +1,9 @@
 SERVER_PORT=3000
 ROOT_PATH=/home/josepablocb/Documents/Work/EnRuta/SysS/ETAAPI
-API_CONFIG=config/apiConfig_local.json
+API_CONFIG=src/config/apiConfig_local.json
 ############################
 # PATHS relative to ROOT
 ############################
-LIB_PATH=lib
+LIB_PATH=src/lib
-MODELS_PATH=lib/Models
+MODELS_PATH=src/lib/Models
-HANDLERS_PATH=lib/Handlers
+HANDLERS_PATH=src/lib/Handlers

lib/Handlers/Companies.handler.js

@@ -1,9 +0,0 @@
-'user strict';
-const { ROOT_PATH, HANDLERS_PATH, MODELS_PATH, API_CONFIG } = process.env;
-const companiesModel = require( `${ROOT_PATH}/${MODELS_PATH}/companies.model.js` );
-
-async function getCompanyData( id ){
-    return await companiesModel.findById( id );
-}
-
-module.exports = { getCompanyData };

package.json

@@ -4,8 +4,8 @@
   "description": "ETA API",
   "main": "index.js",
   "scripts": {
-    "start": "node index.js",
+    "start": "node src/",
-    "dev": "nodemon index.js"
+    "dev": "nodemon src/"
   },
   "repository": {
     "type": "git",

scripts/ci_functions.sh

@@ -8,7 +8,7 @@ function build_docker(){
         return -1
     fi
     CONTAINER_NAME=$1
-    cat config/apiConfig.json > config/apiConfig_local.json
+    cat src/config/apiConfig.json > src/config/apiConfig_local.json
 
     set -x
     docker rmi -f "$AWS_ECR_REPO/$CONTAINER_NAME"

src/apps/index.js

@@ -0,0 +1,10 @@
+const express = require('express');
+const app = express();
+
+const private = require('./private');
+const public = require('./public');
+
+app.use( public );
+app.use( private );
+
+module.exports = app;

src/apps/private/index.js

@@ -0,0 +1,37 @@
+'use strict';
+const { ROOT_PATH , LIB_PATH } = process.env;
+
+///	Router instance
+const router = require('express').Router();
+const jwtValidator = require( `${ROOT_PATH}/${LIB_PATH}/jwtValidator.js` );
+
+const loadAttachments = require('./load-attachments/routes.js');
+const loads = require('./loads/routes.js');
+const users = require('./users/routes.js');
+
+router.use( jwtValidator.middleware );
+
+router.use('/load-attachments', loadAttachments );
+router.use('/loads', loads);
+router.use('/users', users);
+
+/*
+router.use('/orders', test);
+router.use('/companies', test);
+router.use('/vehicles', test);
+router.use('/mailer', test);
+router.use('/authmanagement', test);
+router.use('/memberships', test);
+router.use('/checkAccount', test);
+router.use('/proposals', test);
+router.use('/bootresolvers', test);
+router.use('/budgets', test);
+router.use('/news', test);
+router.use('/branches', test);
+router.use('/trackings', test);
+router.use('/upload', test);
+router.use('/calendars', test);
+router.use('/dashboard', test);
+*/
+
+module.exports = router;

src/apps/public/index.js

@@ -3,12 +3,9 @@ const { ROOT_PATH , LIB_PATH } = process.env;
 
 ///	Router instance
 const router = require('express').Router();
-const jwtValidator = require( `${ROOT_PATH}/${LIB_PATH}/jwtValidator.js` );
 
 const cities = require('./cities/routes.js');
 const countries = require('./countries/routes.js');
-const loadAttachments = require('./load-attachments/routes.js');
-const loads = require('./loads/routes.js');
 const metaData = require('./meta-data/routes.js');
 const metaGroups = require('./meta-groups/routes.js');
 const productCategories = require('./product-categories/routes.js');
@@ -17,10 +14,9 @@ const publicVehicles = require('./public-vehicles/routes.js');
 const publicLoadAttachments = require('./public-load-attachments/routes.js');
 const states = require('./states/routes.js');
 const test = require('./test/routes.js');
-const users = require('./users/routes.js');
 
-router.use('/countries', countries);
 router.use('/cities', cities);
+router.use('/countries', countries);
 router.use('/meta-data', metaData);
 router.use('/meta-groups', metaGroups);
 router.use('/product-categories', productCategories);
@@ -31,32 +27,4 @@ router.use('/states', states);
 
 router.use("/test", test);
 
-router.use( jwtValidator.middleware );
-
-router.use('/users', users);
-
-router.use('/load-attachments', loadAttachments );
-router.use('/loads', loads);
-
-router.use('/orders', test);
-router.use('/companies', test);
-router.use('/vehicles', test);
-router.use('/mailer', test);
-router.use('/authmanagement', test);
-router.use('/memberships', test);
-router.use('/checkAccount', test);
-router.use('/proposals', test);
-router.use('/bootresolvers', test);
-router.use('/budgets', test);
-router.use('/news', test);
-router.use('/branches', test);
-router.use('/trackings', test);
-router.use('/upload', test);
-router.use('/calendars', test);
-router.use('/dashboard', test);
-
-/**
- * TODO: Add extra middleware to enable endpoints to lock admin resources.
- */
-
 module.exports = router;

src/config/apiConfig.json

@@ -14,7 +14,7 @@
         }
     },
     "version" : {
-        "version" : "0.0.0",
+        "version" : "1.0.14",
         "name": "ETA Beta",
         "date":"10/2023"
     },

src/config/apiConfig_local.json

@@ -14,7 +14,7 @@
         }
     },
     "version" : {
-        "version" : "0.0.0",
+        "version" : "1.0.14",
         "name": "ETA Beta",
         "date":"10/2023"
     },

src/index.js

@@ -2,6 +2,7 @@
 require('dotenv').config();
 const { ROOT_PATH, LIB_PATH, API_CONFIG } = process.env;
 const apiConfig = require( `${ROOT_PATH}/${API_CONFIG}` );
+const apps = require('./apps');
 
 const express = require('express');
 const cors = require('cors');
@@ -10,7 +11,6 @@ const morgan = require('morgan');
 const helmet = require('helmet');
 const bodyParser = require('body-parser');
 const fileUpload = require('express-fileupload');
-const sections = require('./sections/sections.js');
 const middlewares = require( `${ROOT_PATH}/${LIB_PATH}/Middlewares.js` );
 
 const mongoose = require('mongoose');
@@ -59,7 +59,7 @@ app.use(cors({
     allowedHeaders: ['Content-Type', 'Authorization']
 }));
 app.use( middlewares.errorJSON );
-app.use( sections );
+app.use( apps );
 app.use( middlewares.error404 );
 
 app.listen( serverPort , function(err){