update use token keycloak all routes

src/controllers/admin/HospitalController.js

@@ -13,7 +13,7 @@ exports.getAllHospital = async (req, res) => {
             page, limit, search, sortBy, orderBy, province, city, type, ownership, progress_status
         });
 
-        return HospitalCollection(req, res, hospitals, total, page, limit, 'Hospital data successfully retrieved');
+        return HospitalCollection({ req, res, data: hospitals, total, page, limit, message: 'Hospital data successfully retrieved' });
     } catch (err) {
         return errorResponse(res, err);
     }

src/controllers/admin/StatusHistoryController.js

@@ -12,7 +12,7 @@ exports.getAllStatusHistory = async (req, res) => {
             page, limit, search, sortBy, orderBy
         }, req);
 
-        return StatusHistoryCollection(req, res, status_histories, total, page, limit, 'Status history successfully retrieved');
+        return StatusHistoryCollection({ req, res, data: status_histories, total, page, limit, message: 'Status history successfully retrieved' });
     } catch (err) {
         return errorResponse(res, err);
     }

src/controllers/sales/StatusHistoryController.js

@@ -1,7 +1,7 @@
 const { PaginationParam } = require("../../utils/PaginationParams");
 const statusHistoryService = require('../../services/sales/StatusHistoryService.js');
 const { validateCreateStatusHisotryRequest } = require("../../validators/admin/status_history/StatusHistoryValidators.js");
-const { StatusHistoryCollection } = require("../../resources/admin/status_history/StatusHistoryCollection.js");
+const { StatusHistoryCollection } = require("../../resources/sales/status_history/StatusHistoryCollection.js");
 const { errorResponse, messageSuccessResponse } = require("../../utils/Response.js");
 
 exports.getAllStatusHistory = async (req, res) => {
@@ -12,7 +12,7 @@ exports.getAllStatusHistory = async (req, res) => {
             page, limit, search, sortBy, orderBy
         }, req);
 
-        return StatusHistoryCollection(req, res, status_histories, total, page, limit, 'Status history successfully retrieved');
+        return StatusHistoryCollection({ req, res, data: status_histories, total, page, limit, message: 'Status history successfully retrieved' });
     } catch (err) {
         return errorResponse(res, err);
     }

src/repository/admin/ExecutivesHistoryRepository.js

@@ -34,12 +34,7 @@ const ExecutivesHistoryRepository = {
                         image: true,
                         progress_status: true,
                         note: true,
-                        user: {
-                            select: {
-                                id: true,
-                                username: true
-                            }
-                        }
+                        created_by: true
                     }
                 },
                 executive_name: true,
@@ -90,12 +85,7 @@ const ExecutivesHistoryRepository = {
                         image: true,
                         progress_status: true,
                         note: true,
-                        user: {
-                            select: {
-                                id: true,
-                                username: true
-                            }
-                        }
+                        created_by: true
                     }
                 },
                 executive_name: true,

src/repository/admin/HospitalRepository.js

@@ -24,7 +24,7 @@ const HospitalRepository = {
                 latitude: true,
                 longitude: true,
                 gmaps_url: true,
-                user: { select: { id: true, username: true } },
+                created_by: true,
                 createdAt: true,
                 updatedAt: true,
                 // vendor_histories: {
@@ -74,7 +74,7 @@ const HospitalRepository = {
                 latitude: true,
                 longitude: true,
                 gmaps_url: true,
-                user: { select: { id: true, username: true } },
+                created_by: true,
                 createdAt: true,
                 updatedAt: true,
                 // vendor_histories: {

src/repository/admin/StatusHistoryRepository.js

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

src/repository/admin/VendorHistoryRepository.js

@@ -34,12 +34,7 @@ const VendorHistoryRepository = {
                         image: true,
                         progress_status: true,
                         note: true,
-                        user: {
-                            select: {
-                                id: true,
-                                username: true
-                            }
-                        }
+                        created_by: true
                     }
                 },
                 vendor: {
@@ -50,12 +45,7 @@ const VendorHistoryRepository = {
                         strengths: true,
                         weaknesses: true,
                         website: true,
-                        user: {
-                            select: {
-                                id: true,
-                                username: true
-                            }
-                        }
+                        created_by: true,
                     }
                 },
                 vendor_impression: true,
@@ -105,12 +95,7 @@ const VendorHistoryRepository = {
                         image: true,
                         progress_status: true,
                         note: true,
-                        user: {
-                            select: {
-                                id: true,
-                                username: true
-                            }
-                        }
+                        created_by: true
                     }
                 },
                 vendor: {
@@ -121,12 +106,7 @@ const VendorHistoryRepository = {
                         strengths: true,
                         weaknesses: true,
                         website: true,
-                        user: {
-                            select: {
-                                id: true,
-                                username: true
-                            }
-                        }
+                        created_by: true,
                     }
                 },
                 vendor_impression: true,

src/repository/sales/ExecutivesHistoryRepository.js

@@ -34,12 +34,13 @@ const ExecutivesHistoryRepository = {
                         image: true,
                         progress_status: true,
                         note: true,
-                        user: {
-                            select: {
-                                id: true,
-                                username: true
-                            }
-                        }
+                        // user: {
+                        //     select: {
+                        //         id: true,
+                        //         username: true
+                        //     }
+                        // }
+                        created_by: true
                     }
                 },
                 executive_name: true,
@@ -90,12 +91,7 @@ const ExecutivesHistoryRepository = {
                         image: true,
                         progress_status: true,
                         note: true,
-                        user: {
-                            select: {
-                                id: true,
-                                username: true
-                            }
-                        }
+                        created_by: true
                     }
                 },
                 executive_name: true,

src/repository/sales/StatusHistoryRepository.js

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

src/repository/sales/VendorHistoryRepository.js

