update vendor, hospital and logs related to sso keycloak

src/controllers/admin/VendorController.js

@@ -14,7 +14,7 @@ exports.getAllVendor = async (req, res) => {
             page, limit, search, sortBy, orderBy
         });
 
-        return VendorCollection(req, res, vendors, total, page, limit, 'Vendor data successfully retrieved');
+        return VendorCollection({ req, res, data: vendors, total, page, limit, message: 'Vendor data successfully retrieved' });
     } catch (err) {
         return errorResponse(res, err);
     }
@@ -23,8 +23,8 @@ exports.getAllVendor = async (req, res) => {
 exports.showVendor = async (req, res) => {
     try {
         const id = req.params.id;
-        const data = await vendorService.showVendorService(id);
-        return VendorResource(res, data, 'Success show vendor');
+        const { vendor, userName } = await vendorService.showVendorService(id);
+        return VendorResource(res, vendor, userName, 'Success show vendor');
     } catch (err) {
         return errorResponse(res, err);
     }

src/repository/admin/VendorRepository.js

@@ -15,15 +15,7 @@ const VendorRepository = {
                 strengths: true,
                 weaknesses: true,
                 website: true,
-                user: {
-                    select: {
-                        id: true,
-                        username: true,
-                        email: true,
-                        firstname: true,
-                        lastname: true,
-                    }
-                },
+                created_by: true,
                 _count: {
                     select: {
                         vendor_histories: {
@@ -66,15 +58,7 @@ const VendorRepository = {
                 strengths: true,
                 weaknesses: true,
                 website: true,
-                user: {
-                    select: {
-                        id: true,
-                        username: true,
-                        email: true,
-                        firstname: true,
-                        lastname: true,
-                    }
-                },
+                created_by: true,
                 _count: {
                     select: {
                         vendor_histories: {

src/resources/admin/vendor/VendorCollection.js

@@ -1,22 +1,26 @@
 const { ListResponse } = require("../../../utils/ListResponse");
 const { formatISOWithoutTimezone } = require("../../../utils/FormatDate.js");
+const { getUserNameById } = require("../../../utils/CheckUserKeycloak");
 
-const formatItem = (item) => ({
-    ...item,
-    createdAt: formatISOWithoutTimezone(item.createdAt),
-    updatedAt: formatISOWithoutTimezone(item.updatedAt)
-});
+const transformVendorList = async (data = []) => {
+    return Promise.all(data.map(async ({ created_by, ...rest }) => {
+        const name = await getUserNameById(created_by);
 
-exports.VendorCollection = (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.VendorCollection = async ({ req, res, data = [], total = 0, page = 1, limit = 10, message = 'Success' }) => {
+    const formatted = await transformVendorList(data);
 
-    return ListResponse({ req, res, data: formattedData, total, page, limit, message });
+    return ListResponse({ req, res, data: formatted, total, page, limit, message });
 };

src/resources/admin/vendor/VendorResource.js

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

src/services/admin/HospitalService.js

@@ -40,7 +40,7 @@ exports.showHospitalService = async (id) => {
 };
 
 exports.storeHospitalService = async (validateData, req) => {
-    const creatorId = req.user.id;
+    const creatorId = req.tokenData.sub;
     const province = await ProvinceRepository.findById(validateData.province_id);
     if (!province) {
         throw new HttpException('Province not found', 404);

src/services/admin/VendorService.js

@@ -5,6 +5,7 @@ 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');
+const { getUserNameById } = require('../../utils/CheckUserKeycloak.js');
 
 exports.getAllVendorService = async ({ page, limit, search, sortBy, orderBy }) => {
     const skip = (page - 1) * limit;
@@ -28,11 +29,13 @@ exports.showVendorService = async (id) => {
         throw new HttpException("Data vendor not found", 404);
     }
 
-    return vendor;
+    const userName = await getUserNameById(vendor.created_by);
+
+    return { vendor, userName };
 };
 
 exports.storeVendorService = async (validateData, req) => {
-    const creatorId = req.user.id;
+    const creatorId = req.tokenData.sub;
 
     const name_vendor = await prisma.vendor.findFirst({
         where: {
@@ -55,7 +58,7 @@ exports.storeVendorService = async (validateData, req) => {
 };
 
 exports.updateVendorService = async (validateData, id, req) => {
-    const creatorId = req.user.id;
+    // const creatorId = req.user.id;
 
     const vendor = await VendorRepository.findById(id);
     if (!vendor) {
@@ -77,7 +80,7 @@ exports.updateVendorService = async (validateData, id, req) => {
 
     const payload = {
         ...validateData,
-        created_by: creatorId
+        // created_by: creatorId
     };
 
     const data = await VendorRepository.update(id, payload);

src/services/sales/HospitalService.js

@@ -94,7 +94,7 @@ exports.getAllHospitalByAreaService = async ({ page, limit, search, sortBy, orde
 // };
 
 exports.storeHospitalService = async (validateData, req) => {
-    const creatorId = req.user.id;
+    const creatorId = req.tokenData.sub;
 
     const province = await ProvinceRepository.findById(validateData.province_id);
     if (!province) {
@@ -103,7 +103,7 @@ exports.storeHospitalService = async (validateData, req) => {
 
     const userArea = await prisma.userArea.findFirst({
         where: {
-            user_id: req.user.id,
+            user_id: req.tokenData.sub,
             province_id: validateData.province_id
         }
     });
@@ -135,12 +135,45 @@ exports.storeHospitalService = async (validateData, req) => {
 
     const imagePath = req.file ? `/storage/img/${req.file.filename}` : null;
 
+    let latitude = validateData.latitude ?? null;
+    let longitude = validateData.longitude ?? null;
+    let gmapsUrl = validateData.gmaps_url ?? null;
+
+    if (gmapsUrl) {
+        if (gmapsUrl.includes("www.google.com/maps")) {
+            const regex = /@(-?\d+\.\d+),(-?\d+\.\d+)/;
+            const match = gmapsUrl.match(regex);
+
+            if (match) {
+                latitude = parseFloat(match[1]);
+                longitude = parseFloat(match[2]);
+            } else {
+                throw new HttpException("Unable to extract coordinates from gmaps_url", 400);
+            }
+
+        } else if (gmapsUrl.includes("maps.app.goo.gl")) {
+            latitude = null;
+            longitude = null;
+
+        } else {
+            // URL disediakan tapi bukan dari domain yang valid
+            throw new HttpException("gmaps_url must be a valid Google Maps URL", 400);
+        }
+    } else if (latitude !== null && longitude !== null) {
+        gmapsUrl = null;
+    } else {
+        throw new HttpException("Either gmaps_url or coordinates must be provided", 400);
+    }
+
     const payload = {
         ...validateData,
         image: imagePath,
         progress_status: "cari_data",
         simrs_type: "-",
-        created_by: creatorId
+        created_by: creatorId,
+        latitude,
+        longitude,
+        gmaps_url: gmapsUrl,
     };
 
     const data = await salesHospitalRepository.create(payload);
@@ -157,7 +190,7 @@ exports.updateHospitalService = async (validateData, id, req) => {
 
     const userArea = await prisma.userArea.findFirst({
         where: {
-            user_id: req.user.id,
+            user_id: req.tokenData.sub,
             province_id: validateData.province_id
         }
     });
@@ -166,14 +199,18 @@ exports.updateHospitalService = async (validateData, id, req) => {
         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);
+    if (validateData.province_id) {
+        const province = await ProvinceRepository.findById(validateData.province_id);
+        if (!province) {
+            throw new HttpException('Province not found', 404);
+        }
     }
 
-    const city = await CityRepository.findById(validateData.city_id);
-    if (!city) {
-        throw new HttpException('City not found', 404);
+    if (validateData.city_id) {
+        const city = await CityRepository.findById(validateData.city_id);
+        if (!city) {
+            throw new HttpException('City not found', 404);
+        }
     }
 
     if (validateData.progress_status && !validProgressStatuses.includes(validateData.progress_status)) {
@@ -183,16 +220,19 @@ exports.updateHospitalService = async (validateData, id, req) => {
         );
     }
 
-    const existingHospital = await prisma.hospital.findFirst({
-        where: {
-            name: validateData.name,
-            city_id: validateData.city_id,
-            deletedAt: null
+    if (validateData.name && validateData.city_id) {
+        const existingHospital = await prisma.hospital.findFirst({
+            where: {
+                name: validateData.name,
+                city_id: validateData.city_id,
+                deletedAt: null,
+                NOT: { id }
+            }
+        });
+
+        if (existingHospital) {
+            throw new HttpException('Hospital with same name in this city already exists', 400);
         }
-    });
-
-    if (existingHospital) {
-        throw new HttpException('Hospital with same name in this city already exists', 400);
     }
 
     // Jika ada file baru, replace image
@@ -201,10 +241,53 @@ exports.updateHospitalService = async (validateData, id, req) => {
         imagePath = `/storage/img/${req.file.filename}`; // path relatif
     }
 
+    // Handle koordinat dan gmaps_url
+    let latitude = hospital.latitude;
+    let longitude = hospital.longitude;
+    let gmapsUrl = hospital.gmaps_url;
+
+    if (
+        validateData.latitude !== undefined &&
+        validateData.longitude !== undefined &&
+        validateData.latitude !== null &&
+        validateData.longitude !== null
+    ) {
+        // Jika diberikan lat long langsung
+        latitude = validateData.latitude;
+        longitude = validateData.longitude;
+        gmapsUrl = validateData.gmaps_url || gmapsUrl;
+    } else if (
+        validateData.gmaps_url &&
+        typeof validateData.gmaps_url === "string" &&
+        validateData.gmaps_url.trim() !== ""
+    ) {
+        gmapsUrl = validateData.gmaps_url;
+
+        if (gmapsUrl.includes("www.google.com/maps")) {
+            const regex = /@(-?\d+\.\d+),(-?\d+\.\d+)/;
+            const match = gmapsUrl.match(regex);
+            if (match) {
+                latitude = parseFloat(match[1]);
+                longitude = parseFloat(match[2]);
+            } else {
+                throw new HttpException("Unable to extract coordinates from gmaps_url", 400);
+            }
+        } else if (gmapsUrl.includes("maps.app.goo.gl")) {
+            // Tidak bisa ambil koordinat langsung
+            latitude = null;
+            longitude = null;
+        } else {
+            throw new HttpException("gmaps_url must be a valid Google Maps URL", 400);
+        }
+    }
+
     const payload = {
         ...validateData,
         image: imagePath,
         // created_by: req.user.id,
+        latitude,
+        longitude,
+        gmaps_url: gmapsUrl,
     };
 
     const data = await salesHospitalRepository.update(id, payload);

src/services/sales/VendorService.js

@@ -5,7 +5,7 @@ const { SearchFilter } = require('../../utils/SearchFilter.js');
 
 exports.getAllVendorService = async ({ page, limit, search, sortBy, orderBy }, req) => {
     const skip = (page - 1) * limit;
-    const userId = req.user.id;
+    const userId = req.tokenData.sub;
 
     // 1. Ambil provinsi yang menjadi area kerja sales
     const userAreas = await prisma.userArea.findMany({

src/utils/LogActivity.js

@@ -1,43 +1,80 @@
 const jwt = require('jsonwebtoken');
 const prisma = require('../prisma/PrismaClient.js');
-const timeLocal = require('../utils/TimeLocal.js')
+const timeLocal = require('../utils/TimeLocal.js');
+const { getUserNameById } = require('./CheckUserKeycloak.js');
 
-const baseLog = async ({ req, action, data }) => {
-    // try {
-    //     const authHeader = req.headers.authorization;
-    //     if (!authHeader || !authHeader.startsWith('Bearer ')) return;
+// const baseLog = async ({ req, action, data }) => {
+// 1
+// try {
+//     const authHeader = req.headers.authorization;
+//     if (!authHeader || !authHeader.startsWith('Bearer ')) return;
+
+//     const token = authHeader.split(' ')[1];
+//     const decoded = jwt.decode(token);
+//     if (!decoded?.id || !decoded?.username) return;
+
+//     await prisma.activityLog.create({
+//         data: {
+//             user_id: decoded.id,
+//             username: decoded.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);
+// }
+
+// 2
+// try {
+//     let userId, username;
 
-    //     const token = authHeader.split(' ')[1];
-    //     const decoded = jwt.decode(token);
-    //     if (!decoded?.id || !decoded?.username) return;
+//     // Coba ambil dari Bearer token jika ada
+//     const authHeader = req?.headers?.authorization;
+//     if (authHeader?.startsWith('Bearer ')) {
+//         const token = authHeader.split(' ')[1];
+//         const decoded = jwt.decode(token);
+//         userId = decoded?.id;
+//         username = decoded?.username;
+//     }
 
-    //     await prisma.activityLog.create({
-    //         data: {
-    //             user_id: decoded.id,
-    //             username: decoded.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);
-    // }
+//     // Fallback ke data langsung jika belum dapat dari token
+//     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);
+// }
+
+// };
+// 3
+const baseLog = async ({ req, action, data }) => {
     try {
         let userId, username;
 
-        // Coba ambil dari Bearer token jika ada
-        const authHeader = req?.headers?.authorization;
-        if (authHeader?.startsWith('Bearer ')) {
-            const token = authHeader.split(' ')[1];
-            const decoded = jwt.decode(token);
-            userId = decoded?.id;
-            username = decoded?.username;
+        // Ambil userId dari token Keycloak
+        if (req?.tokenData?.sub) {
+            userId = req.tokenData.sub;
+            username = await getUserNameById(userId);
         }
 
-        // Fallback ke data langsung jika belum dapat dari token
+        // Fallback kalau tokenData tidak ada
         if (!userId || !username) {
             userId = data?.id;
             username = data?.username;