add feature epic 2 & 3

entrypoint.sh

@@ -6,8 +6,11 @@ npx prisma generate
 echo "🔃 Menjalankan migrasi dev..."
 npx prisma migrate dev --name init
 
-echo "♻️ Reset database dan menjalankan seeder..."
-npx prisma migrate reset --force
+# echo "♻️ Reset database dan menjalankan seeder..."
+# npx prisma migrate reset --force
+
+echo "🌱 Menjalankan seeder (aman)..."
+npx prisma db seed
 
 echo "🚀 Menjalankan aplikasi..."
 exec node index.js

index.js

@@ -12,6 +12,10 @@ 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')
 
 app.use(cors())
@@ -29,6 +33,10 @@ 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('/vendor-sales', vendorSalesRoutes);
 
 app.get('/', (req, res) => {
     res.send('Selamat Datang di API Radar Farmagitechs');

package-lock.json

@@ -14,6 +14,8 @@
         "axios": "^1.10.0",
         "bcrypt": "^6.0.0",
         "cors": "^2.8.5",
+        "date-fns": "^4.1.0",
+        "date-fns-tz": "^3.2.0",
         "dayjs": "^1.11.13",
         "dayjs-plugin-utc": "^0.1.2",
         "dotenv": "^16.5.0",
@@ -335,6 +337,25 @@
         "node": ">= 0.10"
       }
     },
