Merge branch 'update_fitur_sales' of gayuh/radar_farmagitechs into master

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/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/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/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/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/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/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/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
+    };
+}