@@ -34,12 +34,7 @@ const VendorHistoryRepository = {
                         image: true,
                         progress_status: true,
                         note: true,
-                        user: {
-                            select: {
-                                id: true,
-                                username: true
-                            }
-                        }
+                        created_by: true
                     }
                 },
                 vendor: {
@@ -50,12 +45,7 @@ const VendorHistoryRepository = {
                         strengths: true,
                         weaknesses: true,
                         website: true,
-                        user: {
-                            select: {
-                                id: true,
-                                username: true
-                            }
-                        }
+                        created_by: true,
                     }
                 },
                 vendor_impression: true,
@@ -105,12 +95,7 @@ const VendorHistoryRepository = {
                         image: true,
                         progress_status: true,
                         note: true,
-                        user: {
-                            select: {
-                                id: true,
-                                username: true
-                            }
-                        }
+                        created_by: true
                     }
                 },
                 vendor: {
@@ -121,12 +106,7 @@ const VendorHistoryRepository = {
                         strengths: true,
                         weaknesses: true,
                         website: true,
-                        user: {
-                            select: {
-                                id: true,
-                                username: true
-                            }
-                        }
+                        created_by: true,
                     }
                 },
                 vendor_impression: true,

src/resources/admin/hospital/HospitalCollection.js

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

src/resources/admin/status_history/StatusHistoryCollection.js

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

src/resources/sales/status_history/StatusHistoryCollection.js

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

src/routes/admin/HospitalRoute.js

@@ -3,6 +3,7 @@ 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 statusHistoriesController = require('../../controllers/admin/StatusHistoryController.js')
 // const verifyJWT = require('../../middleware/VerifyJWT.js');
 // const checkRole = require('../../middleware/CheckRole.js');
 const upload = require('../../middleware/UploadImage.js');
@@ -52,7 +53,7 @@ router.patch('/:id/executives-history/:id_executives_history', [keycloak.protect
 router.delete('/:id/executives-history/:id_executives_history', [keycloak.protect(), extractToken, checkRoles(["admin"])], executivesHistoryController.deleteExecutivesHistory);
 
 // Status History
-router.get('/:id/status-histories', verifyJWT, checkRole(['admin']), statusHistoriesController.getAllStatusHistory);
-router.post('/:id/status-histories', verifyJWT, checkRole(['admin']), statusHistoriesController.storeStatusHistory);
+router.get('/:id/status-histories', [keycloak.protect(), extractToken, checkRoles(["admin"])], statusHistoriesController.getAllStatusHistory);
+router.post('/:id/status-histories', [keycloak.protect(), extractToken, checkRoles(["admin"])], statusHistoriesController.storeStatusHistory);
 
 module.exports = router;

src/routes/sales/HospitalRoute.js

@@ -3,6 +3,7 @@ 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 statusHistoriesController = require('../../controllers/sales/StatusHistoryController.js')
 // const verifyJWT = require('../../middleware/VerifyJWT.js');
 // const checkRole = require('../../middleware/CheckRole.js');
 const upload = require('../../middleware/UploadImage.js');
@@ -49,7 +50,7 @@ router.get('/:id/executives-history/:id_executives_history', [keycloak.protect()
 router.patch('/:id/executives-history/:id_executives_history', [keycloak.protect(), extractToken, checkRoles(['sales'])], executivesHistoryController.updateExecutivesHistory);
 router.delete('/:id/executives-history/:id_executives_history', [keycloak.protect(), extractToken, checkRoles(['sales'])], executivesHistoryController.deleteExecutivesHistory);
 
-router.get('/:id/status-history', verifyJWT, checkRole(['sales']), statusHistoryController.getAllStatusHistory);
-router.post('/:id/status-history', verifyJWT, checkRole(['sales']), statusHistoryController.storeStatusHistory);
+router.get('/:id/status-history', [keycloak.protect(), extractToken, checkRoles(["sales"])], statusHistoriesController.getAllStatusHistory);
+router.post('/:id/status-history', [keycloak.protect(), extractToken, checkRoles(["sales"])], statusHistoriesController.storeStatusHistory);
 
 module.exports = router;

src/services/admin/StatusHistoryService.js

@@ -1,9 +1,6 @@
 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');
+const { createLog } = require('../../utils/LogActivity.js');
 const StatusHistoryRepository = require('../../repository/admin/StatusHistoryRepository.js');
 
 exports.getAllStatusHistoryService = async ({ page, limit, search, sortBy, orderBy }, req) => {
@@ -36,7 +33,7 @@ const validProgressStatuses = ['cari_data', 'dihubungi', 'negosiasi', 'follow_up
 
 exports.storeStatusHistoryService = async (validateData, req) => {
     const hospitalId = req.params.id;
-    const userId = req.user.id;
+    const userId = req.tokenData.sub;
 
     const hospital = await prisma.hospital.findFirst({
         where: {

src/services/sales/StatusHistoryService.js

@@ -6,7 +6,7 @@ const StatusHistoryRepository = require('../../repository/sales/StatusHistoryRep
 exports.getAllStatusHistoryService = async ({ page, limit, search, sortBy, orderBy }, req) => {
     const skip = (page - 1) * limit;
 
-    const userId = req.user.id;
+    const userId = req.tokenData.sub;
     const hospitalId = req.params.id;
     const hospital = await prisma.hospital.findFirst({
         where: {
@@ -45,7 +45,7 @@ const validProgressStatuses = ['cari_data', 'dihubungi', 'negosiasi', 'follow_up
 
 exports.storeStatusHistoryService = async (validateData, req) => {
     const hospitalId = req.params.id;
-    const userId = req.user.id;
+    const userId = req.tokenData.sub;
 
     const hospital = await prisma.hospital.findFirst({
         where: {