Merge branch 'update_fitur_sales' of gayuh/radar_farmagitechs into master

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/VendorController.js

@@ -4,7 +4,7 @@ const vendorService = require('../../services/admin/VendorService.js');
 const { ListResponse } = require('../../utils/ListResponse.js');
 const { PaginationParam } = require('../../utils/PaginationParams.js');
 const { errorResponse, successResponse, 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 {
@@ -43,7 +43,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/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/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/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/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,
+    };
 };