update response user from keycloak

entrypoint.sh

@@ -14,3 +14,5 @@ npx prisma migrate dev --name init
 
 echo "🚀 Menjalankan aplikasi..."
 exec node index.js
+
+# cara jalaninnya, kan databaseseeder dulu, setelah itu node prisma/seeders/UserAreaSeeder, HospitalSeeder, VendorSeeder

prisma/migrations/20250722014110_add_relation_user/migration.sql

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

prisma/migrations/20250722023051_add_relation/migration.sql

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

prisma/schema.prisma

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

prisma/seeders/DatabaseSeeder.js

@@ -39,9 +39,9 @@ const { seedSumateraBaratCities } = require('./city/SumateraBaratCitySeeder');
 const { seedSumateraSelatanCities } = require('./city/SumateraSelatanCitySeeder');
 const { seedSumateraUtaraCities } = require('./city/SumateraUtaraCitySeeder');
 const { seedUsers } = require('./UserSeeder.js');
-const { seedVendors } = require('./VendorSeeder.js');
-const seedUserAreas = require('./UserAreaSeeder.js');
-const { seedHospitals } = require('./HospitalSeeder.js');
+// const { seedVendors } = require('./VendorSeeder.js');
+// const seedUserAreas = require('./UserAreaSeeder.js');
+// const { seedHospitals } = require('./HospitalSeeder.js');
 
 async function main() {
     await seedProvinces();
@@ -83,10 +83,9 @@ async function main() {
     await seedSumateraSelatanCities();
     await seedSumateraUtaraCities();
     await seedUsers();
-    await seedVendors();
-    await seedUserAreas();
-    await seedHospitals();
-    await seedVendors();
+    // await seedUserAreas();
+    // await seedHospitals();
+    // await seedVendors();
 }
 
 main().then(() => {

prisma/seeders/HospitalSeeder.js

@@ -3,8 +3,8 @@ 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' } });
+        const sales1 = await prisma.userKeycloak.findFirst({ where: { id: '26042443-e53a-44b1-ab52-12985e8bdad1' } });
+        const sales2 = await prisma.userKeycloak.findFirst({ where: { id: '49349b07-a46c-4686-a964-8bbcedbf63f2' } });
 
         if (!sales1 || !sales2) {
             throw new Error('User sales1 or sales2 not found');
@@ -131,4 +131,16 @@ async function seedHospitals() {
     }
 }
 
-module.exports = { seedHospitals };
+module.exports = { seedHospitals };
+
+if (require.main === module) {
+    seedHospitals()
+        .then(() => {
+            console.log('🌱 Seeder selesai!');
+            process.exit(0);
+        })
+        .catch((err) => {
+            console.error('❌ Error saat seeding:', err);
+            process.exit(1);
+        });
+}

prisma/seeders/UserAreaSeeder.js

@@ -3,8 +3,8 @@ 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' } });
+        const sales1 = await prisma.userKeycloak.findFirst({ where: { id: '26042443-e53a-44b1-ab52-12985e8bdad1' } });
+        const sales2 = await prisma.userKeycloak.findFirst({ where: { id: '49349b07-a46c-4686-a964-8bbcedbf63f2' } });
 
         if (!sales1 || !sales2) {
             throw new Error('User sales1 or sales2 not found');
@@ -38,4 +38,16 @@ async function seedUserAreas() {
     }
 }
 
-module.exports = seedUserAreas;
+module.exports = seedUserAreas;
+
+if (require.main === module) {
+    seedUserAreas()
+        .then(() => {
+            console.log('🌱 Seeder selesai!');
+            process.exit(0);
+        })
+        .catch((err) => {
+            console.error('❌ Error saat seeding:', err);
+            process.exit(1);
+        });
+}

prisma/seeders/VendorSeeder.js

@@ -3,9 +3,9 @@ const prisma = require('../../src/prisma/PrismaClient.js');
 async function seedVendors() {
     try {
         // cari user role admin
-        const adminUser = await prisma.user.findFirst({
+        const adminUser = await prisma.userKeycloak.findFirst({
             where: {
-                username: 'admin1',
+                id: 'ffc58d77-b098-4cc2-ad99-6eeeac8d87ab',
             },
         });
 
@@ -54,4 +54,16 @@ async function seedVendors() {
     }
 }
 
-module.exports = { seedVendors };
+module.exports = { seedVendors };
+
+if (require.main === module) {
+    seedVendors()
+        .then(() => {
+            console.log('🌱 Seeder selesai!');
+            process.exit(0);
+        })
+        .catch((err) => {
+            console.error('❌ Error saat seeding:', err);
+            process.exit(1);
+        });
+}

src/controllers/admin/VendorController.js

@@ -22,8 +22,8 @@ exports.getAllVendor = async (req, res) => {
 exports.showVendor = async (req, res) => {
     try {
         const id = req.params.id;
-        const { vendor, userName } = await vendorService.showVendorService(id);
-        return VendorResource(res, vendor, userName, 'Success show vendor');
+        const { vendor } = await vendorService.showVendorService(id);
+        return VendorResource(res, vendor, 'Success show vendor');
     } catch (err) {
         return errorResponse(res, err);
     }

src/controllers/sales/HospitalController.js

@@ -41,8 +41,8 @@ exports.updateHospital = async (req, res) => {
 exports.showHospital = async (req, res) => {
     try {
         const id = req.params.id;
-        const { hospital, userName } = await showHospitalService(id);
-        return HospitalResource(res, hospital, userName, 'Success show hospital');
+        const { hospital } = await showHospitalService(id);
+        return HospitalResource(res, hospital, 'Success show hospital');
     } catch (err) {
         return errorResponse(res, err);
     }

src/repository/admin/HospitalRepository.js

@@ -27,6 +27,7 @@ const HospitalRepository = {
                 created_by: true,
                 createdAt: true,
                 updatedAt: true,
+                user: { select: { id: true, fullname: true } },
                 vendor_experiences: {
                     where: {
                         status: "active",
@@ -49,10 +50,10 @@ const HospitalRepository = {
         });
 
         return hospitalsRaw.map(hospital => {
-            const { vendor_histories, ...rest } = hospital;
+            const { vendor_experiences, ...rest } = hospital;
             return {
                 ...rest,
-                vendor: vendor_histories?.[0]?.vendor || null
+                vendor: vendor_experiences?.[0]?.vendor || null
             };
         });
     },
@@ -87,6 +88,7 @@ const HospitalRepository = {
                 created_by: true,
                 createdAt: true,
                 updatedAt: true,
+                user: { select: { id: true, fullname: true } },
                 vendor_experiences: {
                     where: {
                         status: "active",
@@ -111,10 +113,10 @@ const HospitalRepository = {
 
         if (!hospitalRaw) return null;
 
-        const { vendor_histories, ...rest } = hospitalRaw;
+        const { vendor_experiences, ...rest } = hospitalRaw;
         return {
             ...rest,
-            vendor: vendor_histories?.[0]?.vendor || null
+            vendor: vendor_experiences?.[0]?.vendor || null
         };
     },
 

src/repository/admin/StatusHistoryRepository.js

@@ -34,15 +34,15 @@ const StatusHistoryRepository = {
                         // image: true,
                         progress_status: true,
                         // note: true,
-                        // user: {
-                        //     select: {
-                        //         id: true,
-                        //         username: true
-                        //     }
-                        // }
                     }
                 },
-                user_id: true,
+                user: {
+                    select: {
+                        id: true,
+                        fullname: true
+                    }
+                },
+                // user_id: true,
                 old_status: true,
                 new_status: true,
                 note: true,

src/repository/admin/VendorRepository.js

@@ -15,7 +15,7 @@ const VendorRepository = {
                 strengths: true,
                 weaknesses: true,
                 website: true,
-                created_by: true,
+                user: { select: { id: true, fullname: true } },
                 _count: {
                     select: {
                         vendor_experiences: {
@@ -58,7 +58,7 @@ const VendorRepository = {
                 strengths: true,
                 weaknesses: true,
                 website: true,
-                created_by: true,
+                user: { select: { id: true, fullname: true } },
                 _count: {
                     select: {
                         vendor_experiences: {

src/repository/sales/AreaRepository.js

@@ -9,7 +9,6 @@ const AreaRepository = {
             orderBy,
             select: {
                 id: true,
-                user_id: true,
                 province: {
                     select: {
                         id: true,

src/repository/sales/HospitalRepository.js

@@ -26,6 +26,7 @@ const HospitalRepository = {
                 created_by: true,
                 createdAt: true,
                 updatedAt: true,
+                user: { select: { id: true, fullname: true } },
                 vendor_experiences: {
                     where: {
                         status: "active",
@@ -48,10 +49,10 @@ const HospitalRepository = {
         });
 
         return hospitalsRaw.map(hospital => {
-            const { vendor_histories, ...rest } = hospital;
+            const { vendor_experiences, ...rest } = hospital;
             return {
                 ...rest,
-                vendor: vendor_histories?.[0]?.vendor || null
+                vendor: vendor_experiences?.[0]?.vendor || null
             };
         });
     },
@@ -89,6 +90,7 @@ const HospitalRepository = {
                 created_by: true,
                 createdAt: true,
                 updatedAt: true,
+                user: { select: { id: true, fullname: true } },
                 vendor_experiences: {
                     where: {
                         status: "active",
@@ -113,10 +115,10 @@ const HospitalRepository = {
 
         if (!hospitalRaw) return null;
 
-        const { vendor_histories, ...rest } = hospitalRaw;
+        const { vendor_experiences, ...rest } = hospitalRaw;
         return {
             ...rest,
-            vendor: vendor_histories?.[0]?.vendor || null
+            vendor: vendor_experiences?.[0]?.vendor || null
         };
     },
 
@@ -139,6 +141,7 @@ const HospitalRepository = {
     //         }
     //     });
     // },
+
     update: async (id, data) => {
         return prisma.hospital.update({
             where: { id },

src/repository/sales/StatusHistoryRepository.js

@@ -42,13 +42,13 @@ const StatusHistoryRepository = {
                         // }
                     }
                 },
-                // user: {
-                //     select: {
-                //         id: true,
-                //         username: true,
-                //     }
-                // },
-                user_id: true,
+                user: {
+                    select: {
+                        id: true,
+                        fullname: true,
+                    }
+                },
+                // user_id: true,
                 old_status: true,
                 new_status: true,
                 note: true,

src/resources/admin/hospital/HospitalCollection.js

@@ -5,14 +5,14 @@ const { getUserNameById } = require("../../../utils/CheckUserKeycloak.js");
 // Fungsi transform per item
 const transformHospitalList = async (data = []) => {
     return Promise.all(data.map(async ({ created_by, ...rest }) => {
-        const name = await getUserNameById(created_by);
+        // const name = await getUserNameById(created_by);
 
         return {
             ...rest,
-            user: {
-                id: created_by,
-                name: name
-            },
+            // user: {
+            //     id: created_by,
+            //     name: name
+            // },
             createdAt: formatISOWithoutTimezone(rest.createdAt),
             updatedAt: formatISOWithoutTimezone(rest.updatedAt)
         };

src/resources/admin/status_history/StatusHistoryCollection.js

@@ -3,15 +3,15 @@ const { formatISOWithoutTimezone } = require("../../../utils/FormatDate.js");
 const { getUserNameById } = require("../../../utils/CheckUserKeycloak.js");
 
 const transformStatusHistoryList = async (data = []) => {
-    return Promise.all(data.map(async ({ user_id, ...rest }) => {
-        const name = await getUserNameById(user_id);
+    return Promise.all(data.map(async ({ ...rest }) => {
+        // const name = await getUserNameById(user_id);
 
         return {
             ...rest,
-            user: {
-                id: user_id,
-                name: name
-            },
+            // user: {
+            //     id: user_id,
+            //     name: name
+            // },
             note: rest.note?.trim() === '' ? null : rest.note,
             createdAt: formatISOWithoutTimezone(rest.createdAt),
             updatedAt: formatISOWithoutTimezone(rest.updatedAt)

src/resources/admin/vendor/VendorCollection.js

@@ -3,15 +3,15 @@ const { formatISOWithoutTimezone } = require("../../../utils/FormatDate.js");
 const { getUserNameById } = require("../../../utils/CheckUserKeycloak");
 
 const transformVendorList = async (data = []) => {
-    return Promise.all(data.map(async ({ created_by, ...rest }) => {
-        const name = await getUserNameById(created_by);
+    return Promise.all(data.map(async ({ ...rest }) => {
+        // const name = await getUserNameById(created_by);
 
         return {
             ...rest,
-            user: {
-                id: created_by,
-                name: name
-            },
+            // user: {
+            //     id: created_by,
+            //     name: name
+            // },
             createdAt: formatISOWithoutTimezone(rest.createdAt),
             updatedAt: formatISOWithoutTimezone(rest.updatedAt)
         };

src/resources/admin/vendor/VendorResource.js

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

src/resources/sales/area/UserAreaCollection.js

@@ -2,15 +2,15 @@ const { getUserNameById } = require("../../../utils/CheckUserKeycloak");
 const { ListResponse } = require("../../../utils/ListResponse");
 
 const transformArea = async (data = []) => {
-    return Promise.all(data.map(async ({ user_id, ...rest }) => {
-        const name = await getUserNameById(user_id);
+    return Promise.all(data.map(async ({ ...rest }) => {
+        // const name = await getUserNameById(user_id);
 
         return {
             ...rest,
-            user: {
-                id: user_id,
-                name: name
-            },
+            // user: {
+            //     id: user_id,
+            //     name: name
+            // },
         };
     }));
 };

src/resources/sales/hospital/HospitalCollection.js

@@ -5,14 +5,14 @@ const { getUserNameById } = require("../../../utils/CheckUserKeycloak.js");
 // Fungsi transform per item
 const transformHospitalList = async (data = []) => {
     return Promise.all(data.map(async ({ created_by, ...rest }) => {
-        const name = await getUserNameById(created_by);
+        // const name = await getUserNameById(created_by);
 
         return {
             ...rest,
-            user: {
-                id: created_by,
-                name: name
-            },
+            // user: {
+            //     id: created_by,
+            //     name: name
+            // },
             createdAt: formatISOWithoutTimezone(rest.createdAt),
             updatedAt: formatISOWithoutTimezone(rest.updatedAt)
         };

src/resources/sales/hospital/HospitalResource.js

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

src/resources/sales/status_history/StatusHistoryCollection.js

@@ -3,15 +3,15 @@ const { formatISOWithoutTimezone } = require("../../../utils/FormatDate.js");
 const { getUserNameById } = require("../../../utils/CheckUserKeycloak.js");
 
 const transformStatusHistoryList = async (data = []) => {
-    return Promise.all(data.map(async ({ user_id, ...rest }) => {
-        const name = await getUserNameById(user_id);
+    return Promise.all(data.map(async ({ ...rest }) => {
+        // const name = await getUserNameById(user_id);
 
         return {
             ...rest,
-            user: {
-                id: user_id,
-                name: name
-            },
+            // user: {
+            //     id: user_id,
+            //     name: name
+            // },
             note: rest.note?.trim() === '' ? null : rest.note,
             createdAt: formatISOWithoutTimezone(rest.createdAt),
             updatedAt: formatISOWithoutTimezone(rest.updatedAt)

src/routes/admin/HospitalRoute.js

@@ -33,9 +33,9 @@ const checkRoles = require('../../middleware/CheckRoles.js');
 // router.delete('/:id/executives-history/:id_executives_history', verifyJWT, checkRole(['admin']), executivesHistoryController.deleteExecutivesHistory);
 
 router.get('/', [keycloak.protect(), extractToken, checkRoles(["admin"])], hospitalController.getAllHospital);
-router.post('/', [keycloak.protect(), extractToken, checkRoles(["admin", "admin"])], upload.single('image'), hospitalController.storeHospital);
+router.post('/', [keycloak.protect(), extractToken, checkRoles(["admin"])], upload.single('image'), hospitalController.storeHospital);
 router.get('/:id', [keycloak.protect(), extractToken, checkRoles(["admin"])], hospitalController.showHospital);
-router.patch('/:id', [keycloak.protect(), extractToken, checkRoles(["admin", "admin"])], upload.single('image'), hospitalController.updateHospital);
+router.patch('/:id', [keycloak.protect(), extractToken, checkRoles(["admin"])], upload.single('image'), hospitalController.updateHospital);
 router.delete('/:id', [keycloak.protect(), extractToken, checkRoles(["admin"])], hospitalController.deleteHospital);
 
 // Vendor History

src/services/admin/VendorService.js

@@ -29,9 +29,9 @@ exports.showVendorService = async (id) => {
         throw new HttpException("Data vendor not found", 404);
     }
 
-    const userName = await getUserNameById(vendor.created_by);
+    // const userName = await getUserNameById(vendor.created_by);
 
-    return { vendor, userName };
+    return { vendor };
 };
 
 exports.storeVendorService = async (validateData, req) => {

src/services/sales/HospitalService.js

@@ -300,7 +300,7 @@ exports.showHospitalService = async (id) => {
         throw new HttpException("Data hospital not found", 404);
     }
 
-    const userName = await getUserNameById(hospital.created_by);
+    // const userName = await getUserNameById(hospital.created_by);
 
-    return { hospital, userName };
+    return { hospital };
 };

src/utils/LogActivity.js

@@ -64,22 +64,63 @@ const { getUserNameById } = require('./CheckUserKeycloak.js');
 
 // };
 // 3
+// const baseLog = async ({ req, action, data }) => {
+//     try {
+//         let userId, username;
+
+//         // Ambil userId dari token Keycloak
+//         if (req?.tokenData?.sub) {
+//             userId = req.tokenData.sub;
+//             username = await getUserNameById(userId);
+//         }
+
+//         // Fallback kalau tokenData tidak ada
+//         if (!userId || !username) {
+//             userId = data?.id;
+//             username = data?.username;
+//         }
+
+//         if (!userId || !username) return;
+
+//         await prisma.activityLog.create({
+//             data: {
+//                 user_id: userId,
+//                 username,
+//                 action: JSON.stringify({ [action]: data }),
+//                 createdAt: timeLocal.now().toDate(),
+//                 updatedAt: timeLocal.now().toDate(),
+//                 deletedAt: null,
+//             }
+//         });
+//     } catch (err) {
+//         console.error('Failed to log activity:', err.message);
+//     }
+// };
+
 const baseLog = async ({ req, action, data }) => {
     try {
         let userId, username;
 
-        // Ambil userId dari token Keycloak
+        // Ambil user dari tabel userKeycloak berdasarkan token.sub
         if (req?.tokenData?.sub) {
-            userId = req.tokenData.sub;
-            username = await getUserNameById(userId);
+            const user = await prisma.userKeycloak.findUnique({
+                where: { id: req.tokenData.sub },
+                select: { id: true, fullname: true }
+            });
+
+            if (user) {
+                userId = user.id;
+                username = user.fullname;
+            }
         }
 
-        // Fallback kalau tokenData tidak ada
+        // Fallback (misalnya digunakan di luar request auth)
         if (!userId || !username) {
             userId = data?.id;
             username = data?.username;
         }
 
+        // Skip jika tetap tidak ada userId atau username
         if (!userId || !username) return;
 
         await prisma.activityLog.create({