migrasi js to ts full

.env.example

@@ -9,14 +9,42 @@
 # one found in a remote Prisma Postgres URL, does not contain any sensitive information.
 
 # Database
-DATABASE_URL="postgresql://postgres:postgres@localhost:5432/<namadb>"
+DATABASE_URL="postgresql://postgres:postgres@localhost:<port>/<name>"
+# DATABASE_URL="postgresql://postgres123:postgres123@db:5432/db_radar"
+# DATABASE_URL=postgresql://postgres123:postgres123@db:5432/db_radar
 
 PORT=3200
 
-# Keycloak
-KEYCLOAK_TOKEN_URL=<url>/realms/<name_realm>/protocol/openid-connect/token
-CLIENT_ID=my-app
-CLIENT_SECRET=vUT3dbn2EfYslBYMm0cjvvA6D5bLT2mH
-JWT_SECRET=FF9q223buywGKYfLbu4ojSOYJ9s63G0iJFiCwSiVXB4FOm4WJQMoOF7DubqYT46v
-KEYCLOAK_ADMIN_URL=<url>
-KEYCLOAK_REALM=<name_realm>
+# Keycloak lokal
+KEYCLOAK_TOKEN_URL=http://localhost:8020/realms/<name_realm>/protocol/openid-connect/token
+CLIENT_ID=<name_client>
+CLIENT_SECRET=<client_secret>
+KEYCLOAK_ADMIN_URL=http://localhost:<port_keycloak>
+# KEYCLOAK_REALM=pearlgw
+
+KEYCLOAK_REALM=pearlgw
+KEYCLOAK_CLIENT=<name_client>
+KEYCLOAK_URL=http://localhost:<port_keycloak>
+
+KEYCLOAK_ADMIN_CLIENT=admin-cli
+KEYCLOAK_ADMIN_USERNAME=<username>
+KEYCLOAK_ADMIN_PASSWORD=<password>
+
+# jwt
+JWT_SECRET=<jwt_secret>
+
+# Keycloak production
+# KEYCLOAK_TOKEN_URL=https://keycloak.natagw.my.id/realms/radar/protocol/openid-connect/token
+# CLIENT_ID=fg-radar
+# CLIENT_SECRET=7kVIBw6FYdHhjLRfnruLj4l8X0qlP2Yz
+# KEYCLOAK_ADMIN_URL=https://keycloak.natagw.my.id
+# KEYCLOAK_REALM=radar
+
+# Keycloak production server fg
+# KEYCLOAK_TOKEN_URL=https://keycloak-radar.natagw.my.id/realms/radar/protocol/openid-connect/token
+# CLIENT_ID=fg-radar
+# CLIENT_SECRET=t6qZPIqOuukAsZWDLyi9CMHFE9mva4cs
+# KEYCLOAK_ADMIN_URL=https://keycloak-radar.natagw.my.id
+# KEYCLOAK_REALM=radar
+
+BASE_URL=http://localhost:3200

entrypoint.sh

@@ -13,4 +13,7 @@ npx prisma migrate dev --name init
 # npx prisma db seed
 
 echo "🚀 Menjalankan aplikasi..."
-exec node index.js
+# exec node index.js
+exec nodemon
+
+# cara jalaninnya, kan databaseseeder dulu, setelah itu node prisma/seeders/UserAreaSeeder, HospitalSeeder, VendorSeeder

index.ts

@@ -1,4 +1,4 @@
-import express, { Application } from 'express';
+import express, { Application, Request, Response } from 'express';
 import cors from 'cors';
 import path from 'path';
 import bodyParser from 'body-parser';
@@ -8,41 +8,13 @@ import keycloak from './src/middleware/Keycloak';
 import { config } from './config/config';
 
 import provinceRoutes from './src/routes/admin/ProvinceRoute';
-// import authRoutes from './src/routes/auth/AuthRoute.js';
 import cityRoutes from './src/routes/admin/CityRoute';
-// import salesRoutes from './src/routes/admin/SalesRoute.js';
-// import adminRoutes from './src/routes/superadmin/AdminRoute.js';
-// import hospitalRoutes from './src/routes/admin/HospitalRoute.js';
-// import salesHospitalRoutes from './src/routes/sales/HospitalRoute.js';
-// import vendorRoutes from './src/routes/admin/VendorRoute.js';
-// import logRoutes from './src/routes/superadmin/LogRoute.js';
-// import areaRoutes from './src/routes/sales/AreaRoute.js';
-// import vendorSalesRoutes from './src/routes/sales/VendorRoute.js';
+import vendorRoutes from './src/routes/admin/VendorRoute';
+import hospitalRoutes from './src/routes/admin/HospitalRoute';
+import salesHospitalRoutes from './src/routes/sales/HospitalRoute';
+import areaRoutes from './src/routes/sales/AreaRoute';
 
-import './src/utils/Scheduler'; // dijalankan di awal
-
-// const express = require('express')
-// const cors = require('cors')
-// const errorHandler = require('./src/middleware/ErrorHandler.js')
-// const app = express()
-// const path = require('path');
-// // const hospitalRoutes = require('./src/routes/HospitalRoute.js')
-// const provinceRoutes = require('./src/routes/admin/ProvinceRoute.js')
-// const authRoutes = require('./src/routes/auth/AuthRoute.js')
-// // const userRoutes = require('./src/routes/UserRoute.js')
-// const cityRoutes = require('./src/routes/admin/CityRoute.js')
-// const salesRoutes = require('./src/routes/admin/SalesRoute.js')
-// const adminRoutes = require('./src/routes/superadmin/AdminRoute.js')
-// const hospitalRoutes = require('./src/routes/admin/HospitalRoute.js')
-// const salesHospitalRoutes = require('./src/routes/sales/HospitalRoute.js')
-// const vendorRoutes = require('./src/routes/admin/VendorRoute.js')
-// const logRoutes = require('./src/routes/superadmin/LogRoute.js')
-// const areaRoutes = require('./src/routes/sales/AreaRoute.js')
-// const vendorSalesRoutes = require('./src/routes/sales/VendorRoute.js')
-// const { port } = require('./config/config.js')
-// const keycloak = require('./src/middleware/Keycloak.js');
-// import bodyParser from 'body-parser';
-// require("./src/utils/Scheduler.js")
+import './src/utils/Scheduler';
 
 const app: Application = express();
 
@@ -54,21 +26,15 @@ app.use('/storage/', express.static(path.join(__dirname, 'storage/')));
 
 const apiV1 = express.Router();
 
-// apiV1.use('/hospitals', hospitalRoutes);
 apiV1.use('/province', provinceRoutes);
-// apiV1.use('/auth', authRoutes);
-// apiV1.use('/user', userRoutes);
 apiV1.use('/city', cityRoutes);
-// apiV1.use('/sales', salesRoutes);
-// apiV1.use('/admin', adminRoutes);
-// apiV1.use('/hospital', hospitalRoutes);
-// apiV1.use('/hospital-area', salesHospitalRoutes);
-// apiV1.use('/vendor', vendorRoutes);
-// apiV1.use('/logs', logRoutes);
-// apiV1.use('/area', areaRoutes);
+apiV1.use('/hospital', hospitalRoutes);
+apiV1.use('/hospital-area', salesHospitalRoutes);
+apiV1.use('/vendor', vendorRoutes);
+apiV1.use('/area', areaRoutes);
 // apiV1.use('/vendor-sales', vendorSalesRoutes);
 
-app.get('/', (req, res) => {
+app.get('/', (req: Request, res: Response) => {
     res.send('Selamat Datang di API Radar Farmagitechs');
 });
 

package-lock.json

@@ -22,6 +22,7 @@
         "dotenv": "^16.5.0",
         "express": "^5.1.0",
         "http-status-codes": "^2.3.0",
+        "joi": "^17.13.3",
         "jsonwebtoken": "^9.0.2",
         "keycloak-connect": "^26.1.1",
         "multer": "^2.0.1",
@@ -34,10 +35,12 @@
         "@types/bcrypt": "^5.0.2",
         "@types/cors": "^2.8.19",
         "@types/express": "^5.0.3",
+        "@types/joi": "^17.2.2",
         "@types/jsonwebtoken": "^9.0.10",
         "@types/keycloak-connect": "^4.5.4",
         "@types/multer": "^2.0.0",
         "@types/node": "^24.0.14",
+        "nodemon": "^3.1.10",
         "prisma": "^6.10.1",
         "ts-node": "^10.9.2",
         "typescript": "^5.8.3"
@@ -72,6 +75,21 @@
         "npm": ">=9.0.0"
       }
     },
+    "node_modules/@hapi/hoek": {
+      "version": "9.3.0",
+      "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.3.0.tgz",
+      "integrity": "sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==",
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/@hapi/topo": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-5.1.0.tgz",
+      "integrity": "sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==",
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@hapi/hoek": "^9.0.0"
+      }
+    },
     "node_modules/@jridgewell/resolve-uri": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
@@ -182,6 +200,27 @@
         "@prisma/debug": "6.10.1"
       }
     },
+    "node_modules/@sideway/address": {
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.5.tgz",
+      "integrity": "sha512-IqO/DUQHUkPeixNQ8n0JA6102hT9CmaljNTPmQ1u8MEhBo/R4Q8eKLN/vGZxuebwOroDB4cbpjheD4+/sKFK4Q==",
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@hapi/hoek": "^9.0.0"
+      }
+    },
+    "node_modules/@sideway/formula": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@sideway/formula/-/formula-3.0.1.tgz",
+      "integrity": "sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg==",
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/@sideway/pinpoint": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@sideway/pinpoint/-/pinpoint-2.0.0.tgz",
+      "integrity": "sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==",
+      "license": "BSD-3-Clause"
+    },
     "node_modules/@testim/chrome-version": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/@testim/chrome-version/-/chrome-version-1.1.4.tgz",
@@ -297,6 +336,16 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/@types/joi": {
+      "version": "17.2.2",
+      "resolved": "https://registry.npmjs.org/@types/joi/-/joi-17.2.2.tgz",
+      "integrity": "sha512-vPvPwxn0Y4pQyqkEcMCJYxXCMYcrHqdfFX4SpF4zcqYioYexmDyxtM3OK+m/ZwGBS8/dooJ0il9qCwAdd6KFtA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "joi": "*"
+      }
+    },
     "node_modules/@types/jsonwebtoken": {
       "version": "9.0.10",
       "resolved": "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-9.0.10.tgz",
@@ -448,6 +497,20 @@
         "node": ">= 14"
       }
     },
+    "node_modules/anymatch": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
+      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "normalize-path": "^3.0.0",
+        "picomatch": "^2.0.4"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
     "node_modules/append-field": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/append-field/-/append-field-1.0.0.tgz",
@@ -503,6 +566,13 @@
         "proxy-from-env": "^1.1.0"
       }
     },
+    "node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/basic-ftp": {
       "version": "5.0.5",
       "resolved": "https://registry.npmjs.org/basic-ftp/-/basic-ftp-5.0.5.tgz",
@@ -527,6 +597,19 @@
         "node": ">= 18"
       }
     },
+    "node_modules/binary-extensions": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
+      "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/bn.js": {
       "version": "4.12.2",
       "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.2.tgz",
@@ -553,6 +636,30 @@
         "node": ">=18"
       }
     },
+    "node_modules/brace-expansion": {
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/braces": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fill-range": "^7.1.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/brorand": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
@@ -630,6 +737,31 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/chokidar": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
+      "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "anymatch": "~3.1.2",
+        "braces": "~3.0.2",
+        "glob-parent": "~5.1.2",
+        "is-binary-path": "~2.1.0",
+        "is-glob": "~4.0.1",
+        "normalize-path": "~3.0.0",
+        "readdirp": "~3.6.0"
+      },
+      "engines": {
+        "node": ">= 8.10.0"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.2"
+      }
+    },
     "node_modules/chromedriver": {
       "version": "138.0.1",
       "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-138.0.1.tgz",
@@ -672,6 +804,13 @@
       "license": "MIT",
       "optional": true
     },
+    "node_modules/concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/concat-stream": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-2.0.0.tgz",
@@ -1118,6 +1257,19 @@
         "pend": "~1.2.0"
       }
     },
+    "node_modules/fill-range": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "to-regex-range": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/finalhandler": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-2.1.0.tgz",
@@ -1210,6 +1362,21 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/fsevents": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
     "node_modules/function-bind": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
@@ -1287,6 +1454,19 @@
         "node": ">= 14"
       }
     },
+    "node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/gopd": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
@@ -1299,6 +1479,16 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/has-symbols": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
@@ -1430,6 +1620,13 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/ignore-by-default": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz",
+      "integrity": "sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA==",
+      "dev": true,
+      "license": "ISC"
+    },
     "node_modules/inherits": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
@@ -1469,6 +1666,52 @@
         "node": ">= 0.10"
       }
     },
+    "node_modules/is-binary-path": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "binary-extensions": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-extglob": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
     "node_modules/is-promise": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-4.0.0.tgz",
@@ -1507,6 +1750,19 @@
         "jiti": "lib/jiti-cli.mjs"
       }
     },
+    "node_modules/joi": {
+      "version": "17.13.3",
+      "resolved": "https://registry.npmjs.org/joi/-/joi-17.13.3.tgz",
+      "integrity": "sha512-otDA4ldcIx+ZXsKHWmp0YizCweVRZG96J10b0FevjfuncLO1oX59THoAmHkNubYJ+9gWsYsp5k8v4ib6oDv1fA==",
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@hapi/hoek": "^9.3.0",
+        "@hapi/topo": "^5.1.0",
+        "@sideway/address": "^4.1.5",
+        "@sideway/formula": "^3.0.1",
+        "@sideway/pinpoint": "^2.0.0"
+      }
+    },
     "node_modules/jsbn": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz",
@@ -1705,6 +1961,19 @@
       "integrity": "sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==",
       "license": "MIT"
     },
+    "node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/minimist": {
       "version": "1.2.8",
       "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
@@ -1841,6 +2110,45 @@
         "node-gyp-build-test": "build-test.js"
       }
     },
+    "node_modules/nodemon": {
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.1.10.tgz",
+      "integrity": "sha512-WDjw3pJ0/0jMFmyNDp3gvY2YizjLmmOUQo6DEBY+JgdvW/yQ9mEeSw6H5ythl5Ny2ytb7f9C2nIbjSxMNzbJXw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "chokidar": "^3.5.2",
+        "debug": "^4",
+        "ignore-by-default": "^1.0.1",
+        "minimatch": "^3.1.2",
+        "pstree.remy": "^1.1.8",
+        "semver": "^7.5.3",
+        "simple-update-notifier": "^2.0.0",
+        "supports-color": "^5.5.0",
+        "touch": "^3.1.0",
+        "undefsafe": "^2.0.5"
+      },
+      "bin": {
+        "nodemon": "bin/nodemon.js"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/nodemon"
+      }
+    },
+    "node_modules/normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
@@ -2031,6 +2339,19 @@
         "split2": "^4.1.0"
       }
     },
+    "node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
     "node_modules/postgres-array": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/postgres-array/-/postgres-array-2.0.0.tgz",
@@ -2135,6 +2456,13 @@
       "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
       "license": "MIT"
     },
+    "node_modules/pstree.remy": {
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz",
+      "integrity": "sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/pump": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.3.tgz",
@@ -2199,6 +2527,19 @@
         "node": ">= 6"
       }
     },
+    "node_modules/readdirp": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "picomatch": "^2.2.1"
+      },
+      "engines": {
+        "node": ">=8.10.0"
+      }
+    },
     "node_modules/router": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/router/-/router-2.2.0.tgz",
@@ -2368,6 +2709,19 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/simple-update-notifier": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-2.0.0.tgz",
+      "integrity": "sha512-a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "semver": "^7.5.3"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/smart-buffer": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
@@ -2461,6 +2815,19 @@
         "safe-buffer": "~5.2.0"
       }
     },
+    "node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/tcp-port-used": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/tcp-port-used/-/tcp-port-used-1.0.2.tgz",
@@ -2497,6 +2864,19 @@
       "license": "MIT",
       "optional": true
     },
+    "node_modules/to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-number": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
     "node_modules/toidentifier": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
@@ -2506,6 +2886,16 @@
         "node": ">=0.6"
       }
     },
+    "node_modules/touch": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/touch/-/touch-3.1.1.tgz",
+      "integrity": "sha512-r0eojU4bI8MnHr8c5bNo7lJDdI2qXlWWJk6a9EAFG7vbhTjElYhBVS3/miuE0uOuoLdb8Mc/rVfsmm6eo5o9GA==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "nodetouch": "bin/nodetouch.js"
+      }
+    },
     "node_modules/ts-node": {
       "version": "10.9.2",
       "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz",
@@ -2591,6 +2981,13 @@
         "node": ">=14.17"
       }
     },
