merge from update fitur sales

entrypoint.sh

@@ -9,7 +9,7 @@ npx prisma migrate dev --name init
 # echo "♻️ Reset database dan menjalankan seeder..."
 # npx prisma migrate reset --force
 
-# echo "🌱 Menjalankan seeder (aman)..."
+echo "🌱 Menjalankan seeder (aman)..."
 # npx prisma db seed
 
 echo "🚀 Menjalankan aplikasi..."

src/controllers/admin/CityController.js

@@ -3,7 +3,7 @@ const { CityResource } = require('../../resources/admin/city/CityResource.js');
 const cityService = require('../../services/admin/CityService.js');
 const { PaginationParam } = require('../../utils/PaginationParams.js');
 const { errorResponse, messageSuccessResponse } = require('../../utils/Response.js');
-const { validateStoreCityRequest } = require('../../validators/admin/city/CityValidators.js');
+const { validateStoreCityRequest, validateUpdateCityRequest } = require('../../validators/admin/city/CityValidators.js');
 
 exports.getAllCity = async (req, res) => {
     try {
@@ -42,7 +42,7 @@ exports.storeCity = async (req, res) => {
 exports.updateCity = async (req, res) => {
     try {
         const id = req.params.id;
-        const validatedData = validateStoreCityRequest(req.body);
+        const validatedData = validateUpdateCityRequest(req.body);
         await cityService.updateCityService(validatedData, id, req);
         return messageSuccessResponse(res, 'Success update city');
     } catch (err) {

src/controllers/admin/ExecutivesHistoryController.js

@@ -3,7 +3,7 @@ const { ExecutivesHistoriResource } = require('../../resources/admin/executives_
 const executivesHistoryService = require('../../services/admin/ExecutivesHistoryService.js');
 const { PaginationParam } = require('../../utils/PaginationParams.js');
 const { errorResponse, messageSuccessResponse } = require('../../utils/Response.js');
-const { validateStoreExecutivesHistoryRequest } = require('../../validators/sales/executives_history/ExecutivesHistoriValidators.js');
+const { validateStoreExecutivesHistoryRequest, validateUpdateExecutivesHistoryRequest } = require('../../validators/admin/executives_history/ExecutivesHistoriValidators.js');
 
 exports.getAllExecutivesHistory = async (req, res) => {
     try {
@@ -40,7 +40,7 @@ exports.storeExecutivesHistory = async (req, res) => {
 
 exports.updateExecutivesHistory = async (req, res) => {
     try {
-        const validatedData = validateStoreExecutivesHistoryRequest(req.body);
+        const validatedData = validateUpdateExecutivesHistoryRequest(req.body);
         await executivesHistoryService.updateExecutivesHistoryService(validatedData, req);
         return messageSuccessResponse(res, 'Success update executives history');
     } catch (err) {

src/controllers/admin/VendorController.js

@@ -3,7 +3,7 @@ const { VendorResource } = require('../../resources/admin/vendor/VendorResource.
 const vendorService = require('../../services/admin/VendorService.js');
 const { PaginationParam } = require('../../utils/PaginationParams.js');
 const { errorResponse, messageSuccessResponse } = require('../../utils/Response.js');
-const { validateStoreVendorRequest } = require('../../validators/sales/vendor/VendorValidators.js');
+const { validateStoreVendorRequest, validateUpdateVendorRequest } = require('../../validators/admin/vendor/VendorValidators.js');
 
 exports.getAllVendor = async (req, res) => {
     try {
@@ -42,7 +42,7 @@ exports.storeVendor = async (req, res) => {
 exports.updateVendor = async (req, res) => {
     try {
         const id = req.params.id;
-        const validatedData = validateStoreVendorRequest(req.body);
+        const validatedData = validateUpdateVendorRequest(req.body);
         await vendorService.updateVendorService(validatedData, id, req);
         return messageSuccessResponse(res, 'Success update vendor');
     } catch (err) {

src/controllers/admin/VendorHistoryController.js

@@ -3,7 +3,7 @@ const { VendorHistoriResource } = require('../../resources/admin/vendor_history/
 const vendorHistoryService = require('../../services/admin/VendorHistoryService.js');
 const { PaginationParam } = require('../../utils/PaginationParams.js');
 const { errorResponse, messageSuccessResponse } = require('../../utils/Response.js');
-const { validateStoreVendorHistoryRequest } = require('../../validators/sales/vendor_history/VendorHistoriValidators.js');
+const { validateStoreVendorHistoryRequest, validateUpdateVendorHistoryRequest } = require('../../validators/admin/vendor_history/VendorHistoriValidators.js');
 
 exports.getAllVendorHistory = async (req, res) => {
     try {
@@ -41,7 +41,7 @@ exports.storeVendorHistory = async (req, res) => {
 
 exports.updateVendorHistory = async (req, res) => {
     try {
-        const validatedData = validateStoreVendorHistoryRequest(req.body);
+        const validatedData = validateUpdateVendorHistoryRequest(req.body);
         await vendorHistoryService.updateVendorHistoryService(validatedData, req);
         return messageSuccessResponse(res, 'Success update vendor history');
     } catch (err) {

src/controllers/sales/ExecutivesHistoryController.js

@@ -3,7 +3,7 @@ const { ExecutivesHistoriCollection } = require('../../resources/sales/executive
 const executivesHistoryService = require('../../services/sales/ExecutivesHistoryService.js');
 const { PaginationParam } = require('../../utils/PaginationParams.js');
 const { errorResponse, messageSuccessResponse } = require('../../utils/Response.js');
-const { validateStoreExecutivesHistoryRequest } = require('../../validators/admin/executives_history/ExecutivesHistoriValidators.js');
+const { validateStoreExecutivesHistoryRequest, validateUpdateExecutivesHistoryRequest } = require('../../validators/sales/executives_history/ExecutivesHistoriValidators.js');
 
 exports.getAllExecutivesHistory = async (req, res) => {
     try {
@@ -40,7 +40,7 @@ exports.storeExecutivesHistory = async (req, res) => {
 
 exports.updateExecutivesHistory = async (req, res) => {
     try {
-        const validatedData = validateStoreExecutivesHistoryRequest(req.body);
+        const validatedData = validateUpdateExecutivesHistoryRequest(req.body);
         await executivesHistoryService.updateExecutivesHistoryService(validatedData, req);
         return messageSuccessResponse(res, 'Success update executives history');
     } catch (err) {

src/controllers/sales/VendorHistoryController.js

@@ -3,7 +3,7 @@ const { VendorHistoriResource } = require('../../resources/sales/vendor_history/
 const vendorHistoryService = require('../../services/sales/VendorHistoryService.js');
 const { PaginationParam } = require('../../utils/PaginationParams.js');
 const { errorResponse, messageSuccessResponse } = require('../../utils/Response.js');
-const { validateStoreVendorHistoryRequest } = require('../../validators/admin/vendor_history/VendorHistoriValidators.js');
+const { validateStoreVendorHistoryRequest, validateUpdateVendorHistoryRequest } = require('../../validators/sales/vendor_history/VendorHistoriValidators.js');
 
 exports.getAllVendorHistory = async (req, res) => {
     try {
@@ -41,7 +41,7 @@ exports.storeVendorHistory = async (req, res) => {
 
 exports.updateVendorHistory = async (req, res) => {
     try {
-        const validatedData = validateStoreVendorHistoryRequest(req.body);
+        const validatedData = validateUpdateVendorHistoryRequest(req.body);
         await vendorHistoryService.updateVendorHistoryService(validatedData, req);
         return messageSuccessResponse(res, 'Success update vendor history');
     } catch (err) {

src/repository/admin/HospitalRepository.js

@@ -101,32 +101,30 @@ const HospitalRepository = {
         return prisma.hospital.create({ data });
     },
 
+    // update: async (id, data) => {
+    //     return prisma.hospital.update({
+    //         where: { id },
+    //         data: {
+    //             name: data.name,
+    //             hospital_code: data.hospital_code,
+    //             type: data.type,
+    //             ownership: data.ownership,
+    //             province: { connect: { id: data.province_id } },
+    //             city: { connect: { id: data.city_id } },
+    //             address: data.address,
+    //             // simrs_type: data.simrs_type,
+    //             contact: data.contact,
+    //             note: data.note,
+    //             image: data.image,
+    //             progress_status: data.progress_status,
+    //         }
+    //     });
+    // },
+
     update: async (id, data) => {
         return prisma.hospital.update({
             where: { id },
-            data: {
-                name: data.name,
-                hospital_code: data.hospital_code,
-                type: data.type,
-                ownership: data.ownership,
-                // province: { connect: { id: data.province_id } },
-                // city: { connect: { id: data.city_id } },
-                ...(data.province_id && {
-                    province: { connect: { id: data.province_id } },
-                }),
-                ...(data.city_id && {
-                    city: { connect: { id: data.city_id } },
-                }),
-                address: data.address,
-                // simrs_type: data.simrs_type,
-                contact: data.contact,
-                note: data.note,
-                image: data.image,
-                gmaps_url: data.gmaps_url,
-                latitude: data.latitude,
-                longitude: data.longitude,
-                // progress_status: data.progress_status,
-            }
+            data
         });
     },
 };

src/repository/sales/HospitalRepository.js

@@ -69,32 +69,29 @@ const HospitalRepository = {
         });
     },
 
+    // update: async (id, data) => {
+    //     return prisma.hospital.update({
+    //         where: { id },
+    //         data: {
+    //             name: data.name,
+    //             hospital_code: data.hospital_code,
+    //             type: data.type,
+    //             ownership: data.ownership,
+    //             province: { connect: { id: data.province_id } },
+    //             city: { connect: { id: data.city_id } },
+    //             address: data.address,
+    //             // simrs_type: data.simrs_type,
+    //             contact: data.contact,
+    //             note: data.note,
+    //             image: data.image,
+    //             progress_status: data.progress_status,
+    //         }
+    //     });
+    // },
     update: async (id, data) => {
         return prisma.hospital.update({
             where: { id },
-            data: {
-                name: data.name,
-                hospital_code: data.hospital_code,
-                type: data.type,
-                ownership: data.ownership,
-                // province: { connect: { id: data.province_id } },
-                // city: { connect: { id: data.city_id } },
-                ...(data.province_id && {
-                    province: { connect: { id: data.province_id } },
-                }),
-                ...(data.city_id && {
-                    city: { connect: { id: data.city_id } },
-                }),
-                address: data.address,
-                // simrs_type: data.simrs_type,
-                contact: data.contact,
-                note: data.note,
-                image: data.image,
-                gmaps_url: data.gmaps_url,
-                latitude: data.latitude,
-                longitude: data.longitude,
-                // progress_status: data.progress_status,
-            }
+            data
         });
     },
 };

src/services/admin/CityService.js

@@ -53,9 +53,11 @@ exports.updateCityService = async (validateData, id, req) => {
         throw new HttpException("Data city not found", 404);
     }
 
-    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 data = await CityRepository.update(id, validateData);

src/services/admin/ExecutivesHistoryService.js

@@ -93,8 +93,16 @@ exports.updateExecutivesHistoryService = async (validateData, req) => {
         throw new HttpException("Executives history not found", 404);
     }
 
+    if (validateData.start_term && validateData.end_term) {
+        if (validateData.start_term >= validateData.end_term) {
+            throw new HttpException("End term must be after start_term", 400)
+        }
+    }
+
     const payload = {
-        ...validateData
+        ...validateData,
+        start_term: validateData.start_term ? new Date(validateData.start_term) : executivesHistory.start_term,
+        end_term: validateData.end_term ? new Date(validateData.end_term) : executivesHistory.end_term,
     };
 
     const data = await ExecutivesHistoryRepository.update(id_executives_history, payload);

src/services/admin/HospitalService.js

@@ -122,14 +122,18 @@ exports.updateHospitalService = async (validateData, id, req) => {
         throw new HttpException("Hospital data not found", 404);
     }
 
-    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)) {
@@ -138,15 +142,14 @@ exports.updateHospitalService = async (validateData, id, req) => {
             422
         );
     }
+
     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: id
-                // }
+                NOT: { id }
             }
         });
 

src/services/admin/VendorHistoryService.js

@@ -104,19 +104,27 @@ exports.updateVendorHistoryService = async (validateData, req) => {
         throw new HttpException("Vendor history not found", 404);
     }
 
-    await prisma.hospital.update({
-        where: { id: id_hospital },
-        data: {
-            simrs_type: validateData.simrs_type
-        }
-    });
+    if (validateData.simrs_type) {
+        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)
+        }
+    }
+    
     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
+        contract_date: validateData.contract_date ? new Date(validateData.contract_date) : vendor.contract_date,
+        contract_expired_date: validateData.contract_expired_date ? new Date(validateData.contract_expired_date) : vendor.contract_expired_date,
     };
 
     const data = await VendorHistoryRepository.update(id_vendor_history, payload);

src/services/admin/VendorService.js

@@ -62,15 +62,17 @@ exports.updateVendorService = async (validateData, id, req) => {
         throw new HttpException("Data vendor not found", 404);
     }
 
-    const name_vendor = await prisma.vendor.findFirst({
-        where: {
-            name: validateData.name,
-            deletedAt: null
+    if (validateData.name && validateData.name !== vendor.name) {
+        const name_vendor = await prisma.vendor.findFirst({
+            where: {
+                name: validateData.name,
+                deletedAt: null
+            }
+        });
+
+        if (name_vendor) {
+            throw new HttpException("Vendor name must be unique", 400);
         }
-    });
-
-    if (name_vendor) {
-        throw new HttpException("Vendor name must be unique", 400);
     }
 
     const payload = {

src/services/sales/ExecutivesHistoryService.js

@@ -92,8 +92,16 @@ exports.updateExecutivesHistoryService = async (validateData, req) => {
         throw new HttpException("Executives history not found", 404);
     }
 
+    if (validateData.start_term && validateData.end_term) {
+        if (validateData.start_term >= validateData.end_term) {
+            throw new HttpException("End term must be after start_term", 400)
+        }
+    }
+
     const payload = {
-        ...validateData
+        ...validateData,
+        start_term: validateData.start_term ? new Date(validateData.start_term) : executivesHistory.start_term,
+        end_term: validateData.end_term ? new Date(validateData.end_term) : executivesHistory.end_term,
     };
 
     const data = await ExecutivesHistoryRepository.update(id_executives_history, payload);

src/services/sales/HospitalService.js

@@ -197,14 +197,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)) {
@@ -214,14 +218,20 @@ exports.updateHospitalService = async (validateData, id, req) => {
         );
     }
 
+<<<<<<< HEAD
     let existingHospital = null;
 
     if (validateData.name && validateData.city_id) {
         existingHospital = await prisma.hospital.findFirst({
+=======
+    if (validateData.name && validateData.city_id) {
+        const existingHospital = await prisma.hospital.findFirst({
+>>>>>>> update_fitur_sales
             where: {
                 name: validateData.name,
                 city_id: validateData.city_id,
                 deletedAt: null,
+<<<<<<< HEAD
                 // NOT: {
                 //     id: id,
                 // }
@@ -232,9 +242,15 @@ exports.updateHospitalService = async (validateData, id, req) => {
             throw new HttpException('Hospital with same name in this city already exists', 400);
         }
     }
+=======
+                NOT: { id }
+            }
+        });
+>>>>>>> update_fitur_sales
 
-    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

src/services/sales/VendorHistoryService.js

@@ -111,12 +111,18 @@ exports.updateVendorHistoryService = async (validateData, req) => {
         }
     });
 
+    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)
+        }
+    }
+
     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
+        contract_date: validateData.contract_date ? new Date(validateData.contract_date) : vendor.contract_date,
+        contract_expired_date: validateData.contract_expired_date ? new Date(validateData.contract_expired_date) : vendor.contract_expired_date,
     };
 
     const data = await VendorHistoryRepository.update(id_vendor_history, payload);

src/validators/admin/city/CityValidators.js

@@ -21,4 +21,27 @@ exports.validateStoreCityRequest = (body) => {
         name: name.trim(),
         province_id: province_id.trim()
     };
+};
+
+exports.validateUpdateCityRequest = (body) => {
+    const { name, province_id } = body;
+
+    // const errors = {};
+
+    // if (!name || name.trim() === '') {
+    //     errors.name = ['City name is required'];
+    // }
+
+    // if (!province_id || province_id.trim() === '') {
+    //     errors.province_id = ['Province ID is required'];
+    // }
+
+    // if (Object.keys(errors).length > 0) {
+    //     throw new HttpException(errors, 422);
+    // }
+
+    return {
+        name,
+        province_id
+    };
 };

src/validators/admin/executives_history/ExecutivesHistoriValidators.js

@@ -74,4 +74,15 @@ exports.validateStoreExecutivesHistoryRequest = (body) => {
         start_term: start_term ? new Date(start_term) : null,
         end_term: end_term ? new Date(end_term) : null,
     };
-};
+};
+
+exports.validateUpdateExecutivesHistoryRequest = (body) => {
+    const { executive_name, contact, status, start_term, end_term } = body;
+    return {
+        executive_name,
+        contact,
+        status,
+        start_term,
+        end_term,
+    };
+}

src/validators/admin/hospital/HospitalValidators.js

@@ -69,56 +69,6 @@ exports.validateStoreHospitalRequest = (body) => {
 exports.validateUpdateHospitalRequest = (body) => {
     const { name, hospital_code, type, ownership, province_id, city_id, address, contact, note, gmaps_url, latitude, longitude } = body;
 
-    // const errors = {};
-
-    // if (!name || name.trim() === '') {
-    //     errors.name = ['name is required'];
-    // }
-
-    // if (!hospital_code || hospital_code.trim() === '') {
-    //     errors.hospital_code = ['hospital code is required'];
-    // }
-
-    // if (!type || type.trim() === '') {
-    //     errors.type = ['type is required'];
-    // }
-
-    // if (!ownership || ownership.trim() === '') {
-    //     errors.ownership = ['ownership is required'];
-    // }
-
-    // if (!province_id || province_id.trim() === '') {
-    //     errors.province_id = ['province id is required'];
-    // }
-
-    // if (!city_id || city_id.trim() === '') {
-    //     errors.city_id = ['city id is required'];
-    // }
-
-    // if (!address || address.trim() === '') {
-    //     errors.address = ['address is required'];
-    // }
-
-    // if (!simrs_type || simrs_type.trim() === '') {
-    //     errors.simrs_type = ['simrs type is required'];
-    // }
-
-    // if (!progress_status || progress_status.trim() === '') {
-    //     errors.progress_status = ['progress status is required'];
-    // }
-
-    // if (!contact || contact.trim() === '') {
-    //     errors.contact = ['contact is required'];
-    // }
-
-    // if (!note || note.trim() === '') {
-    //     errors.note = ['note is required'];
-    // }
-
-    // if (Object.keys(errors).length > 0) {
-    //     throw new HttpException(errors, 422);
-    // }
-
     return {
         name,
         hospital_code,

src/validators/admin/sales/SalesValidators.js

@@ -68,61 +68,61 @@ exports.validateCreateSalesRequest = (body) => {
 
 exports.validateUpdateSalesRequest = (body) => {
     const { email, firstname, lastname, password, province_ids } = body;
-    const errors = {};
+    // const errors = {};
 
-    if (!email || email.trim() === '') {
-        errors.email = ['Email is required'];
-    }
+    // if (!email || email.trim() === '') {
+    //     errors.email = ['Email is required'];
+    // }
 
-    if (!firstname || firstname.trim() === '') {
-        errors.firstname = ['First name is required'];
-    }
+    // if (!firstname || firstname.trim() === '') {
+    //     errors.firstname = ['First name is required'];
+    // }
 
-    if (!lastname || lastname.trim() === '') {
-        errors.lastname = ['Last name is required'];
-    }
+    // if (!lastname || lastname.trim() === '') {
+    //     errors.lastname = ['Last name is required'];
+    // }
 
-    if (!password || password.trim().length === 0) {
-        errors.password = ['Password is required'];
-    } else {
-        const trimmed = password.trim();
+    // if (!password || password.trim().length === 0) {
+    //     errors.password = ['Password is required'];
+    // } else {
+    //     const trimmed = password.trim();
 
-        const messages = [];
+    //     const messages = [];
 
-        if (trimmed.length < 8) {
-            messages.push('Password must be at least 8 characters');
-        }
+    //     if (trimmed.length < 8) {
+    //         messages.push('Password must be at least 8 characters');
+    //     }
 
-        if (!/[A-Z]/.test(trimmed)) {
-            messages.push('Password must contain uppercase letter');
-        }
+    //     if (!/[A-Z]/.test(trimmed)) {
+    //         messages.push('Password must contain uppercase letter');
+    //     }
 
-        if (!/[0-9]/.test(trimmed)) {
-            messages.push('Password must contain digit');
-        }
+    //     if (!/[0-9]/.test(trimmed)) {
+    //         messages.push('Password must contain digit');
+    //     }
 
-        if (!/[^a-zA-Z0-9]/.test(trimmed)) {
-            messages.push('Password must contain special character');
-        }
+    //     if (!/[^a-zA-Z0-9]/.test(trimmed)) {
+    //         messages.push('Password must contain special character');
+    //     }
 
-        if (messages.length > 0) {
-            errors.password = messages;
-        }
-    }
+    //     if (messages.length > 0) {
+    //         errors.password = messages;
+    //     }
+    // }
 
-    if (!Array.isArray(province_ids) || province_ids.length === 0) {
-        errors.province_ids = ['At least one province must be selected'];
-    }
+    // if (!Array.isArray(province_ids) || province_ids.length === 0) {
+    //     errors.province_ids = ['At least one province must be selected'];
+    // }
 
-    if (Object.keys(errors).length > 0) {
-        throw new HttpException(errors, 422);
-    }
+    // if (Object.keys(errors).length > 0) {
+    //     throw new HttpException(errors, 422);
+    // }
 
     return {
-        email: email.trim(),
-        firstname: firstname.trim(),
-        lastname: lastname.trim(),
-        password: password.trim(),
+        email,
+        firstname,
+        lastname,
+        password,
         province_ids
     };
 };

src/validators/admin/vendor/VendorValidators.js

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

src/validators/admin/vendor_history/VendorHistoriValidators.js

@@ -70,4 +70,17 @@ exports.validateStoreVendorHistoryRequest = (body) => {
         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;
+
+    return {
+        simrs_type,
+        vendor_id,
+        vendor_impression,
+        status,
+        contract_date,
+        contract_expired_date
+    };
+}

src/validators/sales/executives_history/ExecutivesHistoriValidators.js

@@ -60,7 +60,7 @@ exports.validateStoreExecutivesHistoryRequest = (body) => {
         !errors.end_term &&
         new Date(end_term) <= new Date(start_term)
     ) {
-        errors.end_term = ['End term expired date must be after start term date'];
+        errors.end_term = ['End term date must be after start term date'];
     }
 
     if (Object.keys(errors).length > 0) {
@@ -74,4 +74,15 @@ exports.validateStoreExecutivesHistoryRequest = (body) => {
         start_term: start_term ? new Date(start_term) : null,
         end_term: end_term ? new Date(end_term) : null,
     };
-};
+};
+
+exports.validateUpdateExecutivesHistoryRequest = (body) => {
+    const { executive_name, contact, status, start_term, end_term } = body;
+    return {
+        executive_name,
+        contact,
+        status,
+        start_term,
+        end_term,
+    };
+}

src/validators/sales/vendor/VendorValidators.js

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

src/validators/sales/vendor_history/VendorHistoriValidators.js

@@ -70,4 +70,17 @@ exports.validateStoreVendorHistoryRequest = (body) => {
         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;
+
+    return {
+        simrs_type,
+        vendor_id,
+        vendor_impression,
+        status,
+        contract_date,
+        contract_expired_date
+    };
+}