solve bug hospital, executive history & vendor experience sales admin

src/controllers/admin/VendorExperienceController.js

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

src/controllers/sales/VendorHistoryController.js

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

src/repository/admin/CityRepository.js

@@ -48,6 +48,19 @@ const CityRepository = {
         });
     },
 
+
+    findByNameAndProvinceId: async (name, province_id) => {
+        return await prisma.city.findFirst({
+            where: {
+                name: {
+                    equals: name,
+                    mode: "insensitive"
+                },
+                province_id: province_id
+            }
+        });
+    },
+
     create: async (data) => {
         return prisma.city.create({ data });
     },

src/repository/admin/ExecutivesHistoryRepository.js

@@ -29,7 +29,7 @@ const ExecutivesHistoryRepository = {
                             }
                         },
                         address: true,
-                        simrs_type: true,
+                        // simrs_type: true,
                         contact: true,
                         image: true,
                         progress_status: true,
@@ -80,7 +80,7 @@ const ExecutivesHistoryRepository = {
                             }
                         },
                         address: true,
-                        simrs_type: true,
+                        // simrs_type: true,
                         contact: true,
                         image: true,
                         progress_status: true,

src/repository/admin/ProvinceRepository.js

@@ -35,6 +35,17 @@ const ProvinceRepository = {
         });
     },
 
+    findByName: async (name) => {
+        return await prisma.province.findFirst({
+            where: {
+                name: {
+                    equals: name,
+                    mode: "insensitive"
+                }
+            }
+        });
+    },
+
     create: async (data) => {
         return prisma.province.create({ data });
     },

src/repository/sales/ExecutivesHistoryRepository.js

@@ -29,7 +29,7 @@ const ExecutivesHistoryRepository = {
                             }
                         },
                         address: true,
-                        simrs_type: true,
+                        // simrs_type: true,
                         contact: true,
                         image: true,
                         progress_status: true,
@@ -86,7 +86,7 @@ const ExecutivesHistoryRepository = {
                             }
                         },
                         address: true,
-                        simrs_type: true,
+                        // simrs_type: true,
                         contact: true,
                         image: true,
                         progress_status: true,

src/repository/sales/HospitalRepository.js