+    "node_modules/undefsafe": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.5.tgz",
+      "integrity": "sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/undici-types": {
       "version": "7.8.0",
       "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.8.0.tgz",

package.json

@@ -1,13 +1,10 @@
 {
   "name": "proyek_radar_farmagitechs",
   "version": "1.0.0",
-  "main": "index.js",
+  "main": "index.ts",
   "type": "commonjs",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "dev": "ts-node index.ts",
-    "build": "tsc",
-    "start": "node dist/index.js"
+    "dev": "nodemon"
   },
   "prisma": {
     "seed": "ts-node prisma/seeders/DatabaseSeeder.ts"
@@ -30,6 +27,7 @@
     "dotenv": "^16.5.0",
     "express": "^5.1.0",
     "http-status-codes": "^2.3.0",
+    "joi": "^17.13.3",
     "jsonwebtoken": "^9.0.2",
     "keycloak-connect": "^26.1.1",
     "multer": "^2.0.1",
@@ -42,10 +40,12 @@
     "@types/bcrypt": "^5.0.2",
     "@types/cors": "^2.8.19",
     "@types/express": "^5.0.3",
+    "@types/joi": "^17.2.2",
     "@types/jsonwebtoken": "^9.0.10",
     "@types/keycloak-connect": "^4.5.4",
     "@types/multer": "^2.0.0",
     "@types/node": "^24.0.14",
+    "nodemon": "^3.1.10",
     "prisma": "^6.10.1",
     "ts-node": "^10.9.2",
     "typescript": "^5.8.3"

prisma/migrations/20250722014110_add_relation_user/migration.sql

@@ -0,0 +1,2 @@
+-- AddForeignKey
+ALTER TABLE "hospitals" ADD CONSTRAINT "hospitals_created_by_fkey" FOREIGN KEY ("created_by") REFERENCES "keycloak_users"("id") ON DELETE RESTRICT ON UPDATE CASCADE;

prisma/migrations/20250722023051_add_relation/migration.sql

@@ -0,0 +1,8 @@
+-- AddForeignKey
+ALTER TABLE "vendors" ADD CONSTRAINT "vendors_created_by_fkey" FOREIGN KEY ("created_by") REFERENCES "keycloak_users"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "user_areas" ADD CONSTRAINT "user_areas_user_id_fkey" FOREIGN KEY ("user_id") REFERENCES "keycloak_users"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "status_histories" ADD CONSTRAINT "status_histories_user_id_fkey" FOREIGN KEY ("user_id") REFERENCES "keycloak_users"("id") ON DELETE RESTRICT ON UPDATE CASCADE;

prisma/migrations/20250729072052_solve/migration.sql

@@ -0,0 +1,2 @@
+-- DropIndex
+DROP INDEX "provinces_name_key";

prisma/schema.prisma

@@ -59,15 +59,19 @@ model User {
 }
 
 model UserKeycloak {
-  id       String @id @default(uuid())
-  fullname String
+  id            String          @id @default(uuid())
+  fullname      String
+  Hospital      Hospital[]
+  UserArea      UserArea[]
+  Vendor        Vendor[]
+  StatusHistory StatusHistory[]
 
   @@map("keycloak_users")
 }
 
 model Province {
   id         String     @id @default(uuid())
-  name       String     @unique
+  name       String
   cities     City[]
   hospitals  Hospital[]
   user_areas UserArea[]
@@ -115,6 +119,7 @@ model Hospital {
   deletedAt            DateTime?
   province             Province            @relation(fields: [province_id], references: [id])
   city                 City                @relation(fields: [city_id], references: [id])
+  user                 UserKeycloak        @relation(fields: [created_by], references: [id])
   vendor_experiences   VendorExperience[]
   executives_histories ExecutivesHistory[]
   status_histories     StatusHistory[]
@@ -133,18 +138,20 @@ model Vendor {
   createdAt          DateTime           @default(now())
   updatedAt          DateTime           @updatedAt
   deletedAt          DateTime?
+  user               UserKeycloak       @relation(fields: [created_by], references: [id])
   vendor_experiences VendorExperience[]
 
   @@map("vendors")
 }
 
 model UserArea {
-  id          String    @id @default(uuid())
+  id          String       @id @default(uuid())
   user_id     String
   province_id String
-  province    Province  @relation(fields: [province_id], references: [id])
-  createdAt   DateTime  @default(now())
-  updatedAt   DateTime  @updatedAt
+  province    Province     @relation(fields: [province_id], references: [id])
+  user        UserKeycloak @relation(fields: [user_id], references: [id])
+  createdAt   DateTime     @default(now())
+  updatedAt   DateTime     @updatedAt
   deletedAt   DateTime?
 
   @@map("user_areas")
@@ -212,6 +219,7 @@ model StatusHistory {
   new_status  ProgressStatus
   note        String?        @db.Text
   hospital    Hospital       @relation(fields: [hospital_id], references: [id])
+  user        UserKeycloak   @relation(fields: [user_id], references: [id])
   createdAt   DateTime       @default(now())
   updatedAt   DateTime       @updatedAt
   deletedAt   DateTime?

prisma/seeders/DatabaseSeeder.ts

@@ -84,9 +84,9 @@ async function main(): Promise<void> {
     await seedSumateraUtaraCities();
     await seedPapuaSelatanCities();
     await seedUsers();
-    await seedVendors();
-    await seedUserAreas();
-    await seedHospitals();
+    // await seedVendors();
+    // await seedUserAreas();
+    // await seedHospitals();
 }
 
 main()

prisma/seeders/HospitalSeeder.ts

@@ -5,8 +5,8 @@ const prisma = new PrismaClient();
 
 export async function seedHospitals(): Promise<void> {
     try {
-        const sales1 = await prisma.user.findFirst({ where: { username: 'sales1' } });
-        const sales2 = await prisma.user.findFirst({ where: { username: 'sales2' } });
+        const sales1 = await prisma.userKeycloak.findFirst({ where: { id: '1b50e497-159f-49c2-aa4d-466e72d796f0' } });
+        const sales2 = await prisma.userKeycloak.findFirst({ where: { id: '0ec065d8-547c-46e3-9980-df36b9648767' } });
 
         if (!sales1 || !sales2) {
             throw new Error('User sales1 or sales2 not found');
@@ -123,6 +123,7 @@ export async function seedHospitals(): Promise<void> {
     }
 }
 
+seedHospitals();
 
 // const { PrismaClient } = require('@prisma/client');
 // const prisma = new PrismaClient();

prisma/seeders/ProvinceSeeder.ts

@@ -14,17 +14,28 @@ const provinces: string[] = [
 
 export async function seedProvinces(): Promise<void> {
     for (const name of provinces.sort()) {
-        await prisma.province.upsert({
-            where: { name }, // 'name' harus @unique di schema.prisma
-            create: {
-                name,
-                createdAt: now().toDate(),
-            },
-            update: {
-                updatedAt: now().toDate()
-            }
+        const existing = await prisma.province.findFirst({
+            where: { name },
         });
+
+        if (!existing || existing.deletedAt !== null) {
+            // Jika tidak ada atau sudah soft-deleted, buat baru
+            await prisma.province.create({
+                data: {
+                    name,
+                    createdAt: now().toDate(),
+                },
+            });
+        } else {
+            // Jika sudah ada dan aktif, update updatedAt saja (optional)
+            await prisma.province.update({
+                where: { id: existing.id },
+                data: {
+                    updatedAt: now().toDate(),
+                },
+            });
+        }
     }
 
     console.log('✅ Provinces seeded!');
-}
+}

prisma/seeders/UserAreaSeeder.ts

@@ -3,8 +3,8 @@ import prisma from '../../src/prisma/PrismaClient';
 export async function seedUserAreas(): Promise<void> {
     try {
         // Ambil user dengan username 'sales1' dan 'sales2'
-        const sales1 = await prisma.user.findFirst({ where: { username: 'sales1' } });
-        const sales2 = await prisma.user.findFirst({ where: { username: 'sales2' } });
+        const sales1 = await prisma.userKeycloak.findFirst({ where: { id: '1b50e497-159f-49c2-aa4d-466e72d796f0' } });
+        const sales2 = await prisma.userKeycloak.findFirst({ where: { id: '0ec065d8-547c-46e3-9980-df36b9648767' } });
 
         if (!sales1 || !sales2) {
             throw new Error('User sales1 or sales2 not found');
@@ -38,6 +38,8 @@ export async function seedUserAreas(): Promise<void> {
     }
 }
 
+seedUserAreas();
+
 
 // const prisma = require('../../src/prisma/PrismaClient.js');
 

prisma/seeders/VendorSeeder.ts

@@ -11,9 +11,9 @@ interface VendorInput {
 export async function seedVendors(): Promise<void> {
     try {
         // Cari user dengan username admin1
-        const adminUser = await prisma.user.findFirst({
+        const adminUser = await prisma.userKeycloak.findFirst({
             where: {
-                username: 'admin1',
+                id: 'd3dcbbbd-fc92-45cf-9520-d0a6859358f6',
             },
         });
 
@@ -62,6 +62,8 @@ export async function seedVendors(): Promise<void> {
     }
 }
 
+seedVendors();
+
 // const prisma = require('../../src/prisma/PrismaClient.js');
 
 // async function seedVendors() {

src/controllers/admin/CityController.ts

@@ -1,28 +1,16 @@
 import { Request, Response } from 'express';
 import { CityCollection } from '../../resources/admin/city/CityCollection';
 import { CityResource } from '../../resources/admin/city/CityResource';
-import {
-    getAllCityService,
-    showCityService,
-    storeCityService,
-    updateCityService,
-    deleteCityService
-} from '../../services/admin/CityService';
+import * as CityService from '../../services/admin/CityService';
 import { PaginationParam } from '../../utils/PaginationParams';
 import { errorResponse, messageSuccessResponse } from '../../utils/Response';
-import {
-    validateStoreCityRequest,
-    // validateUpdateCityRequest,
-} from '../../validators/admin/city/CityValidators';
-
-// interface CustomRequest extends Request {
-//     tokenData?: any;
-// }
+import { validateStoreCityRequest, validateUpdateCityRequest, } from '../../validators/admin/city/CityValidators';
+import { CustomRequest } from '../../types/token/CustomRequest';
 
 export const getAllCity = async (req: Request, res: Response): Promise<Response> => {
     try {
         const { page, limit, search, sortBy, orderBy } = PaginationParam(req);
-        const { cities, total } = await getAllCityService({ page, limit, search, sortBy, orderBy });
+        const { cities, total } = await CityService.getAllCityService({ page, limit, search, sortBy, orderBy });
 
         return CityCollection(req, res, cities, total, page, limit, 'City data successfully retrieved');
     } catch (err) {
@@ -33,7 +21,7 @@ export const getAllCity = async (req: Request, res: Response): Promise<Response>
 export const showCity = async (req: Request, res: Response): Promise<Response> => {
     try {
         const id = req.params.id;
-        const data = await showCityService(id);
+        const data = await CityService.showCityService(id);
         return CityResource(res, data, 'Success show city');
     } catch (err) {
         return errorResponse(res, err);
@@ -43,7 +31,7 @@ export const showCity = async (req: Request, res: Response): Promise<Response> =
 export const storeCity = async (req: Request, res: Response): Promise<Response> => {
     try {
         const validatedData = validateStoreCityRequest(req.body);
-        await storeCityService(validatedData, req);
+        await CityService.storeCityService(validatedData, req as CustomRequest);
         return messageSuccessResponse(res, 'Success added city', 201);
     } catch (err) {
         return errorResponse(res, err);
@@ -53,8 +41,8 @@ export const storeCity = async (req: Request, res: Response): Promise<Response>
 export const updateCity = async (req: Request, res: Response): Promise<Response> => {
     try {
         const id = req.params.id;
-        // const validatedData = validateUpdateCityRequest(req.body);
-        // await updateCityService(validatedData, id, req);
+        const validatedData = validateUpdateCityRequest(req.body);
+        await CityService.updateCityService(validatedData, id, req as CustomRequest);
         return messageSuccessResponse(res, 'Success update city');
     } catch (err) {
         return errorResponse(res, err);
@@ -64,7 +52,7 @@ export const updateCity = async (req: Request, res: Response): Promise<Response>
 export const deleteCity = async (req: Request, res: Response): Promise<Response> => {
     try {
         const id = req.params.id;
-        await deleteCityService(id, req);
+        await CityService.deleteCityService(id, req as CustomRequest);
         return messageSuccessResponse(res, 'Success delete city');
     } catch (err) {
         return errorResponse(res, err);

src/controllers/admin/ExecutivesHistoryController.js

@@ -1,58 +0,0 @@
-const { ExecutivesHistoriCollection } = require('../../resources/admin/executives_history/ExecutivesHistoriCollection.js');
-const { ExecutivesHistoriResource } = require('../../resources/admin/executives_history/ExecutivesHistoriResource.js');
-const executivesHistoryService = require('../../services/admin/ExecutivesHistoryService.js');
-const { PaginationParam } = require('../../utils/PaginationParams.js');
-const { errorResponse, messageSuccessResponse } = require('../../utils/Response.js');
-const { validateStoreExecutivesHistoryRequest, validateUpdateExecutivesHistoryRequest } = require('../../validators/admin/executives_history/ExecutivesHistoriValidators.js');
-
-exports.getAllExecutivesHistory = async (req, res) => {
-    try {
-        const { page, limit, search, sortBy, orderBy } = PaginationParam(req);
-
-        const { executives_histories, total } = await executivesHistoryService.getAllExecutivesHistoryService({
-            page, limit, search, sortBy, orderBy
-        }, req);
-
-        return ExecutivesHistoriCollection(req, res, executives_histories, total, page, limit, 'Executives history successfully retrieved');
-    } catch (err) {
-        return errorResponse(res, err);
-    }
-};
-
-exports.showExecutivesHistory = async (req, res) => {
-    try {
-        const data = await executivesHistoryService.showExecutivesHistoryService(req);
-        return ExecutivesHistoriResource(res, data, 'Success show executives history');
-    } catch (err) {
-        return errorResponse(res, err);
-    }
-};
-
-exports.storeExecutivesHistory = async (req, res) => {
-    try {
-        const validatedData = validateStoreExecutivesHistoryRequest(req.body);
-        await executivesHistoryService.storeExecutivesHistoryService(validatedData, req);
-        return messageSuccessResponse(res, 'Success added executives history', 201);
-    } catch (err) {
-        return errorResponse(res, err);
-    }
-}
-
-exports.updateExecutivesHistory = async (req, res) => {
-    try {
-        const validatedData = validateUpdateExecutivesHistoryRequest(req.body);
-        await executivesHistoryService.updateExecutivesHistoryService(validatedData, req);
-        return messageSuccessResponse(res, 'Success update executives history');
-    } catch (err) {
-        return errorResponse(res, err);
-    }
-}
-
-exports.deleteExecutivesHistory = async (req, res) => {
-    try {
-        await executivesHistoryService.deleteExecutivesHistoryService(req);
-        return messageSuccessResponse(res, 'Success delete executives history');
-    } catch (err) {
-        return errorResponse(res, err);
-    }
-};

src/controllers/admin/ExecutivesHistoryController.ts

@@ -0,0 +1,121 @@
+import { Request, Response } from 'express';
+import { ExecutivesHistoriCollection } from '../../resources/admin/executives_history/ExecutivesHistoriCollection';
+import { ExecutivesHistoriResource } from '../../resources/admin/executives_history/ExecutivesHistoriResource';
+import * as executivesHistoryService from '../../services/admin/ExecutivesHistoryService';
+import { PaginationParam } from '../../utils/PaginationParams';
+import { errorResponse, messageSuccessResponse } from '../../utils/Response';
+import { validateStoreExecutivesHistoryRequest, validateUpdateExecutivesHistoryRequest, } from '../../validators/admin/executives_history/ExecutivesHistoriValidators';
+import { CustomRequest } from '../../types/token/CustomRequest';
+
+export const getAllExecutivesHistory = async (req: Request, res: Response): Promise<Response> => {
+    try {
+        const { page, limit, search, sortBy, orderBy } = PaginationParam(req);
+
+        const { executives_histories, total } = await executivesHistoryService.getAllExecutivesHistoryService(
+            { page, limit, search, sortBy, orderBy },
+            req
+        );
+
+        return ExecutivesHistoriCollection(req, res, executives_histories, total, page, limit, 'Executives history successfully retrieved');
+    } catch (err) {
+        return errorResponse(res, err);
+    }
+};
+
+export const showExecutivesHistory = async (req: Request, res: Response): Promise<Response> => {
+    try {
+        const data = await executivesHistoryService.showExecutivesHistoryService(req);
+        return ExecutivesHistoriResource(res, data, 'Success show executives history');
+    } catch (err) {
+        return errorResponse(res, err);
+    }
+};
+
+export const storeExecutivesHistory = async (req: Request, res: Response): Promise<Response> => {
+    try {
+        const validatedData = validateStoreExecutivesHistoryRequest(req.body);
+        await executivesHistoryService.storeExecutivesHistoryService(validatedData, req as CustomRequest);
+        return messageSuccessResponse(res, 'Success added executives history', 201);
+    } catch (err) {
+        return errorResponse(res, err);
+    }
+};
+
+export const updateExecutivesHistory = async (req: Request, res: Response): Promise<Response> => {
+    try {
+        const validatedData = validateUpdateExecutivesHistoryRequest(req.body);
+        await executivesHistoryService.updateExecutivesHistoryService(validatedData, req as CustomRequest);
+        return messageSuccessResponse(res, 'Success update executives history');
+    } catch (err) {
+        return errorResponse(res, err);
+    }
+};
+
+export const deleteExecutivesHistory = async (req: Request, res: Response): Promise<Response> => {
+    try {
+        await executivesHistoryService.deleteExecutivesHistoryService(req as CustomRequest);
+        return messageSuccessResponse(res, 'Success delete executives history');
+    } catch (err) {
+        return errorResponse(res, err);
+    }
+};
+
+
+// const { ExecutivesHistoriCollection } = require('../../resources/admin/executives_history/ExecutivesHistoriCollection.js');
+// const { ExecutivesHistoriResource } = require('../../resources/admin/executives_history/ExecutivesHistoriResource.js');
+// const executivesHistoryService = require('../../services/admin/ExecutivesHistoryService.js');
+// const { PaginationParam } = require('../../utils/PaginationParams.js');
+// const { errorResponse, messageSuccessResponse } = require('../../utils/Response.js');
+// const { validateStoreExecutivesHistoryRequest, validateUpdateExecutivesHistoryRequest } = require('../../validators/admin/executives_history/ExecutivesHistoriValidators.js');
+
+// exports.getAllExecutivesHistory = async (req, res) => {
+//     try {
+//         const { page, limit, search, sortBy, orderBy } = PaginationParam(req);
+
+//         const { executives_histories, total } = await executivesHistoryService.getAllExecutivesHistoryService({
+//             page, limit, search, sortBy, orderBy
+//         }, req);
+
+//         return ExecutivesHistoriCollection(req, res, executives_histories, total, page, limit, 'Executives history successfully retrieved');
+//     } catch (err) {
+//         return errorResponse(res, err);
+//     }
+// };
+
+// exports.showExecutivesHistory = async (req, res) => {
+//     try {
+//         const data = await executivesHistoryService.showExecutivesHistoryService(req);
+//         return ExecutivesHistoriResource(res, data, 'Success show executives history');
+//     } catch (err) {
+//         return errorResponse(res, err);
+//     }
+// };
+
+// exports.storeExecutivesHistory = async (req, res) => {
+//     try {
+//         const validatedData = validateStoreExecutivesHistoryRequest(req.body);
+//         await executivesHistoryService.storeExecutivesHistoryService(validatedData, req);
+//         return messageSuccessResponse(res, 'Success added executives history', 201);
+//     } catch (err) {
+//         return errorResponse(res, err);
+//     }
+// }
+
+// exports.updateExecutivesHistory = async (req, res) => {
+//     try {
+//         const validatedData = validateUpdateExecutivesHistoryRequest(req.body);
+//         await executivesHistoryService.updateExecutivesHistoryService(validatedData, req);
+//         return messageSuccessResponse(res, 'Success update executives history');
+//     } catch (err) {
+//         return errorResponse(res, err);
+//     }
+// }
+
+// exports.deleteExecutivesHistory = async (req, res) => {
+//     try {
+//         await executivesHistoryService.deleteExecutivesHistoryService(req);
+//         return messageSuccessResponse(res, 'Success delete executives history');
+//     } catch (err) {
+//         return errorResponse(res, err);
+//     }
+// };

src/controllers/admin/HospitalController.js

@@ -1,61 +0,0 @@
-const { HospitalCollection } = require('../../resources/admin/hospital/HospitalCollection.js');
-const { HospitalResource } = require('../../resources/admin/hospital/HospitalResource.js');
-const hospitalService = require('../../services/admin/HospitalService.js');
-const { PaginationParam } = require('../../utils/PaginationParams.js');
-const { errorResponse, messageSuccessResponse } = require('../../utils/Response.js');
-const { validateStoreHospitalRequest, validateUpdateHospitalRequest } = require('../../validators/admin/hospital/HospitalValidators.js');
-
-exports.getAllHospital = async (req, res) => {
-    try {
-        const { page, limit, search, sortBy, orderBy, province, city, type, ownership, progress_status } = PaginationParam(req, ['province', 'city', 'type', 'ownership', 'progress_status']);
-
-        const { hospitals, total } = await hospitalService.getAllHospitalService({
-            page, limit, search, sortBy, orderBy, province, city, type, ownership, progress_status
-        });
-
-        return HospitalCollection({ req, res, data: hospitals, total, page, limit, message: 'Hospital data successfully retrieved' });
-    } catch (err) {
-        return errorResponse(res, err);
-    }
-};
-
-exports.showHospital = async (req, res) => {
-    try {
-        const id = req.params.id;
-        const data = await hospitalService.showHospitalService(id);
-        return HospitalResource(res, data, 'Success show hospital');
-    } catch (err) {
-        return errorResponse(res, err);
-    }
-};
-
-exports.storeHospital = async (req, res) => {
-    try {
-        const validatedData = validateStoreHospitalRequest(req.body);
-        await hospitalService.storeHospitalService(validatedData, req);
-        return messageSuccessResponse(res, 'Success added hospital', 201);
-    } catch (err) {
-        return errorResponse(res, err);
-    }
-}
-
-exports.updateHospital = async (req, res) => {
-    try {
-        const id = req.params.id;
-        const validatedData = validateUpdateHospitalRequest(req.body);
-        await hospitalService.updateHospitalService(validatedData, id, req);
-        return messageSuccessResponse(res, 'Success update hospital');
-    } catch (err) {
-        return errorResponse(res, err);
-    }
-}
-
-exports.deleteHospital = async (req, res) => {
-    try {
-        const id = req.params.id;
-        await hospitalService.deleteHospitalService(id, req);
-        return messageSuccessResponse(res, 'Success delete hospital');
-    } catch (err) {
-        return errorResponse(res, err);
-    }
-};

src/controllers/admin/HospitalController.ts

@@ -0,0 +1,146 @@
+import { Request, Response } from 'express';
+import { HospitalCollection } from '../../resources/admin/hospital/HospitalCollection';
+import { HospitalResource } from '../../resources/admin/hospital/HospitalResource';
+import * as HospitalService from '../../services/admin/HospitalService';
+import { PaginationParam } from '../../utils/PaginationParams';
+import { errorResponse, messageSuccessResponse } from '../../utils/Response';
+import { validateStoreHospitalRequest, validateUpdateHospitalRequest } from '../../validators/admin/hospital/HospitalValidators';
+import { CustomRequest } from '../../types/token/CustomRequest';
+
+export const getAllHospital = async (req: Request, res: Response): Promise<Response> => {
+    try {
+        const {
+            page,
+            limit,
+            search,
+            sortBy,
+            orderBy,
+            province,
+            city,
+            type,
+            ownership,
+            progress_status
+        } = PaginationParam(req, ['province', 'city', 'type', 'ownership', 'progress_status']);
+
+        const { hospitals, total } = await HospitalService.getAllHospitalService({
+            page,
+            limit,
+            search,
+            sortBy,
+            orderBy,
+            province,
+            city,
+            type,
+            ownership,
+            progress_status
+        });
+
+        return HospitalCollection(req, res, hospitals, total, page, limit, 'Hospital data successfully retrieved');
+    } catch (err) {
+        return errorResponse(res, err);
+    }
+};
+
+export const showHospital = async (req: Request, res: Response): Promise<Response> => {
+    try {
+        const id = req.params.id;
+        const data = await HospitalService.showHospitalService(id);
+        return HospitalResource(res, data, 'Success show hospital');
+    } catch (err) {
+        return errorResponse(res, err);
+    }
+};
+
+export const storeHospital = async (req: Request, res: Response): Promise<Response> => {
+    try {
+        const validatedData = validateStoreHospitalRequest(req.body);
+        await HospitalService.storeHospitalService(validatedData, req as CustomRequest);
+        return messageSuccessResponse(res, 'Success added hospital', 201);
+    } catch (err) {
+        return errorResponse(res, err);
+    }
+};
+
+export const updateHospital = async (req: Request, res: Response): Promise<Response> => {
+    try {
+        const id = req.params.id;
+        const validatedData = validateUpdateHospitalRequest(req.body);
+        await HospitalService.updateHospitalService(validatedData, id, req as CustomRequest);
+        return messageSuccessResponse(res, 'Success update hospital');
+    } catch (err) {
+        return errorResponse(res, err);
+    }
+};
+
+export const deleteHospital = async (req: Request, res: Response): Promise<Response> => {
+    try {
+        const id = req.params.id;
+        await HospitalService.deleteHospitalService(id, req as CustomRequest);
+        return messageSuccessResponse(res, 'Success delete hospital');
+    } catch (err) {
+        return errorResponse(res, err);
+    }
+};
+
+
+// const { HospitalCollection } = require('../../resources/admin/hospital/HospitalCollection.js');
+// const { HospitalResource } = require('../../resources/admin/hospital/HospitalResource.js');
+// const hospitalService = require('../../services/admin/HospitalService.js');
+// const { PaginationParam } = require('../../utils/PaginationParams.js');
+// const { errorResponse, messageSuccessResponse } = require('../../utils/Response.js');
+// const { validateStoreHospitalRequest, validateUpdateHospitalRequest } = require('../../validators/admin/hospital/HospitalValidators.js');
+
+// exports.getAllHospital = async (req, res) => {
+//     try {
+//         const { page, limit, search, sortBy, orderBy, province, city, type, ownership, progress_status } = PaginationParam(req, ['province', 'city', 'type', 'ownership', 'progress_status']);
+
+//         const { hospitals, total } = await hospitalService.getAllHospitalService({
+//             page, limit, search, sortBy, orderBy, province, city, type, ownership, progress_status
+//         });
+
+//         return HospitalCollection({ req, res, data: hospitals, total, page, limit, message: 'Hospital data successfully retrieved' });
+//     } catch (err) {
+//         return errorResponse(res, err);
+//     }
+// };
+
+// exports.showHospital = async (req, res) => {
+//     try {
+//         const id = req.params.id;
+//         const data = await hospitalService.showHospitalService(id);
+//         return HospitalResource(res, data, 'Success show hospital');
+//     } catch (err) {
+//         return errorResponse(res, err);
+//     }
+// };
+
+// exports.storeHospital = async (req, res) => {
+//     try {
+//         const validatedData = validateStoreHospitalRequest(req.body);
+//         await hospitalService.storeHospitalService(validatedData, req);
+//         return messageSuccessResponse(res, 'Success added hospital', 201);
+//     } catch (err) {
+//         return errorResponse(res, err);
+//     }
+// }
+
+// exports.updateHospital = async (req, res) => {
+//     try {
+//         const id = req.params.id;
+//         const validatedData = validateUpdateHospitalRequest(req.body);
+//         await hospitalService.updateHospitalService(validatedData, id, req);
+//         return messageSuccessResponse(res, 'Success update hospital');
+//     } catch (err) {
+//         return errorResponse(res, err);
+//     }
+// }
+
+// exports.deleteHospital = async (req, res) => {
+//     try {
+//         const id = req.params.id;
+//         await hospitalService.deleteHospitalService(id, req);
+//         return messageSuccessResponse(res, 'Success delete hospital');
+//     } catch (err) {
+//         return errorResponse(res, err);
+//     }
+// };

src/controllers/admin/ProvinceController.ts

@@ -1,16 +1,17 @@
 import { Request, Response } from 'express';
 import { ProvinceCollection } from '../../resources/admin/province/ProvinceCollection';
 import { ProvinceResource } from '../../resources/admin/province/ProvinceResource';
-import { getAllProvinceService, storeProvinceService, showProvinceService, updateProvinceService, deleteProvinceService } from '../../services/admin/ProvinceService';
+import * as ProvinceService from '../../services/admin/ProvinceService';
 import { PaginationParam } from '../../utils/PaginationParams';
 import { errorResponse, messageSuccessResponse } from '../../utils/Response';
-import { validateStoreProvinceRequest } from '../../validators/admin/province/ProvinceValidators';
+import { validateProvinceStoreRequest, validateProvinceUpdateRequest } from '../../validators/admin/province/ProvinceValidators';
+import { CustomRequest } from '../../types/token/CustomRequest';
 
 export const getAllProvince = async (req: Request, res: Response): Promise<Response> => {
     try {
         const { page, limit, search, sortBy, orderBy } = PaginationParam(req);
 
-        const { provinces, total } = await getAllProvinceService({
+        const { provinces, total } = await ProvinceService.getAllProvinceService({
             page, limit, search, sortBy, orderBy
         });
 
@@ -23,7 +24,7 @@ export const getAllProvince = async (req: Request, res: Response): Promise<Respo
 export const showProvince = async (req: Request, res: Response): Promise<Response> => {
     try {
         const id = req.params.id;
-        const data = await showProvinceService(id);
+        const data = await ProvinceService.showProvinceService(id);
         return ProvinceResource(res, data, 'Success show province');
     } catch (err) {
         return errorResponse(res, err);
@@ -32,8 +33,8 @@ export const showProvince = async (req: Request, res: Response): Promise<Respons
 
 export const storeProvince = async (req: Request, res: Response): Promise<Response> => {
     try {
-        const validatedData = validateStoreProvinceRequest(req.body);
-        await storeProvinceService(validatedData, req);
+        const validatedData = validateProvinceStoreRequest(req.body);
+        await ProvinceService.storeProvinceService(validatedData, req as CustomRequest);
         return messageSuccessResponse(res, 'Success added province', 201);
     } catch (err) {
         return errorResponse(res, err);
@@ -43,8 +44,8 @@ export const storeProvince = async (req: Request, res: Response): Promise<Respon
 export const updateProvince = async (req: Request, res: Response): Promise<Response> => {
     try {
         const id = req.params.id;
-        const validatedData = validateStoreProvinceRequest(req.body);
-        await updateProvinceService(validatedData, id, req);
+        const validatedData = validateProvinceUpdateRequest(req.body);
+        await ProvinceService.updateProvinceService(validatedData, id, req as CustomRequest);
         return messageSuccessResponse(res, 'Success update province');
     } catch (err) {
         return errorResponse(res, err);
@@ -54,7 +55,7 @@ export const updateProvince = async (req: Request, res: Response): Promise<Respo
 export const deleteProvince = async (req: Request, res: Response): Promise<Response> => {
     try {
         const id = req.params.id;
-        await deleteProvinceService(id, req);
+        await ProvinceService.deleteProvinceService(id, req as CustomRequest);
         return messageSuccessResponse(res, 'Success delete province');
     } catch (err) {
         return errorResponse(res, err);

src/controllers/admin/SalesController.js

@@ -1,63 +0,0 @@
-const { SalesCollection } = require('../../resources/admin/sales/SalesCollection.js');
-const { SalesResource } = require('../../resources/admin/sales/SalesResource.js');
-const salesService = require('../../services/admin/SalesService.js');
-const { ListResponse } = require('../../utils/ListResponse.js');
-const { PaginationParam } = require('../../utils/PaginationParams.js');
-const { errorResponse, successResponse, messageSuccessResponse } = require('../../utils/Response.js');
-const { validateCreateSalesRequest, validateUpdateSalesRequest } = require('../../validators/admin/sales/SalesValidators.js');
-
-exports.getAllSales = async (req, res) => {
-    try {
-        const { page, limit, search, sortBy, orderBy } = PaginationParam(req);
-
-        const { sales, total } = await salesService.getAllSalesService({
-            page, limit, search, sortBy, orderBy
-        });
-
-        return SalesCollection(req, res, sales, total, page, limit, 'Sales data successfully retrieved');
-
-    } catch (err) {
-        return errorResponse(res, err);
-    }
-};
-
-exports.showSales = async (req, res) => {
-    try {
-        const id = req.params.id;
-        const data = await salesService.showSalesService(id);
-        return SalesResource(res, data, 'Success show sales');
-    } catch (err) {
-        return errorResponse(res, err);
-    }
-};
-
-exports.storeSales = async (req, res) => {
-    try {
-        const validated = validateCreateSalesRequest(req.body);
-        await salesService.storeSalesService(validated, req);
-        return messageSuccessResponse(res, 'Sales user created successfully', 201);
-    } catch (err) {
-        return errorResponse(res, err);
-    }
-}
-
-exports.updateSales = async (req, res) => {
-    try {
-        const id = req.params.id;
-        const validatedData = validateUpdateSalesRequest(req.body);
-        await salesService.updateSalesService(validatedData, id, req);
-        return messageSuccessResponse(res, 'Success update sales');
-    } catch (err) {
-        return errorResponse(res, err);
-    }
-}
-
-exports.deleteSales = async (req, res) => {
-    try {
-        const id = req.params.id;
-        await salesService.deleteSalesService(id, req);
-        return messageSuccessResponse(res, 'Success delete sales');
-    } catch (err) {
-        return errorResponse(res, err);
-    }
-};

src/controllers/admin/StatusHistoryController.js

@@ -1,29 +0,0 @@
-const { PaginationParam } = require("../../utils/PaginationParams");
-const statusHistoryService = require('../../services/admin/StatusHistoryService.js');
-const { validateCreateStatusHisotryRequest } = require("../../validators/admin/status_history/StatusHistoryValidators.js");
-const { StatusHistoryCollection } = require("../../resources/admin/status_history/StatusHistoryCollection.js");
-const { errorResponse, messageSuccessResponse } = require("../../utils/Response.js");
-
-exports.getAllStatusHistory = async (req, res) => {
-    try {
-        const { page, limit, search, sortBy, orderBy } = PaginationParam(req);
-
-        const { status_histories, total } = await statusHistoryService.getAllStatusHistoryService({
-            page, limit, search, sortBy, orderBy
-        }, req);
-
-        return StatusHistoryCollection({ req, res, data: status_histories, total, page, limit, message: 'Status history successfully retrieved' });
-    } catch (err) {
-        return errorResponse(res, err);
-    }
-};
-
-exports.storeStatusHistory = async (req, res) => {
-    try {
-        const validatedData = validateCreateStatusHisotryRequest(req.body);
-        await statusHistoryService.storeStatusHistoryService(validatedData, req);
-        return messageSuccessResponse(res, 'Success added status history', 201);
-    } catch (err) {
-        return errorResponse(res, err);
-    }
-}

src/controllers/admin/StatusHistoryController.ts

@@ -0,0 +1,71 @@
+import { Request, Response } from 'express';
+import { PaginationParam } from '../../utils/PaginationParams';
+import * as statusHistoryService from '../../services/admin/StatusHistoryService';
+import { validateCreateStatusHisotryRequest } from '../../validators/admin/status_history/StatusHistoryValidators';
+import { StatusHistoryCollection } from '../../resources/admin/status_history/StatusHistoryCollection';
+import { errorResponse, messageSuccessResponse } from '../../utils/Response';
+import { CustomRequest } from '../../types/token/CustomRequest';
+
+export const getAllStatusHistory = async (req: Request, res: Response): Promise<Response> => {
+    try {
+        const { page, limit, search, sortBy, orderBy } = PaginationParam(req);
+
+        const { status_histories, total } = await statusHistoryService.getAllStatusHistoryService(
+            { page, limit, search, sortBy, orderBy },
+            req
+        );
+
+        return StatusHistoryCollection(
+            req,
+            res,
+            status_histories,
+            total,
+            page,
+            limit,
+            'Status history successfully retrieved',
+        );
+    } catch (err) {
+        return errorResponse(res, err);
+    }
+};
+
+export const storeStatusHistory = async (req: Request, res: Response): Promise<Response> => {
+    try {
+        const validatedData = validateCreateStatusHisotryRequest(req.body);
+        await statusHistoryService.storeStatusHistoryService(validatedData, req as CustomRequest);
+        return messageSuccessResponse(res, 'Success added status history', 201);
+    } catch (err) {
+        return errorResponse(res, err);
+    }
+};
+
+
+// const { PaginationParam } = require("../../utils/PaginationParams");
+// const statusHistoryService = require('../../services/admin/StatusHistoryService.js');
+// const { validateCreateStatusHisotryRequest } = require("../../validators/admin/status_history/StatusHistoryValidators.js");
+// const { StatusHistoryCollection } = require("../../resources/admin/status_history/StatusHistoryCollection.js");
+// const { errorResponse, messageSuccessResponse } = require("../../utils/Response.js");
+
+// exports.getAllStatusHistory = async (req, res) => {
+//     try {
+//         const { page, limit, search, sortBy, orderBy } = PaginationParam(req);
+
+//         const { status_histories, total } = await statusHistoryService.getAllStatusHistoryService({
+//             page, limit, search, sortBy, orderBy
+//         }, req);
+
+//         return StatusHistoryCollection({ req, res, data: status_histories, total, page, limit, message: 'Status history successfully retrieved' });
+//     } catch (err) {
+//         return errorResponse(res, err);
+//     }
+// };
+
+// exports.storeStatusHistory = async (req, res) => {
+//     try {
+//         const validatedData = validateCreateStatusHisotryRequest(req.body);
+//         await statusHistoryService.storeStatusHistoryService(validatedData, req);
+//         return messageSuccessResponse(res, 'Success added status history', 201);
+//     } catch (err) {
+//         return errorResponse(res, err);
+//     }
+// }

src/controllers/admin/VendorController.js

@@ -1,61 +0,0 @@
-const { VendorCollection } = require('../../resources/admin/vendor/VendorCollection.js');
-const { VendorResource } = require('../../resources/admin/vendor/VendorResource.js');
-const vendorService = require('../../services/admin/VendorService.js');
-const { PaginationParam } = require('../../utils/PaginationParams.js');
-const { errorResponse, messageSuccessResponse } = require('../../utils/Response.js');
-const { validateStoreVendorRequest, validateUpdateVendorRequest } = require('../../validators/admin/vendor/VendorValidators.js');
-
-exports.getAllVendor = async (req, res) => {
-    try {
-        const { page, limit, search, sortBy, orderBy } = PaginationParam(req);
-
-        const { vendors, total } = await vendorService.getAllVendorService({
-            page, limit, search, sortBy, orderBy
-        });
-
-        return VendorCollection({ req, res, data: vendors, total, page, limit, message: 'Vendor data successfully retrieved' });
-    } catch (err) {
-        return errorResponse(res, err);
-    }
-};
-
-exports.showVendor = async (req, res) => {
-    try {
-        const id = req.params.id;
-        const { vendor, userName } = await vendorService.showVendorService(id);
-        return VendorResource(res, vendor, userName, 'Success show vendor');
-    } catch (err) {
-        return errorResponse(res, err);
-    }
-};
-
-exports.storeVendor = async (req, res) => {
-    try {
-        const validatedData = validateStoreVendorRequest(req.body);
-        await vendorService.storeVendorService(validatedData, req);
-        return messageSuccessResponse(res, 'Success added vendor', 201);
-    } catch (err) {
-        return errorResponse(res, err);
-    }
-}
-
-exports.updateVendor = async (req, res) => {
-    try {
-        const id = req.params.id;
-        const validatedData = validateUpdateVendorRequest(req.body);
-        await vendorService.updateVendorService(validatedData, id, req);
-        return messageSuccessResponse(res, 'Success update vendor');
-    } catch (err) {
-        return errorResponse(res, err);
-    }
-}
-
-exports.deleteVendor = async (req, res) => {
-    try {
-        const id = req.params.id;
-        await vendorService.deleteVendorService(id, req);
-        return messageSuccessResponse(res, 'Success delete vendor');
-    } catch (err) {
-        return errorResponse(res, err);
-    }
-};

src/controllers/admin/VendorController.ts

@@ -0,0 +1,126 @@
+import { Request, Response } from 'express';
+import { VendorCollection } from '../../resources/admin/vendor/VendorCollection';
+import { VendorResource } from '../../resources/admin/vendor/VendorResource';
+import * as VendorService from '../../services/admin/VendorService';
+import { PaginationParam } from '../../utils/PaginationParams';
+import { errorResponse, messageSuccessResponse } from '../../utils/Response';
+import { validateStoreVendorRequest, validateUpdateVendorRequest } from '../../validators/admin/vendor/VendorValidators';
+import { CustomRequest } from '../../types/token/CustomRequest';
+
+export const getAllVendor = async (req: Request, res: Response): Promise<Response> => {
+    try {
+        const { page, limit, search, sortBy, orderBy } = PaginationParam(req);
+
+        const { vendors, total } = await VendorService.getAllVendorService({
+            page, limit, search, sortBy, orderBy
+        });
+
+        return VendorCollection(req, res, vendors, total, page, limit, 'Vendor data successfully retrieved');
+    } catch (err) {
+        return errorResponse(res, err);
+    }
+};
+
+export const showVendor = async (req: Request, res: Response): Promise<Response> => {
+    try {
+        const id: string = req.params.id;
+        const { vendor } = await VendorService.showVendorService(id);
+        return VendorResource(res, vendor, 'Success show vendor');
+    } catch (err) {
+        return errorResponse(res, err);
+    }
+};
+
+export const storeVendor = async (req: Request, res: Response): Promise<Response> => {
+    try {
+        const validatedData = validateStoreVendorRequest(req.body);
+        await VendorService.storeVendorService(validatedData, req as CustomRequest);
+        return messageSuccessResponse(res, 'Success added vendor', 201);
+    } catch (err) {
+        return errorResponse(res, err);
+    }
+};
+
+export const updateVendor = async (req: Request, res: Response): Promise<Response> => {
+    try {
+        const id: string = req.params.id;
+        const validatedData = validateUpdateVendorRequest(req.body);
+        await VendorService.updateVendorService(validatedData, id, req as CustomRequest);
+        return messageSuccessResponse(res, 'Success update vendor');
+    } catch (err) {
+        return errorResponse(res, err);
+    }
+};
+
+export const deleteVendor = async (req: Request, res: Response): Promise<Response> => {
+    try {
+        const id: string = req.params.id;
+        await VendorService.deleteVendorService(id, req as CustomRequest);
+        return messageSuccessResponse(res, 'Success delete vendor');
+    } catch (err) {
+        return errorResponse(res, err);
+    }
+};
+
+
+// const { VendorCollection } = require('../../resources/admin/vendor/VendorCollection.js');
+// const { VendorResource } = require('../../resources/admin/vendor/VendorResource.js');
+// const vendorService = require('../../services/admin/VendorService.js');
+// const { PaginationParam } = require('../../utils/PaginationParams.js');
+// const { errorResponse, messageSuccessResponse } = require('../../utils/Response.js');
+// const { validateStoreVendorRequest, validateUpdateVendorRequest } = require('../../validators/admin/vendor/VendorValidators.js');
+
+// exports.getAllVendor = async (req, res) => {
+//     try {
+//         const { page, limit, search, sortBy, orderBy } = PaginationParam(req);
+
+//         const { vendors, total } = await vendorService.getAllVendorService({
+//             page, limit, search, sortBy, orderBy
+//         });
+
+//         return VendorCollection({ req, res, data: vendors, total, page, limit, message: 'Vendor data successfully retrieved' });
+//     } catch (err) {
+//         return errorResponse(res, err);
+//     }
+// };
+
+// exports.showVendor = async (req, res) => {
+//     try {
+//         const id = req.params.id;
+//         const { vendor } = await vendorService.showVendorService(id);
+//         return VendorResource(res, vendor, 'Success show vendor');
+//     } catch (err) {
+//         return errorResponse(res, err);
+//     }
+// };
+
+// exports.storeVendor = async (req, res) => {
+//     try {
+//         const validatedData = validateStoreVendorRequest(req.body);
+//         await vendorService.storeVendorService(validatedData, req);
+//         return messageSuccessResponse(res, 'Success added vendor', 201);
+//     } catch (err) {
+//         return errorResponse(res, err);
+//     }
+// }
+
+// exports.updateVendor = async (req, res) => {
+//     try {
+//         const id = req.params.id;
+//         const validatedData = validateUpdateVendorRequest(req.body);
+//         await vendorService.updateVendorService(validatedData, id, req);
+//         return messageSuccessResponse(res, 'Success update vendor');
+//     } catch (err) {
+//         return errorResponse(res, err);
+//     }
+// }
+
+// exports.deleteVendor = async (req, res) => {
+//     try {
+//         const id = req.params.id;
+//         await vendorService.deleteVendorService(id, req);
+//         return messageSuccessResponse(res, 'Success delete vendor');
+//     } catch (err) {
+//         return errorResponse(res, err);
+//     }
+// };

src/controllers/admin/VendorExperienceController.js

@@ -1,59 +0,0 @@
-const { VendorHistoriCollection } = require('../../resources/admin/vendor_history/VendorExperienceCollection.js');
-const { VendorHistoriResource } = require('../../resources/admin/vendor_history/VendorExperienceResource.js');
-const vendorHistoryService = require('../../services/admin/VendorExperienceService.js');
-const { PaginationParam } = require('../../utils/PaginationParams.js');
-const { errorResponse, messageSuccessResponse } = require('../../utils/Response.js');
-const { validateStoreVendorHistoryRequest, validateUpdateVendorHistoryRequest } = require('../../validators/admin/vendor_experience/VendorExperienceValidators.js');
-
-exports.getAllVendorHistory = async (req, res) => {
-    try {
-        const { page, limit, search, sortBy, orderBy } = PaginationParam(req);
-
-        const { vendor_histories, total } = await vendorHistoryService.getAllVendorHistoryService({
-            page, limit, search, sortBy, orderBy
-        }, req);
-
-        return VendorHistoriCollection(req, res, vendor_histories, total, page, limit, 'Vendor history successfully retrieved');
-
-    } catch (err) {
-        return errorResponse(res, err);
-    }
-};
-
-exports.showVendorHistory = async (req, res) => {
-    try {
-        const data = await vendorHistoryService.showVendorHistoryService(req);
-        return VendorHistoriResource(res, data, 'Success show vendor history');
-    } catch (err) {
-        return errorResponse(res, err);
-    }
-};
-
-exports.storeVendorHistory = async (req, res) => {
-    try {
-        const validatedData = validateStoreVendorHistoryRequest(req.body);
-        await vendorHistoryService.storeVendorHistoryService(validatedData, req);
-        return messageSuccessResponse(res, 'Success added vendor history', 201);
-    } catch (err) {
-        return errorResponse(res, err);
-    }
-}
-
-exports.updateVendorHistory = async (req, res) => {
-    try {
-        const validatedData = validateUpdateVendorHistoryRequest(req.body);
-        await vendorHistoryService.updateVendorHistoryService(validatedData, req);
-        return messageSuccessResponse(res, 'Success update vendor history');
-    } catch (err) {
-        return errorResponse(res, err);
-    }
-}
-
-exports.deleteVendorHistory = async (req, res) => {
-    try {
-        await vendorHistoryService.deleteVendorHistoryService(req);
-        return messageSuccessResponse(res, 'Success delete vendor history');
-    } catch (err) {
-        return errorResponse(res, err);
-    }
-};

src/controllers/admin/VendorExperienceController.ts

@@ -0,0 +1,122 @@
+import { Request, Response } from 'express';
+import { VendorExperienceCollection } from '../../resources/admin/vendor_experience/VendorExperienceCollection';
+import { VendorExperienceResource } from '../../resources/admin/vendor_experience/VendorExperienceResource';
+import * as VendorExperienceService from '../../services/admin/VendorExperienceService';
+import { PaginationParam } from '../../utils/PaginationParams';
+import { errorResponse, messageSuccessResponse } from '../../utils/Response';
+import { validateStoreVendorExperienceRequest, validateUpdateVendorExperienceRequest } from '../../validators/admin/vendor_experience/VendorExperienceValidators';
+import { CustomRequest } from '../../types/token/CustomRequest';
+
+export const getAllVendorExperience = async (req: Request, res: Response): Promise<Response> => {
+    try {
+        const { page, limit, search, sortBy, orderBy } = PaginationParam(req);
+
+        const { vendor_experiences, total } = await VendorExperienceService.getAllVendorExperienceService(
+            { page, limit, search, sortBy, orderBy },
+            req
+        );
+
+        return VendorExperienceCollection(req, res, vendor_experiences, total, page, limit, 'Vendor experience successfully retrieved');
+    } catch (err) {
+        return errorResponse(res, err);
+    }
+};
+
+export const showVendorExperience = async (req: Request, res: Response) => {
+    try {
+        const data = await VendorExperienceService.showVendorExperienceService(req);
+        return VendorExperienceResource(res, data, 'Success show vendor experience');
+    } catch (err) {
+        return errorResponse(res, err);
+    }
+};
+
+export const storeVendorExperience = async (req: Request, res: Response): Promise<Response> => {
+    try {
+        const validatedData = validateStoreVendorExperienceRequest(req.body);
+        await VendorExperienceService.storeVendorExperienceService(validatedData, req as CustomRequest);
+        return messageSuccessResponse(res, 'Success added vendor experience', 201);
+    } catch (err) {
+        return errorResponse(res, err);
+    }
+};
+
+export const updateVendorExperience = async (req: Request, res: Response): Promise<Response> => {
+    try {
+        const validatedData = validateUpdateVendorExperienceRequest(req.body);
+        await VendorExperienceService.updateVendorExperienceService(validatedData, req as CustomRequest);
+        return messageSuccessResponse(res, 'Success update vendor experience');
+    } catch (err) {
+        return errorResponse(res, err);
+    }
+};
+
+export const deleteVendorExperience = async (req: Request, res: Response): Promise<Response> => {
+    try {
+        await VendorExperienceService.deleteVendorExperienceService(req as CustomRequest);
+        return messageSuccessResponse(res, 'Success delete vendor experience');
+    } catch (err) {
+        return errorResponse(res, err);
+    }
+};
+
+
+// const { VendorExperienceCollection } = require('../../resources/admin/vendor_experience/VendorExperienceCollection.js');
+// const { VendorExperienceResource } = require('../../resources/admin/vendor_experience/VendorExperienceResource.js');
+// const vendorHistoryService = require('../../services/admin/VendorExperienceService.js');
+// const { PaginationParam } = require('../../utils/PaginationParams.js');
+// const { errorResponse, messageSuccessResponse } = require('../../utils/Response.js');
+// const { validateStoreVendorHistoryRequest, validateUpdateVendorHistoryRequest } = require('../../validators/admin/vendor_experience/VendorExperienceValidators.js');
+
+// exports.getAllVendorHistory = async (req, res) => {
+//     try {
+//         const { page, limit, search, sortBy, orderBy } = PaginationParam(req);
+
+//         const { vendor_histories, total } = await vendorHistoryService.getAllVendorHistoryService({
+//             page, limit, search, sortBy, orderBy
+//         }, req);
+
+//         return VendorExperienceCollection(req, res, vendor_histories, total, page, limit, 'Vendor experience successfully retrieved');
+
+//     } catch (err) {
+//         return errorResponse(res, err);
+//     }
+// };
+
+// exports.showVendorHistory = async (req, res) => {
+//     try {
+//         const data = await vendorHistoryService.showVendorHistoryService(req);
+//         return VendorExperienceResource(res, data, 'Success show vendor experience');
+//     } catch (err) {
+//         return errorResponse(res, err);
+//     }
+// };
+
+// exports.storeVendorHistory = async (req, res) => {
+//     try {
+//         const validatedData = validateStoreVendorHistoryRequest(req.body);
+//         await vendorHistoryService.storeVendorHistoryService(validatedData, req);
+//         return messageSuccessResponse(res, 'Success added vendor experience', 201);
+//     } catch (err) {
+//         return errorResponse(res, err);
+//     }
+// }
+
+// exports.updateVendorHistory = async (req, res) => {
+//     try {
+//         const validatedData = validateUpdateVendorHistoryRequest(req.body);
+//         await vendorHistoryService.updateVendorHistoryService(validatedData, req);
+//         return messageSuccessResponse(res, 'Success update vendor experience');
+//     } catch (err) {
+//         return errorResponse(res, err);
+//     }
+// }
+
+// exports.deleteVendorHistory = async (req, res) => {
+//     try {
+//         await vendorHistoryService.deleteVendorHistoryService(req);
+//         return messageSuccessResponse(res, 'Success delete vendor experience');
+//     } catch (err) {
+//         return errorResponse(res, err);
+//     }
+// };

src/controllers/auth/AuthControllers.js

@@ -1,33 +0,0 @@
-const { LoginResource } = require('../../resources/auth/LoginResource.js');
-const { UserResource } = require('../../resources/auth/UserResource.js');
-const { loginService, getUserService, logoutService } = require('../../services/auth/AuthService.js');
-const { successResponse, errorResponse, messageSuccessResponse } = require('../../utils/Response.js');
-const { validateLoginRequest } = require('../../validators/auth/LoginValidators.js');
-
-exports.login = async (req, res) => {
-    try {
-        const validated = validateLoginRequest(req.body);
-        const data = await loginService(validated, req);
-        return LoginResource(res, data, "Login success")
-    } catch (error) {
-        return errorResponse(res, error);
-    }
-};
-
-exports.getUser = async (req, res) => {
-    try {
-        const data = await getUserService(req);
-        return UserResource(res, data, 'Success get user');
-    } catch (error) {
-        return errorResponse(res, error);
-    }
-};
-
-exports.logout = async (req, res) => {
-    try {
-        await logoutService(req);
-        return messageSuccessResponse(res, 'Logout success', 200);
-    } catch (error) {
-        return errorResponse(res, error);
-    }
-}

src/controllers/sales/AreaController.js

@@ -1,16 +0,0 @@
-const { UserAreaCollection } = require("../../resources/sales/area/UserAreaCollection.js");
-const { getAllAreaByUserService } = require("../../services/sales/AreaService.js");
-const { PaginationParam } = require("../../utils/PaginationParams");
-const { errorResponse } = require("../../utils/Response");
-
-exports.getAllAreaByUser = async (req, res) => {
-    try {
-        const { page, limit, search, sortBy, orderBy } = PaginationParam(req);
-
-        const { areas, total } = await getAllAreaByUserService({ page, limit, search, sortBy, orderBy }, req);
-
-        return UserAreaCollection({ req, res, data: areas, total, page, limit, message: 'Area data successfully retrieved' });
-    } catch (err) {
-        return errorResponse(res, err);
-    }
-};

src/controllers/sales/AreaController.ts

@@ -0,0 +1,38 @@
+import { Request, Response } from 'express';
+import { UserAreaCollection } from '../../resources/sales/area/UserAreaCollection';
+import { getAllAreaByUserService } from '../../services/sales/AreaService';
+import { PaginationParam } from '../../utils/PaginationParams';
+import { errorResponse } from '../../utils/Response';
+import { CustomRequest } from '../../types/token/CustomRequest';
+
+export const getAllAreaByUser = async (req: Request, res: Response): Promise<Response | void> => {
+    try {
+        const { page, limit, search, sortBy, orderBy } = PaginationParam(req);
+
+        const { areas, total } = await getAllAreaByUserService(
+            { page, limit, search, sortBy, orderBy },
+            req as CustomRequest
+        );
+
+        return UserAreaCollection(req, res, areas, total, page, limit, 'Area data successfully retrieved',);
+    } catch (err) {
+        return errorResponse(res, err);
+    }
+};
+
+// const { UserAreaCollection } = require("../../resources/sales/area/UserAreaCollection.js");
+// const { getAllAreaByUserService } = require("../../services/sales/AreaService.js");
+// const { PaginationParam } = require("../../utils/PaginationParams");
+// const { errorResponse } = require("../../utils/Response");
+
+// exports.getAllAreaByUser = async (req, res) => {
+//     try {
+//         const { page, limit, search, sortBy, orderBy } = PaginationParam(req);
+
+//         const { areas, total } = await getAllAreaByUserService({ page, limit, search, sortBy, orderBy }, req);
+
+//         return UserAreaCollection({ req, res, data: areas, total, page, limit, message: 'Area data successfully retrieved' });
+//     } catch (err) {
+//         return errorResponse(res, err);
+//     }
+// };

src/controllers/sales/ExecutivesHistoryController.js

@@ -1,58 +0,0 @@
-const { ExecutivesHistoriResource } = require('../../resources/sales/executives_history/ExecutivesHistoriResource.js');
-const { ExecutivesHistoriCollection } = require('../../resources/sales/executives_history/ExecutivesHistoriCollection.js');
-const executivesHistoryService = require('../../services/sales/ExecutivesHistoryService.js');
-const { PaginationParam } = require('../../utils/PaginationParams.js');
-const { errorResponse, messageSuccessResponse } = require('../../utils/Response.js');
-const { validateStoreExecutivesHistoryRequest, validateUpdateExecutivesHistoryRequest } = require('../../validators/sales/executives_history/ExecutivesHistoriValidators.js');
-
-exports.getAllExecutivesHistory = async (req, res) => {
-    try {
-        const { page, limit, search, sortBy, orderBy } = PaginationParam(req);
-
-        const { executives_histories, total } = await executivesHistoryService.getAllExecutivesHistoryService({
-            page, limit, search, sortBy, orderBy
-        }, req);
-
-        return ExecutivesHistoriCollection(req, res, executives_histories, total, page, limit, 'Executives history successfully retrieved');
-    } catch (err) {
-        return errorResponse(res, err);
-    }
-};
-
-exports.showExecutivesHistory = async (req, res) => {
-    try {
-        const data = await executivesHistoryService.showExecutivesHistoryService(req);
-        return ExecutivesHistoriResource(res, data, 'Success show executives history');
-    } catch (err) {
-        return errorResponse(res, err);
-    }
-};
-
-exports.storeExecutivesHistory = async (req, res) => {
-    try {
-        const validatedData = validateStoreExecutivesHistoryRequest(req.body);
-        await executivesHistoryService.storeExecutivesHistoryService(validatedData, req);
-        return messageSuccessResponse(res, 'Success added executives history', 201);
-    } catch (err) {
-        return errorResponse(res, err);
-    }
-}
-
-exports.updateExecutivesHistory = async (req, res) => {
-    try {
-        const validatedData = validateUpdateExecutivesHistoryRequest(req.body);
-        await executivesHistoryService.updateExecutivesHistoryService(validatedData, req);
-        return messageSuccessResponse(res, 'Success update executives history');
-    } catch (err) {
-        return errorResponse(res, err);
-    }
-}
-
-exports.deleteExecutivesHistory = async (req, res) => {
-    try {
-        await executivesHistoryService.deleteExecutivesHistoryService(req);
-        return messageSuccessResponse(res, 'Success delete executives history');
-    } catch (err) {
-        return errorResponse(res, err);
-    }
-};

src/controllers/sales/ExecutivesHistoryController.ts

@@ -0,0 +1,120 @@
+import { Request, Response } from 'express';
+import { ExecutivesHistoriCollection } from '../../resources/sales/executives_history/ExecutivesHistoriCollection';
+import { ExecutivesHistoriResource } from '../../resources/sales/executives_history/ExecutivesHistoriResource';
+import * as executivesHistoryService from '../../services/sales/ExecutivesHistoryService';
+import { PaginationParam } from '../../utils/PaginationParams';
+import { errorResponse, messageSuccessResponse } from '../../utils/Response';
+import { validateStoreExecutivesHistoryRequest, validateUpdateExecutivesHistoryRequest, } from '../../validators/sales/executives_history/ExecutivesHistoriValidators';
+import { CustomRequest } from '../../types/token/CustomRequest';
+
+export const getAllExecutivesHistory = async (req: Request, res: Response): Promise<Response> => {
+    try {
+        const { page, limit, search, sortBy, orderBy } = PaginationParam(req);
+
+        const { executives_histories, total } = await executivesHistoryService.getAllExecutivesHistoryService(
+            { page, limit, search, sortBy, orderBy },
+            req as CustomRequest
+        );
+
+        return ExecutivesHistoriCollection(req, res, executives_histories, total, page, limit, 'Executives history successfully retrieved');
+    } catch (err) {
+        return errorResponse(res, err);
+    }
+};
+
+export const showExecutivesHistory = async (req: Request, res: Response): Promise<Response> => {
+    try {
+        const data = await executivesHistoryService.showExecutivesHistoryService(req as CustomRequest);
+        return ExecutivesHistoriResource(res, data, 'Success show executives history');
+    } catch (err) {
+        return errorResponse(res, err);
+    }
+};
+
+export const storeExecutivesHistory = async (req: Request, res: Response): Promise<Response> => {
+    try {
+        const validatedData = validateStoreExecutivesHistoryRequest(req.body);
+        await executivesHistoryService.storeExecutivesHistoryService(validatedData, req as CustomRequest);
+        return messageSuccessResponse(res, 'Success added executives history', 201);
+    } catch (err) {
+        return errorResponse(res, err);
+    }
+};
+
+export const updateExecutivesHistory = async (req: Request, res: Response): Promise<Response> => {
+    try {
+        const validatedData = validateUpdateExecutivesHistoryRequest(req.body);
+        await executivesHistoryService.updateExecutivesHistoryService(validatedData, req as CustomRequest);
+        return messageSuccessResponse(res, 'Success update executives history');
+    } catch (err) {
+        return errorResponse(res, err);
+    }
+};
+
+export const deleteExecutivesHistory = async (req: Request, res: Response): Promise<Response> => {
+    try {
+        await executivesHistoryService.deleteExecutivesHistoryService(req as CustomRequest);
+        return messageSuccessResponse(res, 'Success delete executives history');
+    } catch (err) {
+        return errorResponse(res, err);
+    }
+};
+
+// const { ExecutivesHistoriResource } = require('../../resources/sales/executives_history/ExecutivesHistoriResource.js');
+// const { ExecutivesHistoriCollection } = require('../../resources/sales/executives_history/ExecutivesHistoriCollection.js');
+// const executivesHistoryService = require('../../services/sales/ExecutivesHistoryService.js');
+// const { PaginationParam } = require('../../utils/PaginationParams.js');
+// const { errorResponse, messageSuccessResponse } = require('../../utils/Response.js');
+// const { validateStoreExecutivesHistoryRequest, validateUpdateExecutivesHistoryRequest } = require('../../validators/sales/executives_history/ExecutivesHistoriValidators.js');
+
+// exports.getAllExecutivesHistory = async (req, res) => {
+//     try {
+//         const { page, limit, search, sortBy, orderBy } = PaginationParam(req);
+
+//         const { executives_histories, total } = await executivesHistoryService.getAllExecutivesHistoryService({
+//             page, limit, search, sortBy, orderBy
+//         }, req);
+
+//         return ExecutivesHistoriCollection(req, res, executives_histories, total, page, limit, 'Executives history successfully retrieved');
+//     } catch (err) {
+//         return errorResponse(res, err);
+//     }
+// };
+
+// exports.showExecutivesHistory = async (req, res) => {
+//     try {
+//         const data = await executivesHistoryService.showExecutivesHistoryService(req);
+//         return ExecutivesHistoriResource(res, data, 'Success show executives history');
+//     } catch (err) {
+//         return errorResponse(res, err);
+//     }
+// };
+
+// exports.storeExecutivesHistory = async (req, res) => {
+//     try {
+//         const validatedData = validateStoreExecutivesHistoryRequest(req.body);
+//         await executivesHistoryService.storeExecutivesHistoryService(validatedData, req);
+//         return messageSuccessResponse(res, 'Success added executives history', 201);
+//     } catch (err) {
+//         return errorResponse(res, err);
+//     }
+// }
+
+// exports.updateExecutivesHistory = async (req, res) => {
+//     try {
+//         const validatedData = validateUpdateExecutivesHistoryRequest(req.body);
+//         await executivesHistoryService.updateExecutivesHistoryService(validatedData, req);
+//         return messageSuccessResponse(res, 'Success update executives history');
+//     } catch (err) {
+//         return errorResponse(res, err);
+//     }
+// }
+
+// exports.deleteExecutivesHistory = async (req, res) => {
+//     try {
+//         await executivesHistoryService.deleteExecutivesHistoryService(req);
+//         return messageSuccessResponse(res, 'Success delete executives history');
+//     } catch (err) {
+//         return errorResponse(res, err);
+//     }
+// };

src/controllers/sales/HospitalController.js

@@ -1,49 +0,0 @@
-const { HospitalCollection } = require("../../resources/sales/hospital/HospitalCollection.js");
-const { HospitalResource } = require("../../resources/sales/hospital/HospitalResource.js");
-const { getAllHospitalByAreaService, storeHospitalService, updateHospitalService, showHospitalService } = require("../../services/sales/HospitalService");
-const { PaginationParam } = require("../../utils/PaginationParams");
-const { errorResponse, messageSuccessResponse } = require("../../utils/Response");
-const { validateStoreHospitalRequest, validateUpdateHospitalRequest } = require('../../validators/admin/hospital/HospitalValidators.js');
-
-exports.getAllHospitalByArea = async (req, res) => {
-    try {
-        const { page, limit, search, sortBy, orderBy, province, city, type, ownership, progress_status } = PaginationParam(req, ['province', 'city', 'type', 'ownership', 'progress_status']);
-
-        const { hospitals, total } = await getAllHospitalByAreaService({ page, limit, search, sortBy, orderBy, province, city, type, ownership, progress_status }, req);
-
-        return HospitalCollection({ req, res, data: hospitals, total, page, limit, message: 'Hospital data successfully retrieved' });
-    } catch (err) {
-        return errorResponse(res, err);
-    }
-};
-
-exports.storeHospital = async (req, res) => {
-    try {
-        const validatedData = validateStoreHospitalRequest(req.body);
-        await storeHospitalService(validatedData, req);
-        return messageSuccessResponse(res, 'Success added hospital', 201);
-    } catch (err) {
-        return errorResponse(res, err);
-    }
-}
-
-exports.updateHospital = async (req, res) => {
-    try {
-        const id = req.params.id;
-        const validatedData = validateUpdateHospitalRequest(req.body);
-        await updateHospitalService(validatedData, id, req);
-        return messageSuccessResponse(res, 'Success update hospital');
-    } catch (err) {
-        return errorResponse(res, err);
-    }
-}
-
-exports.showHospital = async (req, res) => {
-    try {
-        const id = req.params.id;
-        const { hospital, userName } = await showHospitalService(id);
-        return HospitalResource(res, hospital, userName, 'Success show hospital');
-    } catch (err) {
-        return errorResponse(res, err);
-    }
-};

src/controllers/sales/HospitalController.ts

@@ -0,0 +1,110 @@
+import { Request, Response } from "express";
+import { HospitalCollection } from "../../resources/sales/hospital/HospitalCollection";
+import { HospitalResource } from "../../resources/sales/hospital/HospitalResource";
+import * as HospitalController from "../../services/sales/HospitalService";
+import { PaginationParam } from "../../utils/PaginationParams";
+import { errorResponse, messageSuccessResponse } from "../../utils/Response";
+import { validateStoreHospitalRequest, validateUpdateHospitalRequest, } from "../../validators/admin/hospital/HospitalValidators";
+import { CustomRequest } from "../../types/token/CustomRequest";
+
+// GET All Hospital by Area
+export const getAllHospitalByArea = async (req: any, res: Response): Promise<Response> => {
+    try {
+        const { page, limit, search, sortBy, orderBy, province, city, type, ownership, progress_status } =
+            PaginationParam(req, ["province", "city", "type", "ownership", "progress_status"]);
+
+        const { hospitals, total } = await HospitalController.getAllHospitalByAreaService(
+            { page, limit, search, sortBy, orderBy, province, city, type, ownership, progress_status },
+            req
+        );
+
+        return HospitalCollection({ req, res, data: hospitals, total, page, limit, message: "Hospital data successfully retrieved" });
+    } catch (err) {
+        return errorResponse(res, err);
+    }
+};
+
+// POST Store Hospital
+export const storeHospital = async (req: Request, res: Response): Promise<Response> => {
+    try {
+        const validatedData = validateStoreHospitalRequest(req.body);
+        await HospitalController.storeHospitalService(validatedData, req as CustomRequest);
+        return messageSuccessResponse(res, "Success added hospital", 201);
+    } catch (err) {
+        return errorResponse(res, err);
+    }
+};
+
+// PATCH/PUT Update Hospital
+export const updateHospital = async (req: Request, res: Response): Promise<Response> => {
+    try {
+        const id = req.params.id;
+        const validatedData = validateUpdateHospitalRequest(req.body);
+        await HospitalController.updateHospitalService(validatedData, id, req as CustomRequest);
+        return messageSuccessResponse(res, "Success update hospital");
+    } catch (err) {
+        return errorResponse(res, err);
+    }
+};
+
+// GET Show Hospital by ID
+export const showHospital = async (req: Request, res: Response): Promise<Response> => {
+    try {
+        const id = req.params.id;
+        const { hospital } = await HospitalController.showHospitalService(id, req as CustomRequest);
+        return HospitalResource(res, hospital, "Success show hospital");
+    } catch (err) {
+        return errorResponse(res, err);
+    }
+};
+
+
+// const { HospitalCollection } = require("../../resources/sales/hospital/HospitalCollection.js");
+// const { HospitalResource } = require("../../resources/sales/hospital/HospitalResource.js");
+// const { getAllHospitalByAreaService, storeHospitalService, updateHospitalService, showHospitalService } = require("../../services/sales/HospitalService");
+// const { PaginationParam } = require("../../utils/PaginationParams");
+// const { errorResponse, messageSuccessResponse } = require("../../utils/Response");
+// const { validateStoreHospitalRequest, validateUpdateHospitalRequest } = require('../../validators/admin/hospital/HospitalValidators.js');
+
+// exports.getAllHospitalByArea = async (req, res) => {
+//     try {
+//         const { page, limit, search, sortBy, orderBy, province, city, type, ownership, progress_status } = PaginationParam(req, ['province', 'city', 'type', 'ownership', 'progress_status']);
+
+//         const { hospitals, total } = await getAllHospitalByAreaService({ page, limit, search, sortBy, orderBy, province, city, type, ownership, progress_status }, req);
+
+//         return HospitalCollection({ req, res, data: hospitals, total, page, limit, message: 'Hospital data successfully retrieved' });
+//     } catch (err) {
+//         return errorResponse(res, err);
+//     }
+// };
+
+// exports.storeHospital = async (req, res) => {
+//     try {
+//         const validatedData = validateStoreHospitalRequest(req.body);
+//         await storeHospitalService(validatedData, req);
+//         return messageSuccessResponse(res, 'Success added hospital', 201);
+//     } catch (err) {
+//         return errorResponse(res, err);
+//     }
+// }
+
+// exports.updateHospital = async (req, res) => {
+//     try {
+//         const id = req.params.id;
+//         const validatedData = validateUpdateHospitalRequest(req.body);
+//         await updateHospitalService(validatedData, id, req);
+//         return messageSuccessResponse(res, 'Success update hospital');
+//     } catch (err) {
+//         return errorResponse(res, err);
+//     }
+// }
+
+// exports.showHospital = async (req, res) => {
+//     try {
+//         const id = req.params.id;
+//         const { hospital } = await showHospitalService(id);
+//         return HospitalResource(res, hospital, 'Success show hospital');
+//     } catch (err) {
+//         return errorResponse(res, err);
+//     }
+// };

src/controllers/sales/StatusHistoryController.js

@@ -1,29 +0,0 @@
-const { PaginationParam } = require("../../utils/PaginationParams");
-const statusHistoryService = require('../../services/sales/StatusHistoryService.js');
-const { validateCreateStatusHisotryRequest } = require("../../validators/admin/status_history/StatusHistoryValidators.js");
-const { StatusHistoryCollection } = require("../../resources/sales/status_history/StatusHistoryCollection.js");
-const { errorResponse, messageSuccessResponse } = require("../../utils/Response.js");
-
-exports.getAllStatusHistory = async (req, res) => {
-    try {
-        const { page, limit, search, sortBy, orderBy } = PaginationParam(req);
-
-        const { status_histories, total } = await statusHistoryService.getAllStatusHistoryService({
-            page, limit, search, sortBy, orderBy
-        }, req);
-
-        return StatusHistoryCollection({ req, res, data: status_histories, total, page, limit, message: 'Status history successfully retrieved' });
-    } catch (err) {
-        return errorResponse(res, err);
-    }
-};
-
-exports.storeStatusHistory = async (req, res) => {
-    try {
-        const validatedData = validateCreateStatusHisotryRequest(req.body);
-        await statusHistoryService.storeStatusHistoryService(validatedData, req);
-        return messageSuccessResponse(res, 'Success added status history', 201);
-    } catch (err) {
-        return errorResponse(res, err);
-    }
-}

src/controllers/sales/StatusHistoryController.ts

@@ -0,0 +1,71 @@
+import { Request, Response } from 'express';
+import { PaginationParam } from '../../utils/PaginationParams';
+import * as statusHistoryService from '../../services/sales/StatusHistoryService';
+import { validateCreateStatusHisotryRequest } from '../../validators/sales/status_history/StatusHistoryValidators';
+import { StatusHistoryCollection } from '../../resources/sales/status_history/StatusHistoryCollection';
+import { errorResponse, messageSuccessResponse } from '../../utils/Response';
+import { CustomRequest } from '../../types/token/CustomRequest';
+
+export const getAllStatusHistory = async (req: Request, res: Response): Promise<Response> => {
+    try {
+        const { page, limit, search, sortBy, orderBy } = PaginationParam(req);
+
+        const { status_histories, total } = await statusHistoryService.getAllStatusHistoryService(
+            { page, limit, search, sortBy, orderBy },
+            req as CustomRequest
+        );
+
+        return StatusHistoryCollection(
+            req,
+            res,
+            status_histories,
+            total,
+            page,
+            limit,
+            'Status history successfully retrieved',
+        );
+    } catch (err) {
+        return errorResponse(res, err);
+    }
+};
+
+export const storeStatusHistory = async (req: Request, res: Response): Promise<Response> => {
+    try {
+        const validatedData = validateCreateStatusHisotryRequest(req.body);
+        await statusHistoryService.storeStatusHistoryService(validatedData, req as CustomRequest);
+        return messageSuccessResponse(res, 'Success added status history', 201);
+    } catch (err) {
+        return errorResponse(res, err);
+    }
+};
+
+
+// const { PaginationParam } = require("../../utils/PaginationParams");
+// const statusHistoryService = require('../../services/sales/StatusHistoryService.js');
+// const { validateCreateStatusHisotryRequest } = require("../../validators/admin/status_history/StatusHistoryValidators.js");
+// const { StatusHistoryCollection } = require("../../resources/sales/status_history/StatusHistoryCollection.js");
+// const { errorResponse, messageSuccessResponse } = require("../../utils/Response.js");
+
+// exports.getAllStatusHistory = async (req, res) => {
+//     try {
+//         const { page, limit, search, sortBy, orderBy } = PaginationParam(req);
+
+//         const { status_histories, total } = await statusHistoryService.getAllStatusHistoryService({
+//             page, limit, search, sortBy, orderBy
+//         }, req);
+
+//         return StatusHistoryCollection({ req, res, data: status_histories, total, page, limit, message: 'Status history successfully retrieved' });
+//     } catch (err) {
+//         return errorResponse(res, err);
+//     }
+// };
+
+// exports.storeStatusHistory = async (req, res) => {
+//     try {
+//         const validatedData = validateCreateStatusHisotryRequest(req.body);
+//         await statusHistoryService.storeStatusHistoryService(validatedData, req);
+//         return messageSuccessResponse(res, 'Success added status history', 201);
+//     } catch (err) {
+//         return errorResponse(res, err);
+//     }
+// }

src/controllers/sales/VendorController.js

@@ -1,60 +0,0 @@
-const { VendorCollection } = require('../../resources/sales/vendor/VendorCollection.js');
-const vendorService = require('../../services/sales/VendorService.js');
-const { ListResponse } = require('../../utils/ListResponse.js');
-const { PaginationParam } = require('../../utils/PaginationParams.js');
-const { errorResponse, successResponse, messageSuccessResponse } = require('../../utils/Response.js');
-
-exports.getAllVendor = async (req, res) => {
-    try {
-        const { page, limit, search, sortBy, orderBy } = PaginationParam(req);
-
-        const { vendors, total } = await vendorService.getAllVendorService({
-            page, limit, search, sortBy, orderBy
-        }, req);
-
-        return VendorCollection(req, res, vendors, total, page, limit, 'Vendor data sales successfully retrieved');
-    } catch (err) {
-        return errorResponse(res, err);
-    }
-};
-
-// exports.showVendor = async (req, res) => {
-//     try {
-//         const id = req.params.id;
-//         const data = await vendorService.showVendorService(id);
-//         return successResponse(res, data, 'Success show vendor');
-//     } catch (err) {
-//         return errorResponse(res, err);
-//     }
-// };
-
-// exports.storeVendor = async (req, res) => {
-//     try {
-//         const validatedData = validateStoreVendorRequest(req.body);
-//         await vendorService.storeVendorService(validatedData, req);
-//         return messageSuccessResponse(res, 'Success added vendor', 201);
-//     } catch (err) {
-//         return errorResponse(res, err);
-//     }
-// }
-
-// exports.updateVendor = async (req, res) => {
-//     try {
-//         const id = req.params.id;
-//         const validatedData = validateStoreVendorRequest(req.body);
-//         await vendorService.updateVendorService(validatedData, id, req);
-//         return messageSuccessResponse(res, 'Success update vendor');
-//     } catch (err) {
-//         return errorResponse(res, err);
-//     }
-// }
-
-// exports.deleteVendor = async (req, res) => {
-//     try {
-//         const id = req.params.id;
-//         await vendorService.deleteVendorService(id, req);
-//         return messageSuccessResponse(res, 'Success delete vendor');
-//     } catch (err) {
-//         return errorResponse(res, err);
-//     }
-// };

src/controllers/sales/VendorExperienceController.ts

@@ -0,0 +1,121 @@
+import { Request, Response } from 'express';
+import { VendorExperienceCollection } from '../../resources/sales/vendor_experience/VendorExperienceCollection';
+import { VendorExperienceResource } from '../../resources/sales/vendor_experience/VendorExperienceResource';
+import * as VendorExperienceService from '../../services/sales/VendorExperienceService';
+import { PaginationParam } from '../../utils/PaginationParams';
+import { errorResponse, messageSuccessResponse } from '../../utils/Response';
+import { validateStoreVendorExperienceRequest, validateUpdateVendorExperienceRequest } from '../../validators/sales/vendor_experience/VendorExperienceValidators';
+import { CustomRequest } from '../../types/token/CustomRequest';
+
+export const getAllVendorExperience = async (req: Request, res: Response): Promise<Response> => {
+    try {
+        const { page, limit, search, sortBy, orderBy } = PaginationParam(req);
+
+        const { vendor_experiences, total } = await VendorExperienceService.getAllVendorExperienceService(
+            { page, limit, search, sortBy, orderBy },
+            req as CustomRequest
+        );
+
+        return VendorExperienceCollection(req, res, vendor_experiences, total, page, limit, 'Vendor experience successfully retrieved');
+    } catch (err) {
+        return errorResponse(res, err);
+    }
+};
+
+export const showVendorExperience = async (req: Request, res: Response) => {
+    try {
+        const data = await VendorExperienceService.showVendorExperienceService(req as CustomRequest);
+        return VendorExperienceResource(res, data, 'Success show vendor experience');
+    } catch (err) {
+        return errorResponse(res, err);
+    }
+};
+
+export const storeVendorExperience = async (req: Request, res: Response): Promise<Response> => {
+    try {
+        const validatedData = validateStoreVendorExperienceRequest(req.body);
+        await VendorExperienceService.storeVendorExperienceService(validatedData, req as CustomRequest);
+        return messageSuccessResponse(res, 'Success added vendor experience', 201);
+    } catch (err) {
+        return errorResponse(res, err);
+    }
+};
+
+export const updateVendorExperience = async (req: Request, res: Response): Promise<Response> => {
+    try {
+        const validatedData = validateUpdateVendorExperienceRequest(req.body);
+        await VendorExperienceService.updateVendorExperienceService(validatedData, req as CustomRequest);
+        return messageSuccessResponse(res, 'Success update vendor experience');
+    } catch (err) {
+        return errorResponse(res, err);
+    }
+};
+
+export const deleteVendorExperience = async (req: Request, res: Response): Promise<Response> => {
+    try {
+        await VendorExperienceService.deleteVendorExperienceService(req as CustomRequest);
+        return messageSuccessResponse(res, 'Success delete vendor experience');
+    } catch (err) {
+        return errorResponse(res, err);
+    }
+};
+
+// const { VendorExperienceCollection } = require('../../resources/sales/vendor_experience/VendorExperienceCollection.js');
+// const { VendorExperienceResource } = require('../../resources/sales/vendor_experience/VendorExperienceResource.js');
+// const vendorExperienceService = require('../../services/sales/VendorExperienceService.js');
+// const { PaginationParam } = require('../../utils/PaginationParams.js');
+// const { errorResponse, messageSuccessResponse } = require('../../utils/Response.js');
+// const { validateStoreVendorHistoryRequest, validateUpdateVendorHistoryRequest } = require('../../validators/sales/vendor_experience/VendorExperienceValidators.js');
+
+// exports.getAllVendorHistory = async (req, res) => {
+//     try {
+//         const { page, limit, search, sortBy, orderBy } = PaginationParam(req);
+
+//         const { vendor_histories, total } = await vendorExperienceService.getAllVendorHistoryService({
+//             page, limit, search, sortBy, orderBy
+//         }, req);
+
+//         return VendorExperienceCollection(req, res, vendor_histories, total, page, limit, 'Vendor experience successfully retrieved');
+
+//     } catch (err) {
+//         return errorResponse(res, err);
+//     }
+// };
+
+// exports.showVendorHistory = async (req, res) => {
+//     try {
+//         const data = await vendorExperienceService.showVendorHistoryService(req);
+//         return VendorExperienceResource(res, data, 'Success show vendor experience');
+//     } catch (err) {
+//         return errorResponse(res, err);
+//     }
+// };
+
+// exports.storeVendorHistory = async (req, res) => {
+//     try {
+//         const validatedData = validateStoreVendorHistoryRequest(req.body);
+//         await vendorExperienceService.storeVendorHistoryService(validatedData, req);
+//         return messageSuccessResponse(res, 'Success added vendor experience', 201);
+//     } catch (err) {
+//         return errorResponse(res, err);
+//     }
+// }
+
+// exports.updateVendorHistory = async (req, res) => {
+//     try {
+//         const validatedData = validateUpdateVendorHistoryRequest(req.body);
+//         await vendorExperienceService.updateVendorHistoryService(validatedData, req);
+//         return messageSuccessResponse(res, 'Success update vendor experience');
+//     } catch (err) {
+//         return errorResponse(res, err);
+//     }
+// }
+
+// exports.deleteVendorHistory = async (req, res) => {
+//     try {
+//         await vendorExperienceService.deleteVendorHistoryService(req);
+//         return messageSuccessResponse(res, 'Success delete vendor experience');
+//     } catch (err) {
+//         return errorResponse(res, err);
+//     }
+// };

src/controllers/sales/VendorHistoryController.js

@@ -1,59 +0,0 @@
-const { VendorHistoriCollection } = require('../../resources/sales/vendor_history/VendorHistoriCollection.js');
-const { VendorHistoriResource } = require('../../resources/sales/vendor_history/VendorHistoriResource.js');
-const vendorHistoryService = require('../../services/sales/VendorHistoryService.js');
-const { PaginationParam } = require('../../utils/PaginationParams.js');
-const { errorResponse, messageSuccessResponse } = require('../../utils/Response.js');
-const { validateStoreVendorHistoryRequest, validateUpdateVendorHistoryRequest } = require('../../validators/sales/vendor_history/VendorHistoriValidators.js');
-
-exports.getAllVendorHistory = async (req, res) => {
-    try {
-        const { page, limit, search, sortBy, orderBy } = PaginationParam(req);
-
-        const { vendor_histories, total } = await vendorHistoryService.getAllVendorHistoryService({
-            page, limit, search, sortBy, orderBy
-        }, req);
-
-        return VendorHistoriCollection(req, res, vendor_histories, total, page, limit, 'Vendor history successfully retrieved');
-
-    } catch (err) {
-        return errorResponse(res, err);
-    }
-};
-
-exports.showVendorHistory = async (req, res) => {
-    try {
-        const data = await vendorHistoryService.showVendorHistoryService(req);
-        return VendorHistoriResource(res, data, 'Success show vendor history');
-    } catch (err) {
-        return errorResponse(res, err);
-    }
-};
-
-exports.storeVendorHistory = async (req, res) => {
-    try {
-        const validatedData = validateStoreVendorHistoryRequest(req.body);
-        await vendorHistoryService.storeVendorHistoryService(validatedData, req);
-        return messageSuccessResponse(res, 'Success added vendor history', 201);
-    } catch (err) {
-        return errorResponse(res, err);
-    }
-}
-
-exports.updateVendorHistory = async (req, res) => {
-    try {
-        const validatedData = validateUpdateVendorHistoryRequest(req.body);
-        await vendorHistoryService.updateVendorHistoryService(validatedData, req);
-        return messageSuccessResponse(res, 'Success update vendor history');
-    } catch (err) {
-        return errorResponse(res, err);
-    }
-}
-
-exports.deleteVendorHistory = async (req, res) => {
-    try {
-        await vendorHistoryService.deleteVendorHistoryService(req);
-        return messageSuccessResponse(res, 'Success delete vendor history');
-    } catch (err) {
-        return errorResponse(res, err);
-    }
-};

src/controllers/superadmin/AdminController.js

@@ -1,61 +0,0 @@
-const { AdminCollection } = require('../../resources/superadmin/admin/AdminCollection.js');
-const { AdminResource } = require('../../resources/superadmin/admin/AdminResource.js');
-const adminService = require('../../services/superadmin/AdminService.js');
-const { PaginationParam } = require('../../utils/PaginationParams.js');
-const { errorResponse, messageSuccessResponse } = require('../../utils/Response.js');
-const { validateCreateAdminRequest, validateUpdateAdminRequest } = require('../../validators/superadmin/admin/AdminValidators.js');
-
-exports.getAllAdmin = async (req, res) => {
-    try {
-        const { page, limit, search, sortBy, orderBy } = PaginationParam(req);
-
-        const { admin, total } = await adminService.getAllAdminService({
-            page, limit, search, sortBy, orderBy
-        });
-
-        return AdminCollection(req, res, admin, total, page, limit, 'Admin data successfully retrieved');
-    } catch (err) {
-        return errorResponse(res, err);
-    }
-};
-
-exports.showAdmin = async (req, res) => {
-    try {
-        const id = req.params.id;
-        const data = await adminService.showAdminService(id);
-        return AdminResource(res, data, 'Success show admin');
-    } catch (err) {
-        return errorResponse(res, err);
-    }
-};
-
-exports.storeAdmin = async (req, res) => {
-    try {
-        const validated = validateCreateAdminRequest(req.body);
-        await adminService.storeAdminService(validated, req);
-        return messageSuccessResponse(res, 'Admin user created successfully', 201);
-    } catch (err) {
-        return errorResponse(res, err);
-    }
-}
-
-exports.updateAdmin = async (req, res) => {
-    try {
-        const id = req.params.id;
-        const validatedData = validateUpdateAdminRequest(req.body);
-        await adminService.updateAdminService(validatedData, id, req);
-        return messageSuccessResponse(res, 'Success update admin');
-    } catch (err) {
-        return errorResponse(res, err);
-    }
-}
-
-exports.deleteAdmin = async (req, res) => {
-    try {
-        const id = req.params.id;
-        await adminService.deleteAdminService(id, req);
-        return messageSuccessResponse(res, 'Success delete admin');
-    } catch (err) {
-        return errorResponse(res, err);
-    }
-};

src/controllers/superadmin/LogController.js

@@ -1,18 +0,0 @@
-const { LogCollection } = require('../../resources/superadmin/log/LogCollection.js');
-const logService = require('../../services/superadmin/LogService.js');
-const { PaginationParam } = require('../../utils/PaginationParams.js');
-const { errorResponse } = require('../../utils/Response.js');
-
-exports.getAllLogs = async (req, res) => {
-    try {
-        const { page, limit, search, sortBy, orderBy } = PaginationParam(req);
-
-        const { logs, total } = await logService.getAllLogsService({
-            page, limit, search, sortBy, orderBy
-        });
-
-        return LogCollection(req, res, logs, total, page, limit, 'Logs data successfully retrieved');
-    } catch (err) {
-        return errorResponse(res, err);
-    }
-};

src/middleware/CheckRoles.ts

@@ -1,29 +1,18 @@
 import { Request, Response, NextFunction } from 'express';
 
-interface CustomRequest extends Request {
-    tokenData?: {
-        realm_access?: {
-            roles?: string[];
-        };
-        [key: string]: any;
-    };
-}
-
-const checkRoles = (allowedRoles: string[] = []) => {
-    return async (req: CustomRequest, res: Response, next: NextFunction) => {
+const checkRoles = (allowedRoles: string[]) => {
+    return (req: Request, res: Response, next: NextFunction) => {
         try {
-            const tokenData = req.tokenData;
+            const tokenData = (req as any).tokenData;
             const roles = tokenData?.realm_access?.roles || [];
 
             const hasAccess = allowedRoles.some(role => roles.includes(role));
 
-            if (hasAccess) {
-                return next();
+            if (!hasAccess) {
+                return res.status(403).json({ message: 'Access Denied' });
             }
 
-            const error = new Error('Access Denied') as Error & { statusCode?: number };
-            error.statusCode = 403;
-            throw error;
+            next();
         } catch (error) {
             next(error);
         }
@@ -32,6 +21,34 @@ const checkRoles = (allowedRoles: string[] = []) => {
 
 export default checkRoles;
 
+// import { Response, NextFunction } from 'express';
+// import { CustomRequest } from '../types/token/CustomRequest';
+
+// const checkRoles = (allowedRoles: string[] = []) => {
+//     return async (req: CustomRequest, res: Response, next: NextFunction) => {
+//         try {
+//             const tokenData = req.tokenData;
+//             const roles = tokenData?.realm_access?.roles || [];
+
+//             const hasAccess = allowedRoles.some(role => roles.includes(role));
+
+//             if (hasAccess) {
+//                 return next();
+//             }
+
+//             const error = new Error('Access Denied') as Error & { statusCode?: number };
+//             error.statusCode = 403;
+//             throw error;
+//         } catch (error) {
+//             next(error);
+//         }
+//     };
+// };
+
+// export default checkRoles;
+
+// ========================================================
+
 // module.exports = (allowedRoles = []) => {
 //     return async (req, res, next) => {
 //         try {

src/middleware/ExtractToken.ts

@@ -1,11 +1,7 @@
 import { Request, Response, NextFunction } from 'express';
-import jwt from 'jsonwebtoken';
+import jwt, { JwtPayload } from 'jsonwebtoken';
 
-interface CustomRequest extends Request {
-    tokenData?: any;
-}
-
-const extractToken = async (req: CustomRequest, res: Response, next: NextFunction) => {
+export const extractToken = async (req: Request, res: Response, next: NextFunction) => {
     try {
         const bearerToken = req.headers.authorization;
 
@@ -14,16 +10,42 @@ const extractToken = async (req: CustomRequest, res: Response, next: NextFunctio
         }
 
         const token = bearerToken.split(' ')[1];
-        const tokenData = jwt.decode(token);
+        const tokenData = jwt.decode(token) as JwtPayload;
+
+        (req as any).tokenData = {
+            sub: tokenData?.sub as string,
+            realm_access: tokenData?.realm_access
+        };
 
-        req.tokenData = tokenData;
         next();
     } catch (error) {
         next(error);
     }
 };
 
-export default extractToken;
+// import { Response, NextFunction } from 'express';
+// import jwt from 'jsonwebtoken';
+// import { CustomRequest } from '../types/token/CustomRequest';
+
+// const extractToken = async (req: CustomRequest, res: Response, next: NextFunction) => {
+//     try {
+//         const bearerToken = req.headers.authorization;
+
+//         if (!bearerToken || !bearerToken.startsWith('Bearer ')) {
+//             return res.status(401).json({ message: 'Token tidak valid atau tidak ditemukan.' });
+//         }
+
+//         const token = bearerToken.split(' ')[1];
+//         const tokenData = jwt.decode(token);
+
+//         req.tokenData = { sub: tokenData?.sub as string };
+//         next();
+//     } catch (error) {
+//         next(error);
+//     }
+// };
+
+// export default extractToken;
 
 // module.exports = async (req, res, next) => {
 //     try {

src/repository/admin/CityRepository.ts

@@ -59,9 +59,22 @@ const CityRepository = {
         return prisma.city.create({ data });
     },
 
-    findByNameAndProvince: async (name: string, province_id: string) => {
+    // findByNameAndProvince: async (name: string, province_id: string) => {
+    //     return prisma.city.findFirst({
+    //         where: { name, province_id, deletedAt: null }
+    //     });
+    // },
+
+    findByNameAndProvinceId: async (name: string, province_id: string) => {
         return prisma.city.findFirst({
-            where: { name, province_id, deletedAt: null }
+            where: {
+                name: {
+                    equals: name,
+                    mode: 'insensitive'
+                },
+                province_id,
+                deletedAt: null,
+            }
         });
     },
 

src/repository/admin/ExecutivesHistoryRepository.js

@@ -1,114 +0,0 @@
-const prisma = require('../../prisma/PrismaClient.js');
-
-const ExecutivesHistoryRepository = {
-    findAll: async ({ skip, take, where, orderBy }) => {
-        return prisma.executivesHistory.findMany({
-            where,
-            skip,
-            take,
-            orderBy,
-            select: {
-                id: true,
-                hospital: {
-                    select: {
-                        id: true,
-                        name: true,
-                        hospital_code: true,
-                        type: true,
-                        ownership: true,
-                        province: {
-                            select: {
-                                id: true,
-                                name: true
-                            }
-                        },
-                        city: {
-                            select: {
-                                id: true,
-                                name: true
-                            }
-                        },
-                        address: true,
-                        simrs_type: true,
-                        contact: true,
-                        image: true,
-                        progress_status: true,
-                        note: true,
-                        created_by: true
-                    }
-                },
-                executive_name: true,
-                contact: true,
-                status: true,
-                start_term: true,
-                end_term: true,
-                createdAt: true,
-                updatedAt: true,
-            },
-        });
-    },
-
-    countAll: async (where) => {
-        return prisma.executivesHistory.count({ where });
-    },
-
-    findById: async (id) => {
-        return prisma.executivesHistory.findFirst({
-            where: {
-                id,
-                deletedAt: null
-            },
-            select: {
-                id: true,
-                hospital: {
-                    select: {
-                        id: true,
-                        name: true,
-                        hospital_code: true,
-                        type: true,
-                        ownership: true,
-                        province: {
-                            select: {
-                                id: true,
-                                name: true
-                            }
-                        },
-                        city: {
-                            select: {
-                                id: true,
-                                name: true
-                            }
-                        },
-                        address: true,
-                        simrs_type: true,
-                        contact: true,
-                        image: true,
-                        progress_status: true,
-                        note: true,
-                        created_by: true
-                    }
-                },
-                executive_name: true,
-                contact: true,
-                status: true,
-                start_term: true,
-                end_term: true,
-                createdAt: true,
-                updatedAt: true,
-            },
-        });
-    },
-
-    create: async (data) => {
-        return prisma.executivesHistory.create({ data });
-    },
-
-    update: async (id, data) => {
-        return prisma.executivesHistory.update({
-            where: { id },
-            data
-        });
-    },
-};
-
-module.exports = ExecutivesHistoryRepository;

src/repository/admin/ExecutivesHistoryRepository.ts

@@ -0,0 +1,184 @@
+import { PrismaClient, Prisma } from '@prisma/client';
+
+const prisma = new PrismaClient();
+
+export const ExecutivesHistoryRepository = {
+    findAll: async ({
+        skip,
+        take,
+        where,
+        orderBy
+    }: {
+        skip?: number;
+        take?: number;
+        where?: Prisma.ExecutivesHistoryWhereInput;
+        orderBy?: Prisma.ExecutivesHistoryOrderByWithRelationInput;
+    }) => {
+        return prisma.executivesHistory.findMany({
+            where,
+            skip,
+            take,
+            orderBy,
+            select: {
+                id: true,
+                executive_name: true,
+                contact: true,
+                status: true,
+                start_term: true,
+                end_term: true,
+                createdAt: true,
+                updatedAt: true,
+            },
+        });
+    },
+
+    countAll: async (where?: Prisma.ExecutivesHistoryWhereInput) => {
+        return prisma.executivesHistory.count({ where });
+    },
+
+    findById: async (id: string) => {
+        return prisma.executivesHistory.findFirst({
+            where: {
+                id,
+                deletedAt: null,
+            },
+            select: {
+                id: true,
+                executive_name: true,
+                contact: true,
+                status: true,
+                start_term: true,
+                end_term: true,
+                createdAt: true,
+                updatedAt: true,
+            },
+        });
+    },
+
+    create: async (data: Prisma.ExecutivesHistoryCreateInput) => {
+        return prisma.executivesHistory.create({ data });
+    },
+
+    update: async (id: string, data: Prisma.ExecutivesHistoryUpdateInput) => {
+        return prisma.executivesHistory.update({
+            where: { id },
+            data,
+        });
+    },
+};
+
+
+// const prisma = require('../../prisma/PrismaClient.js');
+
+// const ExecutivesHistoryRepository = {
+//     findAll: async ({ skip, take, where, orderBy }) => {
+//         return prisma.executivesHistory.findMany({
+//             where,
+//             skip,
+//             take,
+//             orderBy,
+//             select: {
+//                 id: true,
+//                 hospital: {
+//                     select: {
+//                         id: true,
+//                         name: true,
+//                         hospital_code: true,
+//                         type: true,
+//                         ownership: true,
+//                         province: {
+//                             select: {
+//                                 id: true,
+//                                 name: true
+//                             }
+//                         },
+//                         city: {
+//                             select: {
+//                                 id: true,
+//                                 name: true
+//                             }
+//                         },
+//                         address: true,
+//                         // simrs_type: true,
+//                         contact: true,
+//                         image: true,
+//                         progress_status: true,
+//                         note: true,
+//                         created_by: true
+//                     }
+//                 },
+//                 executive_name: true,
+//                 contact: true,
+//                 status: true,
+//                 start_term: true,
+//                 end_term: true,
+//                 createdAt: true,
+//                 updatedAt: true,
+//             },
+//         });
+//     },
+
+//     countAll: async (where) => {
+//         return prisma.executivesHistory.count({ where });
+//     },
+
+//     findById: async (id) => {
+//         return prisma.executivesHistory.findFirst({
+//             where: {
+//                 id,
+//                 deletedAt: null
+//             },
+//             select: {
+//                 id: true,
+//                 hospital: {
+//                     select: {
+//                         id: true,
+//                         name: true,
+//                         hospital_code: true,
+//                         type: true,
+//                         ownership: true,
+//                         province: {
+//                             select: {
+//                                 id: true,
+//                                 name: true
+//                             }
+//                         },
+//                         city: {
+//                             select: {
+//                                 id: true,
+//                                 name: true
+//                             }
+//                         },
+//                         address: true,
+//                         // simrs_type: true,
+//                         contact: true,
+//                         image: true,
+//                         progress_status: true,
+//                         note: true,
+//                         created_by: true
+//                     }
+//                 },
+//                 executive_name: true,
+//                 contact: true,
+//                 status: true,
+//                 start_term: true,
+//                 end_term: true,
+//                 createdAt: true,
+//                 updatedAt: true,
+//             },
+//         });
+//     },
+
+//     create: async (data) => {
+//         return prisma.executivesHistory.create({ data });
+//     },
+
+//     update: async (id, data) => {
+//         return prisma.executivesHistory.update({
+//             where: { id },
+//             data
+//         });
+//     },
+// };
+
+// module.exports = ExecutivesHistoryRepository;

src/repository/admin/HospitalRepository.js

@@ -1,153 +0,0 @@
-const prisma = require('../../prisma/PrismaClient.js');
-
-const HospitalRepository = {
-    findAll: async ({ skip, take, where, orderBy }) => {
-        const hospitalsRaw = await prisma.hospital.findMany({
-            where,
-            skip,
-            take,
-            orderBy,
-            select: {
-                id: true,
-                name: true,
-                hospital_code: true,
-                type: true,
-                ownership: true,
-                province: { select: { id: true, name: true } },
-                city: { select: { id: true, name: true } },
-                address: true,
-                // simrs_type: true,
-                contact: true,
-                image: true,
-                progress_status: true,
-                note: true,
-                latitude: true,
-                longitude: true,
-                gmaps_url: true,
-                created_by: true,
-                createdAt: true,
-                updatedAt: true,
-                vendor_experiences: {
-                    where: {
-                        status: "active",
-                        deletedAt: null
-                    },
-                    select: {
-                        vendor: {
-                            select: {
-                                id: true,
-                                name: true,
-                                name_pt: true,
-                                strengths: true,
-                                weaknesses: true,
-                                website: true,
-                            }
-                        }
-                    }
-                }
-            }
-        });
-
-        return hospitalsRaw.map(hospital => {
-            const { vendor_histories, ...rest } = hospital;
-            return {
-                ...rest,
-                vendor: vendor_histories?.[0]?.vendor || null
-            };
-        });
-    },
-
-    countAll: async (where) => {
-        return prisma.hospital.count({ where });
-    },
-
-    findById: async (id) => {
-        const hospitalRaw = await prisma.hospital.findFirst({
-            where: {
-                id,
-                deletedAt: null
-            },
-            select: {
-                id: true,
-                name: true,
-                hospital_code: true,
-                type: true,
-                ownership: true,
-                province: { select: { id: true, name: true } },
-                city: { select: { id: true, name: true } },
-                address: true,
-                // simrs_type: true,
-                contact: true,
-                image: true,
-                progress_status: true,
-                note: true,
-                latitude: true,
-                longitude: true,
-                gmaps_url: true,
-                created_by: true,
-                createdAt: true,
-                updatedAt: true,
-                vendor_experiences: {
-                    where: {
-                        status: "active",
-                        deletedAt: null
-                    },
-                    take: 1,
-                    select: {
-                        vendor: {
-                            select: {
-                                id: true,
-                                name: true,
-                                name_pt: true,
-                                strengths: true,
-                                weaknesses: true,
-                                website: true,
-                            }
-                        }
-                    }
-                }
-            }
-        });
-
-        if (!hospitalRaw) return null;
-
-        const { vendor_histories, ...rest } = hospitalRaw;
-        return {
-            ...rest,
-            vendor: vendor_histories?.[0]?.vendor || null
-        };
-    },
-
-    create: async (data) => {
-        return prisma.hospital.create({ data });
-    },
-
-    // update: async (id, data) => {
-    //     return prisma.hospital.update({
-    //         where: { id },
-    //         data: {
-    //             name: data.name,
-    //             hospital_code: data.hospital_code,
-    //             type: data.type,
-    //             ownership: data.ownership,
-    //             province: { connect: { id: data.province_id } },
-    //             city: { connect: { id: data.city_id } },
-    //             address: data.address,
-    //             // simrs_type: data.simrs_type,
-    //             contact: data.contact,
-    //             note: data.note,
-    //             image: data.image,
-    //             progress_status: data.progress_status,
-    //         }
-    //     });
-    // },
-
-    update: async (id, data) => {
-        return prisma.hospital.update({
-            where: { id },
-            data
-        });
-    },
-};
-
-module.exports = HospitalRepository;

src/repository/admin/HospitalRepository.ts

@@ -0,0 +1,300 @@
+import prisma from '../../prisma/PrismaClient';
+import { Prisma } from '@prisma/client';
+
+interface FindAllParams {
+    skip: number;
+    take: number;
+    where?: Prisma.HospitalWhereInput;
+    orderBy?: Prisma.HospitalOrderByWithRelationInput;
+}
+
+const HospitalRepository = {
+    findAll: async ({ skip, take, where, orderBy }: FindAllParams) => {
+        const hospitalsRaw = await prisma.hospital.findMany({
+            where,
+            skip,
+            take,
+            orderBy,
+            select: {
+                id: true,
+                name: true,
+                hospital_code: true,
+                type: true,
+                ownership: true,
+                province: { select: { id: true, name: true } },
+                city: { select: { id: true, name: true } },
+                address: true,
+                // simrs_type: true,
+                contact: true,
+                image: true,
+                progress_status: true,
+                note: true,
+                latitude: true,
+                longitude: true,
+                gmaps_url: true,
+                created_by: true,
+                createdAt: true,
+                updatedAt: true,
+                user: { select: { id: true, fullname: true } },
+                vendor_experiences: {
+                    where: {
+                        status: 'active',
+                        deletedAt: null,
+                    },
+                    select: {
+                        vendor: {
+                            select: {
+                                id: true,
+                                name: true,
+                                name_pt: true,
+                                strengths: true,
+                                weaknesses: true,
+                                website: true,
+                            },
+                        },
+                    },
+                },
+            },
+        });
+
+        return hospitalsRaw.map((hospital) => {
+            const { vendor_experiences, ...rest } = hospital;
+            return {
+                ...rest,
+                vendor: vendor_experiences?.[0]?.vendor || null,
+            };
+        });
+    },
+
+    countAll: async (where: Prisma.HospitalWhereInput) => {
+        return prisma.hospital.count({ where });
+    },
+
+    findById: async (id: string) => {
+        const hospitalRaw = await prisma.hospital.findFirst({
+            where: {
+                id,
+                deletedAt: null,
+            },
+            select: {
+                id: true,
+                name: true,
+                hospital_code: true,
+                type: true,
+                ownership: true,
+                province: { select: { id: true, name: true } },
+                city: { select: { id: true, name: true } },
+                address: true,
+                // simrs_type: true,
+                contact: true,
+                image: true,
+                progress_status: true,
+                note: true,
+                latitude: true,
+                longitude: true,
+                gmaps_url: true,
+                created_by: true,
+                createdAt: true,
+                updatedAt: true,
+                user: { select: { id: true, fullname: true } },
+                vendor_experiences: {
+                    where: {
+                        status: 'active',
+                        deletedAt: null,
+                    },
+                    take: 1,
+                    select: {
+                        vendor: {
+                            select: {
+                                id: true,
+                                name: true,
+                                name_pt: true,
+                                strengths: true,
+                                weaknesses: true,
+                                website: true,
+                            },
+                        },
+                    },
+                },
+            },
+        });
+
+        if (!hospitalRaw) return null;
+
+        const { vendor_experiences, ...rest } = hospitalRaw;
+        return {
+            ...rest,
+            vendor: vendor_experiences?.[0]?.vendor || null,
+        };
+    },
+
+    create: async (data: Prisma.HospitalCreateInput) => {
+        return prisma.hospital.create({ data });
+    },
+
+    update: async (id: string, data: Prisma.HospitalUpdateInput) => {
+        return prisma.hospital.update({
+            where: { id },
+            data,
+        });
+    },
+};
+
+export default HospitalRepository;
+
+
+// const prisma = require('../../prisma/PrismaClient.js');
+
+// const HospitalRepository = {
+//     findAll: async ({ skip, take, where, orderBy }) => {
+//         const hospitalsRaw = await prisma.hospital.findMany({
+//             where,
+//             skip,
+//             take,
+//             orderBy,
+//             select: {
+//                 id: true,
+//                 name: true,
+//                 hospital_code: true,
+//                 type: true,
+//                 ownership: true,
+//                 province: { select: { id: true, name: true } },
+//                 city: { select: { id: true, name: true } },
+//                 address: true,
+//                 // simrs_type: true,
+//                 contact: true,
+//                 image: true,
+//                 progress_status: true,
+//                 note: true,
+//                 latitude: true,
+//                 longitude: true,
+//                 gmaps_url: true,
+//                 created_by: true,
+//                 createdAt: true,
+//                 updatedAt: true,
+//                 user: { select: { id: true, fullname: true } },
+//                 vendor_experiences: {
+//                     where: {
+//                         status: "active",
+//                         deletedAt: null
+//                     },
+//                     select: {
+//                         vendor: {
+//                             select: {
+//                                 id: true,
+//                                 name: true,
+//                                 name_pt: true,
+//                                 strengths: true,
+//                                 weaknesses: true,
+//                                 website: true,
+//                             }
+//                         }
+//                     }
+//                 }
+//             }
+//         });
+
+//         return hospitalsRaw.map(hospital => {
+//             const { vendor_experiences, ...rest } = hospital;
+//             return {
+//                 ...rest,
+//                 vendor: vendor_experiences?.[0]?.vendor || null
+//             };
+//         });
+//     },
+
+//     countAll: async (where) => {
+//         return prisma.hospital.count({ where });
+//     },
+
+//     findById: async (id) => {
+//         const hospitalRaw = await prisma.hospital.findFirst({
+//             where: {
+//                 id,
+//                 deletedAt: null
+//             },
+//             select: {
+//                 id: true,
+//                 name: true,
+//                 hospital_code: true,
+//                 type: true,
+//                 ownership: true,
+//                 province: { select: { id: true, name: true } },
+//                 city: { select: { id: true, name: true } },
+//                 address: true,
+//                 // simrs_type: true,
+//                 contact: true,
+//                 image: true,
+//                 progress_status: true,
+//                 note: true,
+//                 latitude: true,
+//                 longitude: true,
+//                 gmaps_url: true,
+//                 created_by: true,
+//                 createdAt: true,
+//                 updatedAt: true,
+//                 user: { select: { id: true, fullname: true } },
+//                 vendor_experiences: {
+//                     where: {
+//                         status: "active",
+//                         deletedAt: null
+//                     },
+//                     take: 1,
+//                     select: {
+//                         vendor: {
+//                             select: {
+//                                 id: true,
+//                                 name: true,
+//                                 name_pt: true,
+//                                 strengths: true,
+//                                 weaknesses: true,
+//                                 website: true,
+//                             }
+//                         }
+//                     }
+//                 }
+//             }
+//         });
+
+//         if (!hospitalRaw) return null;
+
+//         const { vendor_experiences, ...rest } = hospitalRaw;
+//         return {
+//             ...rest,
+//             vendor: vendor_experiences?.[0]?.vendor || null
+//         };
+//     },
+
+//     create: async (data) => {
+//         return prisma.hospital.create({ data });
+//     },
+
+//     // update: async (id, data) => {
+//     //     return prisma.hospital.update({
+//     //         where: { id },
+//     //         data: {
+//     //             name: data.name,
+//     //             hospital_code: data.hospital_code,
+//     //             type: data.type,
+//     //             ownership: data.ownership,
+//     //             province: { connect: { id: data.province_id } },
+//     //             city: { connect: { id: data.city_id } },
+//     //             address: data.address,
+//     //             // simrs_type: data.simrs_type,
+//     //             contact: data.contact,
+//     //             note: data.note,
+//     //             image: data.image,
+//     //             progress_status: data.progress_status,
+//     //         }
+//     //     });
+//     // },
+
+//     update: async (id, data) => {
+//         return prisma.hospital.update({
+//             where: { id },
+//             data
+//         });
+//     },
+// };
+
+// module.exports = HospitalRepository;

src/repository/admin/ProvinceRepository.ts

@@ -43,6 +43,18 @@ const ProvinceRepository = {
         });
     },
 
+    findByName: async (name: string) => {
+        return prisma.province.findFirst({
+            where: {
+                name: {
+                    equals: name,
+                    mode: "insensitive",
+                },
+                deletedAt: null,
+            },
+        });
+    },
+
     create: async (data: Prisma.ProvinceCreateInput) => {
         return prisma.province.create({ data });
     },

src/repository/admin/SalesRepository.js

@@ -1,261 +0,0 @@
-const axios = require('axios');
-const qs = require('qs');
-const {
-    KEYCLOAK_REALM,
-    KEYCLOAK_ADMIN_URL,
-    CLIENT_ID,
-    CLIENT_SECRET
-} = require('../../../config/keycloak.js');
-const HttpException = require('../../utils/HttpException.js');
-const bcrypt = require('bcrypt');
-const prisma = require('../../prisma/PrismaClient.js');
-
-const getAdminToken = async () => {
-    const tokenParams = qs.stringify({
-        grant_type: 'client_credentials',
-        client_id: CLIENT_ID,
-        client_secret: CLIENT_SECRET
-    });
-
-    const { data } = await axios.post(
-        `${KEYCLOAK_ADMIN_URL}/realms/${KEYCLOAK_REALM}/protocol/openid-connect/token`,
-        tokenParams,
-        {
-            headers: {
-                'Content-Type': 'application/x-www-form-urlencoded'
-            }
-        }
-    );
-
-    return data.access_token;
-};
-
-const KeycloakRepository = {
-    createUser: async (userData) => {
-        const token = await getAdminToken();
-
-        // Cek apakah username sudah terpakai
-        const { data: usersByUsername } = await axios.get(
-            `${KEYCLOAK_ADMIN_URL}/admin/realms/${KEYCLOAK_REALM}/users?username=${encodeURIComponent(userData.username)}`,
-            { headers: { Authorization: `Bearer ${token}` } }
-        );
-
-        if (usersByUsername.length > 0) {
-            throw new HttpException('Username already exists in Keycloak', 409);
-        }
-
-        // Cek apakah email sudah terpakai
-        const { data: usersByEmail } = await axios.get(
-            `${KEYCLOAK_ADMIN_URL}/admin/realms/${KEYCLOAK_REALM}/users?email=${encodeURIComponent(userData.email)}`,
-            { headers: { Authorization: `Bearer ${token}` } }
-        );
-
-        if (usersByEmail.length > 0) {
-            throw new HttpException('Email already exists in Keycloak', 409);
-        }
-
-        const response = await axios.post(
-            `${KEYCLOAK_ADMIN_URL}/admin/realms/${KEYCLOAK_REALM}/users`,
-            {
-                username: userData.username,
-                email: userData.email,
-                firstName: userData.firstname,
-                lastName: userData.lastname,
-                enabled: true,
-                credentials: [{
-                    type: "password",
-                    value: userData.password,
-                    temporary: false
-                }]
-            },
-            { headers: { Authorization: `Bearer ${token}` } }
-        );
-
-        return response.headers.location.split('/').pop();
-    },
-
-    assignSalesRole: async (userId) => {
-        const token = await getAdminToken();
-
-        // Get role sales
-        const { data: roles } = await axios.get(
-            `${KEYCLOAK_ADMIN_URL}/admin/realms/${KEYCLOAK_REALM}/roles`,
-            { headers: { Authorization: `Bearer ${token}` } }
-        );
-
-        const salesRole = roles.find(role => role.name === 'sales');
-        if (!salesRole) throw new HttpException('Sales role not found in Keycloak', 500);
-
-        // Assign role to user
-        await axios.post(
-            `${KEYCLOAK_ADMIN_URL}/admin/realms/${KEYCLOAK_REALM}/users/${userId}/role-mappings/realm`,
-            [salesRole],
-            { headers: { Authorization: `Bearer ${token}` } }
-        );
-    },
-
-    updateUser: async (userId, updatedData) => {
-        const token = await getAdminToken();
-
-        await axios.put(
-            `${KEYCLOAK_ADMIN_URL}/admin/realms/${KEYCLOAK_REALM}/users/${userId}`,
-            {
-                firstName: updatedData.firstname,
-                lastName: updatedData.lastname,
-                email: updatedData.email,
-                credentials: updatedData.password ? [{
-                    type: 'password',
-                    value: updatedData.password,
-                    temporary: false
-                }] : undefined
-            },
-            { headers: { Authorization: `Bearer ${token}` } }
-        );
-    },
-
-    deleteUser: async (userId) => {
-        const token = await getAdminToken();
-
-        await axios.delete(
-            `${KEYCLOAK_ADMIN_URL}/admin/realms/${KEYCLOAK_REALM}/users/${userId}`,
-            { headers: { Authorization: `Bearer ${token}` } }
-        );
-    }
-};
-
-const UserRepository = {
-    createUser: async (userId, userData) => {
-        const hashedPassword = await bcrypt.hash(userData.password, 10);
-
-        return prisma.user.create({
-            data: {
-                id: userId,
-                username: userData.username,
-                email: userData.email,
-                firstname: userData.firstname,
-                lastname: userData.lastname,
-                password: hashedPassword,
-                role: 'sales'
-            }
-        });
-    },
-
-    findAll: async ({ skip, take, where, orderBy }) => {
-        return prisma.user.findMany({
-            where: {
-                ...where,
-                role: 'sales'
-            },
-            skip,
-            take,
-            orderBy,
-            select: {
-                id: true,
-                username: true,
-                email: true,
-                firstname: true,
-                lastname: true,
-                role: true,
-                user_areas: {
-                    select: {
-                        id: true,
-                        province: {
-                            select: {
-                                id: true,
-                                name: true
-                            }
-                        }
-                    }
-                },
-                createdAt: true,
-                updatedAt: true,
-            },
-        });
-    },
-
-    countAll: async (where) => {
-        return prisma.user.count({
-            where: {
-                ...where,
-                role: 'admin'
-            },
-        });
-    },
-
-    findById: async (id) => {
-        return prisma.user.findFirst({
-            where: {
-                id,
-                deletedAt: null
-            },
-            select: {
-                id: true,
-                username: true,
-                email: true,
-                firstname: true,
-                lastname: true,
-                user_areas: {
-                    select: {
-                        id: true,
-                        province: {
-                            select: {
-                                id: true,
-                                name: true
-                            }
-                        }
-                    }
-                },
-                createdAt: true,
-                updatedAt: true,
-            }
-        });
-    },
-
-    updateUser: async (id, updatedData) => {
-        const updatePayload = {
-            email: updatedData.email,
-            firstname: updatedData.firstname,
-            lastname: updatedData.lastname
-        };
-
-        if (updatedData.password) {
-            updatePayload.password = await bcrypt.hash(updatedData.password, 10);
-        }
-
-        return prisma.user.update({
-            where: { id },
-            data: updatePayload
-        });
-    },
-
-    deleteUser: async (id) => {
-        return prisma.user.update({
-            where: { id },
-            data: {
-                deletedAt: new Date()
-            }
-        });
-    }
-};
-
-const UserAreaRepository = {
-    createMany: async (userId, provinceIds) => {
-        const data = provinceIds.map(provinceId => ({
-            user_id: userId,
-            province_id: provinceId
-        }));
-
-        return prisma.userArea.createMany({
-            data,
-            skipDuplicates: true
-        });
-    },
-
-    deleteByUserId: async (userId) => {
-        return prisma.userArea.deleteMany({
-            where: { user_id: userId }
-        });
-    }
-};
-
-module.exports = { KeycloakRepository, UserRepository, UserAreaRepository };

src/repository/admin/StatusHistoryRepository.js

@@ -1,64 +0,0 @@
-const prisma = require('../../prisma/PrismaClient.js');
-
-const StatusHistoryRepository = {
-    findAll: async ({ skip, take, where, orderBy }) => {
-        return prisma.statusHistory.findMany({
-            where,
-            skip,
-            take,
-            orderBy,
-            select: {
-                id: true,
-                hospital: {
-                    select: {
-                        id: true,
-                        name: true,
-                        // hospital_code: true,
-                        // type: true,
-                        // ownership: true,
-                        // province: {
-                        //     select: {
-                        //         id: true,
-                        //         name: true
-                        //     }
-                        // },
-                        // city: {
-                        //     select: {
-                        //         id: true,
-                        //         name: true
-                        //     }
-                        // },
-                        // address: true,
-                        // simrs_type: true,
-                        // contact: true,
-                        // image: true,
-                        progress_status: true,
-                        // note: true,
-                        // user: {
-                        //     select: {
-                        //         id: true,
-                        //         username: true
-                        //     }
-                        // }
-                    }
-                },
-                user_id: true,
-                old_status: true,
-                new_status: true,
-                note: true,
-                createdAt: true,
-                updatedAt: true,
-            },
-        });
-    },
-
-    countAll: async (where) => {
-        return prisma.statusHistory.count({ where });
-    },
-
-    create: async (data) => {
-        return prisma.statusHistory.create({ data });
-    },
-};
-
-module.exports = StatusHistoryRepository;

src/repository/admin/StatusHistoryRepository.ts

@@ -0,0 +1,89 @@
+import { Prisma } from '@prisma/client';
+import prisma from '../../prisma/PrismaClient';
+
+type FindAllArgs = {
+    skip: number;
+    take: number;
+    where: Prisma.StatusHistoryWhereInput;
+    orderBy: Prisma.StatusHistoryOrderByWithRelationInput;
+};
+
+const StatusHistoryRepository = {
+    findAll: async ({ skip, take, where, orderBy }: FindAllArgs) => {
+        return prisma.statusHistory.findMany({
+            where,
+            skip,
+            take,
+            orderBy,
+            select: {
+                id: true,
+                user: {
+                    select: {
+                        id: true,
+                        fullname: true,
+                    },
+                },
+                old_status: true,
+                new_status: true,
+                note: true,
+                createdAt: true,
+                updatedAt: true,
+            },
+        });
+    },
+
+    countAll: async (where: Prisma.StatusHistoryWhereInput) => {
+        return prisma.statusHistory.count({ where });
+    },
+
+    create: async (data: Prisma.StatusHistoryCreateInput) => {
+        return prisma.statusHistory.create({ data });
+    },
+};
+
+export default StatusHistoryRepository;
+
+
+// const prisma = require('../../prisma/PrismaClient.js');
+
+// const StatusHistoryRepository = {
+//     findAll: async ({ skip, take, where, orderBy }) => {
+//         return prisma.statusHistory.findMany({
+//             where,
+//             skip,
+//             take,
+//             orderBy,
+//             select: {
+//                 id: true,
+//                 hospital: {
+//                     select: {
+//                         id: true,
+//                         name: true,
+//                         progress_status: true,
+//                     }
+//                 },
+//                 user: {
+//                     select: {
+//                         id: true,
+//                         fullname: true
+//                     }
+//                 },
+//                 old_status: true,
+//                 new_status: true,
+//                 note: true,
+//                 createdAt: true,
+//                 updatedAt: true,
+//             },
+//         });
+//     },
+
+//     countAll: async (where) => {
+//         return prisma.statusHistory.count({ where });
+//     },
+
+//     create: async (data) => {
+//         return prisma.statusHistory.create({ data });
+//     },
+// };
+
+// module.exports = StatusHistoryRepository;

src/repository/admin/VendorExperienceRepository.js

@@ -1,142 +0,0 @@
-const prisma = require('../../prisma/PrismaClient.js');
-
-const VendorExperienceRepository = {
-    findAll: async ({ skip, take, where, orderBy }) => {
-        return prisma.vendorExperience.findMany({
-            where,
-            skip,
-            take,
-            orderBy,
-            select: {
-                id: true,
-                // hospital: {
-                //     select: {
-                //         id: true,
-                //         name: true,
-                //         hospital_code: true,
-                //         type: true,
-                //         ownership: true,
-                //         province: {
-                //             select: {
-                //                 id: true,
-                //                 name: true
-                //             }
-                //         },
-                //         city: {
-                //             select: {
-                //                 id: true,
-                //                 name: true
-                //             }
-                //         },
-                //         address: true,
-                //         simrs_type: true,
-                //         contact: true,
-                //         image: true,
-                //         progress_status: true,
-                //         note: true,
-                //         created_by: true
-                //     }
-                // },
-                vendor: {
-                    select: {
-                        id: true,
-                        name: true,
-                        name_pt: true,
-                        strengths: true,
-                        weaknesses: true,
-                        website: true,
-                        created_by: true,
-                    }
-                },
-                status: true,
-                simrs_type: true,
-                contract_value_min: true,
-                contract_value_max: true,
-                contract_start_date: true,
-                contract_expired_date: true,
-                positive_notes: true,
-                negative_notes: true,
-                createdAt: true,
-                updatedAt: true,
-            },
-        });
-    },
-
-    countAll: async (where) => {
-        return prisma.vendorExperience.count({ where });
-    },
-
-    findById: async (id) => {
-        return prisma.vendorExperience.findFirst({
-            where: {
-                id,
-                deletedAt: null
-            },
-            select: {
-                id: true,
-                // hospital: {
-                //     select: {
-                //         id: true,
-                //         name: true,
-                //         hospital_code: true,
-                //         type: true,
-                //         ownership: true,
-                //         province: {
-                //             select: {
-                //                 id: true,
-                //                 name: true
-                //             }
-                //         },
-                //         city: {
-                //             select: {
-                //                 id: true,
-                //                 name: true
-                //             }
-                //         },
-                //         address: true,
-                //         simrs_type: true,
-                //         contact: true,
-                //         image: true,
-                //         progress_status: true,
-                //         note: true,
-                //         created_by: true
-                //     }
-                // },
-                vendor: {
-                    select: {
-                        id: true,
-                        name: true,
-                        name_pt: true,
-                        strengths: true,
-                        weaknesses: true,
-                        website: true,
-                        created_by: true,
-                    }
-                },
-                status: true,
-                simrs_type: true,
-                contract_value_min: true,
-                contract_value_max: true,
-                contract_start_date: true,
-                contract_expired_date: true,
-                positive_notes: true,
-                negative_notes: true,
-                createdAt: true,
-                updatedAt: true,
-            },
-        });
-    },
-
-    create: async (data) => {
-        return prisma.vendorExperience.create({ data });
-    },
-
-    update: async (id, data) => {
-        return prisma.vendorExperience.update({
-            where: { id },
-            data
-        });
-    },
-};
-
-module.exports = VendorExperienceRepository;

src/repository/admin/VendorExperienceRepository.ts

@@ -0,0 +1,238 @@
+import { PrismaClient, Prisma } from '@prisma/client';
+const prisma = new PrismaClient();
+
+interface FindAllParams {
+    skip?: number;
+    take?: number;
+    where?: Prisma.VendorExperienceWhereInput;
+    orderBy?: Prisma.VendorExperienceOrderByWithRelationInput;
+}
+
+const VendorExperienceRepository = {
+    findAll: async ({ skip, take, where, orderBy }: FindAllParams) => {
+        return prisma.vendorExperience.findMany({
+            where,
+            skip,
+            take,
+            orderBy,
+            select: {
+                id: true,
+                vendor: {
+                    select: {
+                        id: true,
+                        name: true,
+                        name_pt: true,
+                        strengths: true,
+                        weaknesses: true,
+                        website: true,
+                        created_by: true,
+                    },
+                },
+                status: true,
+                simrs_type: true,
+                contract_value_min: true,
+                contract_value_max: true,
+                contract_start_date: true,
+                contract_expired_date: true,
+                positive_notes: true,
+                negative_notes: true,
+                createdAt: true,
+                updatedAt: true,
+            },
+        });
+    },
+
+    countAll: async (where?: Prisma.VendorExperienceWhereInput) => {
+        return prisma.vendorExperience.count({ where });
+    },
+
+    findById: async (id: string) => {
+        return prisma.vendorExperience.findFirst({
+            where: {
+                id,
+                deletedAt: null,
+            },
+            select: {
+                id: true,
+                vendor_id: true,
+                vendor: {
+                    select: {
+                        id: true,
+                        name: true,
+                        name_pt: true,
+                        strengths: true,
+                        weaknesses: true,
+                        website: true,
+                        created_by: true,
+                    },
+                },
+                status: true,
+                simrs_type: true,
+                contract_value_min: true,
+                contract_value_max: true,
+                contract_start_date: true,
+                contract_expired_date: true,
+                positive_notes: true,
+                negative_notes: true,
+                createdAt: true,
+                updatedAt: true,
+            },
+        });
+    },
+
+    create: async (data: Prisma.VendorExperienceCreateInput) => {
+        return prisma.vendorExperience.create({ data });
+    },
+
+    update: async (id: string, data: Prisma.VendorExperienceUpdateInput) => {
+        return prisma.vendorExperience.update({
+            where: { id },
+            data,
+        });
+    },
+};
+
+export default VendorExperienceRepository;
+
+// const prisma = require('../../prisma/PrismaClient.js');
+
+// const VendorExperienceRepository = {
+//     findAll: async ({ skip, take, where, orderBy }) => {
+//         return prisma.vendorExperience.findMany({
+//             where,
+//             skip,
+//             take,
+//             orderBy,
+//             select: {
+//                 id: true,
+//                 // hospital: {
+//                 //     select: {
+//                 //         id: true,
+//                 //         name: true,
+//                 //         hospital_code: true,
+//                 //         type: true,
+//                 //         ownership: true,
+//                 //         province: {
+//                 //             select: {
+//                 //                 id: true,
+//                 //                 name: true
+//                 //             }
+//                 //         },
+//                 //         city: {
+//                 //             select: {
+//                 //                 id: true,
+//                 //                 name: true
+//                 //             }
+//                 //         },
+//                 //         address: true,
+//                 //         simrs_type: true,
+//                 //         contact: true,
+//                 //         image: true,
+//                 //         progress_status: true,
+//                 //         note: true,
+//                 //         created_by: true
+//                 //     }
+//                 // },
+//                 vendor: {
+//                     select: {
+//                         id: true,
+//                         name: true,
+//                         name_pt: true,
+//                         strengths: true,
+//                         weaknesses: true,
+//                         website: true,
+//                         created_by: true,
+//                     }
+//                 },
+//                 status: true,
+//                 simrs_type: true,
+//                 contract_value_min: true,
+//                 contract_value_max: true,
+//                 contract_start_date: true,
+//                 contract_expired_date: true,
+//                 positive_notes: true,
+//                 negative_notes: true,
+//                 createdAt: true,
+//                 updatedAt: true,
+//             },
+//         });
+//     },
+
+//     countAll: async (where) => {
+//         return prisma.vendorExperience.count({ where });
+//     },
+
+//     findById: async (id) => {
+//         return prisma.vendorExperience.findFirst({
+//             where: {
+//                 id,
+//                 deletedAt: null
+//             },
+//             select: {
+//                 id: true,
+//                 // hospital: {
+//                 //     select: {
+//                 //         id: true,
+//                 //         name: true,
+//                 //         hospital_code: true,
+//                 //         type: true,
+//                 //         ownership: true,
+//                 //         province: {
+//                 //             select: {
+//                 //                 id: true,
+//                 //                 name: true
+//                 //             }
+//                 //         },
+//                 //         city: {
+//                 //             select: {
+//                 //                 id: true,
+//                 //                 name: true
+//                 //             }
+//                 //         },
+//                 //         address: true,
+//                 //         simrs_type: true,
+//                 //         contact: true,
+//                 //         image: true,
+//                 //         progress_status: true,
+//                 //         note: true,
+//                 //         created_by: true
+//                 //     }
+//                 // },
+//                 vendor: {
+//                     select: {
+//                         id: true,
+//                         name: true,
+//                         name_pt: true,
+//                         strengths: true,
+//                         weaknesses: true,
+//                         website: true,
+//                         created_by: true,
+//                     }
+//                 },
+//                 status: true,
+//                 simrs_type: true,
+//                 contract_value_min: true,
+//                 contract_value_max: true,
+//                 contract_start_date: true,
+//                 contract_expired_date: true,
+//                 positive_notes: true,
+//                 negative_notes: true,
+//                 createdAt: true,
+//                 updatedAt: true,
+//             },
+//         });
+//     },
+
+//     create: async (data) => {
+//         return prisma.vendorExperience.create({ data });
+//     },
+
+//     update: async (id, data) => {
+//         return prisma.vendorExperience.update({
+//             where: { id },
+//             data
+//         });
+//     },
+// };
+
+// module.exports = VendorExperienceRepository;

src/repository/admin/VendorRepository.js

@@ -1,118 +0,0 @@
-const prisma = require('../../prisma/PrismaClient.js');
-const timeLocal = require('../../utils/TimeLocal.js');
-
-const VendorRepository = {
-    findAll: async ({ skip, take, where, orderBy }) => {
-        const vendors = await prisma.vendor.findMany({
-            where,
-            skip,
-            take,
-            orderBy,
-            select: {
-                id: true,
-                name: true,
-                name_pt: true,
-                strengths: true,
-                weaknesses: true,
-                website: true,
-                created_by: true,
-                _count: {
-                    select: {
-                        vendor_experiences: {
-                            where: {
-                                deletedAt: null
-                            }
-                        }
-                    }
-                },
-                createdAt: true,
-                updatedAt: true,
-            },
-        });
-
-        const formattedVendors = vendors.map(v => {
-            const { _count, ...rest } = v;
-            return {
-                ...rest,
-                count_hospitals: _count.vendor_experiences,
-            };
-        });
-
-        return formattedVendors;
-    },
-
-    countAll: async (where) => {
-        return prisma.vendor.count({ where });
-    },
-
-    findById: async (id) => {
-        const vendor = await prisma.vendor.findFirst({
-            where: {
-                id,
-                deletedAt: null
-            },
-            select: {
-                id: true,
-                name: true,
-                name_pt: true,
-                strengths: true,
-                weaknesses: true,
-                website: true,
-                created_by: true,
-                _count: {
-                    select: {
-                        vendor_experiences: {
-                            where: {
-                                deletedAt: null
-                            }
-                        }
-                    }
-                },
-                createdAt: true,
-                updatedAt: true,
-            },
-        });
-
-        const { _count, ...rest } = vendor;
-        return {
-            ...rest,
-            count_hospitals: _count.vendor_experiences
-        };
-    },
-
-    create: async (data) => {
-        return prisma.vendor.create({ data });
-    },
-
-    update: async (id, data) => {
-        return prisma.vendor.update({
-            where: { id },
-            data
-        });
-    },
-
-    delete: async (id) => {
-        // delete vendor
-        const vendor = await prisma.vendor.update({
-            where: { id },
-            data: {
-                deletedAt: timeLocal.now().toDate()
-            }
-        });
-
-        // Unlink vendor_id di vendor_histories
-        await prisma.vendorExperience.updateMany({
-            where: {
-                vendor_id: id,
-                deletedAt: null
-            },
-            data: {
-                vendor_id: null
-            }
-        });
-
-        return vendor;
-    },
-};
-
-module.exports = VendorRepository;

src/repository/admin/VendorRepository.ts

@@ -0,0 +1,247 @@
+import prisma from '../../prisma/PrismaClient';
+import { now } from '../../utils/TimeLocal';
+import { Prisma } from '@prisma/client';
+
+type FindAllOptions = {
+    skip?: number;
+    take?: number;
+    where?: Prisma.VendorWhereInput;
+    orderBy?: Prisma.VendorOrderByWithRelationInput;
+};
+
+const VendorRepository = {
+    findAll: async ({ skip, take, where, orderBy }: FindAllOptions) => {
+        const vendors = await prisma.vendor.findMany({
+            where,
+            skip,
+            take,
+            orderBy,
+            select: {
+                id: true,
+                name: true,
+                name_pt: true,
+                strengths: true,
+                weaknesses: true,
+                website: true,
+                user: { select: { id: true, fullname: true } },
+                _count: {
+                    select: {
+                        vendor_experiences: {
+                            where: {
+                                deletedAt: null,
+                                status: "active"
+                            },
+                        },
+                    },
+                },
+                createdAt: true,
+                updatedAt: true,
+            },
+        });
+
+        const formattedVendors = vendors.map(v => {
+            const { _count, ...rest } = v;
+            return {
+                ...rest,
+                count_hospitals: _count.vendor_experiences,
+            };
+        });
+
+        return formattedVendors;
+    },
+
+    countAll: async (where?: Prisma.VendorWhereInput) => {
+        return prisma.vendor.count({ where });
+    },
+
+    findById: async (id: string) => {
+        const vendor = await prisma.vendor.findFirst({
+            where: {
+                id,
+                deletedAt: null,
+            },
+            select: {
+                id: true,
+                name: true,
+                name_pt: true,
+                strengths: true,
+                weaknesses: true,
+                website: true,
+                user: { select: { id: true, fullname: true } },
+                _count: {
+                    select: {
+                        vendor_experiences: {
+                            where: {
+                                deletedAt: null,
+                            },
+                        },
+                    },
+                },
+                createdAt: true,
+                updatedAt: true,
+            },
+        });
+
+        if (!vendor) return null;
+
+        const { _count, ...rest } = vendor;
+        return {
+            ...rest,
+            count_hospitals: _count.vendor_experiences,
+        };
+    },
+
+    create: async (data: Prisma.VendorCreateInput) => {
+        return prisma.vendor.create({ data });
+    },
+
+    update: async (id: string, data: Prisma.VendorUpdateInput) => {
+        return prisma.vendor.update({
+            where: { id },
+            data,
+        });
+    },
+
+    delete: async (id: string) => {
+        const vendor = await prisma.vendor.update({
+            where: { id },
+            data: {
+                deletedAt: now().toDate(),
+            },
+        });
+
+        await prisma.vendorExperience.updateMany({
+            where: {
+                vendor_id: id,
+                deletedAt: null,
+            },
+            data: {
+                vendor_id: null,
+            },
+        });
+
+        return vendor;
+    },
+};
+
+export default VendorRepository;
+
+
+// const prisma = require('../../prisma/PrismaClient.js');
+// const timeLocal = require('../../utils/TimeLocal.js');
+
+// const VendorRepository = {
+//     findAll: async ({ skip, take, where, orderBy }) => {
+//         const vendors = await prisma.vendor.findMany({
+//             where,
+//             skip,
+//             take,
+//             orderBy,
+//             select: {
+//                 id: true,
+//                 name: true,
+//                 name_pt: true,
+//                 strengths: true,
+//                 weaknesses: true,
+//                 website: true,
+//                 user: { select: { id: true, fullname: true } },
+//                 _count: {
+//                     select: {
+//                         vendor_experiences: {
+//                             where: {
+//                                 deletedAt: null
+//                             }
+//                         }
+//                     }
+//                 },
+//                 createdAt: true,
+//                 updatedAt: true,
+//             },
+//         });
+
+//         const formattedVendors = vendors.map(v => {
+//             const { _count, ...rest } = v;
+//             return {
+//                 ...rest,
+//                 count_hospitals: _count.vendor_experiences,
+//             };
+//         });
+
+//         return formattedVendors;
+//     },
+
+//     countAll: async (where) => {
+//         return prisma.vendor.count({ where });
+//     },
+
+//     findById: async (id) => {
+//         const vendor = await prisma.vendor.findFirst({
+//             where: {
+//                 id,
+//                 deletedAt: null
+//             },
+//             select: {
+//                 id: true,
+//                 name: true,
+//                 name_pt: true,
+//                 strengths: true,
+//                 weaknesses: true,
+//                 website: true,
+//                 user: { select: { id: true, fullname: true } },
+//                 _count: {
+//                     select: {
+//                         vendor_experiences: {
+//                             where: {
+//                                 deletedAt: null
+//                             }
+//                         }
+//                     }
+//                 },
+//                 createdAt: true,
+//                 updatedAt: true,
+//             },
+//         });
+
+//         const { _count, ...rest } = vendor;
+//         return {
+//             ...rest,
+//             count_hospitals: _count.vendor_experiences
+//         };
+//     },
+
+//     create: async (data) => {
+//         return prisma.vendor.create({ data });
+//     },
+
+//     update: async (id, data) => {
+//         return prisma.vendor.update({
+//             where: { id },
+//             data
+//         });
+//     },
+
+//     delete: async (id) => {
+//         // delete vendor
+//         const vendor = await prisma.vendor.update({
+//             where: { id },
+//             data: {
+//                 deletedAt: timeLocal.now().toDate()
+//             }
+//         });
+
+//         // Unlink vendor_id di vendor_histories
+//         await prisma.vendorExperience.updateMany({
+//             where: {
+//                 vendor_id: id,
+//                 deletedAt: null
+//             },
+//             data: {
+//                 vendor_id: null
+//             }
+//         });
+
+//         return vendor;
+//     },
+// };
+
+// module.exports = VendorRepository;

src/repository/sales/AreaRepository.js

@@ -1,28 +0,0 @@
-const prisma = require('../../prisma/PrismaClient.js');
-
-const AreaRepository = {
-    findAll: async ({ skip, take, where, orderBy }) => {
-        return await prisma.userArea.findMany({
-            where,
-            skip,
-            take,
-            orderBy,
-            select: {
-                id: true,
-                user_id: true,
-                province: {
-                    select: {
-                        id: true,
-                        name: true
-                    }
-                },
-            }
-        });
-    },
-
-    countAll: async (where) => {
-        return prisma.userArea.count({ where });
-    },
-};
-
-module.exports = AreaRepository;

src/repository/sales/AreaRepository.ts

@@ -0,0 +1,66 @@
+// AreaRepository.ts
+import prisma from '../../prisma/PrismaClient';
+import { Prisma } from '@prisma/client';
+
+interface FindAllParams {
+    skip?: number;
+    take?: number;
+    where?: Prisma.UserAreaWhereInput;
+    orderBy?: Prisma.UserAreaOrderByWithRelationInput;
+}
+
+const AreaRepository = {
+    findAll: async ({ skip, take, where, orderBy }: FindAllParams) => {
+        return await prisma.userArea.findMany({
+            where,
+            skip,
+            take,
+            orderBy,
+            select: {
+                id: true,
+                province: {
+                    select: {
+                        id: true,
+                        name: true,
+                    },
+                },
+                createdAt: true,
+                updatedAt: true
+            },
+        });
+    },
+
+    countAll: async (where?: Prisma.UserAreaWhereInput) => {
+        return prisma.userArea.count({ where });
+    },
+};
+
+export default AreaRepository;
+
+// const prisma = require('../../prisma/PrismaClient.js');
+
+// const AreaRepository = {
+//     findAll: async ({ skip, take, where, orderBy }) => {
+//         return await prisma.userArea.findMany({
+//             where,
+//             skip,
+//             take,
+//             orderBy,
+//             select: {
+//                 id: true,
+//                 province: {
+//                     select: {
+//                         id: true,
+//                         name: true
+//                     }
+//                 },
+//             }
+//         });
+//     },
+
+//     countAll: async (where) => {
+//         return prisma.userArea.count({ where });
+//     },
+// };
+
+// module.exports = AreaRepository;

src/repository/sales/ExecutivesHistoryRepository.js

@@ -1,120 +0,0 @@
-const prisma = require('../../prisma/PrismaClient.js');
-
-const ExecutivesHistoryRepository = {
-    findAll: async ({ skip, take, where, orderBy }) => {
-        return prisma.executivesHistory.findMany({
-            where,
-            skip,
-            take,
-            orderBy,
-            select: {
-                id: true,
-                hospital: {
-                    select: {
-                        id: true,
-                        name: true,
-                        hospital_code: true,
-                        type: true,
-                        ownership: true,
-                        province: {
-                            select: {
-                                id: true,
-                                name: true
-                            }
-                        },
-                        city: {
-                            select: {
-                                id: true,
-                                name: true
-                            }
-                        },
-                        address: true,
-                        simrs_type: true,
-                        contact: true,
-                        image: true,
-                        progress_status: true,
-                        note: true,
-                        // user: {
-                        //     select: {
-                        //         id: true,
-                        //         username: true
-                        //     }
-                        // }
-                        created_by: true
-                    }
-                },
-                executive_name: true,
-                contact: true,
-                status: true,
-                start_term: true,
-                end_term: true,
-                createdAt: true,
-                updatedAt: true,
-            },
-        });
-    },
-
-    countAll: async (where) => {
-        return prisma.executivesHistory.count({ where });
-    },
-
-    findById: async (id) => {
-        return prisma.executivesHistory.findFirst({
-            where: {
-                id,
-                deletedAt: null
-            },
-            select: {
-                id: true,
-                hospital: {
-                    select: {
-                        id: true,
-                        name: true,
-                        hospital_code: true,
-                        type: true,
-                        ownership: true,
-                        province: {
-                            select: {
-                                id: true,
-                                name: true
-                            }
-                        },
-                        city: {
-                            select: {
-                                id: true,
-                                name: true
-                            }
-                        },
-                        address: true,
-                        simrs_type: true,
-                        contact: true,
-                        image: true,
-                        progress_status: true,
-                        note: true,
-                        created_by: true
-                    }
-                },
-                executive_name: true,
-                contact: true,
-                status: true,
-                start_term: true,
-                end_term: true,
-                createdAt: true,
-                updatedAt: true,
-            },
-        });
-    },
-
-    create: async (data) => {
-        return prisma.executivesHistory.create({ data });
-    },
-
-    update: async (id, data) => {
-        return prisma.executivesHistory.update({
-            where: { id },
-            data
-        });
-    },
-};
-
-module.exports = ExecutivesHistoryRepository;

src/repository/sales/ExecutivesHistoryRepository.ts

@@ -0,0 +1,189 @@
+import { PrismaClient, Prisma } from '@prisma/client';
+
+const prisma = new PrismaClient();
+
+export const ExecutivesHistoryRepository = {
+    findAll: async ({
+        skip,
+        take,
+        where,
+        orderBy
+    }: {
+        skip?: number;
+        take?: number;
+        where?: Prisma.ExecutivesHistoryWhereInput;
+        orderBy?: Prisma.ExecutivesHistoryOrderByWithRelationInput;
+    }) => {
+        return prisma.executivesHistory.findMany({
+            where,
+            skip,
+            take,
+            orderBy,
+            select: {
+                id: true,
+                executive_name: true,
+                contact: true,
+                status: true,
+                start_term: true,
+                end_term: true,
+                createdAt: true,
+                updatedAt: true,
+            },
+        });
+    },
+
+    countAll: async (where?: Prisma.ExecutivesHistoryWhereInput) => {
+        return prisma.executivesHistory.count({ where });
+    },
+
+    findById: async (id: string) => {
+        return prisma.executivesHistory.findFirst({
+            where: {
+                id,
+                deletedAt: null,
+            },
+            select: {
+                id: true,
+                executive_name: true,
+                contact: true,
+                status: true,
+                start_term: true,
+                end_term: true,
+                createdAt: true,
+                updatedAt: true,
+            },
+        });
+    },
+
+    create: async (data: Prisma.ExecutivesHistoryCreateInput) => {
+        return prisma.executivesHistory.create({ data });
+    },
+
+    update: async (id: string, data: Prisma.ExecutivesHistoryUpdateInput) => {
+        return prisma.executivesHistory.update({
+            where: { id },
+            data,
+        });
+    },
+};
+
+// const prisma = require('../../prisma/PrismaClient.js');
+
+// const ExecutivesHistoryRepository = {
+//     findAll: async ({ skip, take, where, orderBy }) => {
+//         return prisma.executivesHistory.findMany({
+//             where,
+//             skip,
+//             take,
+//             orderBy,
+//             select: {
+//                 id: true,
+//                 hospital: {
+//                     select: {
+//                         id: true,
+//                         name: true,
+//                         hospital_code: true,
+//                         type: true,
+//                         ownership: true,
+//                         province: {
+//                             select: {
+//                                 id: true,
+//                                 name: true
+//                             }
+//                         },
+//                         city: {
+//                             select: {
+//                                 id: true,
+//                                 name: true
+//                             }
+//                         },
+//                         address: true,
+//                         // simrs_type: true,
+//                         contact: true,
+//                         image: true,
+//                         progress_status: true,
+//                         note: true,
+//                         // user: {
+//                         //     select: {
+//                         //         id: true,
+//                         //         username: true
+//                         //     }
+//                         // }
+//                         created_by: true
+//                     }
+//                 },
+//                 executive_name: true,
+//                 contact: true,
+//                 status: true,
+//                 start_term: true,
+//                 end_term: true,
+//                 createdAt: true,
+//                 updatedAt: true,
+//             },
+//         });
+//     },
+
+//     countAll: async (where) => {
+//         return prisma.executivesHistory.count({ where });
+//     },
+
+//     findById: async (id) => {
+//         return prisma.executivesHistory.findFirst({
+//             where: {
+//                 id,
+//                 deletedAt: null
+//             },
+//             select: {
+//                 id: true,
+//                 hospital: {
+//                     select: {
+//                         id: true,
+//                         name: true,
+//                         hospital_code: true,
+//                         type: true,
+//                         ownership: true,
+//                         province: {
+//                             select: {
+//                                 id: true,
+//                                 name: true
+//                             }
+//                         },
+//                         city: {
+//                             select: {
+//                                 id: true,
+//                                 name: true
+//                             }
+//                         },
+//                         address: true,
+//                         // simrs_type: true,
+//                         contact: true,
+//                         image: true,
+//                         progress_status: true,
+//                         note: true,
+//                         created_by: true
+//                     }
+//                 },
+//                 executive_name: true,
+//                 contact: true,
+//                 status: true,
+//                 start_term: true,
+//                 end_term: true,
+//                 createdAt: true,
+//                 updatedAt: true,
+//             },
+//         });
+//     },
+
+//     create: async (data) => {
+//         return prisma.executivesHistory.create({ data });
+//     },
+
+//     update: async (id, data) => {
+//         return prisma.executivesHistory.update({
+//             where: { id },
+//             data
+//         });
+//     },
+// };
+
+// module.exports = ExecutivesHistoryRepository;

src/repository/sales/HospitalRepository.js

@@ -1,152 +0,0 @@
-const prisma = require('../../prisma/PrismaClient.js');
-
-const HospitalRepository = {
-    findAll: async ({ skip, take, where, orderBy }) => {
-        const hospitalsRaw = await prisma.hospital.findMany({
-            where,
-            skip,
-            take,
-            orderBy,
-            select: {
-                id: true,
-                name: true,
-                hospital_code: true,
-                type: true,
-                ownership: true,
-                province: { select: { id: true, name: true } },
-                city: { select: { id: true, name: true } },
-                address: true,
-                simrs_type: true,
-                contact: true,
-                image: true,
-                progress_status: true,
-                note: true,
-                latitude: true,
-                longitude: true,
-                gmaps_url: true,
-                created_by: true,
-                createdAt: true,
-                updatedAt: true,
-                vendor_histories: {
-                    where: {
-                        status: "active",
-                        deletedAt: null
-                    },
-                    select: {
-                        vendor: {
-                            select: {
-                                id: true,
-                                name: true,
-                                name_pt: true,
-                                strengths: true,
-                                weaknesses: true,
-                                website: true,
-                            }
-                        }
-                    }
-                }
-            }
-        });
-
-        return hospitalsRaw.map(hospital => {
-            const { vendor_histories, ...rest } = hospital;
-            return {
-                ...rest,
-                vendor: vendor_histories?.[0]?.vendor || null
-            };
-        });
-    },
-
-    countAll: async (where) => {
-        return prisma.hospital.count({ where });
-    },
-
-    create: async (data) => {
-        return prisma.hospital.create({ data });
-    },
-
-    findById: async (id) => {
-        const hospitalRaw = await prisma.hospital.findFirst({
-            where: {
-                id,
-                deletedAt: null
-            },
-            select: {
-                id: true,
-                name: true,
-                hospital_code: true,
-                type: true,
-                ownership: true,
-                province: { select: { id: true, name: true } },
-                city: { select: { id: true, name: true } },
-                address: true,
-                simrs_type: true,
-                contact: true,
-                image: true,
-                progress_status: true,
-                note: true,
-                latitude: true,
-                longitude: true,
-                gmaps_url: true,
-                created_by: true,
-                createdAt: true,
-                updatedAt: true,
-                vendor_histories: {
-                    where: {
-                        status: "active",
-                        deletedAt: null
-                    },
-                    take: 1,
-                    select: {
-                        vendor: {
-                            select: {
-                                id: true,
-                                name: true,
-                                name_pt: true,
-                                strengths: true,
-                                weaknesses: true,
-                                website: true,
-                            }
-                        }
-                    }
-                }
-            }
-        });
-
-        if (!hospitalRaw) return null;
-
-        const { vendor_histories, ...rest } = hospitalRaw;
-        return {
-            ...rest,
-            vendor: vendor_histories?.[0]?.vendor || null
-        };
-    },
-
-    // update: async (id, data) => {
-    //     return prisma.hospital.update({
-    //         where: { id },
-    //         data: {
-    //             name: data.name,
-    //             hospital_code: data.hospital_code,
-    //             type: data.type,
-    //             ownership: data.ownership,
-    //             province: { connect: { id: data.province_id } },
-    //             city: { connect: { id: data.city_id } },
-    //             address: data.address,
-    //             // simrs_type: data.simrs_type,
-    //             contact: data.contact,
-    //             note: data.note,
-    //             image: data.image,
-    //             progress_status: data.progress_status,
-    //         }
-    //     });
-    // },
-    update: async (id, data) => {
-        return prisma.hospital.update({
-            where: { id },
-            data
-        });
-    },
-};
-
-module.exports = HospitalRepository;

src/repository/sales/HospitalRepository.ts

@@ -0,0 +1,276 @@
+import prisma from '../../prisma/PrismaClient';
+import { Prisma } from '@prisma/client';
+
+interface FindAllParams {
+    skip?: number;
+    take?: number;
+    where?: Prisma.HospitalWhereInput;
+    orderBy?: Prisma.HospitalOrderByWithRelationInput;
+}
+
+const HospitalRepository = {
+    findAll: async ({ skip, take, where, orderBy }: FindAllParams) => {
+        const hospitalsRaw = await prisma.hospital.findMany({
+            where,
+            skip,
+            take,
+            orderBy,
+            select: {
+                id: true,
+                name: true,
+                hospital_code: true,
+                type: true,
+                ownership: true,
+                province: { select: { id: true, name: true } },
+                city: { select: { id: true, name: true } },
+                address: true,
+                contact: true,
+                image: true,
+                progress_status: true,
+                note: true,
+                latitude: true,
+                longitude: true,
+                gmaps_url: true,
+                // created_by: true,
+                createdAt: true,
+                updatedAt: true,
+                user: { select: { id: true, fullname: true } },
+                vendor_experiences: {
+                    where: {
+                        status: 'active',
+                        deletedAt: null,
+                    },
+                    select: {
+                        vendor: {
+                            select: {
+                                id: true,
+                                name: true,
+                                name_pt: true,
+                                strengths: true,
+                                weaknesses: true,
+                                website: true,
+                            },
+                        },
+                    },
+                },
+            },
+        });
+
+        return hospitalsRaw.map(hospital => {
+            const { vendor_experiences, ...rest } = hospital;
+            return {
+                ...rest,
+                vendor: vendor_experiences?.[0]?.vendor || null,
+            };
+        });
+    },
+
+    countAll: async (where?: Prisma.HospitalWhereInput) => {
+        return prisma.hospital.count({ where });
+    },
+
+    create: async (data: Prisma.HospitalCreateInput) => {
+        return prisma.hospital.create({ data });
+    },
+
+    findById: async (id: string) => {
+        const hospitalRaw = await prisma.hospital.findFirst({
+            where: {
+                id,
+                deletedAt: null,
+            },
+            select: {
+                id: true,
+                name: true,
+                hospital_code: true,
+                type: true,
+                ownership: true,
+                province: { select: { id: true, name: true } },
+                city: { select: { id: true, name: true } },
+                address: true,
+                contact: true,
+                image: true,
+                progress_status: true,
+                note: true,
+                latitude: true,
+                longitude: true,
+                gmaps_url: true,
+                created_by: true,
+                createdAt: true,
+                updatedAt: true,
+                user: { select: { id: true, fullname: true } },
+                vendor_experiences: {
+                    where: {
+                        status: 'active',
+                        deletedAt: null,
+                    },
+                    take: 1,
+                    select: {
+                        vendor: {
+                            select: {
+                                id: true,
+                                name: true,
+                                name_pt: true,
+                                strengths: true,
+                                weaknesses: true,
+                                website: true,
+                            },
+                        },
+                    },
+                },
+            },
+        });
+
+        if (!hospitalRaw) return null;
+
+        const { vendor_experiences, ...rest } = hospitalRaw;
+        return {
+            ...rest,
+            vendor: vendor_experiences?.[0]?.vendor || null,
+        };
+    },
+
+    update: async (id: string, data: Prisma.HospitalUpdateInput) => {
+        return prisma.hospital.update({
+            where: { id },
+            data,
+        });
+    },
+};
+
+export default HospitalRepository;
+
+
+// const prisma = require('../../prisma/PrismaClient.js');
+
+// const HospitalRepository = {
+//     findAll: async ({ skip, take, where, orderBy }) => {
+//         const hospitalsRaw = await prisma.hospital.findMany({
+//             where,
+//             skip,
+//             take,
+//             orderBy,
+//             select: {
+//                 id: true,
+//                 name: true,
+//                 hospital_code: true,
+//                 type: true,
+//                 ownership: true,
+//                 province: { select: { id: true, name: true } },
+//                 city: { select: { id: true, name: true } },
+//                 address: true,
+//                 contact: true,
+//                 image: true,
+//                 progress_status: true,
+//                 note: true,
+//                 latitude: true,
+//                 longitude: true,
+//                 gmaps_url: true,
+//                 created_by: true,
+//                 createdAt: true,
+//                 updatedAt: true,
+//                 user: { select: { id: true, fullname: true } },
+//                 vendor_experiences: {
+//                     where: {
+//                         status: "active",
+//                         deletedAt: null
+//                     },
+//                     select: {
+//                         vendor: {
+//                             select: {
+//                                 id: true,
+//                                 name: true,
+//                                 name_pt: true,
+//                                 strengths: true,
+//                                 weaknesses: true,
+//                                 website: true,
+//                             }
+//                         }
+//                     }
+//                 }
+//             }
+//         });
+
+//         return hospitalsRaw.map(hospital => {
+//             const { vendor_experiences, ...rest } = hospital;
+//             return {
+//                 ...rest,
+//                 vendor: vendor_experiences?.[0]?.vendor || null
+//             };
+//         });
+//     },
+
+//     countAll: async (where) => {
+//         return prisma.hospital.count({ where });
+//     },
+
+//     create: async (data) => {
+//         return prisma.hospital.create({ data });
+//     },
+
+//     findById: async (id) => {
+//         const hospitalRaw = await prisma.hospital.findFirst({
+//             where: {
+//                 id,
+//                 deletedAt: null
+//             },
+//             select: {
+//                 id: true,
+//                 name: true,
+//                 hospital_code: true,
+//                 type: true,
+//                 ownership: true,
+//                 province: { select: { id: true, name: true } },
+//                 city: { select: { id: true, name: true } },
+//                 address: true,
+//                 contact: true,
+//                 image: true,
+//                 progress_status: true,
+//                 note: true,
+//                 latitude: true,
+//                 longitude: true,
+//                 gmaps_url: true,
+//                 created_by: true,
+//                 createdAt: true,
+//                 updatedAt: true,
+//                 user: { select: { id: true, fullname: true } },
+//                 vendor_experiences: {
+//                     where: {
+//                         status: "active",
+//                         deletedAt: null
+//                     },
+//                     take: 1,
+//                     select: {
+//                         vendor: {
+//                             select: {
+//                                 id: true,
+//                                 name: true,
+//                                 name_pt: true,
+//                                 strengths: true,
+//                                 weaknesses: true,
+//                                 website: true,
+//                             }
+//                         }
+//                     }
+//                 }
+//             }
+//         });
+
+//         if (!hospitalRaw) return null;
+
+//         const { vendor_experiences, ...rest } = hospitalRaw;
+//         return {
+//             ...rest,
+//             vendor: vendor_experiences?.[0]?.vendor || null
+//         };
+//     },
+
+//     update: async (id, data) => {
+//         return prisma.hospital.update({
+//             where: { id },
+//             data
+//         });
+//     },
+// };
+
+// module.exports = HospitalRepository;

src/repository/sales/StatusHistoryRepository.js

@@ -1,70 +0,0 @@
-const prisma = require('../../prisma/PrismaClient.js');
-
-const StatusHistoryRepository = {
-    findAll: async ({ skip, take, where, orderBy }) => {
-        return prisma.statusHistory.findMany({
-            where,
-            skip,
-            take,
-            orderBy,
-            select: {
-                id: true,
-                hospital: {
-                    select: {
-                        id: true,
-                        name: true,
-                        // hospital_code: true,
-                        // type: true,
-                        // ownership: true,
-                        // province: {
-                        //     select: {
-                        //         id: true,
-                        //         name: true
-                        //     }
-                        // },
-                        // city: {
-                        //     select: {
-                        //         id: true,
-                        //         name: true
-                        //     }
-                        // },
-                        // address: true,
-                        // simrs_type: true,
-                        // contact: true,
-                        // image: true,
-                        progress_status: true,
-                        // note: true,
-                        // user: {
-                        //     select: {
-                        //         id: true,
-                        //         username: true
-                        //     }
-                        // }
-                    }
-                },
-                // user: {
-                //     select: {
-                //         id: true,
-                //         username: true,
-                //     }
-                // },
-                user_id: true,
-                old_status: true,
-                new_status: true,
-                note: true,
-                createdAt: true,
-                updatedAt: true,
-            },
-        });
-    },
-
-    countAll: async (where) => {
-        return prisma.statusHistory.count({ where });
-    },
-
-    create: async (data) => {
-        return prisma.statusHistory.create({ data });
-    },
-};
-
-module.exports = StatusHistoryRepository;

src/repository/sales/StatusHistoryRepository.ts

@@ -0,0 +1,115 @@
+import { Prisma } from '@prisma/client';
+import prisma from '../../prisma/PrismaClient';
+
+type FindAllArgs = {
+    skip: number;
+    take: number;
+    where: Prisma.StatusHistoryWhereInput;
+    orderBy: Prisma.StatusHistoryOrderByWithRelationInput;
+};
+
+const StatusHistoryRepository = {
+    findAll: async ({ skip, take, where, orderBy }: FindAllArgs) => {
+        return prisma.statusHistory.findMany({
+            where,
+            skip,
+            take,
+            orderBy,
+            select: {
+                id: true,
+                user: {
+                    select: {
+                        id: true,
+                        fullname: true,
+                    },
+                },
+                old_status: true,
+                new_status: true,
+                note: true,
+                createdAt: true,
+                updatedAt: true,
+            },
+        });
+    },
+
+    countAll: async (where: Prisma.StatusHistoryWhereInput) => {
+        return prisma.statusHistory.count({ where });
+    },
+
+    create: async (data: Prisma.StatusHistoryCreateInput) => {
+        return prisma.statusHistory.create({ data });
+    },
+};
+
+export default StatusHistoryRepository;
+
+// const prisma = require('../../prisma/PrismaClient.js');
+
+// const StatusHistoryRepository = {
+//     findAll: async ({ skip, take, where, orderBy }) => {
+//         return prisma.statusHistory.findMany({
+//             where,
+//             skip,
+//             take,
+//             orderBy,
+//             select: {
+//                 id: true,
+//                 hospital: {
+//                     select: {
+//                         id: true,
+//                         name: true,
+//                         // hospital_code: true,
+//                         // type: true,
+//                         // ownership: true,
+//                         // province: {
+//                         //     select: {
+//                         //         id: true,
+//                         //         name: true
+//                         //     }
+//                         // },
+//                         // city: {
+//                         //     select: {
+//                         //         id: true,
+//                         //         name: true
+//                         //     }
+//                         // },
+//                         // address: true,
+//                         // simrs_type: true,
+//                         // contact: true,
+//                         // image: true,
+//                         progress_status: true,
+//                         // note: true,
+//                         // user: {
+//                         //     select: {
+//                         //         id: true,
+//                         //         username: true
+//                         //     }
+//                         // }
+//                     }
+//                 },
+//                 user: {
+//                     select: {
+//                         id: true,
+//                         fullname: true,
+//                     }
+//                 },
+//                 // user_id: true,
+//                 old_status: true,
+//                 new_status: true,
+//                 note: true,
+//                 createdAt: true,
+//                 updatedAt: true,
+//             },
+//         });
+//     },
+
+//     countAll: async (where) => {
+//         return prisma.statusHistory.count({ where });
+//     },
+
+//     create: async (data) => {
+//         return prisma.statusHistory.create({ data });
+//     },
+// };
+
+// module.exports = StatusHistoryRepository;

src/repository/sales/VendorExperienceRepository.ts

@@ -0,0 +1,182 @@
+import { PrismaClient, Prisma } from '@prisma/client';
+const prisma = new PrismaClient();
+
+interface FindAllParams {
+    skip?: number;
+    take?: number;
+    where?: Prisma.VendorExperienceWhereInput;
+    orderBy?: Prisma.VendorExperienceOrderByWithRelationInput;
+}
+
+const VendorExperienceRepository = {
+    findAll: async ({ skip, take, where, orderBy }: FindAllParams) => {
+        return prisma.vendorExperience.findMany({
+            where,
+            skip,
+            take,
+            orderBy,
+            select: {
+                id: true,
+                vendor: {
+                    select: {
+                        id: true,
+                        name: true,
+                        name_pt: true,
+                        strengths: true,
+                        weaknesses: true,
+                        website: true,
+                        created_by: true,
+                    },
+                },
+                status: true,
+                simrs_type: true,
+                contract_value_min: true,
+                contract_value_max: true,
+                contract_start_date: true,
+                contract_expired_date: true,
+                positive_notes: true,
+                negative_notes: true,
+                createdAt: true,
+                updatedAt: true,
+            },
+        });
+    },
+
+    countAll: async (where?: Prisma.VendorExperienceWhereInput) => {
+        return prisma.vendorExperience.count({ where });
+    },
+
+    findById: async (id: string) => {
+        return prisma.vendorExperience.findFirst({
+            where: {
+                id,
+                deletedAt: null,
+            },
+            select: {
+                id: true,
+                vendor_id: true,
+                vendor: {
+                    select: {
+                        id: true,
+                        name: true,
+                        name_pt: true,
+                        strengths: true,
+                        weaknesses: true,
+                        website: true,
+                        created_by: true,
+                    },
+                },
+                status: true,
+                simrs_type: true,
+                contract_value_min: true,
+                contract_value_max: true,
+                contract_start_date: true,
+                contract_expired_date: true,
+                positive_notes: true,
+                negative_notes: true,
+                createdAt: true,
+                updatedAt: true,
+            },
+        });
+    },
+
+    create: async (data: Prisma.VendorExperienceCreateInput) => {
+        return prisma.vendorExperience.create({ data });
+    },
+
+    update: async (id: string, data: Prisma.VendorExperienceUpdateInput) => {
+        return prisma.vendorExperience.update({
+            where: { id },
+            data,
+        });
+    },
+};
+
+export default VendorExperienceRepository;
+
+// const prisma = require('../../prisma/PrismaClient.js');
+
+// const VendorExperienceRepository = {
+//     findAll: async ({ skip, take, where, orderBy }) => {
+//         return prisma.vendorExperience.findMany({
+//             where,
+//             skip,
+//             take,
+//             orderBy,
+//             select: {
+//                 id: true,
+//                 vendor: {
+//                     select: {
+//                         id: true,
+//                         name: true,
+//                         name_pt: true,
+//                         strengths: true,
+//                         weaknesses: true,
+//                         website: true,
+//                         created_by: true,
+//                     }
+//                 },
+//                 status: true,
+//                 simrs_type: true,
+//                 contract_value_min: true,
+//                 contract_value_max: true,
+//                 contract_start_date: true,
+//                 contract_expired_date: true,
+//                 positive_notes: true,
+//                 negative_notes: true,
+//                 createdAt: true,
+//                 updatedAt: true,
+//             },
+//         });
+//     },
+
+//     countAll: async (where) => {
+//         return prisma.vendorExperience.count({ where });
+//     },
+
+//     findById: async (id) => {
+//         return prisma.vendorExperience.findFirst({
+//             where: {
+//                 id,
+//                 deletedAt: null
+//             },
+//             select: {
+//                 id: true,
+//                 vendor: {
+//                     select: {
+//                         id: true,
+//                         name: true,
+//                         name_pt: true,
+//                         strengths: true,
+//                         weaknesses: true,
+//                         website: true,
+//                         created_by: true,
+//                     }
+//                 },
+//                 status: true,
+//                 simrs_type: true,
+//                 contract_value_min: true,
+//                 contract_value_max: true,
+//                 contract_start_date: true,
+//                 contract_expired_date: true,
+//                 positive_notes: true,
+//                 negative_notes: true,
+//                 createdAt: true,
+//                 updatedAt: true,
+//             },
+//         });
+//     },
+
+//     create: async (data) => {
+//         return prisma.vendorExperience.create({ data });
+//     },
+
+//     update: async (id, data) => {
+//         return prisma.vendorExperience.update({
+//             where: { id },
+//             data
+//         });
+//     },
+// };
+
+// module.exports = VendorExperienceRepository;

src/repository/sales/VendorHistoryRepository.js

@@ -1,134 +0,0 @@
-const prisma = require('../../prisma/PrismaClient.js');
-
-const VendorHistoryRepository = {
-    findAll: async ({ skip, take, where, orderBy }) => {
-        return prisma.vendorHistory.findMany({
-            where,
-            skip,
-            take,
-            orderBy,
-            select: {
-                id: true,
-                // hospital: {
-                //     select: {
-                //         id: true,
-                //         name: true,
-                //         hospital_code: true,
-                //         type: true,
-                //         ownership: true,
-                //         province: {
-                //             select: {
-                //                 id: true,
-                //                 name: true
-                //             }
-                //         },
-                //         city: {
-                //             select: {
-                //                 id: true,
-                //                 name: true
-                //             }
-                //         },
-                //         address: true,
-                //         simrs_type: true,
-                //         contact: true,
-                //         image: true,
-                //         progress_status: true,
-                //         note: true,
-                //         created_by: true
-                //     }
-                // },
-                vendor: {
-                    select: {
-                        id: true,
-                        name: true,
-                        name_pt: true,
-                        strengths: true,
-                        weaknesses: true,
-                        website: true,
-                        created_by: true,
-                    }
-                },
-                vendor_impression: true,
-                status: true,
-                contract_date: true,
-                contract_expired_date: true,
-                createdAt: true,
-                updatedAt: true,
-            },
-        });
-    },
-
-    countAll: async (where) => {
-        return prisma.vendorHistory.count({ where });
-    },
-
-    findById: async (id) => {
-        return prisma.vendorHistory.findFirst({
-            where: {
-                id,
-                deletedAt: null
-            },
-            select: {
-                id: true,
-                // hospital: {
-                //     select: {
-                //         id: true,
-                //         name: true,
-                //         hospital_code: true,
-                //         type: true,
-                //         ownership: true,
-                //         province: {
-                //             select: {
-                //                 id: true,
-                //                 name: true
-                //             }
-                //         },
-                //         city: {
-                //             select: {
-                //                 id: true,
-                //                 name: true
-                //             }
-                //         },
-                //         address: true,
-                //         simrs_type: true,
-                //         contact: true,
-                //         image: true,
-                //         progress_status: true,
-                //         note: true,
-                //         created_by: true
-                //     }
-                // },
-                vendor: {
-                    select: {
-                        id: true,
-                        name: true,
-                        name_pt: true,
-                        strengths: true,
-                        weaknesses: true,
-                        website: true,
-                        created_by: true,
-                    }
-                },
-                vendor_impression: true,
-                status: true,
-                contract_date: true,
-                contract_expired_date: true,
-                createdAt: true,
-                updatedAt: true,
-            },
-        });
-    },
-
-    create: async (data) => {
-        return prisma.vendorHistory.create({ data });
-    },
-
-    update: async (id, data) => {
-        return prisma.vendorHistory.update({
-            where: { id },
-            data
-        });
-    },
-};
-
-module.exports = VendorHistoryRepository;

src/repository/sales/VendorRepository.js

@@ -1,117 +0,0 @@
-const prisma = require('../../prisma/PrismaClient.js');
-const { formatDateOnly } = require('../../utils/FormatDate.js');
-
-const VendorRepository = {
-    findAll: async ({ skip, take, where, orderBy }) => {
-        const rawVendors = await prisma.vendor.findMany({
-            where,
-            skip,
-            take,
-            orderBy,
-            select: {
-                id: true,
-                name: true,
-                name_pt: true,
-                strengths: true,
-                weaknesses: true,
-                website: true,
-                user: {
-                    select: {
-                        id: true,
-                        username: true,
-                        email: true,
-                        firstname: true,
-                        lastname: true,
-                    }
-                },
-                createdAt: true,
-                updatedAt: true,
-                vendor_histories: {
-                    where: {
-                        deletedAt: null,
-                        status: 'active',
-                        hospital: {
-                            deletedAt: null
-                        }
-                    },
-                    select: {
-                        vendor_impression: true,
-                        contract_date: true,
-                        contract_expired_date: true,
-                        hospital: {
-                            select: {
-                                id: true,
-                                name: true,
-                                hospital_code: true,
-                                address: true,
-                                city: {
-                                    select: { name: true }
-                                },
-                                province: {
-                                    select: { name: true }
-                                }
-                            }
-                        }
-                    }
-                }
-            },
-        });
-
-        // Format tanggal di dalam vendor_histories
-        const vendors = rawVendors.map(vendor => ({
-            ...vendor,
-            vendor_histories: vendor.vendor_histories.map(vh => ({
-                ...vh,
-                contract_date: formatDateOnly(vh.contract_date),
-                contract_expired_date: formatDateOnly(vh.contract_expired_date),
-            }))
-        }));
-
-        return vendors;
-    },
-
-    countAll: async (where) => {
-        return prisma.vendor.count({ where });
-    }
-
-    // findById: async (id) => {
-    //     return prisma.vendor.findFirst({
-    //         where: {
-    //             id,
-    //             deletedAt: null
-    //         },
-    //         select: {
-    //             id: true,
-    //             name: true,
-    //             name_pt: true,
-    //             strengths: true,
-    //             weaknesses: true,
-    //             website: true,
-    //             user: {
-    //                 select: {
-    //                     id: true,
-    //                     username: true,
-    //                     email: true,
-    //                     firstname: true,
-    //                     lastname: true,
-    //                 }
-    //             },
-    //             createdAt: true,
-    //             updatedAt: true,
-    //         },
-    //     });
-    // },
-
-    // create: async (data) => {
-    //     return prisma.vendor.create({ data });
-    // },
-
-    // update: async (id, data) => {
-    //     return prisma.vendor.update({
-    //         where: { id },
-    //         data
-    //     });
-    // },
-};
-
-module.exports = VendorRepository;

src/repository/superadmin/AdminRepository.js

@@ -1,219 +0,0 @@
-const axios = require('axios');
-const qs = require('qs');
-const {
-    KEYCLOAK_REALM,
-    KEYCLOAK_ADMIN_URL,
-    CLIENT_ID,
-    CLIENT_SECRET
-} = require('../../../config/keycloak.js');
-const HttpException = require('../../utils/HttpException.js');
-const bcrypt = require('bcrypt');
-const prisma = require('../../prisma/PrismaClient.js');
-
-const getAdminToken = async () => {
-    const tokenParams = qs.stringify({
-        grant_type: 'client_credentials',
-        client_id: CLIENT_ID,
-        client_secret: CLIENT_SECRET
-    });
-
-    const { data } = await axios.post(
-        `${KEYCLOAK_ADMIN_URL}/realms/${KEYCLOAK_REALM}/protocol/openid-connect/token`,
-        tokenParams,
-        {
-            headers: {
-                'Content-Type': 'application/x-www-form-urlencoded'
-            }
-        }
-    );
-
-    return data.access_token;
-};
-
-const KeycloakRepository = {
-    createUser: async (userData) => {
-        const token = await getAdminToken();
-
-        // Cek apakah username sudah terpakai
-        const { data: usersByUsername } = await axios.get(
-            `${KEYCLOAK_ADMIN_URL}/admin/realms/${KEYCLOAK_REALM}/users?username=${encodeURIComponent(userData.username)}`,
-            { headers: { Authorization: `Bearer ${token}` } }
-        );
-
-        if (usersByUsername.length > 0) {
-            throw new HttpException('Username already exists in Keycloak', 409);
-        }
-
-        // Cek apakah email sudah terpakai
-        const { data: usersByEmail } = await axios.get(
-            `${KEYCLOAK_ADMIN_URL}/admin/realms/${KEYCLOAK_REALM}/users?email=${encodeURIComponent(userData.email)}`,
-            { headers: { Authorization: `Bearer ${token}` } }
-        );
-
-        if (usersByEmail.length > 0) {
-            throw new HttpException('Email already exists in Keycloak', 409);
-        }
-
-        const response = await axios.post(
-            `${KEYCLOAK_ADMIN_URL}/admin/realms/${KEYCLOAK_REALM}/users`,
-            {
-                username: userData.username,
-                email: userData.email,
-                firstName: userData.firstname,
-                lastName: userData.lastname,
-                enabled: true,
-                credentials: [{
-                    type: "password",
-                    value: userData.password,
-                    temporary: false
-                }]
-            },
-            { headers: { Authorization: `Bearer ${token}` } }
-        );
-
-        return response.headers.location.split('/').pop();
-    },
-
-    assignAdminRole: async (userId) => {
-        const token = await getAdminToken();
-
-        // Get role sales
-        const { data: roles } = await axios.get(
-            `${KEYCLOAK_ADMIN_URL}/admin/realms/${KEYCLOAK_REALM}/roles`,
-            { headers: { Authorization: `Bearer ${token}` } }
-        );
-
-        const adminRole = roles.find(role => role.name === 'admin');
-        if (!adminRole) throw new HttpException('Admin role not found in Keycloak', 500);
-
-        // Assign role to user
-        await axios.post(
-            `${KEYCLOAK_ADMIN_URL}/admin/realms/${KEYCLOAK_REALM}/users/${userId}/role-mappings/realm`,
-            [adminRole],
-            { headers: { Authorization: `Bearer ${token}` } }
-        );
-    },
-
-    updateUser: async (userId, updatedData) => {
-        const token = await getAdminToken();
-
-        await axios.put(
-            `${KEYCLOAK_ADMIN_URL}/admin/realms/${KEYCLOAK_REALM}/users/${userId}`,
-            {
-                firstName: updatedData.firstname,
-                lastName: updatedData.lastname,
-                email: updatedData.email,
-                credentials: updatedData.password ? [{
-                    type: 'password',
-                    value: updatedData.password,
-                    temporary: false
-                }] : undefined
-            },
-            { headers: { Authorization: `Bearer ${token}` } }
-        );
-    },
-
-    deleteUser: async (userId) => {
-        const token = await getAdminToken();
-
-        await axios.delete(
-            `${KEYCLOAK_ADMIN_URL}/admin/realms/${KEYCLOAK_REALM}/users/${userId}`,
-            { headers: { Authorization: `Bearer ${token}` } }
-        );
-    }
-};
-
-const AdminRepository = {
-    createUser: async (userId, userData) => {
-        const hashedPassword = await bcrypt.hash(userData.password, 10);
-
-        return prisma.user.create({
-            data: {
-                id: userId,
-                username: userData.username,
-                email: userData.email,
-                firstname: userData.firstname,
-                lastname: userData.lastname,
-                password: hashedPassword,
-                role: 'admin'
-            }
-        });
-    },
-
-    findAll: async ({ skip, take, where, orderBy }) => {
-        return prisma.user.findMany({
-            where: {
-                ...where,
-                role: 'admin'
-            },
-            skip,
-            take,
-            orderBy,
-            select: {
-                id: true,
-                username: true,
-                email: true,
-                firstname: true,
-                lastname: true,
-                role: true,
-                createdAt: true,
-                updatedAt: true,
-            },
-        });
-    },
-
-    countAll: async (where) => {
-        return prisma.user.count({
-            where: {
-                ...where,
-                role: 'admin'
-            }
-        });
-    },
-
-    findById: async (id) => {
-        return prisma.user.findFirst({
-            where: {
-                id,
-                deletedAt: null
-            },
-            select: {
-                id: true,
-                username: true,
-                email: true,
-                firstname: true,
-                lastname: true,
-                createdAt: true,
-                updatedAt: true,
-            }
-        });
-    },
-
-    updateUser: async (id, updatedData) => {
-        const updatePayload = {
-            email: updatedData.email,
-            firstname: updatedData.firstname,
-            lastname: updatedData.lastname
-        };
-
-        if (updatedData.password) {
-            updatePayload.password = await bcrypt.hash(updatedData.password, 10);
-        }
-
-        return prisma.user.update({
-            where: { id },
-            data: updatePayload
-        });
-    },
-
-    deleteUser: async (id) => {
-        return prisma.user.update({
-            where: { id },
-            data: {
-                deletedAt: new Date()
-            }
-        });
-    }
-};
-
-module.exports = { KeycloakRepository, AdminRepository };

src/repository/superadmin/LogRepository.js

@@ -1,24 +0,0 @@
-const prisma = require('../../prisma/PrismaClient.js');
-
-const LogRepository = {
-    findAll: async ({ skip, take, where, orderBy }) => {
-        return prisma.activityLog.findMany({
-            where,
-            skip,
-            take,
-            orderBy,
-            select: {
-                id: true,
-                username: true,
-                action: true,
-                createdAt: true,
-            },
-        });
-    },
-
-    countAll: async (where) => {
-        return prisma.activityLog.count({ where });
-    },
-}
-
-module.exports = LogRepository;

src/resources/admin/city/CityCollection.ts

@@ -1,33 +1,15 @@
 import { Request, Response } from 'express';
 import { ListResponse } from '../../../utils/ListResponse';
 import { formatISOWithoutTimezone } from '../../../utils/FormatDate';
+import { CityDTO } from '../../../types/admin/city/CityDTO';
 
-interface CityItem {
-    createdAt: Date;
-    updatedAt: Date;
-    [key: string]: any;
-}
-
-interface CityFormattedItem extends Omit<CityItem, 'createdAt' | 'updatedAt'> {
-    createdAt: string | null;
-    updatedAt: string | null;
-}
-
-const formatItem = (item: CityItem): CityFormattedItem => ({
+const formatItem = (item: CityDTO) => ({
     ...item,
     createdAt: formatISOWithoutTimezone(item.createdAt),
     updatedAt: formatISOWithoutTimezone(item.updatedAt),
 });
 
-export const CityCollection = (
-    req: Request,
-    res: Response,
-    data: CityItem[] = [],
-    total: number | null = null,
-    page: number = 1,
-    limit: number = 10,
-    message: string = 'Success'
-): Response => {
+export const CityCollection = (req: Request, res: Response, data: CityDTO[] = [], total: number | null = null, page: number = 1, limit: number = 10, message: string = 'Success'): Response => {
     const formattedData = data.map(formatItem);
 
     if (typeof total !== 'number') {

src/resources/admin/city/CityResource.ts

@@ -1,28 +1,14 @@
 import { Response } from 'express';
 import { formatISOWithoutTimezone } from '../../../utils/FormatDate';
+import { CityDTO } from '../../../types/admin/city/CityDTO';
 
-interface CityItem {
-    [key: string]: any;
-    createdAt: Date;
-    updatedAt: Date;
-}
-
-interface FormattedCityItem extends Omit<CityItem, 'createdAt' | 'updatedAt'> {
-    createdAt: string | null;
-    updatedAt: string | null;
-}
-
-const formatItem = (item: CityItem): FormattedCityItem => ({
+const formatItem = (item: CityDTO) => ({
     ...item,
     createdAt: formatISOWithoutTimezone(item.createdAt),
     updatedAt: formatISOWithoutTimezone(item.updatedAt),
 });
 
-export const CityResource = (
-    res: Response,
-    data: CityItem,
-    message: string = 'Success'
-): Response => {
+export const CityResource = (res: Response, data: CityDTO, message: string = 'Success'): Response => {
     const formattedData = formatItem(data);
 
     return res.status(200).json({

src/resources/admin/executives_history/ExecutivesHistoriCollection.js

@@ -1,24 +0,0 @@
-const { ListResponse } = require("../../../utils/ListResponse");
-const { formatISOWithoutTimezone, formatDateOnly } = require("../../../utils/FormatDate.js");
-
-const formatItem = (item) => ({
-    ...item,
-    start_term: formatDateOnly(item.start_term),
-    end_term: formatDateOnly(item.end_term),
-    createdAt: formatISOWithoutTimezone(item.createdAt),
-    updatedAt: formatISOWithoutTimezone(item.updatedAt),
-});
-
-exports.ExecutivesHistoriCollection = (req, res, data = [], total = null, page = 1, limit = 10, message = 'Success') => {
-    const formattedData = data.map(formatItem);
-
-    if (typeof total !== 'number') {
-        return res.status(200).json({
-            success: true,
-            message,
-            data: Array.isArray(formattedData)
-        });
-    }
-
-    return ListResponse({ req, res, data: formattedData, total, page, limit, message });
-};

src/resources/admin/executives_history/ExecutivesHistoriCollection.ts

@@ -0,0 +1,60 @@
+import { Request, Response } from 'express';
+import { ListResponse } from '../../../utils/ListResponse';
+import { formatISOWithoutTimezone, formatDateOnly } from '../../../utils/FormatDate';
+import { ExecutiveHistoryDTO } from '../../../types/admin/executives_history/ExecutivesHistoryDTO';
+
+const formatItem = (item: ExecutiveHistoryDTO): ExecutiveHistoryDTO => ({
+    ...item,
+    start_term: formatDateOnly(item.start_term),
+    end_term: formatDateOnly(item.end_term),
+    createdAt: formatISOWithoutTimezone(item.createdAt),
+    updatedAt: formatISOWithoutTimezone(item.updatedAt),
+});
+
+export const ExecutivesHistoriCollection = (
+    req: Request,
+    res: Response,
+    data: ExecutiveHistoryDTO[] = [],
+    total: number | null = null,
+    page = 1,
+    limit = 10,
+    message = 'Success'
+): Response => {
+    const formattedData = data.map(formatItem);
+
+    if (typeof total !== 'number') {
+        return res.status(200).json({
+            success: true,
+            message,
+            data: Array.isArray(formattedData)
+        });
+    }
+
+    return ListResponse({ req, res, data: formattedData, total, page, limit, message });
+};
+
+
+// const { ListResponse } = require("../../../utils/ListResponse");
+// const { formatISOWithoutTimezone, formatDateOnly } = require("../../../utils/FormatDate.js");
+
+// const formatItem = (item) => ({
+//     ...item,
+//     start_term: formatDateOnly(item.start_term),
+//     end_term: formatDateOnly(item.end_term),
+//     createdAt: formatISOWithoutTimezone(item.createdAt),
+//     updatedAt: formatISOWithoutTimezone(item.updatedAt),
+// });
+
+// exports.ExecutivesHistoriCollection = (req, res, data = [], total = null, page = 1, limit = 10, message = 'Success') => {
+//     const formattedData = data.map(formatItem);
+
+//     if (typeof total !== 'number') {
+//         return res.status(200).json({
+//             success: true,
+//             message,
+//             data: Array.isArray(formattedData)
+//         });
+//     }
+
+//     return ListResponse({ req, res, data: formattedData, total, page, limit, message });
+// };

src/resources/admin/executives_history/ExecutivesHistoriResource.js

@@ -1,19 +0,0 @@
-const { formatISOWithoutTimezone, formatDateOnly } = require("../../../utils/FormatDate");
-
-const formatItem = (item) => ({
-    ...item,
-    start_term: formatDateOnly(item.start_term),
-    end_term: formatDateOnly(item.end_term),
-    createdAt: formatISOWithoutTimezone(item.createdAt),
-    updatedAt: formatISOWithoutTimezone(item.updatedAt),
-});
-
-exports.ExecutivesHistoriResource = (res, data, message = 'Success') => {
-    const formattedData = formatItem(data);
-
-    return res.status(200).json({
-        success: true,
-        message,
-        data: formattedData
-    });
-};

src/resources/admin/executives_history/ExecutivesHistoriResource.ts

@@ -0,0 +1,45 @@
+import { Response } from 'express';
+import { formatISOWithoutTimezone, formatDateOnly } from '../../../utils/FormatDate';
+import { ExecutiveHistoryDTO } from '../../../types/admin/executives_history/ExecutivesHistoryDTO';
+
+const formatItem = (item: ExecutiveHistoryDTO): ExecutiveHistoryDTO => ({
+    ...item,
+    start_term: formatDateOnly(item.start_term),
+    end_term: formatDateOnly(item.end_term),
+    createdAt: formatISOWithoutTimezone(item.createdAt),
+    updatedAt: formatISOWithoutTimezone(item.updatedAt),
+});
+
+export const ExecutivesHistoriResource = (
+    res: Response,
+    data: ExecutiveHistoryDTO,
+    message = 'Success'
+): Response => {
+    const formattedData = formatItem(data);
+
+    return res.status(200).json({
+        success: true,
+        message,
+        data: formattedData
+    });
+};
+
+// const { formatISOWithoutTimezone, formatDateOnly } = require("../../../utils/FormatDate");
+
+// const formatItem = (item) => ({
+//     ...item,
+//     start_term: formatDateOnly(item.start_term),
+//     end_term: formatDateOnly(item.end_term),
+//     createdAt: formatISOWithoutTimezone(item.createdAt),
+//     updatedAt: formatISOWithoutTimezone(item.updatedAt),
+// });
+
+// exports.ExecutivesHistoriResource = (res, data, message = 'Success') => {
+//     const formattedData = formatItem(data);
+
+//     return res.status(200).json({
+//         success: true,
+//         message,
+//         data: formattedData
+//     });
+// };

src/resources/admin/hospital/HospitalCollection.js

@@ -1,27 +0,0 @@
-const { ListResponse } = require("../../../utils/ListResponse");
-const { formatISOWithoutTimezone } = require("../../../utils/FormatDate.js");
-const { getUserNameById } = require("../../../utils/CheckUserKeycloak.js");
-
-// Fungsi transform per item
-const transformHospitalList = async (data = []) => {
-    return Promise.all(data.map(async ({ created_by, ...rest }) => {
-        const name = await getUserNameById(created_by);
-
-        return {
-            ...rest,
-            user: {
-                id: created_by,
-                name: name
-            },
-            createdAt: formatISOWithoutTimezone(rest.createdAt),
-            updatedAt: formatISOWithoutTimezone(rest.updatedAt)
-        };
-    }));
-};
-
-// Collection yang async
-exports.HospitalCollection = async ({ req, res, data = [], total = 0, page = 1, limit = 10, message = 'Success' }) => {
-    const formatted = await transformHospitalList(data);
-
-    return ListResponse({ req, res, data: formatted, total, page, limit, message });
-};

src/resources/admin/hospital/HospitalCollection.ts

@@ -0,0 +1,128 @@
+import { Request, Response } from 'express';
+import { ListResponse } from '../../../utils/ListResponse';
+import { formatISOWithoutTimezone } from '../../../utils/FormatDate';
+import { HospitalDTO } from '../../../types/admin/hospital/HospitalDTO';
+
+const formatItem = (item: HospitalDTO) => ({
+    ...item,
+    createdAt: formatISOWithoutTimezone(item.createdAt),
+    updatedAt: formatISOWithoutTimezone(item.updatedAt),
+});
+
+export const HospitalCollection = (req: Request, res: Response, data: HospitalDTO[] = [], total: number | null = null, page: number = 1, limit: number = 10, message: string = 'Success'): Response => {
+    const formattedData = data.map(formatItem);
+
+    if (typeof total !== 'number') {
+        return res.status(200).json({
+            success: true,
+            message,
+            data: Array.isArray(formattedData),
+        });
+    }
+
+    return ListResponse({
+        req,
+        res,
+        data: formattedData,
+        total,
+        page,
+        limit,
+        message,
+    });
+};
+
+
+// ==============================================
+
+// import { Request, Response } from "express";
+// import { ListResponse } from "../../../utils/ListResponse";
+// import { formatISOWithoutTimezone } from "../../../utils/FormatDate";
+// import { getUserNameById } from "../../../utils/CheckUserKeycloak";
+
+// // Tipe untuk item rumah sakit
+// interface HospitalItem {
+//     id: string;
+//     name: string;
+//     created_by?: string;
+//     createdAt: Date | string;
+//     updatedAt: Date | string;
+//     [key: string]: any;
+// }
+
+// // Fungsi transform per item
+// const transformHospitalList = async (data: HospitalItem[] = []): Promise<any[]> => {
+//     return Promise.all(
+//         data.map(async ({ created_by, ...rest }) => {
+//             // const name = await getUserNameById(created_by);
+
+//             return {
+//                 ...rest,
+//                 // user: {
+//                 //   id: created_by,
+//                 //   name: name,
+//                 // },
+//                 createdAt: formatISOWithoutTimezone(rest.createdAt),
+//                 updatedAt: formatISOWithoutTimezone(rest.updatedAt),
+//             };
+//         })
+//     );
+// };
+
+// // Collection yang async
+// export const HospitalCollection = async ({
+//     req,
+//     res,
+//     data = [],
+//     total = 0,
+//     page = 1,
+//     limit = 10,
+//     message = "Success",
+// }: {
+//     req: Request;
+//     res: Response;
+//     data: HospitalItem[];
+//     total: number;
+//     page: number;
+//     limit: number;
+//     message?: string;
+// }) => {
+//     const formatted = await transformHospitalList(data);
+
+//     return ListResponse({
+//         req,
+//         res,
+//         data: formatted,
+//         total,
+//         page,
+//         limit,
+//         message,
+//     });
+// };
+
+// const { ListResponse } = require("../../../utils/ListResponse");
+// const { formatISOWithoutTimezone } = require("../../../utils/FormatDate.js");
+// const { getUserNameById } = require("../../../utils/CheckUserKeycloak.js");
+
+// // Fungsi transform per item
+// const transformHospitalList = async (data = []) => {
+//     return Promise.all(data.map(async ({ created_by, ...rest }) => {
+//         // const name = await getUserNameById(created_by);
+
+//         return {
+//             ...rest,
+//             // user: {
+//             //     id: created_by,
+//             //     name: name
+//             // },
+//             createdAt: formatISOWithoutTimezone(rest.createdAt),
+//             updatedAt: formatISOWithoutTimezone(rest.updatedAt)
+//         };
+//     }));
+// };
+
+// // Collection yang async
+// exports.HospitalCollection = async ({ req, res, data = [], total = 0, page = 1, limit = 10, message = 'Success' }) => {
+//     const formatted = await transformHospitalList(data);
+
+//     return ListResponse({ req, res, data: formatted, total, page, limit, message });
+// };

src/resources/admin/hospital/HospitalResource.js

@@ -1,17 +0,0 @@
-const { formatISOWithoutTimezone } = require("../../../utils/FormatDate");
-
-const formatItem = (item) => ({
-    ...item,
-    createdAt: formatISOWithoutTimezone(item.createdAt),
-    updatedAt: formatISOWithoutTimezone(item.updatedAt)
-});
-
-exports.HospitalResource = (res, data, message = 'Success') => {
-    const formattedData = formatItem(data);
-
-    return res.status(200).json({
-        success: true,
-        message,
-        data: formattedData
-    });
-};

src/resources/admin/hospital/HospitalResource.ts

@@ -0,0 +1,65 @@
+import { Response } from 'express';
+import { formatISOWithoutTimezone } from '../../../utils/FormatDate';
+import { HospitalDTO } from '../../../types/admin/hospital/HospitalDTO';
+
+const formatItem = (item: HospitalDTO) => ({
+    ...item,
+    createdAt: formatISOWithoutTimezone(item.createdAt),
+    updatedAt: formatISOWithoutTimezone(item.updatedAt),
+});
+
+export const HospitalResource = (res: Response, data: HospitalDTO, message: string = 'Success'): Response => {
+    const formattedData = formatItem(data);
+
+    return res.status(200).json({
+        success: true,
+        message,
+        data: formattedData,
+    });
+};
+// ==================================================
+
+// import { Response } from 'express';
+// import { formatISOWithoutTimezone } from "../../../utils/FormatDate";
+
+// interface HospitalItem {
+//     createdAt: string | Date;
+//     updatedAt: string | Date;
+//     [key: string]: any;
+// }
+
+// export const HospitalResource = (
+//     res: Response,
+//     data: HospitalItem,
+//     message: string = 'Success'
+// ) => {
+//     const formattedData = {
+//         ...data,
+//         createdAt: formatISOWithoutTimezone(data.createdAt),
+//         updatedAt: formatISOWithoutTimezone(data.updatedAt)
+//     };
+
+//     return res.status(200).json({
+//         success: true,
+//         message,
+//         data: formattedData
+//     });
+// };
+
+// const { formatISOWithoutTimezone } = require("../../../utils/FormatDate");
+
+// const formatItem = (item) => ({
+//     ...item,
+//     createdAt: formatISOWithoutTimezone(item.createdAt),
+//     updatedAt: formatISOWithoutTimezone(item.updatedAt)
+// });
+
+// exports.HospitalResource = (res, data, message = 'Success') => {
+//     const formattedData = formatItem(data);
+
+//     return res.status(200).json({
+//         success: true,
+//         message,
+//         data: formattedData
+//     });
+// };

src/resources/admin/province/ProvinceCollection.ts

@@ -1,30 +1,15 @@
 import { Request, Response } from 'express';
 import { ListResponse } from '../../../utils/ListResponse';
 import { formatISOWithoutTimezone } from '../../../utils/FormatDate';
+import { ProvinceDTO } from '../../../types/admin/province/ProvinceDTO';
 
-interface Province {
-    id: string;
-    name: string;
-    createdAt: Date;
-    updatedAt: Date;
-    [key: string]: any; // properti tambahan
-}
-
-const formatItem = (item: Province) => ({
+const formatItem = (item: ProvinceDTO) => ({
     ...item,
     createdAt: formatISOWithoutTimezone(item.createdAt),
     updatedAt: formatISOWithoutTimezone(item.updatedAt),
 });
 
-export const ProvinceCollection = (
-    req: Request,
-    res: Response,
-    data: Province[] = [],
-    total: number | null = null,
-    page: number = 1,
-    limit: number = 10,
-    message: string = 'Success'
-) => {
+export const ProvinceCollection = (req: Request, res: Response, data: ProvinceDTO[] = [], total: number | null = null, page: number = 1, limit: number = 10, message: string = 'Success') => {
     const formattedData = data.map(formatItem);
 
     if (typeof total !== 'number') {

src/resources/admin/province/ProvinceResource.ts

@@ -1,25 +1,14 @@
 import { Response } from 'express';
 import { formatISOWithoutTimezone } from '../../../utils/FormatDate';
+import { ProvinceDTO } from '../../../types/admin/province/ProvinceDTO';
 
-interface Province {
-    id: string;
-    name: string;
-    createdAt: Date;
-    updatedAt: Date;
-    [key: string]: any; // untuk menangani properti tambahan
-}
-
-const formatItem = (item: Province) => ({
+const formatItem = (item: ProvinceDTO) => ({
     ...item,
     createdAt: formatISOWithoutTimezone(item.createdAt),
     updatedAt: formatISOWithoutTimezone(item.updatedAt),
 });
 
-export const ProvinceResource = (
-    res: Response,
-    data: Province,
-    message: string = 'Success'
-) => {
+export const ProvinceResource = (res: Response, data: ProvinceDTO, message: string = 'Success') => {
     const formattedData = formatItem(data);
 
     return res.status(200).json({

src/resources/admin/status_history/StatusHistoryCollection.js

@@ -1,27 +0,0 @@
-const { ListResponse } = require("../../../utils/ListResponse");
-const { formatISOWithoutTimezone } = require("../../../utils/FormatDate.js");
-const { getUserNameById } = require("../../../utils/CheckUserKeycloak.js");
-
-const transformStatusHistoryList = async (data = []) => {
-    return Promise.all(data.map(async ({ user_id, ...rest }) => {
-        const name = await getUserNameById(user_id);
-
-        return {
-            ...rest,
-            user: {
-                id: user_id,
-                name: name
-            },
-            note: rest.note?.trim() === '' ? null : rest.note,
-            createdAt: formatISOWithoutTimezone(rest.createdAt),
-            updatedAt: formatISOWithoutTimezone(rest.updatedAt)
-        };
-    }));
-};
-
-// Collection yang async
-exports.StatusHistoryCollection = async ({ req, res, data = [], total = 0, page = 1, limit = 10, message = 'Success' }) => {
-    const formatted = await transformStatusHistoryList(data);
-
-    return ListResponse({ req, res, data: formatted, total, page, limit, message });
-};

src/resources/admin/status_history/StatusHistoryCollection.ts

@@ -0,0 +1,137 @@
+import { Request, Response } from 'express';
+import { ListResponse } from '../../../utils/ListResponse';
+import { formatISOWithoutTimezone } from '../../../utils/FormatDate';
+import { StatusHistoryDTO } from '../../../types/admin/status_history/StatusHistoryDTO';
+
+const formatItem = (item: StatusHistoryDTO) => ({
+    ...item,
+    createdAt: formatISOWithoutTimezone(item.createdAt),
+    updatedAt: formatISOWithoutTimezone(item.updatedAt),
+});
+
+export const StatusHistoryCollection = (req: Request, res: Response, data: StatusHistoryDTO[] = [], total: number | null = null, page: number = 1, limit: number = 10, message: string = 'Success'): Response => {
+    const formattedData = data.map(formatItem);
+
+    if (typeof total !== 'number') {
+        return res.status(200).json({
+            success: true,
+            message,
+            data: Array.isArray(formattedData),
+        });
+    }
+
+    return ListResponse({
+        req,
+        res,
+        data: formattedData,
+        total,
+        page,
+        limit,
+        message,
+    });
+};
+
+// import { ListResponse } from "../../../utils/ListResponse";
+// import { formatISOWithoutTimezone } from "../../../utils/FormatDate";
+// import { getUserNameById } from "../../../utils/CheckUserKeycloak";
+
+// // interface StatusHistory {
+// //     id: string;
+// //     hospital_id: string;
+// //     user_id: string;
+// //     old_status: 'cari_data' | 'dihubungi' | 'negosiasi' | 'follow_up' | 'mou' | 'onboarded' | 'tidak_berminat';
+// //     new_status: 'cari_data' | 'dihubungi' | 'negosiasi' | 'follow_up' | 'mou' | 'onboarded' | 'tidak_berminat';
+// //     note?: string | null;
+// //     createdAt: string | Date | null;
+// //     updatedAt: string | Date | null;
+// // }
+
+// interface StatusHistoryWithRelations {
+//     id: string;
+//     old_status: string;
+//     new_status: string;
+//     note: string | null;
+//     createdAt: Date | string | null;
+//     updatedAt: Date | string | null;
+//     hospital: {
+//         id: string;
+//         name: string;
+//         progress_status: string;
+//     };
+//     user: {
+//         id: string;
+//         fullname: string;
+//     };
+// }
+
+
+// const transformStatusHistoryList = async (data: StatusHistoryWithRelations[] = []): Promise<StatusHistoryWithRelations[]> => {
+//     return Promise.all(
+//         data.map(async (rest): Promise<StatusHistoryWithRelations> => {
+//             // const name = await getUserNameById(rest.user_id);
+
+//             return {
+//                 ...rest,
+//                 // user: {
+//                 //   id: rest.user_id,
+//                 //   name,
+//                 // },
+//                 note: rest.note?.trim() === '' ? null : rest.note ?? null,
+//                 createdAt: formatISOWithoutTimezone(rest.createdAt),
+//                 updatedAt: formatISOWithoutTimezone(rest.updatedAt),
+//             };
+//         })
+//     );
+// };
+
+// interface StatusHistoryCollectionParams {
+//     req: any;
+//     res: any;
+//     data?: StatusHistoryWithRelations[];
+//     total?: number;
+//     page?: number;
+//     limit?: number;
+//     message?: string;
+// }
+
+// export const StatusHistoryCollection = async ({
+//     req,
+//     res,
+//     data = [],
+//     total = 0,
+//     page = 1,
+//     limit = 10,
+//     message = 'Success',
+// }: StatusHistoryCollectionParams) => {
+//     const formatted = await transformStatusHistoryList(data);
+//     return ListResponse({ req, res, data: formatted, total, page, limit, message });
+// };
+
+
+// const { ListResponse } = require("../../../utils/ListResponse");
+// const { formatISOWithoutTimezone } = require("../../../utils/FormatDate.js");
+// const { getUserNameById } = require("../../../utils/CheckUserKeycloak.js");
+
+// const transformStatusHistoryList = async (data = []) => {
+//     return Promise.all(data.map(async ({ ...rest }) => {
+//         // const name = await getUserNameById(user_id);
+
+//         return {
+//             ...rest,
+//             // user: {
+//             //     id: user_id,
+//             //     name: name
+//             // },
+//             note: rest.note?.trim() === '' ? null : rest.note,
+//             createdAt: formatISOWithoutTimezone(rest.createdAt),
+//             updatedAt: formatISOWithoutTimezone(rest.updatedAt)
+//         };
+//     }));
+// };
+
+// // Collection yang async
+// exports.StatusHistoryCollection = async ({ req, res, data = [], total = 0, page = 1, limit = 10, message = 'Success' }) => {
+//     const formatted = await transformStatusHistoryList(data);
+
+//     return ListResponse({ req, res, data: formatted, total, page, limit, message });
+// };

src/resources/admin/vendor/VendorCollection.js

@@ -1,26 +0,0 @@
-const { ListResponse } = require("../../../utils/ListResponse");
-const { formatISOWithoutTimezone } = require("../../../utils/FormatDate.js");
-const { getUserNameById } = require("../../../utils/CheckUserKeycloak");
-
-const transformVendorList = async (data = []) => {
-    return Promise.all(data.map(async ({ created_by, ...rest }) => {
-        const name = await getUserNameById(created_by);
-
-        return {
-            ...rest,
-            user: {
-                id: created_by,
-                name: name
-            },
-            createdAt: formatISOWithoutTimezone(rest.createdAt),
-            updatedAt: formatISOWithoutTimezone(rest.updatedAt)
-        };
-    }));
-};
-
-// Collection yang async
-exports.VendorCollection = async ({ req, res, data = [], total = 0, page = 1, limit = 10, message = 'Success' }) => {
-    const formatted = await transformVendorList(data);
-
-    return ListResponse({ req, res, data: formatted, total, page, limit, message });
-};

src/resources/admin/vendor/VendorCollection.ts

@@ -0,0 +1,112 @@
+import { Request, Response } from 'express';
+import { ListResponse } from '../../../utils/ListResponse';
+import { formatISOWithoutTimezone } from '../../../utils/FormatDate';
+import { VendorDTO } from '../../../types/admin/vendor/VendorDTO';
+
+const formatItem = (item: VendorDTO) => ({
+    ...item,
+    createdAt: formatISOWithoutTimezone(item.createdAt),
+    updatedAt: formatISOWithoutTimezone(item.updatedAt),
+});
+
+export const VendorCollection = (req: Request, res: Response, data: VendorDTO[] = [], total: number | null = null, page: number = 1, limit: number = 10, message: string = 'Success'): Response => {
+    const formattedData = data.map(formatItem);
+
+    if (typeof total !== 'number') {
+        return res.status(200).json({
+            success: true,
+            message,
+            data: Array.isArray(formattedData),
+        });
+    }
+
+    return ListResponse({
+        req,
+        res,
+        data: formattedData,
+        total,
+        page,
+        limit,
+        message,
+    });
+};
+
+// import { ListResponse } from "../../../utils/ListResponse";
+// import { formatISOWithoutTimezone } from "../../../utils/FormatDate";
+// import { getUserNameById } from "../../../utils/CheckUserKeycloak";
+
+// // Jika tahu struktur data vendor, ganti `any` dengan interface Vendor
+// interface Vendor {
+//     createdAt: Date | string | null;
+//     updatedAt: Date | string | null;
+//     [key: string]: any; // untuk properti lainnya
+// }
+
+// const transformVendorList = async (data: Vendor[] = []): Promise<Vendor[]> => {
+//     return Promise.all(
+//         data.map(async ({ ...rest }) => {
+//             // const name = await getUserNameById(rest.created_by);
+
+//             return {
+//                 ...rest,
+//                 // user: {
+//                 //     id: rest.created_by,
+//                 //     name: name
+//                 // },
+//                 createdAt: formatISOWithoutTimezone(rest.createdAt),
+//                 updatedAt: formatISOWithoutTimezone(rest.updatedAt),
+//             };
+//         })
+//     );
+// };
+
+// interface VendorCollectionParams {
+//     req: any;
+//     res: any;
+//     data?: Vendor[];
+//     total?: number;
+//     page?: number;
+//     limit?: number;
+//     message?: string;
+// }
+
+// export const VendorCollection = async ({
+//     req,
+//     res,
+//     data = [],
+//     total = 0,
+//     page = 1,
+//     limit = 10,
+//     message = "Success",
+// }: VendorCollectionParams): Promise<any> => {
+//     const formatted = await transformVendorList(data);
+//     return ListResponse({ req, res, data: formatted, total, page, limit, message });
+// };
+
+
+// const { ListResponse } = require("../../../utils/ListResponse");
+// const { formatISOWithoutTimezone } = require("../../../utils/FormatDate.js");
+// const { getUserNameById } = require("../../../utils/CheckUserKeycloak");
+
+// const transformVendorList = async (data = []) => {
+//     return Promise.all(data.map(async ({ ...rest }) => {
+//         // const name = await getUserNameById(created_by);
+
+//         return {
+//             ...rest,
+//             // user: {
+//             //     id: created_by,
+//             //     name: name
+//             // },
+//             createdAt: formatISOWithoutTimezone(rest.createdAt),
+//             updatedAt: formatISOWithoutTimezone(rest.updatedAt)
+//         };
+//     }));
+// };
+
+// // Collection yang async
+// exports.VendorCollection = async ({ req, res, data = [], total = 0, page = 1, limit = 10, message = 'Success' }) => {
+//     const formatted = await transformVendorList(data);
+
+//     return ListResponse({ req, res, data: formatted, total, page, limit, message });
+// };

src/resources/admin/vendor/VendorResource.js

@@ -1,25 +0,0 @@
-const { formatISOWithoutTimezone } = require("../../../utils/FormatDate");
-
-const formatItem = ({ item, userName }) => {
-    const { created_by, ...rest } = item;
-
-    return {
-        ...rest,
-        user: {
-            id: created_by,
-            name: userName
-        },
-        createdAt: formatISOWithoutTimezone(item.createdAt),
-        updatedAt: formatISOWithoutTimezone(item.updatedAt)
-    };
-};
-
-exports.VendorResource = (res, item, userName, message = 'Success') => {
-    const formattedData = formatItem({ item, userName });
-
-    return res.status(200).json({
-        success: true,
-        message,
-        data: formattedData
-    });
-};

src/resources/admin/vendor/VendorResource.ts

@@ -0,0 +1,85 @@
+import { Response } from 'express';
+import { formatISOWithoutTimezone } from '../../../utils/FormatDate';
+import { VendorDTO } from '../../../types/admin/vendor/VendorDTO';
+
+const formatItem = (item: VendorDTO) => ({
+    ...item,
+    createdAt: formatISOWithoutTimezone(item.createdAt),
+    updatedAt: formatISOWithoutTimezone(item.updatedAt),
+});
+
+export const VendorResource = (res: Response, data: VendorDTO, message: string = 'Success'): Response => {
+    const formattedData = formatItem(data);
+
+    return res.status(200).json({
+        success: true,
+        message,
+        data: formattedData,
+    });
+};
+
+// import { Response } from "express";
+// import { formatISOWithoutTimezone } from "../../../utils/FormatDate";
+// import { VendorDTO } from '../../../types/admin/vendor/VendorDTO';
+
+// // Kalau ada struktur pasti dari vendor, ganti `any` dengan tipe interface
+// interface Vendor {
+//     createdAt: Date | string | null;
+//     updatedAt: Date | string | null;
+//     [key: string]: any;
+// }
+
+// const formatItem = ({ item }: { item: Vendor }): Vendor => {
+//     const { ...rest } = item;
+
+//     return {
+//         ...rest,
+//         // user: {
+//         //     id: item.created_by,
+//         //     name: userName
+//         // },
+//         createdAt: formatISOWithoutTimezone(item.createdAt),
+//         updatedAt: formatISOWithoutTimezone(item.updatedAt)
+//     };
+// };
+
+// export const VendorResource = (
+//     res: Response,
+//     item: Vendor,
+//     message = "Success"
+// ): Response => {
+//     const formattedData = formatItem({ item });
+
+//     return res.status(200).json({
+//         success: true,
+//         message,
+//         data: formattedData
+//     });
+// };
+
+
+// const { formatISOWithoutTimezone } = require("../../../utils/FormatDate");
+
+// const formatItem = ({ item }) => {
+//     const { ...rest } = item;
+
+//     return {
+//         ...rest,
+//         // user: {
+//         //     id: created_by,
+//         //     name: userName
+//         // },
+//         createdAt: formatISOWithoutTimezone(item.createdAt),
+//         updatedAt: formatISOWithoutTimezone(item.updatedAt)
+//     };
+// };
+
+// exports.VendorResource = (res, item, message = 'Success') => {
+//     const formattedData = formatItem({ item });
+
+//     return res.status(200).json({
+//         success: true,
+//         message,
+//         data: formattedData
+//     });
+// };

src/resources/admin/vendor_experience/VendorExperienceCollection.ts

@@ -0,0 +1,100 @@
+import { Request, Response } from 'express';
+import { ListResponse } from '../../../utils/ListResponse';
+import { formatDateOnly, formatISOWithoutTimezone } from '../../../utils/FormatDate';
+import { VendorExperienceDTO } from '../../../types/admin/vendor_experience/VendorExperienceDTO';
+
+const formatItem = (item: VendorExperienceDTO) => ({
+    ...item,
+    contract_value_min: item.contract_value_min !== null ? Number(item.contract_value_min) : null,
+    contract_value_max: item.contract_value_max !== null ? Number(item.contract_value_max) : null,
+    contract_start_date: formatDateOnly(item.contract_start_date),
+    contract_expired_date: formatDateOnly(item.contract_expired_date),
+    createdAt: formatISOWithoutTimezone(item.createdAt),
+    updatedAt: formatISOWithoutTimezone(item.updatedAt),
+});
+
+export const VendorExperienceCollection = (req: Request, res: Response, data: VendorExperienceDTO[] = [], total: number | null = null, page: number = 1, limit: number = 10, message: string = 'Success'): Response => {
+    const formattedData = data.map(formatItem);
+
+    if (typeof total !== 'number') {
+        return res.status(200).json({
+            success: true,
+            message,
+            data: Array.isArray(formattedData),
+        });
+    }
+
+    return ListResponse({
+        req,
+        res,
+        data: formattedData,
+        total,
+        page,
+        limit,
+        message,
+    });
+};
+
+// import { Request, Response } from 'express';
+// import { ListResponse } from '../../../utils/ListResponse';
+// import { formatDateOnly, formatISOWithoutTimezone } from '../../../utils/FormatDate';
+// import { VendorHistoryDTO } from '../../../types/VendorHistoryDTO';
+
+// const formatItem = (item: VendorHistoryDTO): VendorHistoryDTO => ({
+//     ...item,
+//     contract_value_min: item.contract_value_min !== null ? Number(item.contract_value_min) : null,
+//     contract_value_max: item.contract_value_max !== null ? Number(item.contract_value_max) : null,
+//     contract_start_date: formatDateOnly(item.contract_start_date),
+//     contract_expired_date: formatDateOnly(item.contract_expired_date),
+//     createdAt: formatISOWithoutTimezone(item.createdAt),
+//     updatedAt: formatISOWithoutTimezone(item.updatedAt),
+// });
+
+// export const VendorExperienceCollection = (
+//     req: Request,
+//     res: Response,
+//     data: any[] = [],
+//     total: number | null = null,
+//     page: number = 1,
+//     limit: number = 10,
+//     message: string = 'Success'
+// ): Response => {
+//     const formattedData: VendorHistoryDTO[] = data.map(formatItem);
+
+//     if (typeof total !== 'number') {
+//         return res.status(200).json({
+//             success: true,
+//             message,
+//             data: Array.isArray(formattedData),
+//         });
+//     }
+
+//     return ListResponse({ req, res, data: formattedData, total, page, limit, message });
+// };
+
+// const { ListResponse } = require("../../../utils/ListResponse.js");
+// const { formatISOWithoutTimezone, formatDateOnly } = require("../../../utils/FormatDate.js");
+
+// const formatItem = (item) => ({
+//     ...item,
+//     contract_value_min: item.contract_value_min !== null ? Number(item.contract_value_min) : null,
+//     contract_value_max: item.contract_value_max !== null ? Number(item.contract_value_max) : null,
+//     contract_start_date: formatDateOnly(item.contract_start_date),
+//     contract_expired_date: formatDateOnly(item.contract_expired_date),
+//     createdAt: formatISOWithoutTimezone(item.createdAt),
+//     updatedAt: formatISOWithoutTimezone(item.updatedAt),
+// });
+
+// exports.VendorExperienceCollection = (req, res, data = [], total = null, page = 1, limit = 10, message = 'Success') => {
+//     const formattedData = data.map(formatItem);
+
+//     if (typeof total !== 'number') {
+//         return res.status(200).json({
+//             success: true,
+//             message,
+//             data: Array.isArray(formattedData)
+//         });
+//     }
+
+//     return ListResponse({ req, res, data: formattedData, total, page, limit, message });
+// };

src/resources/admin/vendor_experience/VendorExperienceResource.ts

@@ -0,0 +1,105 @@
+import { Response } from 'express';
+import { formatDateOnly, formatISOWithoutTimezone } from '../../../utils/FormatDate';
+import { VendorExperienceDTO } from '../../../types/admin/vendor_experience/VendorExperienceDTO';
+
+export const VendorExperienceResource = (res: Response, data: VendorExperienceDTO, message: string = 'Success'): Response => {
+    const { vendor_id, ...restData } = data;
+
+    const formatted = {
+        ...restData,
+        vendor: data.vendor
+            ? {
+                id: data.vendor.id,
+                name: data.vendor.name,
+                name_pt: data.vendor.name_pt,
+                strengths: data.vendor.strengths,
+                weaknesses: data.vendor.weaknesses,
+                website: data.vendor.website,
+                created_by: data.vendor.created_by,
+            }
+            : null,
+        contract_start_date: formatDateOnly(data.contract_start_date),
+        contract_expired_date: formatDateOnly(data.contract_expired_date),
+        // contract_value_min: Number(data.contract_value_min),
+        // contract_value_max: Number(data.contract_value_max),
+        contract_value_min: data.contract_value_min !== null ? Number(data.contract_value_min) : null,
+        contract_value_max: data.contract_value_max !== null ? Number(data.contract_value_max) : null,
+        createdAt: formatISOWithoutTimezone(data.createdAt),
+        updatedAt: formatISOWithoutTimezone(data.updatedAt),
+    };
+
+    return res.status(200).json({
+        success: true,
+        message,
+        data: formatted,
+    });
+};
+
+// src/resources/VendorExperienceResource.ts
+// import { Response } from 'express';
+// import { VendorHistoryDTO } from '../../../types/VendorHistoryDTO';
+// import { formatDateOnly, formatISOWithoutTimezone } from '../../../utils/FormatDate';
+
+// export const formatVendorExperience = (item: VendorHistoryDTO): VendorHistoryDTO => ({
+//     ...item,
+//     contract_value_min: item.contract_value_min !== null ? Number(item.contract_value_min) : null,
+//     contract_value_max: item.contract_value_max !== null ? Number(item.contract_value_max) : null,
+//     contract_start_date: formatDateOnly(item.contract_start_date),
+//     contract_expired_date: formatDateOnly(item.contract_expired_date),
+//     createdAt: formatISOWithoutTimezone(item.createdAt),
+//     updatedAt: formatISOWithoutTimezone(item.updatedAt),
+// });
+
+// export const VendorExperienceResource = (res: Response, data: any, message: string) => {
+//     const { vendor_id, ...restData } = data;
+
+//     const formatted = {
+//         ...restData,
+//         vendor: data.vendor
+//             ? {
+//                 id: data.vendor.id,
+//                 name: data.vendor.name,
+//                 name_pt: data.vendor.name_pt,
+//                 strengths: data.vendor.strengths,
+//                 weaknesses: data.vendor.weaknesses,
+//                 website: data.vendor.website,
+//                 created_by: data.vendor.created_by,
+//             }
+//             : null,
+//         contract_start_date: formatDateOnly(data.contract_start_date),
+//         contract_expired_date: formatDateOnly(data.contract_expired_date),
+//         contract_value_min: Number(data.contract_value_min),
+//         contract_value_max: Number(data.contract_value_max),
+//         createdAt: formatISOWithoutTimezone(data.createdAt),
+//         updatedAt: formatISOWithoutTimezone(data.updatedAt),
+//     };
+
+//     return res.status(200).json({
+//         success: true,
+//         message,
+//         data: formatted,
+//     });
+// };
+
+
+// const { formatISOWithoutTimezone, formatDateOnly } = require("../../../utils/FormatDate");
+
+// const formatItem = (item) => ({
+//     ...item,
+//     contract_value_min: item.contract_value_min !== null ? Number(item.contract_value_min) : null,
+//     contract_value_max: item.contract_value_max !== null ? Number(item.contract_value_max) : null,
+//     contract_start_date: formatDateOnly(item.contract_start_date),
+//     contract_expired_date: formatDateOnly(item.contract_expired_date),
+//     createdAt: formatISOWithoutTimezone(item.createdAt),
+//     updatedAt: formatISOWithoutTimezone(item.updatedAt),
+// });
+
+// exports.VendorExperienceResource = (res, data, message = 'Success') => {
+//     const formattedData = formatItem(data);
+
+//     return res.status(200).json({
+//         success: true,
+//         message,
+//         data: formattedData
+//     });
+// };

src/resources/admin/vendor_history/VendorExperienceCollection.js

@@ -1,26 +0,0 @@
-const { ListResponse } = require("../../../utils/ListResponse.js");
-const { formatISOWithoutTimezone, formatDateOnly } = require("../../../utils/FormatDate.js");
-
-const formatItem = (item) => ({
-    ...item,
-    contract_value_min: item.contract_value_min !== null ? Number(item.contract_value_min) : null,
-    contract_value_max: item.contract_value_max !== null ? Number(item.contract_value_max) : null,
-    contract_start_date: formatDateOnly(item.contract_start_date),
-    contract_expired_date: formatDateOnly(item.contract_expired_date),
-    createdAt: formatISOWithoutTimezone(item.createdAt),
-    updatedAt: formatISOWithoutTimezone(item.updatedAt),
-});
-
-exports.VendorHistoriCollection = (req, res, data = [], total = null, page = 1, limit = 10, message = 'Success') => {
-    const formattedData = data.map(formatItem);
-
-    if (typeof total !== 'number') {
-        return res.status(200).json({
-            success: true,
-            message,
-            data: Array.isArray(formattedData)
-        });
-    }
-
-    return ListResponse({ req, res, data: formattedData, total, page, limit, message });
-};

src/resources/admin/vendor_history/VendorExperienceResource.js

@@ -1,21 +0,0 @@
-const { formatISOWithoutTimezone, formatDateOnly } = require("../../../utils/FormatDate");
-
-const formatItem = (item) => ({
-    ...item,
-    contract_value_min: item.contract_value_min !== null ? Number(item.contract_value_min) : null,
-    contract_value_max: item.contract_value_max !== null ? Number(item.contract_value_max) : null,
-    contract_start_date: formatDateOnly(item.contract_start_date),
-    contract_expired_date: formatDateOnly(item.contract_expired_date),
-    createdAt: formatISOWithoutTimezone(item.createdAt),
-    updatedAt: formatISOWithoutTimezone(item.updatedAt),
-});
-
-exports.VendorHistoriResource = (res, data, message = 'Success') => {
-    const formattedData = formatItem(data);
-
-    return res.status(200).json({
-        success: true,
-        message,
-        data: formattedData
-    });
-};

src/resources/auth/LoginResource.js

@@ -1,7 +0,0 @@
-exports.LoginResource = (res, data, message = 'Success') => {
-    return res.status(200).json({
-        success: true,
-        message,
-        data
-    });
-};

src/resources/auth/UserResource.js

@@ -1,8 +0,0 @@
-exports.UserResource = (res, data, message = 'Success') => {
-    return res.status(200).json({
-        success: true,
-        message,
-        // data: Array.isArray(data) ? data : { ...data }
-        data
-    });
-};

src/resources/sales/area/UserAreaCollection.js

@@ -1,22 +0,0 @@
-const { getUserNameById } = require("../../../utils/CheckUserKeycloak");
-const { ListResponse } = require("../../../utils/ListResponse");
-
-const transformArea = async (data = []) => {
-    return Promise.all(data.map(async ({ user_id, ...rest }) => {
-        const name = await getUserNameById(user_id);
-
-        return {
-            ...rest,
-            user: {
-                id: user_id,
-                name: name
-            },
-        };
-    }));
-};
-
-exports.UserAreaCollection = async ({ req, res, data = [], total = 0, page = 1, limit = 10, message = 'Success' }) => {
-    const formatted = await transformArea(data);
-
-    return ListResponse({ req, res, data: formatted, total, page, limit, message });
-};

src/resources/sales/area/UserAreaCollection.ts

@@ -0,0 +1,106 @@
+import { Request, Response } from 'express';
+import { ListResponse } from '../../../utils/ListResponse';
+import { formatISOWithoutTimezone } from '../../../utils/FormatDate';
+import { AreaSalesDTO } from '../../../types/sales/area_sales/AreaSalesDTO';
+
+const formatItem = (item: AreaSalesDTO) => ({
+    ...item,
+    createdAt: formatISOWithoutTimezone(item.createdAt),
+    updatedAt: formatISOWithoutTimezone(item.updatedAt),
+});
+
+export const UserAreaCollection = (req: Request, res: Response, data: AreaSalesDTO[] = [], total: number | null = null, page: number = 1, limit: number = 10, message: string = 'Success'): Response => {
+    const formattedData = data.map(formatItem);
+
+    if (typeof total !== 'number') {
+        return res.status(200).json({
+            success: true,
+            message,
+            data: Array.isArray(formattedData),
+        });
+    }
+
+    return ListResponse({
+        req,
+        res,
+        data: formattedData,
+        total,
+        page,
+        limit,
+        message,
+    });
+};
+
+// import { Request, Response } from 'express';
+// import { ListResponse } from '../../../utils/ListResponse';
+// import { getUserNameById } from '../../../utils/CheckUserKeycloak';
+// import { formatISOWithoutTimezone } from '../../../utils/FormatDate';
+
+// interface Province {
+//     id: string;
+//     name: string;
+// }
+
+// interface Area {
+//     id: string;
+//     province: Province;
+//     createdAt: string | Date | null;
+//     updatedAt: string | Date | null;
+// }
+
+// interface UserAreaCollectionParams {
+//     req: Request;
+//     res: Response;
+//     data?: Area[];
+//     total?: number;
+//     page?: number;
+//     limit?: number;
+//     message?: string;
+// }
+
+// const transformArea = async (data: Area[] = []): Promise<Area[]> => {
+//     return Promise.all(data.map(async (item) => {
+//         return {
+//             ...item,
+//             createdAt: formatISOWithoutTimezone(item.createdAt),
+//             updatedAt: formatISOWithoutTimezone(item.updatedAt),
+//         };
+//     }));
+// };
+
+// export const UserAreaCollection = async ({
+//     req,
+//     res,
+//     data = [],
+//     total = 0,
+//     page = 1,
+//     limit = 10,
+//     message = 'Success',
+// }: UserAreaCollectionParams): Promise<Response> => {
+//     const formatted = await transformArea(data);
+//     return ListResponse({ req, res, data: formatted, total, page, limit, message });
+// };
+
+
+// const { getUserNameById } = require("../../../utils/CheckUserKeycloak");
+// const { ListResponse } = require("../../../utils/ListResponse");
+
+// const transformArea = async (data = []) => {
+//     return Promise.all(data.map(async ({ ...rest }) => {
+//         // const name = await getUserNameById(user_id);
+
+//         return {
+//             ...rest,
+//             // user: {
+//             //     id: user_id,
+//             //     name: name
+//             // },
+//         };
+//     }));
+// };
+
+// exports.UserAreaCollection = async ({ req, res, data = [], total = 0, page = 1, limit = 10, message = 'Success' }) => {
+//     const formatted = await transformArea(data);
+
+//     return ListResponse({ req, res, data: formatted, total, page, limit, message });
+// };

src/resources/sales/executives_history/ExecutivesHistoriCollection.js

@@ -1,24 +0,0 @@
-const { ListResponse } = require("../../../utils/ListResponse");
-const { formatISOWithoutTimezone, formatDateOnly } = require("../../../utils/FormatDate.js");
-
-const formatItem = (item) => ({
-    ...item,
-    start_term: formatDateOnly(item.start_term),
-    end_term: formatDateOnly(item.end_term),
-    createdAt: formatISOWithoutTimezone(item.createdAt),
-    updatedAt: formatISOWithoutTimezone(item.updatedAt),
-});
-
-exports.ExecutivesHistoriCollection = (req, res, data = [], total = null, page = 1, limit = 10, message = 'Success') => {
-    const formattedData = data.map(formatItem);
-
-    if (typeof total !== 'number') {
-        return res.status(200).json({
-            success: true,
-            message,
-            data: Array.isArray(formattedData)
-        });
-    }
-
-    return ListResponse({ req, res, data: formattedData, total, page, limit, message });
-};

src/resources/sales/executives_history/ExecutivesHistoriCollection.ts

@@ -0,0 +1,60 @@
+import { Request, Response } from 'express';
+import { ListResponse } from '../../../utils/ListResponse';
+import { formatISOWithoutTimezone, formatDateOnly } from '../../../utils/FormatDate';
+import { ExecutiveHistoryDTO } from '../../../types/sales/executives_history/ExecutivesHistoryDTO';
+
+const formatItem = (item: ExecutiveHistoryDTO): ExecutiveHistoryDTO => ({
+    ...item,
+    start_term: formatDateOnly(item.start_term),
+    end_term: formatDateOnly(item.end_term),
+    createdAt: formatISOWithoutTimezone(item.createdAt),
+    updatedAt: formatISOWithoutTimezone(item.updatedAt),
+});
+
+export const ExecutivesHistoriCollection = (
+    req: Request,
+    res: Response,
+    data: ExecutiveHistoryDTO[] = [],
+    total: number | null = null,
+    page = 1,
+    limit = 10,
+    message = 'Success'
+): Response => {
+    const formattedData = data.map(formatItem);
+
+    if (typeof total !== 'number') {
+        return res.status(200).json({
+            success: true,
+            message,
+            data: Array.isArray(formattedData)
+        });
+    }
+
+    return ListResponse({ req, res, data: formattedData, total, page, limit, message });
+};
+
+
+// const { ListResponse } = require("../../../utils/ListResponse");
+// const { formatISOWithoutTimezone, formatDateOnly } = require("../../../utils/FormatDate.js");
+
+// const formatItem = (item) => ({
+//     ...item,
+//     start_term: formatDateOnly(item.start_term),
+//     end_term: formatDateOnly(item.end_term),
+//     createdAt: formatISOWithoutTimezone(item.createdAt),
+//     updatedAt: formatISOWithoutTimezone(item.updatedAt),
+// });
+
+// exports.ExecutivesHistoriCollection = (req, res, data = [], total = null, page = 1, limit = 10, message = 'Success') => {
+//     const formattedData = data.map(formatItem);
+
+//     if (typeof total !== 'number') {
+//         return res.status(200).json({
+//             success: true,
+//             message,
+//             data: Array.isArray(formattedData)
+//         });
+//     }
+
+//     return ListResponse({ req, res, data: formattedData, total, page, limit, message });
+// };

src/resources/sales/executives_history/ExecutivesHistoriResource.js

@@ -1,19 +0,0 @@
-const { formatISOWithoutTimezone, formatDateOnly } = require("../../../utils/FormatDate");
-
-const formatItem = (item) => ({
-    ...item,
-    start_term: formatDateOnly(item.start_term),
-    end_term: formatDateOnly(item.end_term),
-    createdAt: formatISOWithoutTimezone(item.createdAt),
-    updatedAt: formatISOWithoutTimezone(item.updatedAt),
-});
-
-exports.ExecutivesHistoriResource = (res, data, message = 'Success') => {
-    const formattedData = formatItem(data);
-
-    return res.status(200).json({
-        success: true,
-        message,
-        data: formattedData
-    });
-};

src/resources/sales/executives_history/ExecutivesHistoriResource.ts

@@ -0,0 +1,45 @@
+import { Response } from 'express';
+import { formatISOWithoutTimezone, formatDateOnly } from '../../../utils/FormatDate';
+import { ExecutiveHistoryDTO } from '../../../types/sales/executives_history/ExecutivesHistoryDTO';
+
+const formatItem = (item: ExecutiveHistoryDTO): ExecutiveHistoryDTO => ({
+    ...item,
+    start_term: formatDateOnly(item.start_term),
+    end_term: formatDateOnly(item.end_term),
+    createdAt: formatISOWithoutTimezone(item.createdAt),
+    updatedAt: formatISOWithoutTimezone(item.updatedAt),
+});
+
+export const ExecutivesHistoriResource = (
+    res: Response,
+    data: ExecutiveHistoryDTO,
+    message = 'Success'
+): Response => {
+    const formattedData = formatItem(data);
+
+    return res.status(200).json({
+        success: true,
+        message,
+        data: formattedData
+    });
+};
+
+// const { formatISOWithoutTimezone, formatDateOnly } = require("../../../utils/FormatDate");
+
+// const formatItem = (item) => ({
+//     ...item,
+//     start_term: formatDateOnly(item.start_term),
+//     end_term: formatDateOnly(item.end_term),
+//     createdAt: formatISOWithoutTimezone(item.createdAt),
+//     updatedAt: formatISOWithoutTimezone(item.updatedAt),
+// });
+
+// exports.ExecutivesHistoriResource = (res, data, message = 'Success') => {
+//     const formattedData = formatItem(data);
+
+//     return res.status(200).json({
+//         success: true,
+//         message,
+//         data: formattedData
+//     });
+// };