+    "node_modules/date-fns": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-4.1.0.tgz",
+      "integrity": "sha512-Ukq0owbQXxa/U3EGtsdVBkR1w7KOQ5gIBqdH2hkvknzZPYvBxb/aa6E8L7tmjFtkwZBu3UXBbjIgPo/Ez4xaNg==",
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/kossnocorp"
+      }
+    },
+    "node_modules/date-fns-tz": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/date-fns-tz/-/date-fns-tz-3.2.0.tgz",
+      "integrity": "sha512-sg8HqoTEulcbbbVXeg84u5UnlsQa8GS5QXMqjjYIhS4abEVVKIUwe0/l/UhrZdKaL/W5eWZNlbTeEIiOXTcsBQ==",
+      "license": "MIT",
+      "peerDependencies": {
+        "date-fns": "^3.0.0 || ^4.0.0"
+      }
+    },
     "node_modules/dayjs": {
       "version": "1.11.13",
       "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.13.tgz",

package.json

@@ -18,6 +18,8 @@
     "axios": "^1.10.0",
     "bcrypt": "^6.0.0",
     "cors": "^2.8.5",
+    "date-fns": "^4.1.0",
+    "date-fns-tz": "^3.2.0",
     "dayjs": "^1.11.13",
     "dayjs-plugin-utc": "^0.1.2",
     "dotenv": "^16.5.0",

prisma/migrations/20250626035040_add_table_vendor/migration.sql

@@ -0,0 +1,18 @@
+-- CreateTable
+CREATE TABLE "vendors" (
+    "id" TEXT NOT NULL,
+    "name" TEXT NOT NULL,
+    "name_pt" TEXT NOT NULL,
+    "strengths" TEXT NOT NULL,
+    "weaknesses" TEXT NOT NULL,
+    "website" TEXT NOT NULL,
+    "created_by" TEXT NOT NULL,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+    "deletedAt" TIMESTAMP(3),
+
+    CONSTRAINT "vendors_pkey" PRIMARY KEY ("id")
+);
+
+-- AddForeignKey
+ALTER TABLE "vendors" ADD CONSTRAINT "vendors_created_by_fkey" FOREIGN KEY ("created_by") REFERENCES "users"("id") ON DELETE RESTRICT ON UPDATE CASCADE;

prisma/migrations/20250627125223_add_table_vendor_history/migration.sql

@@ -0,0 +1,21 @@
+-- CreateTable
+CREATE TABLE "vendor_histories" (
+    "id" TEXT NOT NULL,
+    "hospital_id" TEXT NOT NULL,
+    "vendor_id" TEXT NOT NULL,
+    "vendor_impression" TEXT,
+    "status" TEXT,
+    "contract_date" TIMESTAMP(3),
+    "contract_expired_date" TIMESTAMP(3),
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+    "deletedAt" TIMESTAMP(3),
+
+    CONSTRAINT "vendor_histories_pkey" PRIMARY KEY ("id")
+);
+
+-- AddForeignKey
+ALTER TABLE "vendor_histories" ADD CONSTRAINT "vendor_histories_hospital_id_fkey" FOREIGN KEY ("hospital_id") REFERENCES "hospitals"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "vendor_histories" ADD CONSTRAINT "vendor_histories_vendor_id_fkey" FOREIGN KEY ("vendor_id") REFERENCES "vendors"("id") ON DELETE RESTRICT ON UPDATE CASCADE;

prisma/migrations/20250627171433_add_table_executives_histories/migration.sql

@@ -0,0 +1,18 @@
+-- CreateTable
+CREATE TABLE "executives_histories" (
+    "id" TEXT NOT NULL,
+    "hospital_id" TEXT NOT NULL,
+    "executive_name" TEXT,
+    "contact" TEXT,
+    "status" TEXT,
+    "start_term" TIMESTAMP(3),
+    "end_term" TIMESTAMP(3),
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+    "deletedAt" TIMESTAMP(3),
+
+    CONSTRAINT "executives_histories_pkey" PRIMARY KEY ("id")
+);
+
+-- AddForeignKey
+ALTER TABLE "executives_histories" ADD CONSTRAINT "executives_histories_hospital_id_fkey" FOREIGN KEY ("hospital_id") REFERENCES "hospitals"("id") ON DELETE RESTRICT ON UPDATE CASCADE;

prisma/migrations/20250628023321_update_table_vendor_history/migration.sql

@@ -0,0 +1,8 @@
+-- DropForeignKey
+ALTER TABLE "vendor_histories" DROP CONSTRAINT "vendor_histories_vendor_id_fkey";
+
+-- AlterTable
+ALTER TABLE "vendor_histories" ALTER COLUMN "vendor_id" DROP NOT NULL;
+
+-- AddForeignKey
+ALTER TABLE "vendor_histories" ADD CONSTRAINT "vendor_histories_vendor_id_fkey" FOREIGN KEY ("vendor_id") REFERENCES "vendors"("id") ON DELETE SET NULL ON UPDATE CASCADE;

prisma/migrations/20250628054921_update_field_in_vendor/migration.sql

@@ -0,0 +1,5 @@
+-- AlterTable
+ALTER TABLE "vendors" ALTER COLUMN "name_pt" DROP NOT NULL,
+ALTER COLUMN "strengths" DROP NOT NULL,
+ALTER COLUMN "weaknesses" DROP NOT NULL,
+ALTER COLUMN "website" DROP NOT NULL;

prisma/schema.prisma

@@ -56,6 +56,7 @@ model User {
   deletedAt  DateTime?
   hospitals  Hospital[]
   user_areas UserArea[]
+  vendors    Vendor[]
 
   @@map("users")
 }
@@ -88,39 +89,91 @@ model City {
 }
 
 model Hospital {
-  id              String       @id @default(uuid())
-  name            String
-  hospital_code   String?
-  type            String?
-  ownership       String?
-  province_id     String
-  city_id         String
-  address         String?
-  simrs_type      String?
-  contact         String?
-  image           String?
-  progress_status ProgressStatus
-  note            String?
-  created_by      String
-  createdAt       DateTime     @default(now())
-  updatedAt       DateTime     @updatedAt
-  deletedAt       DateTime?
-  province        Province     @relation(fields: [province_id], references: [id])
-  city            City         @relation(fields: [city_id], references: [id])
-  user            User         @relation(fields: [created_by], references: [id])
+  id                   String              @id @default(uuid())
+  name                 String
+  hospital_code        String?
+  type                 String?
+  ownership            String?
+  province_id          String
+  city_id              String
+  address              String?
+  simrs_type           String?
+  contact              String?
+  image                String?
+  progress_status      ProgressStatus
+  note                 String?
+  created_by           String
+  createdAt            DateTime            @default(now())
+  updatedAt            DateTime            @updatedAt
+  deletedAt            DateTime?
+  province             Province            @relation(fields: [province_id], references: [id])
+  city                 City                @relation(fields: [city_id], references: [id])
+  user                 User                @relation(fields: [created_by], references: [id])
+  vendor_histories     VendorHistory[]
+  executives_histories ExecutivesHistory[]
 
   @@map("hospitals")
 }
 
+model Vendor {
+  id               String          @id @default(uuid())
+  name             String
+  name_pt          String?
+  strengths        String?
+  weaknesses       String?
+  website          String?
+  created_by       String
+  createdAt        DateTime        @default(now())
+  updatedAt        DateTime        @updatedAt
+  deletedAt        DateTime?
+  user             User            @relation(fields: [created_by], references: [id])
+  vendor_histories VendorHistory[]
+
+  @@map("vendors")
+}
+
 model UserArea {
-  id            String       @id @default(uuid())
-  user_id       String
-  province_id   String
-  user          User         @relation(fields: [user_id], references: [id])
-  province      Province     @relation(fields: [province_id], references: [id])
-  createdAt     DateTime     @default(now())
-  updatedAt     DateTime     @updatedAt
-  deletedAt     DateTime?
+  id          String    @id @default(uuid())
+  user_id     String
+  province_id String
+  user        User      @relation(fields: [user_id], references: [id])
+  province    Province  @relation(fields: [province_id], references: [id])
+  createdAt   DateTime  @default(now())
+  updatedAt   DateTime  @updatedAt
+  deletedAt   DateTime?
 
   @@map("user_areas")
 }
+
+model VendorHistory {
+  id                    String    @id @default(uuid())
+  hospital_id           String
+  vendor_id             String?
+  vendor_impression     String?   @db.Text
+  status                String?
+  contract_date         DateTime?
+  contract_expired_date DateTime?
+  hospital              Hospital  @relation(fields: [hospital_id], references: [id])
+  vendor                Vendor?   @relation(fields: [vendor_id], references: [id])
+  createdAt             DateTime  @default(now())
+  updatedAt             DateTime  @updatedAt
+  deletedAt             DateTime?
+
+  @@map("vendor_histories")
+}
+
+model ExecutivesHistory {
+  id             String    @id @default(uuid())
+  hospital_id    String
+  executive_name String?
+  contact        String?
+  status         String?
+  start_term     DateTime?
+  end_term       DateTime?
+  hospital       Hospital  @relation(fields: [hospital_id], references: [id])
+  createdAt      DateTime  @default(now())
+  updatedAt      DateTime  @updatedAt
+  deletedAt      DateTime?
+
+  @@map("executives_histories")
+}

prisma/seeders/DatabaseSeeder.js

@@ -38,8 +38,10 @@ const { seedSulawesiUtaraCities } = require('./city/SulawesiUtaraCitySeeder');
 const { seedSumateraBaratCities } = require('./city/SumateraBaratCitySeeder');
 const { seedSumateraSelatanCities } = require('./city/SumateraSelatanCitySeeder');
 const { seedSumateraUtaraCities } = require('./city/SumateraUtaraCitySeeder');
-const { seedHospital } = require('./HospitalSeeder.js');
-const { seedSales } = require('./UserSeeder.js');
+const { seedUsers } = require('./UserSeeder.js');
+const { seedVendors } = require('./VendorSeeder.js');
+const seedUserAreas = require('./UserAreaSeeder.js');
+const { seedHospitals } = require('./HospitalSeeder.js');
 
 async function main() {
     await seedProvinces();
@@ -80,8 +82,11 @@ async function main() {
     await seedSumateraBaratCities();
     await seedSumateraSelatanCities();
     await seedSumateraUtaraCities();
-    // await seedSales();
-    // await seedHospital();
+    await seedUsers();
+    await seedVendors();
+    await seedUserAreas();
+    await seedHospitals();
+    await seedVendors();
 }
 
 main().then(() => {

prisma/seeders/HospitalSeeder.js

@@ -1,49 +1,134 @@
-const prisma = require('../../src/prisma/PrismaClient.js');
-const { faker } = require('@faker-js/faker');
-const timeLocal = require('../../src/utils/TimeLocal.js');
-
-exports.seedHospital = async () => {
-    // 1. Ambil semua provinsi
-    const allProvinces = await prisma.province.findMany();
-    const shuffled = allProvinces.sort(() => 0.5 - Math.random());
-    const selectedProvinces = shuffled.slice(0, 5); // ambil 5 random
-
-    for (const province of selectedProvinces) {
-        const cities = await prisma.city.findMany({
-            where: { province_id: province.id }
-        });
-
-        if (cities.length === 0) continue; // skip kalau tidak ada kota
-
-        const randomCity = cities[Math.floor(Math.random() * cities.length)];
-
-        await prisma.hospital.create({
-            data: {
-                name: `RS ${faker.company.name()}`,
-                hospital_code: faker.string.alphanumeric(6).toUpperCase(),
-                type: faker.helpers.arrayElement(['Tipe A', 'Tipe B', 'Tipe C']),
-                ownership: faker.helpers.arrayElement(['Pemerintah', 'Swasta']),
-                address: faker.location.streetAddress(),
-                simrs_type: faker.helpers.arrayElement(['SIMRS A', 'SIMRS B', 'SIMRS C']),
-                contact: faker.phone.number('08##########'),
-                image: '/storage/img/dummy.jpg',
-                note: faker.lorem.sentence(),
+const { PrismaClient } = require('@prisma/client');
+const prisma = new PrismaClient();
+
+async function seedHospitals() {
+    try {
+        const sales1 = await prisma.user.findFirst({ where: { username: 'sales1' } });
+        const sales2 = await prisma.user.findFirst({ where: { username: 'sales2' } });
+
+        if (!sales1 || !sales2) {
+            throw new Error('User sales1 or sales2 not found');
+        }
+
+        // Ambil province_id dari user_areas
+        const sales1Area = await prisma.userArea.findFirst({ where: { user_id: sales1.id } });
+        const sales2Area = await prisma.userArea.findFirst({ where: { user_id: sales2.id } });
+
+        if (!sales1Area || !sales2Area) {
+            throw new Error('UserArea for sales1 or sales2 not found');
+        }
+
+        // Ambil city yang berada di province_id tersebut
+        const city1 = await prisma.city.findFirst({ where: { province_id: sales1Area.province_id } });
+        const city2 = await prisma.city.findFirst({ where: { province_id: sales2Area.province_id } });
+
+        if (!city1 || !city2) {
+            throw new Error('City not found for one of province id');
+        }
+
+        // Data rumah sakit
+        const hospitals = [
+            {
+                name: 'RS Sehat Selalu',
+                hospital_code: 'RSS001',
+                type: 'Tipe B',
+                ownership: 'Swasta',
+                address: 'Jl. Kesehatan No. 1',
+                simrs_type: 'MediSoft',
+                contact: '021-123456',
+                image: null,
                 progress_status: 'cari_data',
-                createdAt: timeLocal.now().toDate(),
-                province: { connect: { id: province.id } },
-                city: { connect: { id: randomCity.id } },
-                // user: { connect: { id: await getRandomUserId() } }, // opsional: assign user
-                user: null
-            }
-        });
-    }
+                note: 'Calon potensial',
+                province_id: sales1Area.province_id,
+                city_id: city1.id,
+                created_by: sales1.id,
+            },
+            {
+                name: 'RS Harapan Bangsa',
+                hospital_code: 'RSB002',
+                type: 'Tipe C',
+                ownership: 'Pemerintah',
+                address: 'Jl. Harapan No. 2',
+                simrs_type: 'Hospicare',
+                contact: '021-654321',
+                image: null,
+                progress_status: 'cari_data',
+                note: null,
+                province_id: sales1Area.province_id,
+                city_id: city1.id,
+                created_by: sales1.id,
+            },
+            {
+                name: 'RS Mitra Medika',
+                hospital_code: 'RSM003',
+                type: 'Tipe D',
+                ownership: 'Swasta',
+                address: 'Jl. Mitra No. 3',
+                simrs_type: 'SimRS Platinum',
+                contact: '021-999999',
+                image: null,
+                progress_status: 'cari_data',
+                note: 'Baru dihubungi',
+                province_id: sales1Area.province_id,
+                city_id: city1.id,
+                created_by: sales1.id,
+            },
+            {
+                name: 'RS Sembuh Bersama',
+                hospital_code: 'RSB004',
+                type: 'Tipe B',
+                ownership: 'Swasta',
+                address: 'Jl. Bersama No. 4',
+                simrs_type: 'MediSoft',
+                contact: '0274-111111',
+                image: null,
+                progress_status: 'cari_data',
+                note: null,
+                province_id: sales2Area.province_id,
+                city_id: city2.id,
+                created_by: sales2.id,
+            },
+            {
+                name: 'RS Kasih Ibu',
+                hospital_code: 'RSK005',
+                type: 'Tipe C',
+                ownership: 'Yayasan',
+                address: 'Jl. Kasih No. 5',
+                simrs_type: 'Hospicare',
+                contact: '0274-222222',
+                image: null,
+                progress_status: 'cari_data',
+                note: 'Perlu follow up',
+                province_id: sales2Area.province_id,
+                city_id: city2.id,
+                created_by: sales2.id,
+            },
+            {
+                name: 'RS Bhakti Sehat',
+                hospital_code: 'RSB006',
+                type: 'Tipe D',
+                ownership: 'Swasta',
+                address: 'Jl. Bhakti No. 6',
+                simrs_type: 'SimRS Platinum',
+                contact: '0274-333333',
+                image: null,
+                progress_status: 'cari_data',
+                note: null,
+                province_id: sales2Area.province_id,
+                city_id: city2.id,
+                created_by: sales2.id,
+            },
+        ];
+
+        // Masukkan ke DB
+        for (const hospital of hospitals) {
+            await prisma.hospital.create({ data: hospital });
+        }
 
-    console.log('✅ Hospital seeder done!');
-};
+        console.log('✅ Hospital seeded!');
+    } catch (err) {
+        console.error('❌ Error seeding hospital:', err.message);
+    }
+}
 
-// Fungsi ambil 1 user id random dari tabel user
-async function getRandomUserId() {
-    const users = await prisma.user.findMany({ where: { deletedAt: null } });
-    if (users.length === 0) throw new Error('No users found for seeding hospital.');
-    return users[Math.floor(Math.random() * users.length)].id;
-}
+module.exports = { seedHospitals };

prisma/seeders/UserAreaSeeder.js

@@ -0,0 +1,41 @@
+const prisma = require('../../src/prisma/PrismaClient.js');
+
+async function seedUserAreas() {
+    try {
+        // Ambil user dengan role 'sales1' dan 'sales2'
+        const sales1 = await prisma.user.findFirst({ where: { username: 'sales1' } });
+        const sales2 = await prisma.user.findFirst({ where: { username: 'sales2' } });
+
+        if (!sales1 || !sales2) {
+            throw new Error('User sales1 or sales2 not found');
+        }
+
+        // Ambil provinsi
+        const jawaTengah = await prisma.province.findFirst({ where: { name: 'Jawa Tengah' } });
+        const diy = await prisma.province.findFirst({ where: { name: 'DI Yogyakarta' } });
+
+        if (!jawaTengah || !diy) {
+            throw new Error('Province Jawa Tengah or DI Yogyakarta not found');
+        }
+
+        // Buat user_areas
+        await prisma.userArea.createMany({
+            data: [
+                {
+                    user_id: sales1.id,
+                    province_id: jawaTengah.id,
+                },
+                {
+                    user_id: sales2.id,
+                    province_id: diy.id,
+                },
+            ],
+        });
+
+        console.log('✅ User area seeded');
+    } catch (error) {
+        console.error('❌ Error seeding user area:', error);
+    }
+}
+
+module.exports = seedUserAreas;

prisma/seeders/UserSeeder.js

@@ -1,51 +1,148 @@
-const { KeycloakRepository, UserRepository, UserAreaRepository } = require('../../src/repository/admin/SalesRepository.js');
-const prisma = require('../../src/prisma/PrismaClient');
-const { faker } = require('@faker-js/faker');
-
-exports.seedSales = async () => {
-    try {
-        const provinces = await prisma.province.findMany();
-        if (provinces.length === 0) throw new Error('No provinces found');
-
-        const users = [
-            {
-                username: 'sales1',
-                email: 'sales1@example.com',
-                firstname: 'Sales',
-                lastname: 'One',
-                password: 'Sales@123',
-            },
-            {
-                username: 'sales2',
-                email: 'sales2@example.com',
-                firstname: 'Sales',
-                lastname: 'Two',
-                password: 'Sales@123',
-            },
-            {
-                username: 'sales3',
-                email: 'sales3@example.com',
-                firstname: 'Sales',
-                lastname: 'Three',
-                password: 'Sales@123',
-            },
-        ];
+const axios = require('axios');
+const qs = require('qs');
+const bcrypt = require('bcrypt');
+const prisma = require('../../src/prisma/PrismaClient.js');
+const {
+    KEYCLOAK_TOKEN_URL,
+    KEYCLOAK_ADMIN_URL,
+    KEYCLOAK_REALM,
+    CLIENT_ID,
+    CLIENT_SECRET,
+} = require('../../config/keycloak.js');
 
-        for (const user of users) {
-            const shuffled = provinces.sort(() => 0.5 - Math.random());
-            const selectedProvinces = shuffled.slice(0, Math.floor(Math.random() * 3) + 1);
-            const province_ids = selectedProvinces.map(p => p.id);
+// Ambil token admin Keycloak
+const getAdminToken = async () => {
+    const tokenParams = qs.stringify({
+        grant_type: 'client_credentials',
+        client_id: CLIENT_ID,
+        client_secret: CLIENT_SECRET,
+    });
 
-            user.province_ids = province_ids;
+    const { data } = await axios.post(KEYCLOAK_TOKEN_URL, tokenParams, {
+        headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+    });
 
-            const userId = await KeycloakRepository.createUser(user);
-            await KeycloakRepository.assignSalesRole(userId);
-            await UserRepository.createUser(userId, user);
-            await UserAreaRepository.createMany(userId, province_ids);
+    return data.access_token;
+};
+
+// Buat user di Keycloak
+const createUserInKeycloak = async (user, token) => {
+    const checkUser = await axios.get(
+        `${KEYCLOAK_ADMIN_URL}/admin/realms/${KEYCLOAK_REALM}/users?username=${user.username}`,
+        { headers: { Authorization: `Bearer ${token}` } }
+    );
+
+    if (checkUser.data.length > 0) {
+        console.log(`⚠️  User ${user.username} found in Keycloak`);
+        return checkUser.data[0].id;
+    }
+
+    await axios.post(
+        `${KEYCLOAK_ADMIN_URL}/admin/realms/${KEYCLOAK_REALM}/users`,
+        {
+            username: user.username,
+            email: user.email,
+            firstName: user.firstname,
+            lastName: user.lastname,
+            enabled: true,
+            credentials: [
+                {
+                    type: 'password',
+                    value: user.password,
+                    temporary: false,
+                },
+            ],
+        },
+        {
+            headers: { Authorization: `Bearer ${token}` },
+        }
+    );
+
+    const { data } = await axios.get(
+        `${KEYCLOAK_ADMIN_URL}/admin/realms/${KEYCLOAK_REALM}/users?username=${user.username}`,
+        {
+            headers: { Authorization: `Bearer ${token}` },
+        }
+    );
+
+    return data[0].id;
+};
 
-            console.log(`✅ Seeded user ${user.username}`);
+// Assign role ke user di Keycloak
+const assignRole = async (userId, roleName, token) => {
+    const { data: roles } = await axios.get(
+        `${KEYCLOAK_ADMIN_URL}/admin/realms/${KEYCLOAK_REALM}/roles`,
+        {
+            headers: { Authorization: `Bearer ${token}` },
         }
-    } catch (err) {
-        console.error('❌ Failed to seed sales:', err.message);
+    );
+
+    const role = roles.find((r) => r.name === roleName);
+    if (!role) throw new Error(`Role "${roleName}" not found in Keycloak`);
+
+    await axios.post(
+        `${KEYCLOAK_ADMIN_URL}/admin/realms/${KEYCLOAK_REALM}/users/${userId}/role-mappings/realm`,
+        [role],
+        {
+            headers: { Authorization: `Bearer ${token}` },
+        }
+    );
+};
+
+// Data user yang ingin dibuat
+const users = [
+    {
+        username: 'admin1',
+        email: 'admin1@gmail.com',
+        password: 'password123',
+        firstname: 'Admin',
+        lastname: 'Satu',
+        role: 'admin',
+    },
+    {
+        username: 'sales1',
+        email: 'sales1@gmail.com',
+        password: 'password123',
+        firstname: 'Sales',
+        lastname: 'Satu',
+        role: 'sales',
+    },
+    {
+        username: 'sales2',
+        email: 'sales2@gmail.com',
+        password: 'password123',
+        firstname: 'Sales',
+        lastname: 'Dua',
+        role: 'sales',
+    },
+];
+
+// Fungsi utama yang bisa dipanggil dari seeder utama
+const seedUsers = async () => {
+    const token = await getAdminToken();
+
+    for (const user of users) {
+        const userId = await createUserInKeycloak(user, token);
+        await assignRole(userId, user.role, token);
+
+        const hashedPassword = await bcrypt.hash(user.password, 10);
+
+        await prisma.user.upsert({
+            where: { id: userId },
+            update: {},
+            create: {
+                id: userId,
+                username: user.username,
+                email: user.email,
+                firstname: user.firstname,
+                lastname: user.lastname,
+                password: hashedPassword,
+                role: user.role,
+            },
+        });
+
+        console.log(`✅ Success seed user ${user.role}: ${user.username}`);
     }
 };
+
+module.exports = { seedUsers };

prisma/seeders/VendorSeeder.js

@@ -0,0 +1,57 @@
+const prisma = require('../../src/prisma/PrismaClient.js');
+
+async function seedVendors() {
+    try {
+        // cari user role admin
+        const adminUser = await prisma.user.findFirst({
+            where: {
+                username: 'admin1',
+            },
+        });
+
+        if (!adminUser) {
+            throw new Error('User with role admin not exists');
+        }
+
+        // Data vendor yang akan dimasukkan
+        const vendors = [
+            {
+                name: 'MediSoft SIMRS',
+                name_pt: 'PT Medisoft Technology',
+                strengths: 'Antarmuka user-friendly, support lengkap untuk modul RS',
+                weaknesses: 'Harga relatif tinggi',
+                website: 'https://medisoft.co.id',
+            },
+            {
+                name: 'SimRS Platinum',
+                name_pt: 'PT Platinum Healthtech',
+                strengths: 'Integrasi BPJS dan telemedicine',
+                weaknesses: 'Customisasi sulit',
+                website: 'https://simrsplatinum.id',
+            },
+            {
+                name: 'Hospicare System',
+                name_pt: 'PT Hospicare Nusantara',
+                strengths: 'Stabil dan dokumentasi lengkap',
+                weaknesses: 'Kurang inovatif',
+                website: 'https://hospicare.co.id',
+            },
+        ];
+
+        // Insert vendor dengan created_by dari adminUser.id
+        for (const vendor of vendors) {
+            await prisma.vendor.create({
+                data: {
+                    ...vendor,
+                    created_by: adminUser.id,
+                },
+            });
+        }
+
+        console.log('✅ Vendor seeded!');
+    } catch (error) {
+        console.error('❌ Error seeding vendor:', error);
+    }
+}
+
+module.exports = { seedVendors };

src/controllers/admin/ExecutivesHistoryController.js

@@ -0,0 +1,57 @@
+const executivesHistoryService = require('../../services/admin/ExecutivesHistoryService.js');
+const { ListResponse } = require('../../utils/ListResponse.js');
+const { PaginationParam } = require('../../utils/PaginationParams.js');
+const { errorResponse, successResponse, messageSuccessResponse } = require('../../utils/Response.js');
+const { validateStoreExecutivesHistoryRequest } = require('../../validators/sales/executives_history/ExecutivesHistoriValidators.js');
+
+exports.getAllExecutivesHistory = async (req, res) => {
+    try {
+        const { page, limit, search, sortBy, orderBy } = PaginationParam(req);
+
+        const { vendor_histories, total } = await executivesHistoryService.getAllExecutivesHistoryService({
+            page, limit, search, sortBy, orderBy
+        }, req);
+
+        return ListResponse({ req, res, data: vendor_histories, page, limit, total, message: 'Executives history successfully retrieved' });
+    } catch (err) {
+        return errorResponse(res, err);
+    }
+};
+
+exports.showExecutivesHistory = async (req, res) => {
+    try {
+        const data = await executivesHistoryService.showExecutivesHistoryService(req);
+        return successResponse(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 = validateStoreExecutivesHistoryRequest(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

@@ -6,10 +6,10 @@ const { validateStoreHospitalRequest, validateUpdateHospitalRequest } = require(
 
 exports.getAllHospital = async (req, res) => {
     try {
-        const { page, limit, search, sortBy, orderBy } = PaginationParam(req);
+        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
+            page, limit, search, sortBy, orderBy, province, city, type, ownership, progress_status
         });
 
         return ListResponse({ req, res, data: hospitals, page, limit, total, message: 'Hospital data successfully retrieved' });

src/controllers/admin/VendorController.js

@@ -0,0 +1,60 @@
+const vendorService = require('../../services/admin/VendorService.js');
+const { ListResponse } = require('../../utils/ListResponse.js');
+const { PaginationParam } = require('../../utils/PaginationParams.js');
+const { errorResponse, successResponse, messageSuccessResponse } = require('../../utils/Response.js');
+const { validateStoreVendorRequest } = require('../../validators/sales/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 ListResponse({ req, res, data: vendors, page, limit, total, message: 'Vendor data 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/admin/VendorHistoryController.js

@@ -0,0 +1,57 @@
+const vendorHistoryService = require('../../services/admin/VendorHistoryService.js');
+const { ListResponse } = require('../../utils/ListResponse.js');
+const { PaginationParam } = require('../../utils/PaginationParams.js');
+const { errorResponse, successResponse, messageSuccessResponse } = require('../../utils/Response.js');
+const { validateStoreVendorHistoryRequest } = 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 ListResponse({ req, res, data: vendor_histories, page, limit, total, message: 'Vendor history successfully retrieved' });
+    } catch (err) {
+        return errorResponse(res, err);
+    }
+};
+
+exports.showVendorHistory = async (req, res) => {
+    try {
+        const data = await vendorHistoryService.showVendorHistoryService(req);
+        return successResponse(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 = validateStoreVendorHistoryRequest(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/sales/AreaController.js

@@ -0,0 +1,16 @@
+const { getAllAreaByUserService } = require("../../services/sales/AreaService.js");
+const { ListResponse } = require("../../utils/ListResponse");
+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 ListResponse({ req, res, data: areas, page, limit, total, message: 'Area city successfully retrieved' });
+    } catch (err) {
+        return errorResponse(res, err);
+    }
+};

src/controllers/sales/ExecutivesHistoryController.js

@@ -0,0 +1,57 @@
+const executivesHistoryService = require('../../services/sales/ExecutivesHistoryService.js');
+const { ListResponse } = require('../../utils/ListResponse.js');
+const { PaginationParam } = require('../../utils/PaginationParams.js');
+const { errorResponse, successResponse, messageSuccessResponse } = require('../../utils/Response.js');
+const { validateStoreExecutivesHistoryRequest } = require('../../validators/admin/executives_history/ExecutivesHistoriValidators.js');
+
+exports.getAllExecutivesHistory = async (req, res) => {
+    try {
+        const { page, limit, search, sortBy, orderBy } = PaginationParam(req);
+
+        const { vendor_histories, total } = await executivesHistoryService.getAllExecutivesHistoryService({
+            page, limit, search, sortBy, orderBy
+        }, req);
+
+        return ListResponse({ req, res, data: vendor_histories, page, limit, total, message: 'Executives history successfully retrieved' });
+    } catch (err) {
+        return errorResponse(res, err);
+    }
+};
+
+exports.showExecutivesHistory = async (req, res) => {
+    try {
+        const data = await executivesHistoryService.showExecutivesHistoryService(req);
+        return successResponse(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 = validateStoreExecutivesHistoryRequest(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

@@ -6,9 +6,9 @@ const { validateStoreHospitalRequest, validateUpdateHospitalRequest } = require(
 
 exports.getAllHospitalByArea = async (req, res) => {
     try {
-        const { page, limit, search, sortBy, orderBy } = PaginationParam(req);
+        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, }, req);
+        const { hospitals, total } = await getAllHospitalByAreaService({ page, limit, search, sortBy, orderBy, province, city, type, ownership, progress_status }, req);
 
         return ListResponse({ req, res, data: hospitals, page, limit, total, message: 'Hospital data successfully retrieved' });
     } catch (err) {

src/controllers/sales/VendorController.js

@@ -0,0 +1,59 @@
+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 ListResponse({ req, res, data: vendors, page, limit, total, message: '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/VendorHistoryController.js

@@ -0,0 +1,57 @@
+const vendorHistoryService = require('../../services/sales/VendorHistoryService.js');
+const { ListResponse } = require('../../utils/ListResponse.js');
+const { PaginationParam } = require('../../utils/PaginationParams.js');
+const { errorResponse, successResponse, messageSuccessResponse } = require('../../utils/Response.js');
+const { validateStoreVendorHistoryRequest } = require('../../validators/admin/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 ListResponse({ req, res, data: vendor_histories, page, limit, total, message: 'Vendor history successfully retrieved' });
+    } catch (err) {
+        return errorResponse(res, err);
+    }
+};
+
+exports.showVendorHistory = async (req, res) => {
+    try {
+        const data = await vendorHistoryService.showVendorHistoryService(req);
+        return successResponse(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 = validateStoreVendorHistoryRequest(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/LogController.js

@@ -0,0 +1,18 @@
+const logService = require('../../services/superadmin/LogService.js');
+const { ListResponse } = require('../../utils/ListResponse.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 ListResponse({ req, res, data: logs, page, limit, total, message: 'Logs data successfully retrieved' });
+    } catch (err) {
+        return errorResponse(res, err);
+    }
+};

src/repository/admin/ExecutivesHistoryRepository.js

@@ -0,0 +1,124 @@
+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
+                            }
+                        }
+                    }
+                },
+                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,
+                        user: {
+                            select: {
+                                id: true,
+                                username: 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

@@ -24,6 +24,22 @@ const HospitalRepository = {
                 user: { select: { id: true, username: true } },
                 createdAt: true,
                 updatedAt: true,
+                // vendor_histories: {
+                //     where: { deletedAt: null },
+                //     orderBy: { createdAt: 'desc' },
+                //     select: {
+                //         vendor: {
+                //             select: {
+                //                 id: true,
+                //                 name: true,
+                //                 name_pt: true,
+                //                 strengths: true,
+                //                 weaknesses: true,
+                //                 website: true,
+                //             }
+                //         }
+                //     }
+                // }
             }
         });
     },
@@ -55,6 +71,22 @@ const HospitalRepository = {
                 user: { select: { id: true, username: true } },
                 createdAt: true,
                 updatedAt: true,
+                // vendor_histories: {
+                //     where: { deletedAt: null },
+                //     orderBy: { createdAt: 'desc' },
+                //     select: {
+                //         vendor: {
+                //             select: {
+                //                 id: true,
+                //                 name: true,
+                //                 name_pt: true,
+                //                 strengths: true,
+                //                 weaknesses: true,
+                //                 website: true,
+                //             }
+                //         }
+                //     }
+                // }
             }
         });
     },
@@ -74,7 +106,7 @@ const HospitalRepository = {
                 province: { connect: { id: data.province_id } },
                 city: { connect: { id: data.city_id } },
                 address: data.address,
-                simrs_type: data.simrs_type,
+                // simrs_type: data.simrs_type,
                 contact: data.contact,
                 note: data.note,
                 image: data.image,

src/repository/admin/VendorHistoryRepository.js

@@ -0,0 +1,154 @@
+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,
+                        user: {
+                            select: {
+                                id: true,
+                                username: true
+                            }
+                        }
+                    }
+                },
+                vendor: {
+                    select: {
+                        id: true,
+                        name: true,
+                        name_pt: true,
+                        strengths: true,
+                        weaknesses: true,
+                        website: true,
+                        user: {
+                            select: {
+                                id: true,
+                                username: 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,
+                        user: {
+                            select: {
+                                id: true,
+                                username: true
+                            }
+                        }
+                    }
+                },
+                vendor: {
+                    select: {
+                        id: true,
+                        name: true,
+                        name_pt: true,
+                        strengths: true,
+                        weaknesses: true,
+                        website: true,
+                        user: {
+                            select: {
+                                id: true,
+                                username: 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/admin/VendorRepository.js

@@ -0,0 +1,134 @@
+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,
+                        username: true,
+                        email: true,
+                        firstname: true,
+                        lastname: true,
+                    }
+                },
+                _count: {
+                    select: {
+                        vendor_histories: {
+                            where: {
+                                deletedAt: null
+                            }
+                        }
+                    }
+                },
+                createdAt: true,
+                updatedAt: true,
+            },
+        });
+
+        const formattedVendors = vendors.map(v => {
+            const { _count, ...rest } = v;
+            return {
+                ...rest,
+                count_hospitals: _count.vendor_histories,
+            };
+        });
+
+        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,
+                        username: true,
+                        email: true,
+                        firstname: true,
+                        lastname: true,
+                    }
+                },
+                _count: {
+                    select: {
+                        vendor_histories: {
+                            where: {
+                                deletedAt: null
+                            }
+                        }
+                    }
+                },
+                createdAt: true,
+                updatedAt: true,
+            },
+        });
+
+        const { _count, ...rest } = vendor;
+        return {
+            ...rest,
+            count_hospitals: _count.vendor_histories
+        };
+    },
+
+    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.vendorHistory.updateMany({
+            where: {
+                vendor_id: id,
+                deletedAt: null
+            },
+            data: {
+                vendor_id: null
+            }
+        });
+
+        return vendor;
+    },
+};
+
+module.exports = VendorRepository;

src/repository/sales/AreaRepository.js

@@ -0,0 +1,33 @@
+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: {
+                    select: {
+                        id: true,
+                        username: true
+                    }
+                },
+                province: {
+                    select: {
+                        id: true,
+                        name: true
+                    }
+                },
+            }
+        });
+    },
+
+    countAll: async (where) => {
+        return prisma.userArea.count({ where });
+    },
+};
+
+module.exports = AreaRepository;

src/repository/sales/ExecutivesHistoryRepository.js

@@ -0,0 +1,124 @@
+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
+                            }
+                        }
+                    }
+                },
+                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,
+                        user: {
+                            select: {
+                                id: true,
+                                username: 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

@@ -74,7 +74,7 @@ const HospitalRepository = {
                 province: { connect: { id: data.province_id } },
                 city: { connect: { id: data.city_id } },
                 address: data.address,
-                simrs_type: data.simrs_type,
+                // simrs_type: data.simrs_type,
                 contact: data.contact,
                 note: data.note,
                 image: data.image,

src/repository/sales/VendorHistoryRepository.js

@@ -0,0 +1,154 @@
+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,
+                        user: {
+                            select: {
+                                id: true,
+                                username: true
+                            }
+                        }
+                    }
+                },
+                vendor: {
+                    select: {
+                        id: true,
+                        name: true,
+                        name_pt: true,
+                        strengths: true,
+                        weaknesses: true,
+                        website: true,
+                        user: {
+                            select: {
+                                id: true,
+                                username: 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,
+                        user: {
+                            select: {
+                                id: true,
+                                username: true
+                            }
+                        }
+                    }
+                },
+                vendor: {
+                    select: {
+                        id: true,
+                        name: true,
+                        name_pt: true,
+                        strengths: true,
+                        weaknesses: true,
+                        website: true,
+                        user: {
+                            select: {
+                                id: true,
+                                username: 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

@@ -0,0 +1,117 @@
+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/LogRepository.js

@@ -0,0 +1,24 @@
+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/routes/admin/CityRoute.js

@@ -4,9 +4,9 @@ const cityController = require('../../controllers/admin/CityController.js')
 const verifyJWT = require('../../middleware/VerifyJWT.js');
 const checkRole = require('../../middleware/CheckRole.js');
 
-router.get('/', verifyJWT, checkRole(['admin']), cityController.getAllCity);
+router.get('/', verifyJWT, checkRole(['admin', 'sales']), cityController.getAllCity);
 router.post('/', verifyJWT, checkRole(['admin']), cityController.storeCity);
-router.get('/:id', verifyJWT, checkRole(['admin']), cityController.showCity);
+router.get('/:id', verifyJWT, checkRole(['admin', 'sales']), cityController.showCity);
 router.patch('/:id', verifyJWT, checkRole(['admin']), cityController.updateCity);
 router.delete('/:id', verifyJWT, checkRole(['admin']), cityController.deleteCity);
 

src/routes/admin/HospitalRoute.js

@@ -1,6 +1,8 @@
 const express = require('express')
 const router = express.Router()
 const hospitalController = require('../../controllers/admin/HospitalController.js')
+const vendorHistoryController = require('../../controllers/admin/VendorHistoryController.js')
+const executivesHistoryController = require('../../controllers/admin/ExecutivesHistoryController.js')
 const verifyJWT = require('../../middleware/VerifyJWT.js');
 const checkRole = require('../../middleware/CheckRole.js');
 const upload = require('../../middleware/UploadImage.js');
@@ -11,4 +13,18 @@ router.get('/:id', verifyJWT, checkRole(['admin']), hospitalController.showHospi
 router.patch('/:id', verifyJWT, upload.single('image'), checkRole(['admin']), hospitalController.updateHospital);
 router.delete('/:id', verifyJWT, checkRole(['admin']), hospitalController.deleteHospital);
 
+// Vendor History
+router.get('/:id/vendor-history', verifyJWT, checkRole(['admin']), vendorHistoryController.getAllVendorHistory);
+router.post('/:id/vendor-history', verifyJWT, checkRole(['admin']), vendorHistoryController.storeVendorHistory);
+router.get('/:id/vendor-history/:id_vendor_history', verifyJWT, checkRole(['admin']), vendorHistoryController.showVendorHistory);
+router.patch('/:id/vendor-history/:id_vendor_history', verifyJWT, checkRole(['admin']), vendorHistoryController.updateVendorHistory);
+router.delete('/:id/vendor-history/:id_vendor_history', verifyJWT, checkRole(['admin']), vendorHistoryController.deleteVendorHistory);
+
+// Executives History
+router.get('/:id/executives-history', verifyJWT, checkRole(['admin']), executivesHistoryController.getAllExecutivesHistory);
+router.post('/:id/executives-history', verifyJWT, checkRole(['admin']), executivesHistoryController.storeExecutivesHistory);
+router.get('/:id/executives-history/:id_executives_history', verifyJWT, checkRole(['admin']), executivesHistoryController.showExecutivesHistory);
+router.patch('/:id/executives-history/:id_executives_history', verifyJWT, checkRole(['admin']), executivesHistoryController.updateExecutivesHistory);
+router.delete('/:id/executives-history/:id_executives_history', verifyJWT, checkRole(['admin']), executivesHistoryController.deleteExecutivesHistory);
+
 module.exports = router;

src/routes/admin/VendorRoute.js

@@ -0,0 +1,13 @@
+const express = require('express')
+const router = express.Router()
+const vendorController = require('../../controllers/admin/VendorController.js')
+const verifyJWT = require('../../middleware/VerifyJWT.js');
+const checkRole = require('../../middleware/CheckRole.js');
+
+router.get('/', verifyJWT, checkRole(['admin', 'sales']), vendorController.getAllVendor);
+router.post('/', verifyJWT, checkRole(['admin', 'sales']), vendorController.storeVendor);
+router.get('/:id', verifyJWT, checkRole(['admin', 'sales']), vendorController.showVendor);
+router.patch('/:id', verifyJWT, checkRole(['admin', 'sales']), vendorController.updateVendor);
+router.delete('/:id', verifyJWT, checkRole(['admin']), vendorController.deleteVendor);
+
+module.exports = router;

src/routes/sales/AreaRoute.js

@@ -0,0 +1,9 @@
+const express = require('express')
+const router = express.Router()
+const areaController = require('../../controllers/sales/AreaController.js')
+const verifyJWT = require('../../middleware/VerifyJWT.js');
+const checkRole = require('../../middleware/CheckRole.js');
+const upload = require('../../middleware/UploadImage.js');
+
+router.get('/', verifyJWT, checkRole(['sales']), areaController.getAllAreaByUser);
+module.exports = router;

src/routes/sales/HospitalRoute.js

@@ -1,6 +1,8 @@
 const express = require('express')
 const router = express.Router()
 const hospitalController = require('../../controllers/sales/HospitalController.js')
+const vendorHistoryController = require('../../controllers/sales/VendorHistoryController.js')
+const executivesHistoryController = require('../../controllers/sales/ExecutivesHistoryController.js')
 const verifyJWT = require('../../middleware/VerifyJWT.js');
 const checkRole = require('../../middleware/CheckRole.js');
 const upload = require('../../middleware/UploadImage.js');
@@ -10,4 +12,18 @@ router.post('/', verifyJWT, upload.single('image'), checkRole(['sales']), hospit
 router.patch('/:id', verifyJWT, upload.single('image'), checkRole(['sales']), hospitalController.updateHospital);
 router.get('/:id', verifyJWT, checkRole(['sales']), hospitalController.showHospital);
 
+// Vendor History
+router.get('/:id/vendor-history', verifyJWT, checkRole(['sales']), vendorHistoryController.getAllVendorHistory);
+router.post('/:id/vendor-history', verifyJWT, checkRole(['sales']), vendorHistoryController.storeVendorHistory);
+router.get('/:id/vendor-history/:id_vendor_history', verifyJWT, checkRole(['sales']), vendorHistoryController.showVendorHistory);
+router.patch('/:id/vendor-history/:id_vendor_history', verifyJWT, checkRole(['sales']), vendorHistoryController.updateVendorHistory);
+router.delete('/:id/vendor-history/:id_vendor_history', verifyJWT, checkRole(['sales']), vendorHistoryController.deleteVendorHistory);
+
+// Executives History
+router.get('/:id/executives-history', verifyJWT, checkRole(['sales']), executivesHistoryController.getAllExecutivesHistory);
+router.post('/:id/executives-history', verifyJWT, checkRole(['sales']), executivesHistoryController.storeExecutivesHistory);
+router.get('/:id/executives-history/:id_executives_history', verifyJWT, checkRole(['sales']), executivesHistoryController.showExecutivesHistory);
+router.patch('/:id/executives-history/:id_executives_history', verifyJWT, checkRole(['sales']), executivesHistoryController.updateExecutivesHistory);
+router.delete('/:id/executives-history/:id_executives_history', verifyJWT, checkRole(['sales']), executivesHistoryController.deleteExecutivesHistory);
+
 module.exports = router;

src/routes/sales/VendorRoute.js

@@ -0,0 +1,9 @@
+const express = require('express')
+const router = express.Router()
+const vendorController = require('../../controllers/sales/VendorController.js')
+const verifyJWT = require('../../middleware/VerifyJWT.js');
+const checkRole = require('../../middleware/CheckRole.js');
+
+router.get('/', verifyJWT, checkRole(['sales']), vendorController.getAllVendor);
+
+module.exports = router;

src/routes/superadmin/LogRoute.js

@@ -0,0 +1,10 @@
+const express = require('express');
+const logControllers = require('../../controllers/superadmin/LogController.js');
+const verifyJWT = require('../../middleware/VerifyJWT.js');
+const checkRole = require('../../middleware/CheckRole.js');
+
+const router = express.Router();
+
+router.get('/', verifyJWT, checkRole(['superadmin']), logControllers.getAllLogs);
+
+module.exports = router;

src/services/admin/CityService.js

@@ -1,16 +1,16 @@
 const CityRepository = require('../../repository/admin/CityRepository.js');
 const HttpException = require('../../utils/HttpException.js');
-const prisma = require('../../prisma/PrismaClient.js');
 const { SearchFilter } = require('../../utils/SearchFilter.js');
 const timeLocal = require('../../utils/TimeLocal.js');
 const { createLog, updateLog, deleteLog } = require('../../utils/LogActivity.js');
 const ProvinceRepository = require('../../repository/admin/ProvinceRepository.js');
+const { formatISOWithoutTimezone } = require('../../utils/FormatDate.js');
 
 exports.getAllCityService = async ({ page, limit, search, sortBy, orderBy }) => {
     const skip = (page - 1) * limit;
 
     const where = {
-        ...SearchFilter(search, ['name']),
+        ...SearchFilter(search, ['name', 'province.id']),
         deletedAt: null
     };
 
@@ -19,7 +19,13 @@ exports.getAllCityService = async ({ page, limit, search, sortBy, orderBy }) =>
         CityRepository.countAll(where)
     ]);
 
-    return { cities, total };
+    const formatted = cities.map(v => ({
+        ...v,
+        createdAt: formatISOWithoutTimezone(v.createdAt),
+        updatedAt: formatISOWithoutTimezone(v.updatedAt),
+    }));
+
+    return { cities: formatted, total };
 };
 
 exports.showCityService = async (id) => {
@@ -27,7 +33,12 @@ exports.showCityService = async (id) => {
     if (!city) {
         throw new HttpException("Data city not found", 404);
     }
-    return city;
+
+    return {
+        ...city,
+        createdAt: formatISOWithoutTimezone(city.createdAt),
+        updatedAt: formatISOWithoutTimezone(city.updatedAt),
+    };
 };
 
 exports.storeCityService = async (validateData, req) => {

src/services/admin/ExecutivesHistoryService.js

@@ -0,0 +1,141 @@
+const ExecutivesHistoryRepository = require('../../repository/admin/ExecutivesHistoryRepository.js');
+const HttpException = require('../../utils/HttpException.js');
+const prisma = require('../../prisma/PrismaClient.js');
+const { SearchFilter } = require('../../utils/SearchFilter.js');
+const timeLocal = require('../../utils/TimeLocal.js');
+const { createLog, updateLog, deleteLog } = require('../../utils/LogActivity.js');
+const { formatDateOnly, formatISOWithoutTimezone } = require('../../utils/FormatDate.js');
+
+exports.getAllExecutivesHistoryService = async ({ page, limit, search, sortBy, orderBy }, req) => {
+    const skip = (page - 1) * limit;
+
+    const hospitalId = req.params.id;
+    const hospital = await prisma.hospital.findFirst({
+        where: {
+            id: hospitalId
+        }
+    })
+    if (!hospital) {
+        throw new HttpException("Hospital not found", 404)
+    }
+
+    const where = {
+        // ...SearchFilter(search, ['name', 'name_pt']),
+        hospital_id: req.params.id,
+        deletedAt: null
+    };
+
+    const [vendor_histories, total] = await Promise.all([
+        ExecutivesHistoryRepository.findAll({ skip, take: limit, where, orderBy: { [sortBy]: orderBy } }),
+        ExecutivesHistoryRepository.countAll(where)
+    ]);
+
+    const formatted = vendor_histories.map(v => ({
+        ...v,
+        start_term: formatDateOnly(v.start_term),
+        end_term: formatDateOnly(v.end_term),
+        createdAt: formatISOWithoutTimezone(v.createdAt),
+        updatedAt: formatISOWithoutTimezone(v.updatedAt),
+    }));
+
+    return { vendor_histories: formatted, total };
+};
+
+exports.showExecutivesHistoryService = async (req) => {
+    const id_hospital = req.params.id;
+    const id_executives_history = req.params.id_executives_history;
+
+    const hospital = await prisma.hospital.findFirst({
+        where: {
+            id: id_hospital
+        }
+    })
+    if (!hospital) {
+        throw new HttpException("Hospital not found", 404)
+    }
+
+    const executivesHistory = await ExecutivesHistoryRepository.findById(id_executives_history);
+    if (!executivesHistory) {
+        throw new HttpException("Executives history not found", 404);
+    }
+
+    return {
+        ...executivesHistory,
+        start_term: formatDateOnly(executivesHistory.start_term),
+        end_term: formatDateOnly(executivesHistory.end_term),
+        createdAt: formatISOWithoutTimezone(executivesHistory.createdAt),
+        updatedAt: formatISOWithoutTimezone(executivesHistory.updatedAt),
+    };
+};
+
+exports.storeExecutivesHistoryService = async (validateData, req) => {
+    const hospitalId = req.params.id;
+
+    const hospital = await prisma.hospital.findFirst({
+        where: {
+            id: hospitalId
+        }
+    })
+    if (!hospital) {
+        throw new HttpException("Hospital not found", 404)
+    }
+
+    const payload = {
+        ...validateData,
+        hospital_id: hospitalId
+    };
+
+    const data = await ExecutivesHistoryRepository.create(payload);
+    await createLog(req, data);
+};
+
+exports.updateExecutivesHistoryService = async (validateData, req) => {
+    const id_hospital = req.params.id;
+    const id_executives_history = req.params.id_executives_history;
+
+    const hospital = await prisma.hospital.findFirst({
+        where: {
+            id: id_hospital
+        }
+    })
+    if (!hospital) {
+        throw new HttpException("Hospital not found", 404)
+    }
+
+    const executivesHistory = await ExecutivesHistoryRepository.findById(id_executives_history);
+    if (!executivesHistory) {
+        throw new HttpException("Executives history not found", 404);
+    }
+
+    const payload = {
+        ...validateData
+    };
+
+    const data = await ExecutivesHistoryRepository.update(id_executives_history, payload);
+    await updateLog(req, data);
+};
+
+exports.deleteExecutivesHistoryService = async (req) => {
+    const id_hospital = req.params.id;
+    const id_executives_history = req.params.id_executives_history;
+
+    const hospital = await prisma.hospital.findFirst({
+        where: {
+            id: id_hospital
+        }
+    })
+    if (!hospital) {
+        throw new HttpException("Hospital not found", 404)
+    }
+
+    const executivesHistory = await ExecutivesHistoryRepository.findById(id_executives_history);
+    if (!executivesHistory) {
+        throw new HttpException("Executives history not found", 404);
+    }
+
+    const data = await ExecutivesHistoryRepository.update(id_executives_history, {
+        deletedAt: timeLocal.now().toDate()
+    });
+
+    await deleteLog(req, data);
+};

src/services/admin/HospitalService.js

@@ -6,12 +6,19 @@ const { createLog, updateLog, deleteLog } = require('../../utils/LogActivity.js'
 const ProvinceRepository = require('../../repository/admin/ProvinceRepository.js');
 const CityRepository = require('../../repository/admin/CityRepository.js');
 const { BASE_URL } = require('../../../config/config.js');
+const prisma = require('../../prisma/PrismaClient.js');
+const { formatISOWithoutTimezone } = require('../../utils/FormatDate.js');
 
-exports.getAllHospitalService = async ({ page, limit, search, sortBy, orderBy }) => {
+exports.getAllHospitalService = async ({ page, limit, search, sortBy, orderBy, province, city, type, ownership, progress_status }) => {
     const skip = (page - 1) * limit;
 
     const where = {
-        ...SearchFilter(search, ['name',]),
+        ...SearchFilter(search, ['name', 'province.id', 'city.id', 'type', 'ownership', 'simrs_type']),
+        ...(province ? { province_id: province } : {}),
+        ...(city ? { city_id: city } : {}),
+        ...(type ? { type: type } : {}),
+        ...(ownership ? { ownership: ownership } : {}),
+        ...(progress_status ? { progress_status: progress_status } : {}),
         deletedAt: null
     };
 
@@ -20,7 +27,13 @@ exports.getAllHospitalService = async ({ page, limit, search, sortBy, orderBy })
         HospitalRepository.countAll(where)
     ]);
 
-    return { hospitals, total };
+    const formatted = hospitals.map(v => ({
+        ...v,
+        createdAt: formatISOWithoutTimezone(v.createdAt),
+        updatedAt: formatISOWithoutTimezone(v.updatedAt),
+    }));
+
+    return { hospitals: formatted, total };
 };
 
 exports.showHospitalService = async (id) => {
@@ -28,7 +41,12 @@ exports.showHospitalService = async (id) => {
     if (!hospital) {
         throw new HttpException("Data hospital not found", 404);
     }
-    return hospital;
+
+    return {
+        ...hospital,
+        createdAt: formatISOWithoutTimezone(hospital.createdAt),
+        updatedAt: formatISOWithoutTimezone(hospital.updatedAt),
+    };
 };
 
 exports.storeHospitalService = async (validateData, req) => {
@@ -65,6 +83,7 @@ exports.storeHospitalService = async (validateData, req) => {
         ...validateData,
         image: imagePath,
         progress_status: "cari_data",
+        // simrs_type: "-",
         created_by: creatorId
     };
 
@@ -75,14 +94,6 @@ exports.storeHospitalService = async (validateData, req) => {
 const validProgressStatuses = ['cari_data', 'dihubungi', 'negosiasi', 'follow_up', 'mou', 'onboarded', 'tidak_berminat'];
 
 exports.updateHospitalService = async (validateData, id, req) => {
-    // const hospital = await HospitalRepository.findById(id);
-    // if (!hospital) {
-    //     throw new HttpException("Data hospital not found", 404);
-    // }
-
-    // const data = await HospitalRepository.update(id, validateData);
-    // await updateLog(req, data);
-
     const hospital = await HospitalRepository.findById(id);
     if (!hospital) {
         throw new HttpException("Hospital data not found", 404);
@@ -126,7 +137,7 @@ exports.updateHospitalService = async (validateData, id, req) => {
     const payload = {
         ...validateData,
         image: imagePath,
-        updated_by: req.user.id,
+        // created_by: req.user.id,
     };
 
     const data = await HospitalRepository.update(id, payload);

src/services/admin/ProvinceService.js

@@ -1,4 +1,5 @@
 const ProvinceRepository = require('../../repository/admin/ProvinceRepository.js');
+const { formatISOWithoutTimezone } = require('../../utils/FormatDate.js');
 const HttpException = require('../../utils/HttpException.js');
 const { createLog, updateLog, deleteLog } = require('../../utils/LogActivity.js');
 const { SearchFilter } = require('../../utils/SearchFilter.js');
@@ -17,7 +18,13 @@ exports.getAllProvinceService = async ({ page, limit, search, sortBy, orderBy })
         ProvinceRepository.countAll(where)
     ]);
 
-    return { provinces, total };
+    const formatted = provinces.map(v => ({
+        ...v,
+        createdAt: formatISOWithoutTimezone(v.createdAt),
+        updatedAt: formatISOWithoutTimezone(v.updatedAt),
+    }));
+
+    return { provinces: formatted, total };
 };
 
 exports.showProvinceService = async (id) => {
@@ -25,7 +32,12 @@ exports.showProvinceService = async (id) => {
     if (!province) {
         throw new HttpException("Data province not found", 404);
     }
-    return province;
+    
+    return {
+        ...province,
+        createdAt: formatISOWithoutTimezone(province.createdAt),
+        updatedAt: formatISOWithoutTimezone(province.updatedAt),
+    };
 };
 
 exports.storeProvinceService = async (validateData, req) => {

src/services/admin/SalesService.js

@@ -2,13 +2,15 @@ const SalesRepository = require('../../repository/admin/SalesRepository.js');
 const HttpException = require('../../utils/HttpException.js');
 const { SearchFilter } = require('../../utils/SearchFilter.js');
 const timeLocal = require('../../utils/TimeLocal.js');
+const prisma = require('../../prisma/PrismaClient.js');
 const { createLog, updateLog, deleteLog } = require('../../utils/LogActivity.js');
+const { formatISOWithoutTimezone } = require('../../utils/FormatDate.js');
 
 exports.getAllSalesService = async ({ page, limit, search, sortBy, orderBy }) => {
     const skip = (page - 1) * limit;
 
     const where = {
-        ...SearchFilter(search, ['username', 'email', 'firstname', 'lastname']),
+        ...SearchFilter(search, ['username', 'user_areas.province.name'], ['user_areas']),
         deletedAt: null
     };
 
@@ -17,7 +19,13 @@ exports.getAllSalesService = async ({ page, limit, search, sortBy, orderBy }) =>
         SalesRepository.UserRepository.countAll(where)
     ]);
 
-    return { sales, total };
+    const formatted = sales.map(v => ({
+        ...v,
+        createdAt: formatISOWithoutTimezone(v.createdAt),
+        updatedAt: formatISOWithoutTimezone(v.updatedAt),
+    }));
+
+    return { sales: formatted, total };
 };
 
 exports.showSalesService = async (id) => {
@@ -25,14 +33,39 @@ exports.showSalesService = async (id) => {
     if (!sales) {
         throw new HttpException("Data sales not found", 404);
     }
-    return sales;
+    
+    return {
+        ...sales,
+        createdAt: formatISOWithoutTimezone(sales.createdAt),
+        updatedAt: formatISOWithoutTimezone(sales.updatedAt),
+    };
 };
 
 exports.storeSalesService = async (userData, req) => {
+    // Validasi province_ids
+    if (userData.province_ids && userData.province_ids.length > 0) {
+        const validProvinces = await prisma.province.findMany({
+            where: { id: { in: userData.province_ids } },
+            select: { id: true },
+        });
+
+        const validProvinceIds = validProvinces.map(p => p.id);
+        const invalidProvinceIds = userData.province_ids.filter(id => !validProvinceIds.includes(id));
+
+        if (invalidProvinceIds.length > 0) {
+            throw new HttpException(
+                `Province ID not found: ${invalidProvinceIds.join(', ')}`,
+                404
+            );
+        }
+    }
+
+    // Create user dan assign role
     const userId = await SalesRepository.KeycloakRepository.createUser(userData);
     await SalesRepository.KeycloakRepository.assignSalesRole(userId);
     const data = await SalesRepository.UserRepository.createUser(userId, userData);
 
+    // Insert ke user_areas
     if (userData.province_ids && userData.province_ids.length > 0) {
         await SalesRepository.UserAreaRepository.createMany(userId, userData.province_ids);
     }
@@ -41,12 +74,47 @@ exports.storeSalesService = async (userData, req) => {
 };
 
 exports.updateSalesService = async (userData, id, req) => {
+    // const sales = await SalesRepository.UserRepository.findById(id);
+    // if (!sales) throw new HttpException('Sales not found', 404);
+
+    // await SalesRepository.KeycloakRepository.updateUser(id, userData);
+    // const data = await SalesRepository.UserRepository.updateUser(id, userData);
+
+    // if (userData.province_ids && userData.province_ids.length > 0) {
+    //     await SalesRepository.UserAreaRepository.deleteByUserId(id);
+    //     await SalesRepository.UserAreaRepository.createMany(id, userData.province_ids);
+    // }
+
+    // await updateLog(req, data);
+
     const sales = await SalesRepository.UserRepository.findById(id);
     if (!sales) throw new HttpException('Sales not found', 404);
 
+    // Validasi province_ids
+    if (userData.province_ids && userData.province_ids.length > 0) {
+        const validProvinces = await prisma.province.findMany({
+            where: { id: { in: userData.province_ids } },
+            select: { id: true },
+        });
+
+        const validProvinceIds = validProvinces.map(p => p.id);
+        const invalidProvinceIds = userData.province_ids.filter(id => !validProvinceIds.includes(id));
+
+        if (invalidProvinceIds.length > 0) {
+            throw new HttpException(
+                `Province ID not found: ${invalidProvinceIds.join(', ')}`,
+                404
+            );
+        }
+    }
+
+    // Update ke Keycloak
     await SalesRepository.KeycloakRepository.updateUser(id, userData);
+
+    // Update ke DB lokal
     const data = await SalesRepository.UserRepository.updateUser(id, userData);
 
+    // Update relasi user_areas
     if (userData.province_ids && userData.province_ids.length > 0) {
         await SalesRepository.UserAreaRepository.deleteByUserId(id);
         await SalesRepository.UserAreaRepository.createMany(id, userData.province_ids);
@@ -64,5 +132,12 @@ exports.deleteSalesService = async (id, req) => {
     await SalesRepository.KeycloakRepository.deleteUser(id);
     const data = await SalesRepository.UserRepository.deleteUser(id, { deletedAt: timeLocal.now().toDate() });
 
+    await prisma.userArea.updateMany({
+        where: { user_id: id },
+        data: {
+            deletedAt: timeLocal.now().toDate()
+        }
+    });
+
     await deleteLog(req, data);
 };

src/services/admin/VendorHistoryService.js

@@ -0,0 +1,163 @@
+const VendorHistoryRepository = require('../../repository/admin/VendorHistoryRepository.js');
+const HttpException = require('../../utils/HttpException.js');
+const prisma = require('../../prisma/PrismaClient.js');
+const { SearchFilter } = require('../../utils/SearchFilter.js');
+const timeLocal = require('../../utils/TimeLocal.js');
+const { createLog, updateLog, deleteLog } = require('../../utils/LogActivity.js');
+const { formatDateOnly, formatISOWithoutTimezone } = require('../../utils/FormatDate.js');
+
+exports.getAllVendorHistoryService = async ({ page, limit, search, sortBy, orderBy }, req) => {
+    const skip = (page - 1) * limit;
+
+    const hospitalId = req.params.id;
+    const hospital = await prisma.hospital.findFirst({
+        where: {
+            id: hospitalId
+        }
+    })
+    if (!hospital) {
+        throw new HttpException("Hospital not found", 404)
+    }
+
+    const where = {
+        // ...SearchFilter(search, ['name', 'name_pt']),
+        hospital_id: req.params.id,
+        deletedAt: null
+    };
+
+    const [vendor_histories, total] = await Promise.all([
+        VendorHistoryRepository.findAll({ skip, take: limit, where, orderBy: { [sortBy]: orderBy } }),
+        VendorHistoryRepository.countAll(where)
+    ]);
+
+    const formatted = vendor_histories.map(v => ({
+        ...v,
+        contract_date: formatDateOnly(v.contract_date),
+        contract_expired_date: formatDateOnly(v.contract_expired_date),
+        createdAt: formatISOWithoutTimezone(v.createdAt),
+        updatedAt: formatISOWithoutTimezone(v.updatedAt),
+    }));
+
+    return { vendor_histories: formatted, total };
+};
+
+exports.showVendorHistoryService = async (req) => {
+    const id_hospital = req.params.id;
+    const id_vendor_history = req.params.id_vendor_history;
+
+    const hospital = await prisma.hospital.findFirst({
+        where: {
+            id: id_hospital
+        }
+    })
+    if (!hospital) {
+        throw new HttpException("Hospital not found", 404)
+    }
+
+    const vendorHistory = await VendorHistoryRepository.findById(id_vendor_history);
+    if (!vendorHistory) {
+        throw new HttpException("Vendor history not found", 404);
+    }
+
+    return {
+        ...vendorHistory,
+        contract_date: formatDateOnly(vendorHistory.contract_date),
+        contract_expired_date: formatDateOnly(vendorHistory.contract_expired_date),
+        createdAt: formatISOWithoutTimezone(vendorHistory.createdAt),
+        updatedAt: formatISOWithoutTimezone(vendorHistory.updatedAt),
+    };
+};
+
+exports.storeVendorHistoryService = async (validateData, req) => {
+    const hospitalId = req.params.id;
+
+    const hospital = await prisma.hospital.findFirst({
+        where: {
+            id: hospitalId
+        }
+    })
+    if (!hospital) {
+        throw new HttpException("Hospital not found", 404)
+    }
+
+    await prisma.hospital.update({
+        where: { id: hospitalId },
+        data: {
+            simrs_type: validateData.simrs_type
+        }
+    });
+
+    const payload = {
+        vendor_id: validateData.vendor_id,
+        vendor_impression: validateData.vendor_impression,
+        status: validateData.status,
+        contract_date: validateData.contract_date,
+        contract_expired_date: validateData.contract_expired_date,
+        hospital_id: hospitalId
+    };
+
+    const data = await VendorHistoryRepository.create(payload);
+    await createLog(req, data);
+};
+
+exports.updateVendorHistoryService = async (validateData, req) => {
+    const id_hospital = req.params.id;
+    const id_vendor_history = req.params.id_vendor_history;
+
+    const hospital = await prisma.hospital.findFirst({
+        where: {
+            id: id_hospital
+        }
+    })
+    if (!hospital) {
+        throw new HttpException("Hospital not found", 404)
+    }
+
+    const vendor = await VendorHistoryRepository.findById(id_vendor_history);
+    if (!vendor) {
+        throw new HttpException("Vendor history not found", 404);
+    }
+
+    await prisma.hospital.update({
+        where: { id: id_hospital },
+        data: {
+            simrs_type: validateData.simrs_type
+        }
+    });
+
+    const payload = {
+        vendor_id: validateData.vendor_id,
+        vendor_impression: validateData.vendor_impression,
+        status: validateData.status,
+        contract_date: validateData.contract_date,
+        contract_expired_date: validateData.contract_expired_date
+    };
+
+    const data = await VendorHistoryRepository.update(id_vendor_history, payload);
+    await updateLog(req, data);
+};
+
+exports.deleteVendorHistoryService = async (req) => {
+    const id_hospital = req.params.id;
+    const id_vendor_history = req.params.id_vendor_history;
+
+    const hospital = await prisma.hospital.findFirst({
+        where: {
+            id: id_hospital
+        }
+    })
+    if (!hospital) {
+        throw new HttpException("Hospital not found", 404)
+    }
+
+    const vendor = await VendorHistoryRepository.findById(id_vendor_history);
+    if (!vendor) {
+        throw new HttpException("Vendor history not found", 404);
+    }
+
+    const data = await VendorHistoryRepository.update(id_vendor_history, {
+        deletedAt: timeLocal.now().toDate()
+    });
+
+    await deleteLog(req, data);
+};

src/services/admin/VendorService.js

@@ -0,0 +1,105 @@
+const VendorRepository = require('../../repository/admin/VendorRepository.js');
+const HttpException = require('../../utils/HttpException.js');
+const prisma = require('../../prisma/PrismaClient.js');
+const { SearchFilter } = require('../../utils/SearchFilter.js');
+const timeLocal = require('../../utils/TimeLocal.js');
+const { createLog, updateLog, deleteLog } = require('../../utils/LogActivity.js');
+const { formatISOWithoutTimezone } = require('../../utils/FormatDate.js');
+
+exports.getAllVendorService = async ({ page, limit, search, sortBy, orderBy }) => {
+    const skip = (page - 1) * limit;
+
+    const where = {
+        ...SearchFilter(search, ['name', 'name_pt']),
+        deletedAt: null
+    };
+
+    const [vendors, total] = await Promise.all([
+        VendorRepository.findAll({ skip, take: limit, where, orderBy: { [sortBy]: orderBy } }),
+        VendorRepository.countAll(where)
+    ]);
+
+    const formatted = vendors.map(v => ({
+        ...v,
+        createdAt: formatISOWithoutTimezone(v.createdAt),
+        updatedAt: formatISOWithoutTimezone(v.updatedAt),
+    }));
+
+    return { vendors: formatted, total };
+};
+
+exports.showVendorService = async (id) => {
+    const vendor = await VendorRepository.findById(id);
+    if (!vendor) {
+        throw new HttpException("Data vendor not found", 404);
+    }
+    
+    return {
+        ...vendor,
+        createdAt: formatISOWithoutTimezone(vendor.createdAt),
+        updatedAt: formatISOWithoutTimezone(vendor.updatedAt),
+    };
+};
+
+exports.storeVendorService = async (validateData, req) => {
+    const creatorId = req.user.id;
+
+    const name_vendor = await prisma.vendor.findFirst({
+        where: {
+            name: validateData.name,
+            deletedAt: null
+        }
+    });
+
+    if (name_vendor) {
+        throw new HttpException("Vendor name must be unique", 400);
+    }
+
+    const payload = {
+        ...validateData,
+        created_by: creatorId
+    };
+
+    const data = await VendorRepository.create(payload);
+    await createLog(req, data);
+};
+
+exports.updateVendorService = async (validateData, id, req) => {
+    const creatorId = req.user.id;
+
+    const vendor = await VendorRepository.findById(id);
+    if (!vendor) {
+        throw new HttpException("Data vendor not found", 404);
+    }
+
+    const name_vendor = await prisma.vendor.findFirst({
+        where: {
+            name: validateData.name,
+            deletedAt: null
+        }
+    });
+
+    if (name_vendor) {
+        throw new HttpException("Vendor name must be unique", 400);
+    }
+
+    const payload = {
+        ...validateData,
+        created_by: creatorId
+    };
+
+    const data = await VendorRepository.update(id, payload);
+    await updateLog(req, data);
+};
+
+exports.deleteVendorService = async (id, req) => {
+    const vendor = await VendorRepository.findById(id);
+
+    if (!vendor) {
+        throw new HttpException('Vendor not found', 404);
+    }
+
+    const data = await VendorRepository.delete(id);
+
+    await deleteLog(req, data);
+};

src/services/sales/AreaService.js

@@ -0,0 +1,20 @@
+const areaRepository = require('../../repository/sales/AreaRepository.js');
+const { SearchFilter } = require('../../utils/SearchFilter.js');
+const prisma = require('../../prisma/PrismaClient.js');
+
+exports.getAllAreaByUserService = async ({ page, limit, search, sortBy, orderBy }, req) => {
+    const skip = (page - 1) * limit;
+
+    const where = {
+        user_id: req.user.id,
+        deletedAt: null,
+        ...SearchFilter(search, ['province.name']),
+    };
+
+    const [areas, total] = await Promise.all([
+        areaRepository.findAll({ skip, take: limit, where, orderBy: { [sortBy]: orderBy } }),
+        areaRepository.countAll(where),
+    ]);
+
+    return { areas, total };
+};

src/services/sales/ExecutivesHistoryService.js

@@ -0,0 +1,141 @@
+const ExecutivesHistoryRepository = require('../../repository/sales/ExecutivesHistoryRepository.js');
+const HttpException = require('../../utils/HttpException.js');
+const prisma = require('../../prisma/PrismaClient.js');
+const { SearchFilter } = require('../../utils/SearchFilter.js');
+const timeLocal = require('../../utils/TimeLocal.js');
+const { createLog, updateLog, deleteLog } = require('../../utils/LogActivity.js');
+const { formatDateOnly, formatISOWithoutTimezone } = require('../../utils/FormatDate.js');
+
+exports.getAllExecutivesHistoryService = async ({ page, limit, search, sortBy, orderBy }, req) => {
+    const skip = (page - 1) * limit;
+
+    const hospitalId = req.params.id;
+    const hospital = await prisma.hospital.findFirst({
+        where: {
+            id: hospitalId
+        }
+    })
+    if (!hospital) {
+        throw new HttpException("Hospital not found", 404)
+    }
+
+    const where = {
+        // ...SearchFilter(search, ['name', 'name_pt']),
+        hospital_id: req.params.id,
+        deletedAt: null
+    };
+
+    const [vendor_histories, total] = await Promise.all([
+        ExecutivesHistoryRepository.findAll({ skip, take: limit, where, orderBy: { [sortBy]: orderBy } }),
+        ExecutivesHistoryRepository.countAll(where)
+    ]);
+
+    const formatted = vendor_histories.map(v => ({
+        ...v,
+        start_term: formatDateOnly(v.start_term),
+        end_term: formatDateOnly(v.end_term),
+        createdAt: formatISOWithoutTimezone(v.createdAt),
+        updatedAt: formatISOWithoutTimezone(v.updatedAt),
+    }));
+
+    return { vendor_histories: formatted, total };
+};
+
+exports.showExecutivesHistoryService = async (req) => {
+    const id_hospital = req.params.id;
+    const id_executives_history = req.params.id_executives_history;
+
+    const hospital = await prisma.hospital.findFirst({
+        where: {
+            id: id_hospital
+        }
+    })
+    if (!hospital) {
+        throw new HttpException("Hospital not found", 404)
+    }
+
+    const executivesHistory = await ExecutivesHistoryRepository.findById(id_executives_history);
+    if (!executivesHistory) {
+        throw new HttpException("Executives history not found", 404);
+    }
+
+    return {
+        ...executivesHistory,
+        start_term: formatDateOnly(executivesHistory.start_term),
+        end_term: formatDateOnly(executivesHistory.end_term),
+        createdAt: formatISOWithoutTimezone(executivesHistory.createdAt),
+        updatedAt: formatISOWithoutTimezone(executivesHistory.updatedAt),
+    };
+};
+
+exports.storeExecutivesHistoryService = async (validateData, req) => {
+    const hospitalId = req.params.id;
+
+    const hospital = await prisma.hospital.findFirst({
+        where: {
+            id: hospitalId
+        }
+    })
+    if (!hospital) {
+        throw new HttpException("Hospital not found", 404)
+    }
+
+    const payload = {
+        ...validateData,
+        hospital_id: hospitalId
+    };
+
+    const data = await ExecutivesHistoryRepository.create(payload);
+    await createLog(req, data);
+};
+
+exports.updateExecutivesHistoryService = async (validateData, req) => {
+    const id_hospital = req.params.id;
+    const id_executives_history = req.params.id_executives_history;
+
+    const hospital = await prisma.hospital.findFirst({
+        where: {
+            id: id_hospital
+        }
+    })
+    if (!hospital) {
+        throw new HttpException("Hospital not found", 404)
+    }
+
+    const executivesHistory = await ExecutivesHistoryRepository.findById(id_executives_history);
+    if (!executivesHistory) {
+        throw new HttpException("Executives history not found", 404);
+    }
+
+    const payload = {
+        ...validateData
+    };
+
+    const data = await ExecutivesHistoryRepository.update(id_executives_history, payload);
+    await updateLog(req, data);
+};
+
+exports.deleteExecutivesHistoryService = async (req) => {
+    const id_hospital = req.params.id;
+    const id_executives_history = req.params.id_executives_history;
+
+    const hospital = await prisma.hospital.findFirst({
+        where: {
+            id: id_hospital
+        }
+    })
+    if (!hospital) {
+        throw new HttpException("Hospital not found", 404)
+    }
+
+    const executivesHistory = await ExecutivesHistoryRepository.findById(id_executives_history);
+    if (!executivesHistory) {
+        throw new HttpException("Executives history not found", 404);
+    }
+
+    const data = await ExecutivesHistoryRepository.update(id_executives_history, {
+        deletedAt: timeLocal.now().toDate()
+    });
+
+    await deleteLog(req, data);
+};

src/services/sales/HospitalService.js

@@ -6,8 +6,9 @@ const ProvinceRepository = require('../../repository/admin/ProvinceRepository.js
 const CityRepository = require('../../repository/admin/CityRepository.js');
 const HttpException = require('../../utils/HttpException.js');
 const HospitalRepository = require('../../repository/admin/HospitalRepository.js');
+const { formatISOWithoutTimezone } = require('../../utils/FormatDate.js');
 
-exports.getAllHospitalByAreaService = async ({ page, limit, search, sortBy, orderBy }, req) => {
+exports.getAllHospitalByAreaService = async ({ page, limit, search, sortBy, orderBy, province, city, type, ownership, progress_status }, req) => {
     const skip = (page - 1) * limit;
 
     const userAreas = await prisma.userArea.findMany({
@@ -17,28 +18,14 @@ exports.getAllHospitalByAreaService = async ({ page, limit, search, sortBy, orde
 
     const provinceIds = userAreas.map(ua => ua.province_id);
 
-    // const where = {
-    //     ...SearchFilter(search, ['username', 'email', 'firstname', 'lastname']),
-    //     deletedAt: null
-    // };
-
     const where = {
-        ...SearchFilter(search, [
-            'name',
-            'hospital_code',
-            'type',
-            'ownership',
-            'address',
-            'simrs_type',
-            'contact',
-            'image',
-            'progress_status',
-            'note',
-            'province.name',
-            'city.name',
-            'user.username'
-        ]),
+        ...SearchFilter(search, ['name', 'province.id', 'city.id', 'type', 'ownership', 'simrs_type']),
         province_id: { in: provinceIds },
+        ...(province ? { province_id: province } : {}),
+        ...(city ? { city_id: city } : {}),
+        ...(type ? { type: type } : {}),
+        ...(ownership ? { ownership: ownership } : {}),
+        ...(progress_status ? { progress_status: progress_status } : {}),
         deletedAt: null
     };
 
@@ -47,9 +34,70 @@ exports.getAllHospitalByAreaService = async ({ page, limit, search, sortBy, orde
         salesHospitalRepository.countAll(where)
     ]);
 
-    return { hospitals, total };
+    const formatted = hospitals.map(v => ({
+        ...v,
+        createdAt: formatISOWithoutTimezone(v.createdAt),
+        updatedAt: formatISOWithoutTimezone(v.updatedAt),
+    }));
+
+    return { hospitals: formatted, total };
 };
 
+// exports.getAllHospitalByAreaService = async (
+//     { page, limit, search, sortBy, orderBy, province, city, type, ownership, progress_status },
+//     req
+// ) => {
+//     const skip = (page - 1) * limit;
+
+//     // 1. Ambil daftar provinsi yang dimiliki user
+//     const userAreas = await prisma.userArea.findMany({
+//         where: {
+//             user_id: req.user.id,
+//             deletedAt: null,
+//         },
+//         select: { province_id: true },
+//     });
+
+//     const areaProvinceIds = userAreas.map((ua) => ua.province_id);
+
+//     if (areaProvinceIds.length === 0) {
+//         return { hospitals: [], total: 0 };
+//     }
+
+//     // 2. Bangun filter where
+//     const where = {
+//         ...SearchFilter(search, [
+//             'name',
+//             'province.name',
+//             'city.name',
+//             'type',
+//             'ownership',
+//             'simrs_type',
+//         ]),
+//         province_id: province
+//             ? province // jika user filter 1 provinsi → override area
+//             : { in: areaProvinceIds }, // kalau tidak → gunakan semua area user
+//         ...(city ? { city_id: city } : {}),
+//         ...(type ? { type } : {}),
+//         ...(ownership ? { ownership } : {}),
+//         ...(progress_status ? { progress_status } : {}),
+//         deletedAt: null,
+//     };
+
+//     const [hospitals, total] = await Promise.all([
+//         salesHospitalRepository.findAll({ skip, take: limit, where, orderBy: { [sortBy]: orderBy } }),
+//         salesHospitalRepository.countAll(where),
+//     ]);
+
+//     const formatted = hospitals.map((v) => ({
+//         ...v,
+//         createdAt: formatISOWithoutTimezone(v.createdAt),
+//         updatedAt: formatISOWithoutTimezone(v.updatedAt),
+//     }));
+
+//     return { hospitals: formatted, total };
+// };
+
 exports.storeHospitalService = async (validateData, req) => {
     const creatorId = req.user.id;
 
@@ -96,6 +144,7 @@ exports.storeHospitalService = async (validateData, req) => {
         ...validateData,
         image: imagePath,
         progress_status: "cari_data",
+        simrs_type: "-",
         created_by: creatorId
     };
 
@@ -106,19 +155,22 @@ exports.storeHospitalService = async (validateData, req) => {
 const validProgressStatuses = ['cari_data', 'dihubungi', 'negosiasi', 'follow_up', 'mou', 'onboarded', 'tidak_berminat'];
 
 exports.updateHospitalService = async (validateData, id, req) => {
-    // const hospital = await HospitalRepository.findById(id);
-    // if (!hospital) {
-    //     throw new HttpException("Data hospital not found", 404);
-    // }
-
-    // const data = await HospitalRepository.update(id, validateData);
-    // await updateLog(req, data);
-
     const hospital = await HospitalRepository.findById(id);
     if (!hospital) {
         throw new HttpException("Hospital data not found", 404);
     }
 
+    const userArea = await prisma.userArea.findFirst({
+        where: {
+            user_id: req.user.id,
+            province_id: validateData.province_id
+        }
+    });
+
+    if (!userArea) {
+        throw new HttpException("You are not authorized to update hospital in this province", 403);
+    }
+
     const province = await ProvinceRepository.findById(validateData.province_id);
     if (!province) {
         throw new HttpException('Province not found', 404);
@@ -157,7 +209,7 @@ exports.updateHospitalService = async (validateData, id, req) => {
     const payload = {
         ...validateData,
         image: imagePath,
-        updated_by: req.user.id,
+        // created_by: req.user.id,
     };
 
     const data = await salesHospitalRepository.update(id, payload);
@@ -169,5 +221,10 @@ exports.showHospitalService = async (id) => {
     if (!hospital) {
         throw new HttpException("Data hospital not found", 404);
     }
-    return hospital;
+
+    return {
+        ...hospital,
+        createdAt: formatISOWithoutTimezone(hospital.createdAt),
+        updatedAt: formatISOWithoutTimezone(hospital.updatedAt),
+    };
 };

src/services/sales/VendorHistoryService.js

@@ -0,0 +1,163 @@
+const VendorHistoryRepository = require('../../repository/sales/VendorHistoryRepository.js');
+const HttpException = require('../../utils/HttpException.js');
+const prisma = require('../../prisma/PrismaClient.js');
+const { SearchFilter } = require('../../utils/SearchFilter.js');
+const timeLocal = require('../../utils/TimeLocal.js');
+const { createLog, updateLog, deleteLog } = require('../../utils/LogActivity.js');
+const { formatDateOnly, formatISOWithoutTimezone } = require('../../utils/FormatDate.js');
+
+exports.getAllVendorHistoryService = async ({ page, limit, search, sortBy, orderBy }, req) => {
+    const skip = (page - 1) * limit;
+
+    const hospitalId = req.params.id;
+    const hospital = await prisma.hospital.findFirst({
+        where: {
+            id: hospitalId
+        }
+    })
+    if (!hospital) {
+        throw new HttpException("Hospital not found", 404)
+    }
+
+    const where = {
+        // ...SearchFilter(search, ['name', 'name_pt']),
+        hospital_id: req.params.id,
+        deletedAt: null
+    };
+
+    const [vendor_histories, total] = await Promise.all([
+        VendorHistoryRepository.findAll({ skip, take: limit, where, orderBy: { [sortBy]: orderBy } }),
+        VendorHistoryRepository.countAll(where)
+    ]);
+
+    const formatted = vendor_histories.map(v => ({
+        ...v,
+        contract_date: formatDateOnly(v.contract_date),
+        contract_expired_date: formatDateOnly(v.contract_expired_date),
+        createdAt: formatISOWithoutTimezone(v.createdAt),
+        updatedAt: formatISOWithoutTimezone(v.updatedAt),
+    }));
+
+    return { vendor_histories: formatted, total };
+};
+
+exports.showVendorHistoryService = async (req) => {
+    const id_hospital = req.params.id;
+    const id_vendor_history = req.params.id_vendor_history;
+
+    const hospital = await prisma.hospital.findFirst({
+        where: {
+            id: id_hospital
+        }
+    })
+    if (!hospital) {
+        throw new HttpException("Hospital not found", 404)
+    }
+
+    const vendorHistory = await VendorHistoryRepository.findById(id_vendor_history);
+    if (!vendorHistory) {
+        throw new HttpException("Vendor history not found", 404);
+    }
+
+    return {
+        ...vendorHistory,
+        contract_date: formatDateOnly(vendorHistory.contract_date),
+        contract_expired_date: formatDateOnly(vendorHistory.contract_expired_date),
+        createdAt: formatISOWithoutTimezone(vendorHistory.createdAt),
+        updatedAt: formatISOWithoutTimezone(vendorHistory.updatedAt),
+    };
+};
+
+exports.storeVendorHistoryService = async (validateData, req) => {
+    const hospitalId = req.params.id;
+
+    const hospital = await prisma.hospital.findFirst({
+        where: {
+            id: hospitalId
+        }
+    })
+    if (!hospital) {
+        throw new HttpException("Hospital not found", 404)
+    }
+
+    await prisma.hospital.update({
+        where: { id: hospitalId },
+        data: {
+            simrs_type: validateData.simrs_type
+        }
+    });
+
+    const payload = {
+        vendor_id: validateData.vendor_id,
+        vendor_impression: validateData.vendor_impression,
+        status: validateData.status,
+        contract_date: validateData.contract_date,
+        contract_expired_date: validateData.contract_expired_date,
+        hospital_id: hospitalId
+    };
+
+    const data = await VendorHistoryRepository.create(payload);
+    await createLog(req, data);
+};
+
+exports.updateVendorHistoryService = async (validateData, req) => {
+    const id_hospital = req.params.id;
+    const id_vendor_history = req.params.id_vendor_history;
+
+    const hospital = await prisma.hospital.findFirst({
+        where: {
+            id: id_hospital
+        }
+    })
+    if (!hospital) {
+        throw new HttpException("Hospital not found", 404)
+    }
+
+    const vendor = await VendorHistoryRepository.findById(id_vendor_history);
+    if (!vendor) {
+        throw new HttpException("Vendor history not found", 404);
+    }
+
+    await prisma.hospital.update({
+        where: { id: id_hospital },
+        data: {
+            simrs_type: validateData.simrs_type
+        }
+    });
+
+    const payload = {
+        vendor_id: validateData.vendor_id,
+        vendor_impression: validateData.vendor_impression,
+        status: validateData.status,
+        contract_date: validateData.contract_date,
+        contract_expired_date: validateData.contract_expired_date
+    };
+
+    const data = await VendorHistoryRepository.update(id_vendor_history, payload);
+    await updateLog(req, data);
+};
+
+exports.deleteVendorHistoryService = async (req) => {
+    const id_hospital = req.params.id;
+    const id_vendor_history = req.params.id_vendor_history;
+
+    const hospital = await prisma.hospital.findFirst({
+        where: {
+            id: id_hospital
+        }
+    })
+    if (!hospital) {
+        throw new HttpException("Hospital not found", 404)
+    }
+
+    const vendor = await VendorHistoryRepository.findById(id_vendor_history);
+    if (!vendor) {
+        throw new HttpException("Vendor history not found", 404);
+    }
+
+    const data = await VendorHistoryRepository.update(id_vendor_history, {
+        deletedAt: timeLocal.now().toDate()
+    });
+
+    await deleteLog(req, data);
+};

src/services/sales/VendorService.js

@@ -0,0 +1,113 @@
+const VendorRepository = require('../../repository/sales/VendorRepository.js');
+const HttpException = require('../../utils/HttpException.js');
+const prisma = require('../../prisma/PrismaClient.js');
+const { SearchFilter } = require('../../utils/SearchFilter.js');
+const { formatISOWithoutTimezone, formatDateOnly } = require('../../utils/FormatDate.js');
+
+exports.getAllVendorService = async ({ page, limit, search, sortBy, orderBy }, req) => {
+    const skip = (page - 1) * limit;
+    const userId = req.user.id;
+
+    // 1. Ambil provinsi yang menjadi area kerja sales
+    const userAreas = await prisma.userArea.findMany({
+        where: {
+            user_id: userId,
+            deletedAt: null,
+        },
+        select: { province_id: true }
+    });
+
+    const provinceIds = userAreas.map(area => area.province_id);
+
+    if (provinceIds.length === 0) {
+        return { vendors: [], total: 0 };
+    }
+
+    // 2. Ambil vendor_id dari vendor_histories RS di provinsi tersebut
+    const vendorHistories = await prisma.vendorHistory.findMany({
+        where: {
+            deletedAt: null,
+            status: 'active',
+            vendor_id: { not: null },
+            hospital: {
+                deletedAt: null,
+                province_id: { in: provinceIds }
+            }
+        },
+        select: { vendor_id: true },
+        distinct: ['vendor_id']
+    });
+
+    const vendorIds = vendorHistories.map(v => v.vendor_id);
+
+    // 3. Filter vendor berdasarkan hasil vendor_id
+    const where = {
+        ...SearchFilter(search, ['name', 'name_pt']),
+        deletedAt: null,
+        id: { in: vendorIds }
+    };
+
+    const [vendors, total] = await Promise.all([
+        VendorRepository.findAll({ skip, take: limit, where, orderBy: { [sortBy]: orderBy } }),
+        VendorRepository.countAll(where)
+    ]);
+
+    const formatted = vendors.map(v => ({
+        ...v,
+        createdAt: formatISOWithoutTimezone(v.createdAt),
+        updatedAt: formatISOWithoutTimezone(v.updatedAt),
+    }));
+
+    return { vendors: formatted, total };
+};
+
+// exports.showVendorService = async (id) => {
+//     const vendor = await VendorRepository.findById(id);
+//     if (!vendor) {
+//         throw new HttpException("Data vendor not found", 404);
+//     }
+//     return vendor;
+// };
+
+// exports.storeVendorService = async (validateData, req) => {
+//     const creatorId = req.user.id;
+
+//     const payload = {
+//         ...validateData,
+//         created_by: creatorId
+//     };
+
+//     const data = await VendorRepository.create(payload);
+//     await createLog(req, data);
+// };
+
+// exports.updateVendorService = async (validateData, id, req) => {
+//     const creatorId = req.user.id;
+
+//     const vendor = await VendorRepository.findById(id);
+//     if (!vendor) {
+//         throw new HttpException("Data vendor not found", 404);
+//     }
+
+//     const payload = {
+//         ...validateData,
+//         created_by: creatorId
+//     };
+
+//     const data = await VendorRepository.update(id, payload);
+//     await updateLog(req, data);
+// };
+
+// exports.deleteVendorService = async (id, req) => {
+//     const vendor = await VendorRepository.findById(id);
+
+//     if (!vendor) {
+//         throw new HttpException('Vendor not found', 404);
+//     }
+
+//     const data = await VendorRepository.update(id, {
+//         deletedAt: timeLocal.now().toDate()
+//     });
+
+//     await deleteLog(req, data);
+// };

src/services/superadmin/LogService.js

@@ -0,0 +1,18 @@
+const LogRepository = require('../../repository/superadmin/LogRepository.js');
+const { SearchFilter } = require('../../utils/SearchFilter.js');
+
+exports.getAllLogsService = async ({ page, limit, search, sortBy, orderBy }) => {
+    const skip = (page - 1) * limit;
+
+    const where = {
+        ...SearchFilter(search, ['username', 'action']),
+        deletedAt: null
+    };
+
+    const [logs, total] = await Promise.all([
+        LogRepository.findAll({ skip, take: limit, where, orderBy: { [sortBy]: orderBy } }),
+        LogRepository.countAll(where)
+    ]);
+
+    return { logs, total };
+};

src/utils/FormatDate.js

@@ -0,0 +1,47 @@
+const { format, toZonedTime } = require('date-fns-tz');
+const { id } = require('date-fns/locale');
+
+/**
+ * Mengubah format tanggal & waktu lengkap ke format Indonesia (DD MMMM YYYY HH:mm:ss)
+ * Contoh: "27 Juni 2025 21:35:46"
+ */
+const formatFullDateTime = (dateInput) => {
+    if (!dateInput) return null;
+
+    const timeZone = 'Asia/Jakarta';
+    const zonedDate = toZonedTime(new Date(dateInput), timeZone);
+
+    return format(zonedDate, 'dd MMMM yyyy HH:mm:ss', { locale: id });
+};
+
+/**
+ * Mengubah hanya tanggal (tanpa jam) ke format YYYY-MM-DD
+ * Contoh: "2025-06-27"
+ */
+const formatDateOnly = (dateInput) => {
+    if (!dateInput) return null;
+
+    const timeZone = 'Asia/Jakarta';
+    const zonedDate = toZonedTime(new Date(dateInput), timeZone);
+
+    return format(zonedDate, 'yyyy-MM-dd');
+};
+
+/**
+ * Mengubah timestamp ISO ke format ISO tanpa zona waktu
+ * Contoh: dari "2025-06-27T14:35:46.376Z" → "2025-06-27 21:35:46"
+ */
+const formatISOWithoutTimezone = (dateInput) => {
+    if (!dateInput) return null;
+
+    const timeZone = 'Asia/Jakarta';
+    const zonedDate = toZonedTime(new Date(dateInput), timeZone);
+
+    return format(zonedDate, "yyyy-MM-dd HH:mm:ss");
+};
+
+module.exports = {
+    formatFullDateTime,
+    formatDateOnly,
+    formatISOWithoutTimezone,
+};

src/utils/PaginationParams.js

@@ -1,10 +1,21 @@
-exports.PaginationParam = (req) => {
+exports.PaginationParam = (req, extraFields = []) => {
     const page = parseInt(req.query.page) || 1;
     const limit = parseInt(req.query.limit) || 10;
     const search = req.query.search || '';
     const sortBy = req.query.sort_by || 'createdAt';
-
     const orderBy = req.query.order_by || (sortBy === 'name' ? 'asc' : 'desc');
 
-    return { page, limit, search, sortBy, orderBy };
+    const extra = {};
+    for (const field of extraFields) {
+        extra[field] = req.query[field] ?? null;
+    }
+
+    return {
+        page,
+        limit,
+        search,
+        sortBy,
+        orderBy,
+        ...extra
+    };
 };

src/utils/SearchFilter.js

@@ -11,34 +11,75 @@
 //     };
 // };
 
-exports.SearchFilter = (search = '', fields = []) => {
-    if (!search || fields.length === 0) return {};
+// exports.SearchFilter = (search = '', fields = []) => {
+//     if (!search || fields.length === 0) return {};
 
-    const or = [];
+//     const or = [];
 
-    for (const field of fields) {
-        const parts = field.split('.');
+//     for (const field of fields) {
+//         const parts = field.split('.');
+//         if (parts.length === 1) {
+//             or.push({
+//                 [field]: {
+//                     contains: search,
+//                     mode: 'insensitive',
+//                 },
+//             });
+//         } else if (parts.length === 2) {
+//             const [relation, subfield] = parts;
+//             or.push({
+//                 [relation]: {
+//                     is: {
+//                         [subfield]: {
+//                             contains: search,
+//                             mode: 'insensitive',
+//                         }
+//                     }
+//                 }
+//             });
+//         }
+//     }
+
+//     return { OR: or };
+// };
+
+exports.SearchFilter = (search = '', fields = [], arrayRelations = []) => {
+    if (!search || fields.length === 0) return {};
+
+    const buildNestedFilter = (parts, value) => {
         if (parts.length === 1) {
-            or.push({
-                [field]: {
-                    contains: search,
+            return {
+                [parts[0]]: {
+                    contains: value,
                     mode: 'insensitive',
                 },
-            });
-        } else if (parts.length === 2) {
-            const [relation, subfield] = parts;
-            or.push({
-                [relation]: {
-                    is: {
-                        [subfield]: {
-                            contains: search,
-                            mode: 'insensitive',
-                        }
-                    }
-                }
-            });
+            };
         }
-    }
+
+        const [current, ...rest] = parts;
+
+        const nested = buildNestedFilter(rest, value);
+
+        // Jika current adalah array relation
+        if (arrayRelations.includes(current)) {
+            return {
+                [current]: {
+                    some: nested,
+                },
+            };
+        } else {
+            return {
+                [current]: {
+                    is: nested,
+                },
+            };
+        }
+    };
+
+    const or = fields.map(field => {
+        const parts = field.split('.');
+        return buildNestedFilter(parts, search);
+    });
 
     return { OR: or };
 };

src/validators/admin/executives_history/ExecutivesHistoriValidators.js

@@ -0,0 +1,77 @@
+const HttpException = require('../../../utils/HttpException.js');
+
+exports.validateStoreExecutivesHistoryRequest = (body) => {
+    const { executive_name, contact, status, start_term, end_term } = body;
+
+    const errors = {};
+
+    // if (!executive_name || executive_name.trim() === '') {
+    //     errors.executive_name = ['Executive name is required'];
+    // }
+
+    // if (!contact || contact.trim() === '') {
+    //     errors.contact = ['Contact is required'];
+    // }
+
+    // if (!status || status.trim() === '') {
+    //     errors.status = ['Status is required'];
+    // } else if (!['active', 'inactive'].includes(status.trim().toLowerCase())) {
+    //     errors.status = ['Status must be either "active" or "inactive"'];
+    // }
+
+    // if (!start_term || start_term.trim() === '') {
+    //     errors.start_term = ['Start term date is required'];
+    // } else if (isNaN(Date.parse(start_term))) {
+    //     errors.start_term = ['Start term date must be a valid date'];
+    // }
+
+    // if (!end_term || end_term.trim() === '') {
+    //     errors.end_term = ['End term expired date is required'];
+    // } else if (isNaN(Date.parse(end_term))) {
+    //     errors.end_term = ['End term expired date must be a valid date'];
+    // }
+
+    // if (
+    //     !errors.start_term &&
+    //     !errors.end_term &&
+    //     new Date(end_term) <= new Date(start_term)
+    // ) {
+    //     errors.end_term = ['End term expired date must be after start term date'];
+    // }
+
+    if (!status || status.trim() === '') {
+        errors.status = ['Status is required'];
+    } else if (!['active', 'inactive'].includes(status.trim().toLowerCase())) {
+        errors.status = ['Status must be either "active" or "inactive"'];
+    }
+
+    if (start_term && isNaN(Date.parse(start_term))) {
+        errors.start_term = ['Start term date must be a valid date'];
+    }
+
+    if (end_term && isNaN(Date.parse(end_term))) {
+        errors.end_term = ['End term expired date must be a valid date'];
+    }
+
+    if (
+        start_term &&
+        end_term &&
+        !errors.start_term &&
+        !errors.end_term &&
+        new Date(end_term) <= new Date(start_term)
+    ) {
+        errors.end_term = ['End term expired date must be after start term date'];
+    }
+
+    if (Object.keys(errors).length > 0) {
+        throw new HttpException(errors, 422);
+    }
+
+    return {
+        executive_name: executive_name?.trim() || null,
+        contact: contact?.trim() || null,
+        status: status.trim().toLowerCase(),
+        start_term: start_term ? new Date(start_term) : null,
+        end_term: end_term ? new Date(end_term) : null,
+    };
+};

src/validators/admin/hospital/HospitalValidators.js

@@ -1,7 +1,7 @@
 const HttpException = require('../../../utils/HttpException.js');
 
 exports.validateStoreHospitalRequest = (body) => {
-    const { name, hospital_code, type, ownership, province_id, city_id, address, simrs_type, contact, note } = body;
+    const { name, hospital_code, type, ownership, province_id, city_id, address, contact, note } = body;
 
     const errors = {};
 
@@ -33,9 +33,9 @@ exports.validateStoreHospitalRequest = (body) => {
         errors.address = ['address is required'];
     }
 
-    if (!simrs_type || simrs_type.trim() === '') {
-        errors.simrs_type = ['simrs type is required'];
-    }
+    // if (!simrs_type || simrs_type.trim() === '') {
+    //     errors.simrs_type = ['simrs type is required'];
+    // }
 
     if (!contact || contact.trim() === '') {
         errors.contact = ['contact is required'];
@@ -57,14 +57,14 @@ exports.validateStoreHospitalRequest = (body) => {
         province_id: province_id.trim(),
         city_id: city_id.trim(),
         address: address.trim(),
-        simrs_type: simrs_type.trim(),
+        // simrs_type: simrs_type.trim(),
         contact: contact.trim(),
         note: note.trim(),
     };
 };
 
 exports.validateUpdateHospitalRequest = (body) => {
-    const { name, hospital_code, type, ownership, province_id, city_id, address, simrs_type, progress_status, contact, note } = body;
+    const { name, hospital_code, type, ownership, province_id, city_id, address, progress_status, contact, note } = body;
 
     const errors = {};
 
@@ -96,9 +96,9 @@ exports.validateUpdateHospitalRequest = (body) => {
         errors.address = ['address is required'];
     }
 
-    if (!simrs_type || simrs_type.trim() === '') {
-        errors.simrs_type = ['simrs type is required'];
-    }
+    // if (!simrs_type || simrs_type.trim() === '') {
+    //     errors.simrs_type = ['simrs type is required'];
+    // }
 
     if (!progress_status || progress_status.trim() === '') {
         errors.progress_status = ['progress status is required'];
@@ -124,7 +124,7 @@ exports.validateUpdateHospitalRequest = (body) => {
         province_id: province_id.trim(),
         city_id: city_id.trim(),
         address: address.trim(),
-        simrs_type: simrs_type.trim(),
+        // simrs_type: simrs_type.trim(),
         progress_status: progress_status.trim(),
         contact: contact.trim(),
         note: note.trim(),

src/validators/admin/vendor/VendorValidators.js

@@ -0,0 +1,35 @@
+const HttpException = require('../../../utils/HttpException.js');
+
+exports.validateStoreVendorRequest = (body) => {
+    const { name, name_pt, strengths, weaknesses, website } = body;
+
+    const errors = {};
+
+    if (!name || name.trim() === '') {
+        errors.name = ['Vendor name is required'];
+    }
+    if (!name_pt || name_pt.trim() === '') {
+        errors.name_pt = ['Vendor name pt is required'];
+    }
+    if (!strengths || strengths.trim() === '') {
+        errors.strengths = ['Vendor strengths is required'];
+    }
+    if (!weaknesses || weaknesses.trim() === '') {
+        errors.weaknesses = ['Vendor weaknesses is required'];
+    }
+    if (!website || website.trim() === '') {
+        errors.website = ['Vendor website is required'];
+    }
+
+    if (Object.keys(errors).length > 0) {
+        throw new HttpException(errors, 422);
+    }
+
+    return {
+        name: name.trim(),
+        name_pt: name_pt.trim(),
+        strengths: strengths.trim(),
+        weaknesses: weaknesses.trim(),
+        website: website.trim(),
+    };
+};

src/validators/admin/vendor_history/VendorHistoriValidators.js

@@ -0,0 +1,73 @@
+const HttpException = require('../../../utils/HttpException.js');
+
+exports.validateStoreVendorHistoryRequest = (body) => {
+    const { simrs_type, vendor_id, vendor_impression, status, contract_date, contract_expired_date } = body;
+
+    const errors = {};
+
+    if (!simrs_type || simrs_type.trim() === '') {
+        errors.simrs_type = ['simrs type is required'];
+    } else if (!['vendor', 'gratis', 'in house'].includes(simrs_type.trim().toLowerCase())) {
+        errors.simrs_type = ['Simrs type must be either "vendor", "gratis", or "in house"'];
+    }
+
+    // if (!vendor_id || vendor_id.trim() === '') {
+    //     errors.vendor_id = ['Vendor id is required'];
+    // }
+
+    // if (!vendor_impression || vendor_impression.trim() === '') {
+    //     errors.vendor_impression = ['Vendor impression is required'];
+    // }
+
+    if (!['active', 'inactive'].includes(status.trim().toLowerCase())) {
+        errors.status = ['Status must be either "active" or "inactive"'];
+    }
+
+    // if (!status || status.trim() === '') {
+    //     errors.status = ['Status is required'];
+    // } else if (!['active', 'inactive'].includes(status.trim().toLowerCase())) {
+    //     errors.status = ['Status must be either "active" or "inactive"'];
+    // }
+
+    if (contract_date !== null && contract_date !== '' && isNaN(Date.parse(contract_date))) {
+        errors.contract_date = ['Contract date must be a valid date'];
+    }
+
+
+    // if (!contract_date || contract_date.trim() === '') {
+    //     errors.contract_date = ['Contract date is required'];
+    // } else if (isNaN(Date.parse(contract_date))) {
+    //     errors.contract_date = ['Contract date must be a valid date'];
+    // }
+
+    if (contract_expired_date !== null && contract_expired_date !== '' && isNaN(Date.parse(contract_expired_date))) {
+        errors.contract_expired_date = ['Contract expired date must be a valid date'];
+    }
+
+    // if (!contract_expired_date || contract_expired_date.trim() === '') {
+    //     errors.contract_expired_date = ['Contract expired date is required'];
+    // } else if (isNaN(Date.parse(contract_expired_date))) {
+    //     errors.contract_expired_date = ['Contract expired date must be a valid date'];
+    // }
+
+    if (
+        !errors.contract_date &&
+        !errors.contract_expired_date &&
+        new Date(contract_expired_date) <= new Date(contract_date)
+    ) {
+        errors.contract_expired_date = ['Contract expired date must be after contract date'];
+    }
+
+    if (Object.keys(errors).length > 0) {
+        throw new HttpException(errors, 422);
+    }
+
+    return {
+        simrs_type: simrs_type.trim(),
+        vendor_id: vendor_id ? vendor_id.trim() : null,
+        vendor_impression: vendor_impression ? vendor_impression.trim() : null,
+        status: status.trim().toLowerCase(),
+        contract_date: contract_date ? new Date(contract_date) : null,
+        contract_expired_date: contract_expired_date ? new Date(contract_expired_date) : null,
+    };
+};

src/validators/sales/executives_history/ExecutivesHistoriValidators.js

@@ -0,0 +1,77 @@
+const HttpException = require('../../../utils/HttpException.js');
+
+exports.validateStoreExecutivesHistoryRequest = (body) => {
+    const { executive_name, contact, status, start_term, end_term } = body;
+
+    const errors = {};
+
+    // if (!executive_name || executive_name.trim() === '') {
+    //     errors.executive_name = ['Executive name is required'];
+    // }
+
+    // if (!contact || contact.trim() === '') {
+    //     errors.contact = ['Contact is required'];
+    // }
+
+    // if (!status || status.trim() === '') {
+    //     errors.status = ['Status is required'];
+    // } else if (!['active', 'inactive'].includes(status.trim().toLowerCase())) {
+    //     errors.status = ['Status must be either "active" or "inactive"'];
+    // }
+
+    // if (!start_term || start_term.trim() === '') {
+    //     errors.start_term = ['Start term date is required'];
+    // } else if (isNaN(Date.parse(start_term))) {
+    //     errors.start_term = ['Start term date must be a valid date'];
+    // }
+
+    // if (!end_term || end_term.trim() === '') {
+    //     errors.end_term = ['End term expired date is required'];
+    // } else if (isNaN(Date.parse(end_term))) {
+    //     errors.end_term = ['End term expired date must be a valid date'];
+    // }
+
+    // if (
+    //     !errors.start_term &&
+    //     !errors.end_term &&
+    //     new Date(end_term) <= new Date(start_term)
+    // ) {
+    //     errors.end_term = ['End term expired date must be after start term date'];
+    // }
+
+    if (!status || status.trim() === '') {
+        errors.status = ['Status is required'];
+    } else if (!['active', 'inactive'].includes(status.trim().toLowerCase())) {
+        errors.status = ['Status must be either "active" or "inactive"'];
+    }
+
+    if (start_term && isNaN(Date.parse(start_term))) {
+        errors.start_term = ['Start term date must be a valid date'];
+    }
+
+    if (end_term && isNaN(Date.parse(end_term))) {
+        errors.end_term = ['End term expired date must be a valid date'];
+    }
+
+    if (
+        start_term &&
+        end_term &&
+        !errors.start_term &&
+        !errors.end_term &&
+        new Date(end_term) <= new Date(start_term)
+    ) {
+        errors.end_term = ['End term expired date must be after start term date'];
+    }
+
+    if (Object.keys(errors).length > 0) {
+        throw new HttpException(errors, 422);
+    }
+
+    return {
+        executive_name: executive_name?.trim() || null,
+        contact: contact?.trim() || null,
+        status: status.trim().toLowerCase(),
+        start_term: start_term ? new Date(start_term) : null,
+        end_term: end_term ? new Date(end_term) : null,
+    };
+};

src/validators/sales/vendor/VendorValidators.js

@@ -0,0 +1,35 @@
+const HttpException = require('../../../utils/HttpException.js');
+
+exports.validateStoreVendorRequest = (body) => {
+    const { name, name_pt, strengths, weaknesses, website } = body;
+
+    const errors = {};
+
+    if (!name || name.trim() === '') {
+        errors.name = ['Vendor name is required'];
+    }
+    // if (!name_pt || name_pt.trim() === '') {
+    //     errors.name_pt = ['Vendor name pt is required'];
+    // }
+    // if (!strengths || strengths.trim() === '') {
+    //     errors.strengths = ['Vendor strengths is required'];
+    // }
+    // if (!weaknesses || weaknesses.trim() === '') {
+    //     errors.weaknesses = ['Vendor weaknesses is required'];
+    // }
+    // if (!website || website.trim() === '') {
+    //     errors.website = ['Vendor website is required'];
+    // }
+
+    if (Object.keys(errors).length > 0) {
+        throw new HttpException(errors, 422);
+    }
+
+    return {
+        name: name.trim(),
+        name_pt: name_pt.trim(),
+        strengths: strengths.trim(),
+        weaknesses: weaknesses.trim(),
+        website: website.trim(),
+    };
+};

src/validators/sales/vendor_history/VendorHistoriValidators.js

@@ -0,0 +1,73 @@
+const HttpException = require('../../../utils/HttpException.js');
+
+exports.validateStoreVendorHistoryRequest = (body) => {
+    const { simrs_type, vendor_id, vendor_impression, status, contract_date, contract_expired_date } = body;
+
+    const errors = {};
+
+    if (!simrs_type || simrs_type.trim() === '') {
+        errors.simrs_type = ['simrs type is required'];
+    } else if (!['vendor', 'gratis', 'in house'].includes(simrs_type.trim().toLowerCase())) {
+        errors.simrs_type = ['Simrs type must be either "vendor", "gratis", or "in house"'];
+    }
+
+    // if (!vendor_id || vendor_id.trim() === '') {
+    //     errors.vendor_id = ['Vendor id is required'];
+    // }
+
+    // if (!vendor_impression || vendor_impression.trim() === '') {
+    //     errors.vendor_impression = ['Vendor impression is required'];
+    // }
+
+    if (!['active', 'inactive'].includes(status.trim().toLowerCase())) {
+        errors.status = ['Status must be either "active" or "inactive"'];
+    }
+
+    // if (!status || status.trim() === '') {
+    //     errors.status = ['Status is required'];
+    // } else if (!['active', 'inactive'].includes(status.trim().toLowerCase())) {
+    //     errors.status = ['Status must be either "active" or "inactive"'];
+    // }
+
+    if (contract_date !== null && contract_date !== '' && isNaN(Date.parse(contract_date))) {
+        errors.contract_date = ['Contract date must be a valid date'];
+    }
+
+
+    // if (!contract_date || contract_date.trim() === '') {
+    //     errors.contract_date = ['Contract date is required'];
+    // } else if (isNaN(Date.parse(contract_date))) {
+    //     errors.contract_date = ['Contract date must be a valid date'];
+    // }
+
+    if (contract_expired_date !== null && contract_expired_date !== '' && isNaN(Date.parse(contract_expired_date))) {
+        errors.contract_expired_date = ['Contract expired date must be a valid date'];
+    }
+
+    // if (!contract_expired_date || contract_expired_date.trim() === '') {
+    //     errors.contract_expired_date = ['Contract expired date is required'];
+    // } else if (isNaN(Date.parse(contract_expired_date))) {
+    //     errors.contract_expired_date = ['Contract expired date must be a valid date'];
+    // }
+
+    if (
+        !errors.contract_date &&
+        !errors.contract_expired_date &&
+        new Date(contract_expired_date) <= new Date(contract_date)
+    ) {
+        errors.contract_expired_date = ['Contract expired date must be after contract date'];
+    }
+
+    if (Object.keys(errors).length > 0) {
+        throw new HttpException(errors, 422);
+    }
+
+    return {
+        simrs_type: simrs_type.trim(),
+        vendor_id: vendor_id ? vendor_id.trim() : null,
+        vendor_impression: vendor_impression ? vendor_impression.trim() : null,
+        status: status.trim().toLowerCase(),
+        contract_date: contract_date ? new Date(contract_date) : null,
+        contract_expired_date: contract_expired_date ? new Date(contract_expired_date) : null,
+    };
+};