Revert "Backend Release to Main [3.06]"

package.json

@@ -22,7 +22,7 @@
     "test:ci": "npm test -- --coverage",
     "lint": "eslint ./src --ext .js,.jsx --max-warnings=2000 --ignore-pattern '**/node_modules/**' --ignore-pattern '**/coverage/**' --ignore-pattern '**/dist/**' --ignore-pattern '**/build/**'",
     "lint:fix": "eslint ./src --ext .js,.jsx --fix --ignore-pattern '**/node_modules/**' --ignore-pattern '**/coverage/**' --ignore-pattern '**/dist/**' --ignore-pattern '**/build/**'",
-    "build": "babel src -d dist && shx mkdir -p dist/data && shx cp -r src/data/* dist/data/",
+    "build": "babel src -d dist && mkdir -p dist/data && cp -r src/data/* dist/data/ 2>/dev/null || true",
     "buildw": "babel src -d dist --watch",
     "start": "node dist/server.js",
     "dev": "nodemon --exec \"babel-node --only src src/server.js\"",
@@ -42,7 +42,6 @@
     "@types/node": "^8.10.61",
     "@types/supertest": "^6.0.2",
     "babel-jest": "^29.7.0",
-    "baseline-browser-mapping": "^2.10.29",
     "eslint": "^8.47.0",
     "eslint-config-airbnb": "^19.0.4",
     "eslint-config-airbnb-base": "^15.0.0",
@@ -61,7 +60,6 @@
     "pidtree": "^0.6.0",
     "prettier": "3.2.5",
     "puppeteer": "^24.40.0",
-    "shx": "^0.4.0",
     "supertest": "^6.3.4"
   },
   "dependencies": {
@@ -89,7 +87,7 @@
     "body-parser": "^1.20.4",
     "card-validator": "^10.0.2",
     "cheerio": "^0.22.0",
-    "cloudinary": "^2.9.0",
+    "cloudinary": "^2.8.0",
     "compression": "^1.8.0",
     "cors": "^2.8.4",
     "cron": "^1.8.2",

src/app.js

@@ -7,30 +7,33 @@ const logger = require('./startup/logger');
 const globalErrorHandler = require('./utilities/errorHandling/globalErrorHandler');
 // const experienceRoutes = require('./routes/applicantAnalyticsRoutes');
 
-// 1. Core initialization
 logger.init();
+
 app.use(Sentry.Handlers.requestHandler());
 
-// 2. Load essential middleware (The "Engine")
+// Then load all other setup
 require('./startup/compression')(app);
 require('./startup/cors')(app);
-require('./startup/bodyParser')(app); // <--- Crucial this runs before routes
-require('./startup/session')(app);
+require('./startup/bodyParser')(app);
+require('./startup/session')(app); // Add session before middleware and routes
 
-// 3. Define Routes (The "Destination")
-// It is better to move these INSIDE startup/routes.js, but if they stay here:
 app.use('/api/test', testRoutes);
 
 const helpFeedbackRouter = require('./routes/helpFeedbackRouter');
 const helpRequestRouter = require('./routes/helpRequestRouter');
+
 app.use('/api/feedback', helpFeedbackRouter);
 app.use('/api/helprequest', helpRequestRouter);
 
 require('./startup/middleware')(app);
-// This handles all other routes and likely has your 404 handler
-require('./startup/routes')(app); 
 
-// 4. Error Handling (The "Safety Net")
+const weeklyReportsRouter = require('./routes/weeklyReportsRouter');
+
+app.use('/api', weeklyReportsRouter);
+
+// ⚠ This must come *after* your custom /api routes
+require('./startup/routes')(app);
+
 app.use(Sentry.Handlers.errorHandler());
 app.use(globalErrorHandler);