Merge pull request #3 from frckbrice/chore/testings

Chore/testings fully functional

Author: frckbrice

README.md

@@ -91,7 +91,7 @@ const doc: any = {
 const swaggerSpec = swaggerJsDoc(doc);
 // app.use("/api-docs", swaggerUi.serve, swaggerUi.setup(swaggerJsDoc(doc)));
 
-const imagesDir = path.join(__dirname, "/src/public/images");
+const imagesDir = path.join(__dirname, "../public/assets/images");
 
 // Ensure the directory exists at app start
 if (!fs.existsSync(imagesDir)) {
@@ -105,7 +105,9 @@ app.use(helmet());
 
 app.use(bodyParser.json());
 app.use(cors());
-app.use("/public/images", express.static("public/images"));
+app.use("/public", express.static("public"));
+app.use("/public/assets", express.static("public/assets"));
+app.use("/public/assets/images", express.static("public/assets/images"));
 
 // Routes setup
 app.use("/api/v1", appRouter);
@@ -130,15 +132,24 @@ app.use("/api-docs", swaggerUi.serve, swaggerUi.setup(swaggerSpec));
  *               properties:
  *                 message:
  *                   type: string
- *                   example: "Hello World!! Farming products_2"
+ *                   example: "Hello World!! Farming products"
  */
 app.get("/", (req: Request, res: Response) => {
-  res.send("Hello World!! Farming products_2");
+  res.sendFile(path.join(__dirname, "../public/index.html"));
 });
 
-// 404 handler
+// 404 handler - serve custom 404 page for HTML requests, JSON for API requests
 app.use((req: Request, res: Response, next: NextFunction) => {
-  next(new AppError(`Not Found - ${req.originalUrl}`, 404));
+  // Check if the request is for an API endpoint or expects JSON
+  const isAPIRequest = req.path.startsWith('/api/v1') || req.get('Accept')?.includes('application/json');
+
+  if (isAPIRequest) {
+  // For API requests, return JSON error
+    next(new AppError(`Not Found - ${req.originalUrl}`, 404));
+  } else {
+    // For web requests, serve the custom 404 page
+    res.status(404).sendFile(path.join(__dirname, "../public/404.html"));
+  }
 });
 
 // Error handling middleware - must be last

TROUBLESHOOTING.md

@@ -7,7 +7,7 @@ services:
       POSTGRES_PASSWORD: ${DB_PASSWORD:-postgres}
       POSTGRES_DB: ${DB_HOSTNAME:-farming_products}
     ports:
-      - "5432:5432"
+      - "5433:5432"
     volumes:
       - db_data:/var/lib/postgresql/data
 
@@ -16,7 +16,7 @@ services:
     depends_on:
       - db
     environment:
-      NODE_ENV: production
+      NODE_ENV: development
       DB_HOST: db
       DB_PORT: 5432
       DB_USER: ${DB_USER:-postgres}
@@ -39,10 +39,15 @@ services:
       TWILIO_AUTH_TOKEN: ${TWILIO_AUTH_TOKEN}
       TWILIO_PHONE: ${TWILIO_PHONE}
       BREVO_API_KEY: ${BREVO_API_KEY}
+      # Adwa Payment Configuration
+      ADWA_MERCHANT_KEY: ${ADWA_MERCHANT_KEY}
+      ADWA_APPLICATION_KEY: ${ADWA_APPLICATION_KEY}
+      ADWA_SUBSCRIPTION_KEY: ${ADWA_SUBSCRIPTION_KEY}
+      ADWA_BASE_URL: ${ADWA_BASE_URL}
     ports:
       - "3000:3000"
     restart: always
-    command: sh -c "yarn install && yarn build && npx sequelize-cli db:migrate && node dist/app.js"
+    command: node dist/app.js
 
 volumes:
   db_data: 

app.ts

@@ -1,11 +1,40 @@
 import js from "@eslint/js";
 import globals from "globals";
-import tseslint from "typescript-eslint";
+import tseslint from "@typescript-eslint/eslint-plugin";
+import tsparser from "@typescript-eslint/parser";
 import { defineConfig } from "eslint/config";
 
-
 export default defineConfig([
-  { files: ["**/*.{js,mjs,cjs,ts,mts,cts}"], plugins: { js }, extends: ["js/recommended"] },
-  { files: ["**/*.{js,mjs,cjs,ts,mts,cts}"], languageOptions: { globals: globals.browser } },
-  tseslint.configs.recommended,
+  {
+    files: ["**/*.{js,mjs,cjs,ts,mts,cts}"],
+    plugins: { js },
+    extends: ["js/recommended"],
+    languageOptions: {
+      globals: {
+        ...globals.node,
+        ...globals.browser
+      }
+    }
+  },
+  {
+    files: ["**/*.{ts,mts,cts}"],
+    languageOptions: {
+      parser: tsparser,
+      parserOptions: {
+        ecmaVersion: "latest",
+        sourceType: "module",
+      },
+      globals: {
+        ...globals.node,
+        ...globals.browser
+      }
+    },
+    plugins: {
+      "@typescript-eslint": tseslint,
+    },
+    rules: {
+      ...tseslint.configs.recommended.rules,
+      "@typescript-eslint/no-unused-vars": "error",
+    },
+  },
 ]);

docker-compose.yml

@@ -22,7 +22,6 @@
   "dependencies": {
     "@faker-js/faker": "^9.5.1",
     "@sequelize/postgres": "^7.0.0-alpha.43",
-    "@types/swagger-ui": "^3.52.4",
     "axios": "^1.7.2",
     "bcryptjs": "^2.4.3",
     "body-parser": "^1.20.2",
@@ -31,23 +30,17 @@
     "dotenv": "^16.4.5",
     "express": "4",
     "express-rate-limit": "^7.2.0",
-    "fs": "^0.0.1-security",
     "google-auth-library": "^9.14.0",
     "helmet": "^7.0.0",
     "jsonwebtoken": "^9.0.2",
     "multer": "^1.4.5-lts.1",
-    "mysql2": "^3.11.5",
     "nodemailer": "^6.9.13",
-    "path": "^0.12.7",
     "pg": "^8.13.1",
     "pg-hstore": "^2.3.4",
     "reflect-metadata": "^0.2.2",
     "sequelize": "^6.37.5",
-    "sequelize-cli": "^6.6.2",
     "sequelize-typescript": "^2.1.6",
-    "sib-api-v3-sdk": "^8.5.0",
     "socket.io": "^4.7.5",
-    "swagger-autogen": "^2.23.7",
     "swagger-jsdoc": "^6.2.8",
     "swagger-ui-express": "^5.0.0",
     "tslib": "^2.8.1",
@@ -62,29 +55,24 @@
     "@types/body-parser": "^1.19.5",
     "@types/cors": "^2.8.13",
     "@types/express": "^4.17.21",
-    "@types/fs-extra": "^9.0.13",
     "@types/helmet": "^4.0.0",
     "@types/jsonwebtoken": "^9.0.2",
     "@types/multer": "^1.4.7",
     "@types/node": "^22.10.2",
-    "@types/node-fetch": "^2.6.12",
     "@types/nodemailer": "^6.4.7",
     "@types/sequelize": "^4.28.20",
     "@types/supertest": "^6.0.3",
     "@types/swagger-jsdoc": "^6.0.3",
     "@types/swagger-ui-express": "^4.1.7",
     "@types/uuid": "^9.0.2",
-    "@types/validator": "^13.12.2",
     "@typescript-eslint/eslint-plugin": "^8.38.0",
     "@typescript-eslint/parser": "^8.38.0",
     "@vitest/coverage-v8": "^3.2.4",
     "eslint": "^9.31.0",
-    "globals": "^16.3.0",
     "nodemon": "^3.1.0",
     "prettier": "^3.6.2",
     "supertest": "^7.1.4",
     "ts-node": "^10.9.2",
-    "typescript-eslint": "^8.38.0",
     "vitest": "^3.2.4"
   }
 }