Merge branch 'update_fitur_sales' of gayuh/radar_farmagitechs into master

entrypoint.sh

@@ -1,16 +1,16 @@
 #!/bin/sh
 
 echo "📦 Menjalankan Prisma generate..."
-npx prisma generate
+# npx prisma generate
 
 echo "🔃 Menjalankan migrasi dev..."
-npx prisma migrate dev --name init
+# npx prisma migrate dev --name init
 
 # echo "♻️ Reset database dan menjalankan seeder..."
 # npx prisma migrate reset --force
 
 echo "🌱 Menjalankan seeder (aman)..."
-npx prisma db seed
+# npx prisma db seed
 
 echo "🚀 Menjalankan aplikasi..."
 exec node index.js

src/repository/admin/HospitalRepository.js

@@ -95,23 +95,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 } },
-                address: data.address,
-                // simrs_type: data.simrs_type,
-                contact: data.contact,
-                note: data.note,
-                image: data.image,
-                progress_status: data.progress_status,
-            }
+            data
         });
     },
 };

src/repository/sales/HospitalRepository.js

@@ -63,23 +63,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 } },
-                address: data.address,
-                // simrs_type: data.simrs_type,
-                contact: data.contact,
-                note: data.note,
-                image: data.image,
-                progress_status: data.progress_status,
-            }
+            data
         });
     },
 };

src/services/admin/HospitalService.js

@@ -89,14 +89,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)) {
@@ -106,16 +110,19 @@ exports.updateHospitalService = async (validateData, id, req) => {
         );
     }
 
-    const existingHospital = await prisma.hospital.findFirst({
-        where: {
-            name: validateData.name,
-            city_id: validateData.city_id,
-            deletedAt: null
+    if (validateData.name && validateData.city_id) {
+        const existingHospital = await prisma.hospital.findFirst({
+            where: {
+                name: validateData.name,
+                city_id: validateData.city_id,
+                deletedAt: null,
+                NOT: { id }
+            }
+        });
+
+        if (existingHospital) {
+            throw new HttpException('Hospital with same name in this city already exists', 400);
         }
-    });
-
-    if (existingHospital) {
-        throw new HttpException('Hospital with same name in this city already exists', 400);
     }
 
     // Jika ada file baru, replace image

src/services/sales/HospitalService.js

@@ -165,14 +165,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)) {
@@ -182,16 +186,19 @@ exports.updateHospitalService = async (validateData, id, req) => {
         );
     }
 
-    const existingHospital = await prisma.hospital.findFirst({
-        where: {
-            name: validateData.name,
-            city_id: validateData.city_id,
-            deletedAt: null
+    if (validateData.name && validateData.city_id) {
+        const existingHospital = await prisma.hospital.findFirst({
+            where: {
+                name: validateData.name,
+                city_id: validateData.city_id,
+                deletedAt: null,
+                NOT: { id }
+            }
+        });
+
+        if (existingHospital) {
+            throw new HttpException('Hospital with same name in this city already exists', 400);
         }
-    });
-
-    if (existingHospital) {
-        throw new HttpException('Hospital with same name in this city already exists', 400);
     }
 
     // Jika ada file baru, replace image

src/validators/admin/hospital/HospitalValidators.js

@@ -66,67 +66,16 @@ exports.validateStoreHospitalRequest = (body) => {
 exports.validateUpdateHospitalRequest = (body) => {
     const { name, hospital_code, type, ownership, province_id, city_id, address, progress_status, contact, note } = 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: name.trim(),
-        hospital_code: hospital_code.trim(),
-        type: type.trim(),
-        ownership: ownership.trim(),
-        province_id: province_id.trim(),
-        city_id: city_id.trim(),
-        address: address.trim(),
-        // simrs_type: simrs_type.trim(),
-        progress_status: progress_status.trim(),
-        contact: contact.trim(),
-        note: note.trim(),
+        name,
+        hospital_code,
+        type,
+        ownership,
+        province_id,
+        city_id,
+        address,
+        progress_status,
+        contact,
+        note,
     };
 };