@@ -16,7 +16,6 @@ const HospitalRepository = {
                 province: { select: { id: true, name: true } },
                 city: { select: { id: true, name: true } },
                 address: true,
-                simrs_type: true,
                 contact: true,
                 image: true,
                 progress_status: true,
@@ -27,7 +26,7 @@ const HospitalRepository = {
                 created_by: true,
                 createdAt: true,
                 updatedAt: true,
-                vendor_histories: {
+                vendor_experiences: {
                     where: {
                         status: "active",
                         deletedAt: null
@@ -80,7 +79,6 @@ const HospitalRepository = {
                 province: { select: { id: true, name: true } },
                 city: { select: { id: true, name: true } },
                 address: true,
-                simrs_type: true,
                 contact: true,
                 image: true,
                 progress_status: true,
@@ -91,7 +89,7 @@ const HospitalRepository = {
                 created_by: true,
                 createdAt: true,
                 updatedAt: true,
-                vendor_histories: {
+                vendor_experiences: {
                     where: {
                         status: "active",
                         deletedAt: null

src/repository/sales/VendorExperienceRepository.js

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

src/repository/sales/VendorHistoryRepository.js

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

src/resources/admin/vendor_history/VendorExperienceCollection.js

@@ -11,7 +11,7 @@ const formatItem = (item) => ({
     updatedAt: formatISOWithoutTimezone(item.updatedAt),
 });
 
-exports.VendorHistoriCollection = (req, res, data = [], total = null, page = 1, limit = 10, message = 'Success') => {
+exports.VendorExperienceCollection = (req, res, data = [], total = null, page = 1, limit = 10, message = 'Success') => {
     const formattedData = data.map(formatItem);
 
     if (typeof total !== 'number') {

src/resources/admin/vendor_history/VendorExperienceResource.js

@@ -10,7 +10,7 @@ const formatItem = (item) => ({
     updatedAt: formatISOWithoutTimezone(item.updatedAt),
 });
 
-exports.VendorHistoriResource = (res, data, message = 'Success') => {
+exports.VendorExperienceResource = (res, data, message = 'Success') => {
     const formattedData = formatItem(data);
 
     return res.status(200).json({

src/resources/sales/vendor_experience/VendorExperienceCollection.js

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

src/resources/sales/vendor_history/VendorHistoriResource.js

@@ -8,7 +8,7 @@ const formatItem = (item) => ({
     updatedAt: formatISOWithoutTimezone(item.updatedAt),
 });
 
-exports.VendorHistoriResource = (res, data, message = 'Success') => {
+exports.VendorExperienceResource = (res, data, message = 'Success') => {
     const formattedData = formatItem(data);
 
     return res.status(200).json({

src/resources/sales/vendor_history/VendorHistoriCollection.js

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

src/routes/sales/HospitalRoute.js

@@ -1,7 +1,7 @@
 const express = require('express')
 const router = express.Router()
 const hospitalController = require('../../controllers/sales/HospitalController.js')
-const vendorHistoryController = require('../../controllers/sales/VendorHistoryController.js')
+const vendorExperienceController = require('../../controllers/sales/VendorExperienceController.js')
 const executivesHistoryController = require('../../controllers/sales/ExecutivesHistoryController.js')
 const statusHistoriesController = require('../../controllers/sales/StatusHistoryController.js')
 // const verifyJWT = require('../../middleware/VerifyJWT.js');
@@ -37,11 +37,11 @@ router.patch('/:id', [keycloak.protect(), extractToken, checkRoles(['sales'])],
 router.get('/:id', [keycloak.protect(), extractToken, checkRoles(['sales'])], hospitalController.showHospital);
 
 // Vendor History
-router.get('/:id/vendor-experience', [keycloak.protect(), extractToken, checkRoles(['sales'])], vendorHistoryController.getAllVendorHistory);
-router.post('/:id/vendor-experience', [keycloak.protect(), extractToken, checkRoles(['sales'])], vendorHistoryController.storeVendorHistory);
-router.get('/:id/vendor-experience/:id_vendor_experience', [keycloak.protect(), extractToken, checkRoles(['sales'])], vendorHistoryController.showVendorHistory);
-router.patch('/:id/vendor-experience/:id_vendor_experience', [keycloak.protect(), extractToken, checkRoles(['sales'])], vendorHistoryController.updateVendorHistory);
-router.delete('/:id/vendor-experience/:id_vendor_experience', [keycloak.protect(), extractToken, checkRoles(['sales'])], vendorHistoryController.deleteVendorHistory);
+router.get('/:id/vendor-experience', [keycloak.protect(), extractToken, checkRoles(['sales'])], vendorExperienceController.getAllVendorHistory);
+router.post('/:id/vendor-experience', [keycloak.protect(), extractToken, checkRoles(['sales'])], vendorExperienceController.storeVendorHistory);
+router.get('/:id/vendor-experience/:id_vendor_experience', [keycloak.protect(), extractToken, checkRoles(['sales'])], vendorExperienceController.showVendorHistory);
+router.patch('/:id/vendor-experience/:id_vendor_experience', [keycloak.protect(), extractToken, checkRoles(['sales'])], vendorExperienceController.updateVendorHistory);
+router.delete('/:id/vendor-experience/:id_vendor_experience', [keycloak.protect(), extractToken, checkRoles(['sales'])], vendorExperienceController.deleteVendorHistory);
 
 // Executives History
 router.get('/:id/executives-history', [keycloak.protect(), extractToken, checkRoles(['sales'])], executivesHistoryController.getAllExecutivesHistory);

src/services/admin/CityService.js

@@ -43,6 +43,11 @@ exports.storeCityService = async (validateData, req) => {
         throw new HttpException('Province not found', 404);
     }
 
+    const existingProvince = await CityRepository.findByNameAndProvinceId(validateData.name, validateData.province_id);
+    if (existingProvince) {
+        throw new HttpException("City with this name and province ID already exists and cannot be duplicated.", 400);
+    }
+
     const data = await CityRepository.create(validateData);
     await createLog(req, data);
 };
@@ -60,6 +65,11 @@ exports.updateCityService = async (validateData, id, req) => {
         }
     }
 
+    const existingProvince = await CityRepository.findByNameAndProvinceId(validateData.name, validateData.province_id);
+    if (existingProvince) {
+        throw new HttpException("City with this name and province ID already exists and cannot be duplicated.", 400);
+    }
+
     const data = await CityRepository.update(id, validateData);
     await updateLog(req, data);
 };

src/services/admin/ExecutivesHistoryService.js

@@ -66,6 +66,18 @@ exports.storeExecutivesHistoryService = async (validateData, req) => {
         throw new HttpException("Hospital not found", 404)
     }
 
+    if (validateData.status === "active") {
+        await prisma.executivesHistory.updateMany({
+            where: {
+                hospital_id: hospitalId,
+                status: "active"
+            },
+            data: {
+                status: "inactive"
+            }
+        });
+    }
+
     const payload = {
         ...validateData,
         hospital_id: hospitalId
@@ -99,6 +111,18 @@ exports.updateExecutivesHistoryService = async (validateData, req) => {
         }
     }
 
+    if (validateData.status === "active") {
+        await prisma.executivesHistory.updateMany({
+            where: {
+                hospital_id: id_hospital,
+                status: "active"
+            },
+            data: {
+                status: "inactive"
+            }
+        });
+    }
+
     const payload = {
         ...validateData,
         start_term: validateData.start_term ? new Date(validateData.start_term) : executivesHistory.start_term,

src/services/admin/ProvinceService.js

@@ -37,6 +37,11 @@ exports.showProvinceService = async (id) => {
 };
 
 exports.storeProvinceService = async (validateData, req) => {
+    const existingProvince = await ProvinceRepository.findByName(validateData.name);
+    if (existingProvince) {
+        throw new HttpException("Province with this name already exists and may not be duplicated.", 400);
+    }
+
     const province = await ProvinceRepository.create(validateData);
     await createLog(req, province);
 };
@@ -47,6 +52,11 @@ exports.updateProvinceService = async (validateData, id, req) => {
         throw new HttpException("Data province not found", 404);
     }
 
+    const existingProvince = await ProvinceRepository.findByName(validateData.name);
+    if (existingProvince) {
+        throw new HttpException("Province with this name already exists and may not be duplicated.", 400);
+    }
+
     const data = await ProvinceRepository.update(id, validateData);
     await updateLog(req, data);
 };

src/services/admin/VendorExperienceService.js

@@ -48,7 +48,7 @@ exports.showVendorHistoryService = async (req) => {
 
     const vendorHistory = await VendorExperienceRepository.findById(id_vendor_experience);
     if (!vendorHistory) {
-        throw new HttpException("Vendor history not found", 404);
+        throw new HttpException("Vendor experience not found", 404);
     }
 
     return vendorHistory;
@@ -160,7 +160,7 @@ exports.updateVendorHistoryService = async (validateData, req) => {
 
     const vendorHistory = await VendorExperienceRepository.findById(id_vendor_experience);
     if (!vendorHistory) {
-        throw new HttpException("Vendor history not found", 404);
+        throw new HttpException("Vendor experience not found", 404);
     }
 
     if (validateData.vendor_id) {
@@ -253,7 +253,7 @@ exports.deleteVendorHistoryService = async (req) => {
 
     const vendor = await VendorExperienceRepository.findById(id_vendor_experience);
     if (!vendor) {
-        throw new HttpException("Vendor history not found", 404);
+        throw new HttpException("Vendor experience not found", 404);
     }
 
     const data = await VendorExperienceRepository.update(id_vendor_experience, {

src/services/sales/ExecutivesHistoryService.js

@@ -65,6 +65,18 @@ exports.storeExecutivesHistoryService = async (validateData, req) => {
         throw new HttpException("Hospital not found", 404)
     }
 
+    if (validateData.status === "active") {
+        await prisma.executivesHistory.updateMany({
+            where: {
+                hospital_id: hospitalId,
+                status: "active"
+            },
+            data: {
+                status: "inactive"
+            }
+        });
+    }
+
     const payload = {
         ...validateData,
         hospital_id: hospitalId
@@ -98,6 +110,18 @@ exports.updateExecutivesHistoryService = async (validateData, req) => {
         }
     }
 
+    if (validateData.status === "active") {
+        await prisma.executivesHistory.updateMany({
+            where: {
+                hospital_id: id_hospital,
+                status: "active"
+            },
+            data: {
+                status: "inactive"
+            }
+        });
+    }
+
     const payload = {
         ...validateData,
         start_term: validateData.start_term ? new Date(validateData.start_term) : executivesHistory.start_term,

src/services/sales/HospitalService.js

@@ -20,7 +20,7 @@ exports.getAllHospitalByAreaService = async ({ page, limit, search, sortBy, orde
     const provinceIds = userAreas.map(ua => ua.province_id);
 
     const where = {
-        ...SearchFilter(search, ['name', 'province.id', 'city.id', 'type', 'ownership', 'simrs_type']),
+        ...SearchFilter(search, ['name', 'province.id', 'city.id', 'type', 'ownership']),
         province_id: { in: provinceIds },
         ...(province ? { province_id: province } : {}),
         ...(city ? { city_id: city } : {}),
@@ -169,7 +169,7 @@ exports.storeHospitalService = async (validateData, req) => {
         ...validateData,
         image: imagePath,
         progress_status: "cari_data",
-        simrs_type: "-",
+        // simrs_type: "-",
         created_by: creatorId,
         latitude,
         longitude,

src/services/sales/VendorExperienceService.js

@@ -0,0 +1,469 @@
+const VendorExperienceRepository = require('../../repository/sales/VendorExperienceRepository.js');
+const HttpException = require('../../utils/HttpException.js');
+const prisma = require('../../prisma/PrismaClient.js');
+const timeLocal = require('../../utils/TimeLocal.js');
+const { createLog, updateLog, deleteLog } = require('../../utils/LogActivity.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([
+        VendorExperienceRepository.findAll({ skip, take: limit, where, orderBy: { [sortBy]: orderBy } }),
+        VendorExperienceRepository.countAll(where)
+    ]);
+
+    return { vendor_histories, total };
+};
+
+exports.showVendorHistoryService = async (req) => {
+    const id_hospital = req.params.id;
+    const id_vendor_experience = req.params.id_vendor_experience;
+
+    const hospital = await prisma.hospital.findFirst({
+        where: {
+            id: id_hospital
+        }
+    })
+    if (!hospital) {
+        throw new HttpException("Hospital not found", 404)
+    }
+
+    const vendorHistory = await VendorExperienceRepository.findById(id_vendor_experience);
+    if (!vendorHistory) {
+        throw new HttpException("Vendor experience not found", 404);
+    }
+
+    return vendorHistory;
+};
+
+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)
+    }
+
+    if (validateData.vendor_id) {
+        const vendor = await prisma.vendor.findFirst({
+            where: {
+                id: validateData.vendor_id
+            }
+        });
+
+        if (!vendor) {
+            throw new HttpException("Vendor not found", 404)
+        }
+    }
+
+    const SimrsType = ["vendor", "in house", "gratis"];
+    if (validateData.simrs_type && !SimrsType.includes(validateData.simrs_type)) {
+        throw new HttpException("Simrs type must be vendor, in house, or gratis", 400);
+    }
+
+    if (validateData.contract_start_date && validateData.contract_expired_date) {
+        if (validateData.contract_start_date >= validateData.contract_expired_date) {
+            throw new HttpException("Contract expired date must be after contract date", 400)
+        }
+    }
+
+    if (validateData.contract_value_min && validateData.contract_value_max) {
+        if (validateData.contract_value_min >= validateData.contract_value_max) {
+            throw new HttpException("Contract value max must be after contract value min", 400)
+        }
+    }
+
+    // await prisma.hospital.update({
+    //     where: { id: hospitalId },
+    //     data: {
+    //         simrs_type: validateData.simrs_type
+    //     }
+    // });
+
+    if (validateData.simrs_type) {
+        const existingActiveVendors = await prisma.vendorExperience.findMany({
+            where: {
+                hospital_id: hospitalId,
+                status: "active",
+                deletedAt: null
+            }
+        });
+
+        if (existingActiveVendors.length > 0) {
+            await prisma.vendorExperience.updateMany({
+                where: {
+                    hospital_id: hospitalId,
+                    status: "active",
+                    deletedAt: null
+                },
+                data: {
+                    status: "inactive"
+                }
+            });
+        }
+
+        validateData.status = "active";
+    }
+
+    const payload = {
+        vendor_id: validateData.vendor_id,
+        simrs_type: validateData.simrs_type,
+        status: validateData.status,
+        contract_start_date: validateData.contract_start_date ? new Date(validateData.contract_start_date) : null,
+        contract_expired_date: validateData.contract_expired_date ? new Date(validateData.contract_expired_date) : null,
+        contract_value_min: validateData.contract_value_min ? Number(validateData.contract_value_min) : null,
+        contract_value_max: validateData.contract_value_max ? Number(validateData.contract_value_max) : null,
+        positive_notes: validateData.positive_notes,
+        negative_notes: validateData.negative_notes,
+        hospital_id: hospitalId
+    };
+
+    const data = await VendorExperienceRepository.create(payload);
+    await createLog(req, data);
+};
+
+exports.updateVendorHistoryService = async (validateData, req) => {
+    const id_hospital = req.params.id;
+    const id_vendor_experience = req.params.id_vendor_experience;
+
+    const hospital = await prisma.hospital.findFirst({
+        where: {
+            id: id_hospital
+        }
+    })
+    if (!hospital) {
+        throw new HttpException("Hospital not found", 404)
+    }
+
+    const vendorHistory = await VendorExperienceRepository.findById(id_vendor_experience);
+    if (!vendorHistory) {
+        throw new HttpException("Vendor experience not found", 404);
+    }
+
+    if (validateData.vendor_id) {
+        const existVendor = await prisma.vendor.findFirst({
+            where: {
+                id: validateData.vendor_id
+            }
+        });
+        if (!existVendor) {
+            throw new HttpException("Vendor not found", 404)
+        }
+    }
+
+    const SimrsType = ["vendor", "in house", "gratis"];
+    if (validateData.simrs_type && !SimrsType.includes(validateData.simrs_type)) {
+        throw new HttpException("Simrs type must be vendor, in house, or gratis", 400);
+    }
+
+    if (
+        validateData.simrs_type &&
+        vendorHistory.simrs_type === "vendor" &&
+        vendorHistory.vendor_id !== null &&
+        validateData.simrs_type !== "vendor"
+    ) {
+        await prisma.vendorExperience.update({
+            where: {
+                id: id_vendor_experience,
+                deletedAt: null
+            },
+            data: {
+                vendor_id: null
+            }
+        });
+    }
+
+    if (validateData.contract_start_date && validateData.contract_expired_date) {
+        if (validateData.contract_start_date >= validateData.contract_expired_date) {
+            throw new HttpException("Contract expired date must be after contract date", 400)
+        }
+    }
+
+    if (validateData.contract_value_min && validateData.contract_value_max) {
+        if (validateData.contract_value_min >= validateData.contract_value_max) {
+            throw new HttpException("Contract value max must be after contract value min", 400)
+        }
+    }
+
+    if (validateData.status === "active") {
+        await prisma.vendorExperience.updateMany({
+            where: {
+                hospital_id: id_hospital,
+                status: "active",
+                deletedAt: null,
+                NOT: { id: id_vendor_experience },
+            },
+            data: {
+                status: "inactive",
+            },
+        });
+    }
+
+    const payload = {
+        status: validateData.status,
+        contract_start_date: validateData.contract_start_date ? new Date(validateData.contract_start_date) : vendorHistory.contract_start_date,
+        contract_expired_date: validateData.contract_expired_date ? new Date(validateData.contract_expired_date) : vendorHistory.contract_expired_date,
+        contract_value_min: validateData.contract_value_min ? Number(validateData.contract_value_min) : vendorHistory.contract_value_min,
+        contract_value_max: validateData.contract_value_max ? Number(validateData.contract_value_max) : vendorHistory.contract_value_max,
+        positive_notes: validateData.positive_notes,
+        negative_notes: validateData.negative_notes,
+        simrs_type: validateData.simrs_type,
+        vendor_id: validateData.vendor_id,
+    };
+
+    const data = await VendorExperienceRepository.update(id_vendor_experience, payload);
+    await updateLog(req, data);
+};
+
+exports.deleteVendorHistoryService = async (req) => {
+    const id_hospital = req.params.id;
+    const id_vendor_experience = req.params.id_vendor_experience;
+
+    const hospital = await prisma.hospital.findFirst({
+        where: {
+            id: id_hospital
+        }
+    })
+    if (!hospital) {
+        throw new HttpException("Hospital not found", 404)
+    }
+
+    const vendor = await VendorExperienceRepository.findById(id_vendor_experience);
+    if (!vendor) {
+        throw new HttpException("Vendor experience not found", 404);
+    }
+
+    const data = await VendorExperienceRepository.update(id_vendor_experience, {
+        deletedAt: timeLocal.now().toDate()
+    });
+
+    await deleteLog(req, data);
+};
+
+// 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([
+//         VendorExperienceRepository.findAll({ skip, take: limit, where, orderBy: { [sortBy]: orderBy } }),
+//         VendorExperienceRepository.countAll(where)
+//     ]);
+
+//     return { vendor_histories, total };
+// };
+
+// exports.showVendorHistoryService = async (req) => {
+//     const id_hospital = req.params.id;
+//     const id_vendor_experience = req.params.id_vendor_experience;
+
+//     const hospital = await prisma.hospital.findFirst({
+//         where: {
+//             id: id_hospital
+//         }
+//     })
+//     if (!hospital) {
+//         throw new HttpException("Hospital not found", 404)
+//     }
+
+//     VendorExperienceRepository.findById(id_vendor_experience);
+//     if (!vendorHistory) {
+//         throw new HttpException("Vendor history not found", 404);
+//     }
+
+//     return vendorHistory;
+// };
+
+// 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)
+//     }
+
+//     const vendor = await prisma.vendor.findFirst({
+//         where: {
+//             id: validateData.vendor_id
+//         }
+//     });
+//     if (!vendor) {
+//         throw new HttpException("Vendor not found", 404)
+//     }
+
+//     await prisma.hospital.update({
+//         where: { id: hospitalId },
+//         data: {
+//             simrs_type: validateData.simrs_type
+//         }
+//     });
+
+//     if (validateData.simrs_type) {
+//         const existingActiveVendors = await prisma.vendorHistory.findMany({
+//             where: {
+//                 hospital_id: hospitalId,
+//                 status: "active",
+//                 deletedAt: null
+//             }
+//         });
+
+//         if (existingActiveVendors.length > 0) {
+//             await prisma.vendorHistory.updateMany({
+//                 where: {
+//                     hospital_id: hospitalId,
+//                     status: "active",
+//                     deletedAt: null
+//                 },
+//                 data: {
+//                     status: "inactive"
+//                 }
+//             });
+//         }
+
+//         validateData.status = "active";
+//     }
+
+//     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
+//     };
+
+//     VendorExperienceRepository.create(payload);
+//     await createLog(req, data);
+// };
+
+// exports.updateVendorHistoryService = async (validateData, req) => {
+//     const id_hospital = req.params.id;
+//     const id_vendor_experience = req.params.id_vendor_experience;
+
+//     const hospital = await prisma.hospital.findFirst({
+//         where: {
+//             id: id_hospital
+//         }
+//     })
+//     if (!hospital) {
+//         throw new HttpException("Hospital not found", 404)
+//     }
+
+//     VendorExperienceRepository.findById(id_vendor_experience);
+//     if (!vendorHistory) {
+//         throw new HttpException("Vendor history not found", 404);
+//     }
+
+//     if (validateData.vendor_id) {
+//         const existVendor = await prisma.vendor.findFirst({
+//             where: {
+//                 id: validateData.vendor_id
+//             }
+//         });
+//         if (!existVendor) {
+//             throw new HttpException("Vendor not found", 404)
+//         }
+//     }
+
+//     await prisma.hospital.update({
+//         where: { id: id_hospital },
+//         data: {
+//             simrs_type: validateData.simrs_type
+//         }
+//     });
+
+//     if (validateData.contract_date && validateData.contract_expired_date) {
+//         if (validateData.contract_date >= validateData.contract_expired_date) {
+//             throw new HttpException("Contract expired date must be after contract date", 400)
+//         }
+//     }
+
+//     if (validateData.status === "active") {
+//         await prisma.vendorHistory.updateMany({
+//             where: {
+//                 hospital_id: id_hospital,
+//                 status: "active",
+//                 deletedAt: null,
+//                 NOT: { id: id_vendor_experience },
+//             },
+//             data: {
+//                 status: "inactive",
+//             },
+//         });
+//     }
+
+//     const payload = {
+//         vendor_id: validateData.vendor_id,
+//         vendor_impression: validateData.vendor_impression,
+//         status: validateData.status,
+//         contract_date: validateData.contract_date ? new Date(validateData.contract_date) : vendorHistory.contract_date,
+//         contract_expired_date: validateData.contract_expired_date ? new Date(validateData.contract_expired_date) : vendorHistory.contract_expired_date,
+//     };
+
+//     VendorExperienceRepository.update(id_vendor_experience, payload);
+//     await updateLog(req, data);
+// };
+
+// exports.deleteVendorHistoryService = async (req) => {
+//     const id_hospital = req.params.id;
+//     const id_vendor_experience = req.params.id_vendor_experience;
+
+//     const hospital = await prisma.hospital.findFirst({
+//         where: {
+//             id: id_hospital
+//         }
+//     })
+//     if (!hospital) {
+//         throw new HttpException("Hospital not found", 404)
+//     }
+
+//     VendorExperienceRepository.findById(id_vendor_experience);
+//     if (!vendor) {
+//         throw new HttpException("Vendor history not found", 404);
+//     }
+
+//     VendorExperienceRepository.update(id_vendor_experience, {
+//         deletedAt: timeLocal.now().toDate()
+//     });
+
+//     await deleteLog(req, data);
+// };

src/services/sales/VendorHistoryService.js

@@ -1,212 +0,0 @@
-const VendorHistoryRepository = require('../../repository/sales/VendorHistoryRepository.js');
-const HttpException = require('../../utils/HttpException.js');
-const prisma = require('../../prisma/PrismaClient.js');
-const timeLocal = require('../../utils/TimeLocal.js');
-const { createLog, updateLog, deleteLog } = require('../../utils/LogActivity.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)
-    ]);
-
-    return { vendor_histories, total };
-};
-
-exports.showVendorHistoryService = async (req) => {
-    const id_hospital = req.params.id;
-    const id_vendor_experience = req.params.id_vendor_experience;
-
-    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_experience);
-    if (!vendorHistory) {
-        throw new HttpException("Vendor history not found", 404);
-    }
-
-    return vendorHistory;
-};
-
-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)
-    }
-
-    const vendor = await prisma.vendor.findFirst({
-        where: {
-            id: validateData.vendor_id
-        }
-    });
-    if (!vendor) {
-        throw new HttpException("Vendor not found", 404)
-    }
-
-    await prisma.hospital.update({
-        where: { id: hospitalId },
-        data: {
-            simrs_type: validateData.simrs_type
-        }
-    });
-
-    if (validateData.simrs_type) {
-        const existingActiveVendors = await prisma.vendorHistory.findMany({
-            where: {
-                hospital_id: hospitalId,
-                status: "active",
-                deletedAt: null
-            }
-        });
-
-        if (existingActiveVendors.length > 0) {
-            await prisma.vendorHistory.updateMany({
-                where: {
-                    hospital_id: hospitalId,
-                    status: "active",
-                    deletedAt: null
-                },
-                data: {
-                    status: "inactive"
-                }
-            });
-        }
-
-        validateData.status = "active";
-    }
-
-    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_experience = req.params.id_vendor_experience;
-
-    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_experience);
-    if (!vendorHistory) {
-        throw new HttpException("Vendor history not found", 404);
-    }
-
-    if (validateData.vendor_id) {
-        const existVendor = await prisma.vendor.findFirst({
-            where: {
-                id: validateData.vendor_id
-            }
-        });
-        if (!existVendor) {
-            throw new HttpException("Vendor not found", 404)
-        }
-    }
-
-    await prisma.hospital.update({
-        where: { id: id_hospital },
-        data: {
-            simrs_type: validateData.simrs_type
-        }
-    });
-
-    if (validateData.contract_date && validateData.contract_expired_date) {
-        if (validateData.contract_date >= validateData.contract_expired_date) {
-            throw new HttpException("Contract expired date must be after contract date", 400)
-        }
-    }
-
-    if (validateData.status === "active") {
-        await prisma.vendorHistory.updateMany({
-            where: {
-                hospital_id: id_hospital,
-                status: "active",
-                deletedAt: null,
-                NOT: { id: id_vendor_experience },
-            },
-            data: {
-                status: "inactive",
-            },
-        });
-    }
-
-    const payload = {
-        vendor_id: validateData.vendor_id,
-        vendor_impression: validateData.vendor_impression,
-        status: validateData.status,
-        contract_date: validateData.contract_date ? new Date(validateData.contract_date) : vendorHistory.contract_date,
-        contract_expired_date: validateData.contract_expired_date ? new Date(validateData.contract_expired_date) : vendorHistory.contract_expired_date,
-    };
-
-    const data = await VendorHistoryRepository.update(id_vendor_experience, payload);
-    await updateLog(req, data);
-};
-
-exports.deleteVendorHistoryService = async (req) => {
-    const id_hospital = req.params.id;
-    const id_vendor_experience = req.params.id_vendor_experience;
-
-    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_experience);
-    if (!vendor) {
-        throw new HttpException("Vendor history not found", 404);
-    }
-
-    const data = await VendorHistoryRepository.update(id_vendor_experience, {
-        deletedAt: timeLocal.now().toDate()
-    });
-
-    await deleteLog(req, data);
-};

src/validators/sales/vendor_experience/VendorExperienceValidators.js

@@ -0,0 +1,27 @@
+exports.validateStoreVendorHistoryRequest = (body) => {
+    const { simrs_type, vendor_id, status, contract_start_date, contract_expired_date, contract_value_min, contract_value_max, positive_notes, negative_notes } = body;
+
+    const errors = {};
+
+    if (!simrs_type || simrs_type.trim() === '') {
+        errors.simrs_type = ['simrs type is required'];
+    }
+
+    if (!status || status.trim() === '') {
+        errors.status = ['Status is required'];
+    }
+
+    if (Object.keys(errors).length > 0) {
+        throw new HttpException(errors, 422);
+    }
+
+    return { simrs_type, vendor_id, status, contract_start_date, contract_expired_date, contract_value_min, contract_value_max, positive_notes, negative_notes };
+}
+
+exports.validateUpdateVendorHistoryRequest = (body) => {
+    const { simrs_type, vendor_id, status, contract_start_date, contract_expired_date, contract_value_min, contract_value_max, positive_notes, negative_notes } = body;
+
+    return {
+        simrs_type, vendor_id, status, contract_start_date, contract_expired_date, contract_value_min, contract_value_max, positive_notes, negative_notes
+    };
+}

src/validators/sales/vendor_history/VendorHistoriValidators.js

@@ -1,95 +0,0 @@
-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,
-    };
-};
-
-exports.validateUpdateVendorHistoryRequest = (body) => {
-    const { simrs_type, vendor_id, vendor_impression, status, contract_date, contract_expired_date } = body;
-
-    if (simrs_type !== undefined && simrs_type !== null && simrs_type.trim() !== '') {
-        const allowedTypes = ['vendor', 'gratis', 'in house'];
-        const simrsTypeValue = simrs_type.trim().toLowerCase();
-
-        if (!allowedTypes.includes(simrsTypeValue)) {
-            throw new HttpException('Simrs type must be either "vendor", "gratis", or "in house"', 422);
-        }
-    }
-
-    return {
-        simrs_type,
-        vendor_id,
-        vendor_impression,
-        status,
-        contract_date,
-        contract_expired_date
-    };
-}