update resource

src/controllers/admin/CityController.js

@@ -1,7 +1,8 @@
+const { CityCollection } = require('../../resources/admin/city/CityCollection.js');
+const { CityResource } = require('../../resources/admin/city/CityResource.js');
 const cityService = require('../../services/admin/CityService.js');
-const { ListResponse } = require('../../utils/ListResponse.js');
 const { PaginationParam } = require('../../utils/PaginationParams.js');
-const { errorResponse, successResponse, messageSuccessResponse } = require('../../utils/Response.js');
+const { errorResponse, messageSuccessResponse } = require('../../utils/Response.js');
 const { validateStoreCityRequest } = require('../../validators/admin/city/CityValidators.js');
 
 exports.getAllCity = async (req, res) => {
@@ -12,7 +13,7 @@ exports.getAllCity = async (req, res) => {
             page, limit, search, sortBy, orderBy
         });
 
-        return ListResponse({ req, res, data: cities, page, limit, total, message: 'City data successfully retrieved' });
+        return CityCollection(req, res, cities, total, page, limit, 'City data successfully retrieved');
     } catch (err) {
         return errorResponse(res, err);
     }
@@ -22,7 +23,7 @@ exports.showCity = async (req, res) => {
     try {
         const id = req.params.id;
         const data = await cityService.showCityService(id);
-        return successResponse(res, data, 'Success show city');
+        return CityResource(res, data, 'Success show city');
     } catch (err) {
         return errorResponse(res, err);
     }

src/controllers/admin/ExecutivesHistoryController.js

@@ -1,18 +1,19 @@
+const { ExecutivesHistoriCollection } = require('../../resources/admin/executives_history/ExecutivesHistoriCollection.js');
+const { ExecutivesHistoriResource } = require('../../resources/admin/executives_history/ExecutivesHistoriResource.js');
 const executivesHistoryService = require('../../services/admin/ExecutivesHistoryService.js');
-const { ListResponse } = require('../../utils/ListResponse.js');
 const { PaginationParam } = require('../../utils/PaginationParams.js');
-const { errorResponse, successResponse, messageSuccessResponse } = require('../../utils/Response.js');
+const { errorResponse, messageSuccessResponse } = require('../../utils/Response.js');
 const { validateStoreExecutivesHistoryRequest } = require('../../validators/sales/executives_history/ExecutivesHistoriValidators.js');
 
 exports.getAllExecutivesHistory = async (req, res) => {
     try {
         const { page, limit, search, sortBy, orderBy } = PaginationParam(req);
 
-        const { vendor_histories, total } = await executivesHistoryService.getAllExecutivesHistoryService({
+        const { executives_histories, total } = await executivesHistoryService.getAllExecutivesHistoryService({
             page, limit, search, sortBy, orderBy
         }, req);
 
-        return ListResponse({ req, res, data: vendor_histories, page, limit, total, message: 'Executives history successfully retrieved' });
+        return ExecutivesHistoriCollection(req, res, executives_histories, total, page, limit, 'Executives history successfully retrieved');
     } catch (err) {
         return errorResponse(res, err);
     }
@@ -21,7 +22,7 @@ exports.getAllExecutivesHistory = async (req, res) => {
 exports.showExecutivesHistory = async (req, res) => {
     try {
         const data = await executivesHistoryService.showExecutivesHistoryService(req);
-        return successResponse(res, data, 'Success show executives history');
+        return ExecutivesHistoriResource(res, data, 'Success show executives history');
     } catch (err) {
         return errorResponse(res, err);
     }

src/controllers/admin/HospitalController.js

@@ -1,7 +1,8 @@
+const { HospitalCollection } = require('../../resources/admin/hospital/HospitalCollection.js');
+const { HospitalResource } = require('../../resources/admin/hospital/HospitalResource.js');
 const hospitalService = require('../../services/admin/HospitalService.js');
-const { ListResponse } = require('../../utils/ListResponse.js');
 const { PaginationParam } = require('../../utils/PaginationParams.js');
-const { errorResponse, successResponse, messageSuccessResponse } = require('../../utils/Response.js');
+const { errorResponse, messageSuccessResponse } = require('../../utils/Response.js');
 const { validateStoreHospitalRequest, validateUpdateHospitalRequest } = require('../../validators/admin/hospital/HospitalValidators.js');
 
 exports.getAllHospital = async (req, res) => {
@@ -12,7 +13,7 @@ exports.getAllHospital = async (req, res) => {
             page, limit, search, sortBy, orderBy, province, city, type, ownership, progress_status
         });
 
-        return ListResponse({ req, res, data: hospitals, page, limit, total, message: 'Hospital data successfully retrieved' });
+        return HospitalCollection(req, res, hospitals, total, page, limit, 'Hospital data successfully retrieved');
     } catch (err) {
         return errorResponse(res, err);
     }
@@ -22,7 +23,7 @@ exports.showHospital = async (req, res) => {
     try {
         const id = req.params.id;
         const data = await hospitalService.showHospitalService(id);
-        return successResponse(res, data, 'Success show hospital');
+        return HospitalResource(res, data, 'Success show hospital');
     } catch (err) {
         return errorResponse(res, err);
     }

src/controllers/admin/ProvinceController.js

@@ -1,7 +1,8 @@
+const { ProvinceCollection } = require('../../resources/admin/province/ProvinceCollection.js');
+const { ProvinceResource } = require('../../resources/admin/province/ProvinceResource.js');
 const provinceService = require('../../services/admin/ProvinceService.js');
-const { ListResponse } = require('../../utils/ListResponse.js');
 const { PaginationParam } = require('../../utils/PaginationParams.js');
-const { errorResponse, successResponse, messageSuccessResponse } = require('../../utils/Response.js');
+const { errorResponse, messageSuccessResponse } = require('../../utils/Response.js');
 const { validateStoreProvinceRequest } = require('../../validators/admin/province/ProvinceValidators.js');
 
 exports.getAllProvince = async (req, res) => {
@@ -12,7 +13,7 @@ exports.getAllProvince = async (req, res) => {
             page, limit, search, sortBy, orderBy
         });
 
-        return ListResponse({ req, res, data: provinces, page, limit, total, message: 'Province data successfully retrieved' });
+        return ProvinceCollection(req, res, provinces, total, page, limit, 'Province data successfully retrieved');
     } catch (err) {
         return errorResponse(res, err);
     }
@@ -22,7 +23,7 @@ exports.showProvince = async (req, res) => {
     try {
         const id = req.params.id;
         const data = await provinceService.showProvinceService(id);
-        return successResponse(res, data, 'Success show province');
+        return ProvinceResource(res, data, 'Success show province');
     } catch (err) {
         return errorResponse(res, err);
     }

src/controllers/admin/SalesController.js

@@ -1,3 +1,5 @@
+const { SalesCollection } = require('../../resources/admin/sales/SalesCollection.js');
+const { SalesResource } = require('../../resources/admin/sales/SalesResource.js');
 const salesService = require('../../services/admin/SalesService.js');
 const { ListResponse } = require('../../utils/ListResponse.js');
 const { PaginationParam } = require('../../utils/PaginationParams.js');
@@ -12,7 +14,8 @@ exports.getAllSales = async (req, res) => {
             page, limit, search, sortBy, orderBy
         });
 
-        return ListResponse({ req, res, data: sales, page, limit, total, message: 'Sales data successfully retrieved' });
+        return SalesCollection(req, res, sales, total, page, limit, 'Sales data successfully retrieved');
+
     } catch (err) {
         return errorResponse(res, err);
     }
@@ -22,7 +25,7 @@ exports.showSales = async (req, res) => {
     try {
         const id = req.params.id;
         const data = await salesService.showSalesService(id);
-        return successResponse(res, data, 'Success show sales');
+        return SalesResource(res, data, 'Success show sales');
     } catch (err) {
         return errorResponse(res, err);
     }

src/controllers/admin/VendorController.js

@@ -1,3 +1,5 @@
+const { VendorCollection } = require('../../resources/admin/vendor/VendorCollection.js');
+const { VendorResource } = require('../../resources/admin/vendor/VendorResource.js');
 const vendorService = require('../../services/admin/VendorService.js');
 const { ListResponse } = require('../../utils/ListResponse.js');
 const { PaginationParam } = require('../../utils/PaginationParams.js');
@@ -12,7 +14,7 @@ exports.getAllVendor = async (req, res) => {
             page, limit, search, sortBy, orderBy
         });
 
-        return ListResponse({ req, res, data: vendors, page, limit, total, message: 'Vendor data successfully retrieved' });
+        return VendorCollection(req, res, vendors, total, page, limit, 'Vendor data successfully retrieved');
     } catch (err) {
         return errorResponse(res, err);
     }
@@ -22,7 +24,7 @@ exports.showVendor = async (req, res) => {
     try {
         const id = req.params.id;
         const data = await vendorService.showVendorService(id);
-        return successResponse(res, data, 'Success show vendor');
+        return VendorResource(res, data, 'Success show vendor');
     } catch (err) {
         return errorResponse(res, err);
     }

src/controllers/admin/VendorHistoryController.js

@@ -1,7 +1,8 @@
+const { VendorHistoriCollection } = require('../../resources/admin/vendor_history/VendorHistoriCollection.js');
+const { VendorHistoriResource } = require('../../resources/admin/vendor_history/VendorHistoriResource.js');
 const vendorHistoryService = require('../../services/admin/VendorHistoryService.js');
-const { ListResponse } = require('../../utils/ListResponse.js');
 const { PaginationParam } = require('../../utils/PaginationParams.js');
-const { errorResponse, successResponse, messageSuccessResponse } = require('../../utils/Response.js');
+const { errorResponse, messageSuccessResponse } = require('../../utils/Response.js');
 const { validateStoreVendorHistoryRequest } = require('../../validators/sales/vendor_history/VendorHistoriValidators.js');
 
 exports.getAllVendorHistory = async (req, res) => {
@@ -12,7 +13,8 @@ exports.getAllVendorHistory = async (req, res) => {
             page, limit, search, sortBy, orderBy
         }, req);
 
-        return ListResponse({ req, res, data: vendor_histories, page, limit, total, message: 'Vendor history successfully retrieved' });
+        return VendorHistoriCollection(req, res, vendor_histories, total, page, limit, 'Vendor history successfully retrieved');
+
     } catch (err) {
         return errorResponse(res, err);
     }
@@ -21,7 +23,7 @@ exports.getAllVendorHistory = async (req, res) => {
 exports.showVendorHistory = async (req, res) => {
     try {
         const data = await vendorHistoryService.showVendorHistoryService(req);
-        return successResponse(res, data, 'Success show vendor history');
+        return VendorHistoriResource(res, data, 'Success show vendor history');
     } catch (err) {
         return errorResponse(res, err);
     }

src/controllers/auth/AuthControllers.js

@@ -1,3 +1,5 @@
+const { LoginResource } = require('../../resources/auth/LoginResource.js');
+const { UserResource } = require('../../resources/auth/UserResource.js');
 const { loginService, getUserService, logoutService } = require('../../services/auth/AuthService.js');
 const { successResponse, errorResponse, messageSuccessResponse } = require('../../utils/Response.js');
 const { validateLoginRequest } = require('../../validators/auth/LoginValidators.js');
@@ -5,8 +7,8 @@ const { validateLoginRequest } = require('../../validators/auth/LoginValidators.
 exports.login = async (req, res) => {
     try {
         const validated = validateLoginRequest(req.body);
-        const { user, token } = await loginService(validated, req);
-        return successResponse(res, { ...user, token }, 'Login success');
+        const data = await loginService(validated, req);
+        return LoginResource(res, data, "Login success")
     } catch (error) {
         return errorResponse(res, error);
     }
@@ -15,7 +17,7 @@ exports.login = async (req, res) => {
 exports.getUser = async (req, res) => {
     try {
         const data = await getUserService(req);
-        return successResponse(res, data, 'Success get user');
+        return UserResource(res, data, 'Success get user');
     } catch (error) {
         return errorResponse(res, error);
     }

src/controllers/sales/AreaController.js

@@ -1,5 +1,5 @@
+const { UserAreaCollection } = require("../../resources/sales/area/UserAreaCollection.js");
 const { getAllAreaByUserService } = require("../../services/sales/AreaService.js");
-const { ListResponse } = require("../../utils/ListResponse");
 const { PaginationParam } = require("../../utils/PaginationParams");
 const { errorResponse } = require("../../utils/Response");
 
@@ -9,7 +9,7 @@ exports.getAllAreaByUser = async (req, res) => {
 
         const { areas, total } = await getAllAreaByUserService({ page, limit, search, sortBy, orderBy }, req);
 
-        return ListResponse({ req, res, data: areas, page, limit, total, message: 'Area city successfully retrieved' });
+        return UserAreaCollection(req, res, areas, total, page, limit, 'Area data successfully retrieved');
     } catch (err) {
         return errorResponse(res, err);
     }

src/controllers/sales/ExecutivesHistoryController.js

@@ -1,18 +1,19 @@
+const { ExecutivesHistoriResource } = require('../../resources/sales/executives_history/ExecutivesHistoriResource.js');
+const { ExecutivesHistoriCollection } = require('../../resources/sales/executives_history/ExecutivesHistoriCollection.js');
 const executivesHistoryService = require('../../services/sales/ExecutivesHistoryService.js');
-const { ListResponse } = require('../../utils/ListResponse.js');
 const { PaginationParam } = require('../../utils/PaginationParams.js');
-const { errorResponse, successResponse, messageSuccessResponse } = require('../../utils/Response.js');
+const { errorResponse, messageSuccessResponse } = require('../../utils/Response.js');
 const { validateStoreExecutivesHistoryRequest } = require('../../validators/admin/executives_history/ExecutivesHistoriValidators.js');
 
 exports.getAllExecutivesHistory = async (req, res) => {
     try {
         const { page, limit, search, sortBy, orderBy } = PaginationParam(req);
 
-        const { vendor_histories, total } = await executivesHistoryService.getAllExecutivesHistoryService({
+        const { executives_histories, total } = await executivesHistoryService.getAllExecutivesHistoryService({
             page, limit, search, sortBy, orderBy
         }, req);
 
-        return ListResponse({ req, res, data: vendor_histories, page, limit, total, message: 'Executives history successfully retrieved' });
+        return ExecutivesHistoriCollection(req, res, executives_histories, total, page, limit, 'Executives history successfully retrieved');
     } catch (err) {
         return errorResponse(res, err);
     }
@@ -21,7 +22,7 @@ exports.getAllExecutivesHistory = async (req, res) => {
 exports.showExecutivesHistory = async (req, res) => {
     try {
         const data = await executivesHistoryService.showExecutivesHistoryService(req);
-        return successResponse(res, data, 'Success show executives history');
+        return ExecutivesHistoriResource(res, data, 'Success show executives history');
     } catch (err) {
         return errorResponse(res, err);
     }

src/controllers/sales/HospitalController.js

@@ -1,7 +1,8 @@
+const { HospitalCollection } = require("../../resources/sales/hospital/HospitalCollection.js");
+const { HospitalResource } = require("../../resources/sales/hospital/HospitalResource.js");
 const { getAllHospitalByAreaService, storeHospitalService, updateHospitalService, showHospitalService } = require("../../services/sales/HospitalService");
-const { ListResponse } = require("../../utils/ListResponse");
 const { PaginationParam } = require("../../utils/PaginationParams");
-const { errorResponse, messageSuccessResponse, successResponse } = require("../../utils/Response");
+const { errorResponse, messageSuccessResponse } = require("../../utils/Response");
 const { validateStoreHospitalRequest, validateUpdateHospitalRequest } = require('../../validators/admin/hospital/HospitalValidators.js');
 
 exports.getAllHospitalByArea = async (req, res) => {
@@ -10,7 +11,7 @@ exports.getAllHospitalByArea = async (req, res) => {
 
         const { hospitals, total } = await getAllHospitalByAreaService({ page, limit, search, sortBy, orderBy, province, city, type, ownership, progress_status }, req);
 
-        return ListResponse({ req, res, data: hospitals, page, limit, total, message: 'Hospital data successfully retrieved' });
+        return HospitalCollection(req, res, hospitals, total, page, limit, 'Hospital data successfully retrieved');
     } catch (err) {
         return errorResponse(res, err);
     }
@@ -41,7 +42,7 @@ exports.showHospital = async (req, res) => {
     try {
         const id = req.params.id;
         const data = await showHospitalService(id);
-        return successResponse(res, data, 'Success show hospital');
+        return HospitalResource(res, data, 'Success show hospital');
     } catch (err) {
         return errorResponse(res, err);
     }

src/controllers/sales/VendorController.js

@@ -1,3 +1,4 @@
+const { VendorCollection } = require('../../resources/sales/vendor/VendorCollection.js');
 const vendorService = require('../../services/sales/VendorService.js');
 const { ListResponse } = require('../../utils/ListResponse.js');
 const { PaginationParam } = require('../../utils/PaginationParams.js');
@@ -11,7 +12,7 @@ exports.getAllVendor = async (req, res) => {
             page, limit, search, sortBy, orderBy
         }, req);
 
-        return ListResponse({ req, res, data: vendors, page, limit, total, message: 'Vendor data sales successfully retrieved' });
+        return VendorCollection(req, res, vendors, total, page, limit, 'Vendor data sales successfully retrieved');
     } catch (err) {
         return errorResponse(res, err);
     }

src/controllers/sales/VendorHistoryController.js

@@ -1,7 +1,8 @@
+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 { ListResponse } = require('../../utils/ListResponse.js');
 const { PaginationParam } = require('../../utils/PaginationParams.js');
-const { errorResponse, successResponse, messageSuccessResponse } = require('../../utils/Response.js');
+const { errorResponse, messageSuccessResponse } = require('../../utils/Response.js');
 const { validateStoreVendorHistoryRequest } = require('../../validators/admin/vendor_history/VendorHistoriValidators.js');
 
 exports.getAllVendorHistory = async (req, res) => {
@@ -12,7 +13,8 @@ exports.getAllVendorHistory = async (req, res) => {
             page, limit, search, sortBy, orderBy
         }, req);
 
-        return ListResponse({ req, res, data: vendor_histories, page, limit, total, message: 'Vendor history successfully retrieved' });
+        return VendorHistoriCollection(req, res, vendor_histories, total, page, limit, 'Vendor history successfully retrieved');
+
     } catch (err) {
         return errorResponse(res, err);
     }
@@ -21,7 +23,7 @@ exports.getAllVendorHistory = async (req, res) => {
 exports.showVendorHistory = async (req, res) => {
     try {
         const data = await vendorHistoryService.showVendorHistoryService(req);
-        return successResponse(res, data, 'Success show vendor history');
+        return VendorHistoriResource(res, data, 'Success show vendor history');
     } catch (err) {
         return errorResponse(res, err);
     }

src/controllers/superadmin/AdminController.js

@@ -1,7 +1,8 @@
+const { AdminCollection } = require('../../resources/superadmin/admin/AdminCollection.js');
+const { AdminResource } = require('../../resources/superadmin/admin/AdminResource.js');
 const adminService = require('../../services/superadmin/AdminService.js');
-const { ListResponse } = require('../../utils/ListResponse.js');
 const { PaginationParam } = require('../../utils/PaginationParams.js');
-const { errorResponse, successResponse, messageSuccessResponse } = require('../../utils/Response.js');
+const { errorResponse, messageSuccessResponse } = require('../../utils/Response.js');
 const { validateCreateAdminRequest, validateUpdateAdminRequest } = require('../../validators/superadmin/admin/AdminValidators.js');
 
 exports.getAllAdmin = async (req, res) => {
@@ -12,7 +13,7 @@ exports.getAllAdmin = async (req, res) => {
             page, limit, search, sortBy, orderBy
         });
 
-        return ListResponse({ req, res, data: admin, page, limit, total, message: 'Admin data successfully retrieved' });
+        return AdminCollection(req, res, admin, total, page, limit, 'Admin data successfully retrieved');
     } catch (err) {
         return errorResponse(res, err);
     }
@@ -22,7 +23,7 @@ exports.showAdmin = async (req, res) => {
     try {
         const id = req.params.id;
         const data = await adminService.showAdminService(id);
-        return successResponse(res, data, 'Success show admin');
+        return AdminResource(res, data, 'Success show admin');
     } catch (err) {
         return errorResponse(res, err);
     }

src/controllers/superadmin/LogController.js

@@ -1,5 +1,5 @@
+const { LogCollection } = require('../../resources/superadmin/log/LogCollection.js');
 const logService = require('../../services/superadmin/LogService.js');
-const { ListResponse } = require('../../utils/ListResponse.js');
 const { PaginationParam } = require('../../utils/PaginationParams.js');
 const { errorResponse } = require('../../utils/Response.js');
 
@@ -11,7 +11,7 @@ exports.getAllLogs = async (req, res) => {
             page, limit, search, sortBy, orderBy
         });
 
-        return ListResponse({ req, res, data: logs, page, limit, total, message: 'Logs data successfully retrieved' });
+        return LogCollection(req, res, logs, total, page, limit, 'Logs data successfully retrieved');
     } catch (err) {
         return errorResponse(res, err);
     }

src/resources/admin/city/CityCollection.js

@@ -0,0 +1,22 @@
+const { ListResponse } = require("../../../utils/ListResponse");
+const { formatISOWithoutTimezone } = require("../../../utils/FormatDate.js");
+
+const formatItem = (item) => ({
+    ...item,
+    createdAt: formatISOWithoutTimezone(item.createdAt),
+    updatedAt: formatISOWithoutTimezone(item.updatedAt)
+});
+
+exports.CityCollection = (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/admin/city/CityResource.js

@@ -0,0 +1,17 @@
+const { formatISOWithoutTimezone } = require("../../../utils/FormatDate");
+
+const formatItem = (item) => ({
+    ...item,
+    createdAt: formatISOWithoutTimezone(item.createdAt),
+    updatedAt: formatISOWithoutTimezone(item.updatedAt)
+});
+
+exports.CityResource = (res, data, message = 'Success') => {
+    const formattedData = formatItem(data);
+
+    return res.status(200).json({
+        success: true,
+        message,
+        data: formattedData
+    });
+};

src/resources/admin/executives_history/ExecutivesHistoriCollection.js

@@ -0,0 +1,24 @@
+const { ListResponse } = require("../../../utils/ListResponse");
+const { formatISOWithoutTimezone, formatDateOnly } = require("../../../utils/FormatDate.js");
+
+const formatItem = (item) => ({
+    ...item,
+    start_term: formatDateOnly(item.start_term),
+    end_term: formatDateOnly(item.end_term),
+    createdAt: formatISOWithoutTimezone(item.createdAt),
+    updatedAt: formatISOWithoutTimezone(item.updatedAt),
+});
+
+exports.ExecutivesHistoriCollection = (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/admin/executives_history/ExecutivesHistoriResource.js

@@ -0,0 +1,19 @@
+const { formatISOWithoutTimezone, formatDateOnly } = require("../../../utils/FormatDate");
+
+const formatItem = (item) => ({
+    ...item,
+    start_term: formatDateOnly(item.start_term),
+    end_term: formatDateOnly(item.end_term),
+    createdAt: formatISOWithoutTimezone(item.createdAt),
+    updatedAt: formatISOWithoutTimezone(item.updatedAt),
+});
+
+exports.ExecutivesHistoriResource = (res, data, message = 'Success') => {
+    const formattedData = formatItem(data);
+
+    return res.status(200).json({
+        success: true,
+        message,
+        data: formattedData
+    });
+};

src/resources/admin/hospital/HospitalCollection.js

@@ -0,0 +1,22 @@
+const { ListResponse } = require("../../../utils/ListResponse");
+const { formatISOWithoutTimezone } = require("../../../utils/FormatDate.js");
+
+const formatItem = (item) => ({
+    ...item,
+    createdAt: formatISOWithoutTimezone(item.createdAt),
+    updatedAt: formatISOWithoutTimezone(item.updatedAt)
+});
+
+exports.HospitalCollection = (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/admin/hospital/HospitalResource.js

@@ -0,0 +1,17 @@
+const { formatISOWithoutTimezone } = require("../../../utils/FormatDate");
+
+const formatItem = (item) => ({
+    ...item,
+    createdAt: formatISOWithoutTimezone(item.createdAt),
+    updatedAt: formatISOWithoutTimezone(item.updatedAt)
+});
+
+exports.HospitalResource = (res, data, message = 'Success') => {
+    const formattedData = formatItem(data);
+
+    return res.status(200).json({
+        success: true,
+        message,
+        data: formattedData
+    });
+};

src/resources/admin/province/ProvinceCollection.js

@@ -0,0 +1,22 @@
+const { ListResponse } = require("../../../utils/ListResponse");
+const { formatISOWithoutTimezone } = require("../../../utils/FormatDate.js");
+
+const formatItem = (item) => ({
+    ...item,
+    createdAt: formatISOWithoutTimezone(item.createdAt),
+    updatedAt: formatISOWithoutTimezone(item.updatedAt)
+});
+
+exports.ProvinceCollection = (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/admin/province/ProvinceResource.js

@@ -0,0 +1,17 @@
+const { formatISOWithoutTimezone } = require("../../../utils/FormatDate");
+
+const formatItem = (item) => ({
+    ...item,
+    createdAt: formatISOWithoutTimezone(item.createdAt),
+    updatedAt: formatISOWithoutTimezone(item.updatedAt)
+});
+
+exports.ProvinceResource = (res, data, message = 'Success') => {
+    const formattedData = formatItem(data);
+
+    return res.status(200).json({
+        success: true,
+        message,
+        data: formattedData
+    });
+};

src/resources/admin/sales/SalesCollection.js

@@ -0,0 +1,22 @@
+const { ListResponse } = require("../../../utils/ListResponse");
+const { formatISOWithoutTimezone } = require("../../../utils/FormatDate.js");
+
+const formatItem = (item) => ({
+    ...item,
+    createdAt: formatISOWithoutTimezone(item.createdAt),
+    updatedAt: formatISOWithoutTimezone(item.updatedAt)
+});
+
+exports.SalesCollection = (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/admin/sales/SalesResource.js

@@ -0,0 +1,17 @@
+const { formatISOWithoutTimezone } = require("../../../utils/FormatDate");
+
+const formatItem = (item) => ({
+    ...item,
+    createdAt: formatISOWithoutTimezone(item.createdAt),
+    updatedAt: formatISOWithoutTimezone(item.updatedAt)
+});
+
+exports.SalesResource = (res, data, message = 'Success') => {
+    const formattedData = formatItem(data);
+
+    return res.status(200).json({
+        success: true,
+        message,
+        data: formattedData
+    });
+};

src/resources/admin/vendor/VendorCollection.js

@@ -0,0 +1,22 @@
+const { ListResponse } = require("../../../utils/ListResponse");
+const { formatISOWithoutTimezone } = require("../../../utils/FormatDate.js");
+
+const formatItem = (item) => ({
+    ...item,
+    createdAt: formatISOWithoutTimezone(item.createdAt),
+    updatedAt: formatISOWithoutTimezone(item.updatedAt)
+});
+
+exports.VendorCollection = (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/admin/vendor/VendorResource.js

@@ -0,0 +1,17 @@
+const { formatISOWithoutTimezone } = require("../../../utils/FormatDate");
+
+const formatItem = (item) => ({
+    ...item,
+    createdAt: formatISOWithoutTimezone(item.createdAt),
+    updatedAt: formatISOWithoutTimezone(item.updatedAt)
+});
+
+exports.VendorResource = (res, data, message = 'Success') => {
+    const formattedData = formatItem(data);
+
+    return res.status(200).json({
+        success: true,
+        message,
+        data: formattedData
+    });
+};

src/resources/admin/vendor_history/VendorHistoriCollection.js

@@ -0,0 +1,24 @@
+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/admin/vendor_history/VendorHistoriResource.js

@@ -0,0 +1,19 @@
+const { formatISOWithoutTimezone, formatDateOnly } = require("../../../utils/FormatDate");
+
+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.VendorHistoriResource = (res, data, message = 'Success') => {
+    const formattedData = formatItem(data);
+
+    return res.status(200).json({
+        success: true,
+        message,
+        data: formattedData
+    });
+};

src/resources/auth/LoginResource.js

@@ -0,0 +1,7 @@
+exports.LoginResource = (res, data, message = 'Success') => {
+    return res.status(200).json({
+        success: true,
+        message,
+        data
+    });
+};

src/resources/auth/UserResource.js

@@ -0,0 +1,8 @@
+exports.UserResource = (res, data, message = 'Success') => {
+    return res.status(200).json({
+        success: true,
+        message,
+        // data: Array.isArray(data) ? data : { ...data }
+        data
+    });
+};

src/resources/sales/area/UserAreaCollection.js

@@ -0,0 +1,13 @@
+const { ListResponse } = require("../../../utils/ListResponse");
+
+exports.UserAreaCollection = (req, res, data = [], total = null, page = 1, limit = 10, message = 'Success') => {
+    if (typeof total !== 'number') {
+        return res.status(200).json({
+            success: true,
+            message,
+            data: Array.isArray(data)
+        });
+    }
+
+    return ListResponse({ req, res, data, total, page, limit, message });
+};

src/resources/sales/executives_history/ExecutivesHistoriCollection.js

@@ -0,0 +1,24 @@
+const { ListResponse } = require("../../../utils/ListResponse");
+const { formatISOWithoutTimezone, formatDateOnly } = require("../../../utils/FormatDate.js");
+
+const formatItem = (item) => ({
+    ...item,
+    start_term: formatDateOnly(item.start_term),
+    end_term: formatDateOnly(item.end_term),
+    createdAt: formatISOWithoutTimezone(item.createdAt),
+    updatedAt: formatISOWithoutTimezone(item.updatedAt),
+});
+
+exports.ExecutivesHistoriCollection = (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/executives_history/ExecutivesHistoriResource.js

@@ -0,0 +1,19 @@
+const { formatISOWithoutTimezone, formatDateOnly } = require("../../../utils/FormatDate");
+
+const formatItem = (item) => ({
+    ...item,
+    start_term: formatDateOnly(item.start_term),
+    end_term: formatDateOnly(item.end_term),
+    createdAt: formatISOWithoutTimezone(item.createdAt),
+    updatedAt: formatISOWithoutTimezone(item.updatedAt),
+});
+
+exports.ExecutivesHistoriResource = (res, data, message = 'Success') => {
+    const formattedData = formatItem(data);
+
+    return res.status(200).json({
+        success: true,
+        message,
+        data: formattedData
+    });
+};

src/resources/sales/hospital/HospitalCollection.js

@@ -0,0 +1,22 @@
+const { ListResponse } = require("../../../utils/ListResponse");
+const { formatISOWithoutTimezone } = require("../../../utils/FormatDate.js");
+
+const formatItem = (item) => ({
+    ...item,
+    createdAt: formatISOWithoutTimezone(item.createdAt),
+    updatedAt: formatISOWithoutTimezone(item.updatedAt)
+});
+
+exports.HospitalCollection = (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/hospital/HospitalResource.js

@@ -0,0 +1,17 @@
+const { formatISOWithoutTimezone } = require("../../../utils/FormatDate");
+
+const formatItem = (item) => ({
+    ...item,
+    createdAt: formatISOWithoutTimezone(item.createdAt),
+    updatedAt: formatISOWithoutTimezone(item.updatedAt)
+});
+
+exports.HospitalResource = (res, data, message = 'Success') => {
+    const formattedData = formatItem(data);
+
+    return res.status(200).json({
+        success: true,
+        message,
+        data: formattedData
+    });
+};

src/resources/sales/vendor/VendorCollection.js

@@ -0,0 +1,22 @@
+const { ListResponse } = require("../../../utils/ListResponse");
+const { formatISOWithoutTimezone } = require("../../../utils/FormatDate.js");
+
+const formatItem = (item) => ({
+    ...item,
+    createdAt: formatISOWithoutTimezone(item.createdAt),
+    updatedAt: formatISOWithoutTimezone(item.updatedAt),
+});
+
+exports.VendorCollection = (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/VendorHistoriCollection.js

@@ -0,0 +1,24 @@
+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

@@ -0,0 +1,19 @@
+const { formatISOWithoutTimezone, formatDateOnly } = require("../../../utils/FormatDate");
+
+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.VendorHistoriResource = (res, data, message = 'Success') => {
+    const formattedData = formatItem(data);
+
+    return res.status(200).json({
+        success: true,
+        message,
+        data: formattedData
+    });
+};

src/resources/superadmin/admin/AdminCollection.js

@@ -0,0 +1,22 @@
+const { ListResponse } = require("../../../utils/ListResponse");
+const { formatISOWithoutTimezone } = require("../../../utils/FormatDate.js");
+
+const formatAdminItem = (item) => ({
+    ...item,
+    createdAt: formatISOWithoutTimezone(item.createdAt),
+    updatedAt: formatISOWithoutTimezone(item.updatedAt)
+});
+
+exports.AdminCollection = (req, res, data = [], total = null, page = 1, limit = 10, message = 'Success') => {
+    const formattedData = data.map(formatAdminItem);
+
+    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/superadmin/admin/AdminResource.js

@@ -0,0 +1,17 @@
+const { formatISOWithoutTimezone } = require("../../../utils/FormatDate");
+
+const formatAdminItem = (item) => ({
+    ...item,
+    createdAt: formatISOWithoutTimezone(item.createdAt),
+    updatedAt: formatISOWithoutTimezone(item.updatedAt)
+});
+
+exports.AdminResource = (res, data, message = 'Success') => {
+    const formattedData = formatAdminItem(data);
+
+    return res.status(200).json({
+        success: true,
+        message,
+        data: formattedData
+    });
+};

src/resources/superadmin/log/LogCollection.js

@@ -0,0 +1,21 @@
+const { ListResponse } = require("../../../utils/ListResponse");
+const { formatISOWithoutTimezone } = require("../../../utils/FormatDate.js");
+
+const formatAdminItem = (item) => ({
+    ...item,
+    createdAt: formatISOWithoutTimezone(item.createdAt),
+});
+
+exports.LogCollection = (req, res, data = [], total = null, page = 1, limit = 10, message = 'Success') => {
+    const formattedData = data.map(formatAdminItem);
+
+    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/services/admin/CityService.js

@@ -19,13 +19,13 @@ exports.getAllCityService = async ({ page, limit, search, sortBy, orderBy }) =>
         CityRepository.countAll(where)
     ]);
 
-    const formatted = cities.map(v => ({
-        ...v,
-        createdAt: formatISOWithoutTimezone(v.createdAt),
-        updatedAt: formatISOWithoutTimezone(v.updatedAt),
-    }));
+    // const formatted = cities.map(v => ({
+    //     ...v,
+    //     createdAt: formatISOWithoutTimezone(v.createdAt),
+    //     updatedAt: formatISOWithoutTimezone(v.updatedAt),
+    // }));
 
-    return { cities: formatted, total };
+    return { cities, total };
 };
 
 exports.showCityService = async (id) => {
@@ -34,11 +34,7 @@ exports.showCityService = async (id) => {
         throw new HttpException("Data city not found", 404);
     }
 
-    return {
-        ...city,
-        createdAt: formatISOWithoutTimezone(city.createdAt),
-        updatedAt: formatISOWithoutTimezone(city.updatedAt),
-    };
+    return city;
 };
 
 exports.storeCityService = async (validateData, req) => {

src/services/admin/ExecutivesHistoryService.js

@@ -25,20 +25,12 @@ exports.getAllExecutivesHistoryService = async ({ page, limit, search, sortBy, o
         deletedAt: null
     };
 
-    const [vendor_histories, total] = await Promise.all([
+    const [executives_histories, total] = await Promise.all([
         ExecutivesHistoryRepository.findAll({ skip, take: limit, where, orderBy: { [sortBy]: orderBy } }),
         ExecutivesHistoryRepository.countAll(where)
     ]);
 
-    const formatted = vendor_histories.map(v => ({
-        ...v,
-        start_term: formatDateOnly(v.start_term),
-        end_term: formatDateOnly(v.end_term),
-        createdAt: formatISOWithoutTimezone(v.createdAt),
-        updatedAt: formatISOWithoutTimezone(v.updatedAt),
-    }));
-
-    return { vendor_histories: formatted, total };
+    return { executives_histories, total };
 };
 
 exports.showExecutivesHistoryService = async (req) => {
@@ -59,13 +51,7 @@ exports.showExecutivesHistoryService = async (req) => {
         throw new HttpException("Executives history not found", 404);
     }
 
-    return {
-        ...executivesHistory,
-        start_term: formatDateOnly(executivesHistory.start_term),
-        end_term: formatDateOnly(executivesHistory.end_term),
-        createdAt: formatISOWithoutTimezone(executivesHistory.createdAt),
-        updatedAt: formatISOWithoutTimezone(executivesHistory.updatedAt),
-    };
+    return executivesHistory;
 };
 
 exports.storeExecutivesHistoryService = async (validateData, req) => {

src/services/admin/HospitalService.js

@@ -27,13 +27,7 @@ exports.getAllHospitalService = async ({ page, limit, search, sortBy, orderBy, p
         HospitalRepository.countAll(where)
     ]);
 
-    const formatted = hospitals.map(v => ({
-        ...v,
-        createdAt: formatISOWithoutTimezone(v.createdAt),
-        updatedAt: formatISOWithoutTimezone(v.updatedAt),
-    }));
-
-    return { hospitals: formatted, total };
+    return { hospitals, total };
 };
 
 exports.showHospitalService = async (id) => {
@@ -42,11 +36,7 @@ exports.showHospitalService = async (id) => {
         throw new HttpException("Data hospital not found", 404);
     }
 
-    return {
-        ...hospital,
-        createdAt: formatISOWithoutTimezone(hospital.createdAt),
-        updatedAt: formatISOWithoutTimezone(hospital.updatedAt),
-    };
+    return hospital;
 };
 
 exports.storeHospitalService = async (validateData, req) => {

src/services/admin/ProvinceService.js

@@ -18,13 +18,13 @@ exports.getAllProvinceService = async ({ page, limit, search, sortBy, orderBy })
         ProvinceRepository.countAll(where)
     ]);
 
-    const formatted = provinces.map(v => ({
-        ...v,
-        createdAt: formatISOWithoutTimezone(v.createdAt),
-        updatedAt: formatISOWithoutTimezone(v.updatedAt),
-    }));
+    // const formatted = provinces.map(v => ({
+    //     ...v,
+    //     createdAt: formatISOWithoutTimezone(v.createdAt),
+    //     updatedAt: formatISOWithoutTimezone(v.updatedAt),
+    // }));
 
-    return { provinces: formatted, total };
+    return { provinces, total };
 };
 
 exports.showProvinceService = async (id) => {
@@ -32,12 +32,8 @@ exports.showProvinceService = async (id) => {
     if (!province) {
         throw new HttpException("Data province not found", 404);
     }
-    
-    return {
-        ...province,
-        createdAt: formatISOWithoutTimezone(province.createdAt),
-        updatedAt: formatISOWithoutTimezone(province.updatedAt),
-    };
+
+    return province;
 };
 
 exports.storeProvinceService = async (validateData, req) => {

src/services/admin/SalesService.js

@@ -19,13 +19,7 @@ exports.getAllSalesService = async ({ page, limit, search, sortBy, orderBy }) =>
         SalesRepository.UserRepository.countAll(where)
     ]);
 
-    const formatted = sales.map(v => ({
-        ...v,
-        createdAt: formatISOWithoutTimezone(v.createdAt),
-        updatedAt: formatISOWithoutTimezone(v.updatedAt),
-    }));
-
-    return { sales: formatted, total };
+    return { sales, total };
 };
 
 exports.showSalesService = async (id) => {
@@ -33,12 +27,8 @@ exports.showSalesService = async (id) => {
     if (!sales) {
         throw new HttpException("Data sales not found", 404);
     }
-    
-    return {
-        ...sales,
-        createdAt: formatISOWithoutTimezone(sales.createdAt),
-        updatedAt: formatISOWithoutTimezone(sales.updatedAt),
-    };
+
+    return sales;
 };
 
 exports.storeSalesService = async (userData, req) => {

src/services/admin/VendorHistoryService.js

@@ -30,15 +30,7 @@ exports.getAllVendorHistoryService = async ({ page, limit, search, sortBy, order
         VendorHistoryRepository.countAll(where)
     ]);
 
-    const formatted = vendor_histories.map(v => ({
-        ...v,
-        contract_date: formatDateOnly(v.contract_date),
-        contract_expired_date: formatDateOnly(v.contract_expired_date),
-        createdAt: formatISOWithoutTimezone(v.createdAt),
-        updatedAt: formatISOWithoutTimezone(v.updatedAt),
-    }));
-
-    return { vendor_histories: formatted, total };
+    return { vendor_histories, total };
 };
 
 exports.showVendorHistoryService = async (req) => {
@@ -59,13 +51,7 @@ exports.showVendorHistoryService = async (req) => {
         throw new HttpException("Vendor history not found", 404);
     }
 
-    return {
-        ...vendorHistory,
-        contract_date: formatDateOnly(vendorHistory.contract_date),
-        contract_expired_date: formatDateOnly(vendorHistory.contract_expired_date),
-        createdAt: formatISOWithoutTimezone(vendorHistory.createdAt),
-        updatedAt: formatISOWithoutTimezone(vendorHistory.updatedAt),
-    };
+    return vendorHistory;
 };
 
 exports.storeVendorHistoryService = async (validateData, req) => {

src/services/admin/VendorService.js

@@ -19,13 +19,7 @@ exports.getAllVendorService = async ({ page, limit, search, sortBy, orderBy }) =
         VendorRepository.countAll(where)
     ]);
 
-    const formatted = vendors.map(v => ({
-        ...v,
-        createdAt: formatISOWithoutTimezone(v.createdAt),
-        updatedAt: formatISOWithoutTimezone(v.updatedAt),
-    }));
-
-    return { vendors: formatted, total };
+    return { vendors, total };
 };
 
 exports.showVendorService = async (id) => {
@@ -33,12 +27,8 @@ exports.showVendorService = async (id) => {
     if (!vendor) {
         throw new HttpException("Data vendor not found", 404);
     }
-    
-    return {
-        ...vendor,
-        createdAt: formatISOWithoutTimezone(vendor.createdAt),
-        updatedAt: formatISOWithoutTimezone(vendor.updatedAt),
-    };
+
+    return vendor;
 };
 
 exports.storeVendorService = async (validateData, req) => {

src/services/auth/AuthService.js

@@ -36,9 +36,9 @@ exports.loginService = async ({ username, password }, req) => {
 
         await loginLog(req, user);
 
-        const token = jwt.sign(user, JWT_SECRET, { expiresIn: '1d' });
+        user.token = jwt.sign(user, JWT_SECRET, { expiresIn: '1d' });
 
-        return { user, token };
+        return user;
     } catch (error) {
         throw new HttpException('Invalid username or password', 401);
     }

src/services/sales/AreaService.js

@@ -1,6 +1,5 @@
 const areaRepository = require('../../repository/sales/AreaRepository.js');
 const { SearchFilter } = require('../../utils/SearchFilter.js');
-const prisma = require('../../prisma/PrismaClient.js');
 
 exports.getAllAreaByUserService = async ({ page, limit, search, sortBy, orderBy }, req) => {
     const skip = (page - 1) * limit;

src/services/sales/ExecutivesHistoryService.js

@@ -4,7 +4,6 @@ const prisma = require('../../prisma/PrismaClient.js');
 const { SearchFilter } = require('../../utils/SearchFilter.js');
 const timeLocal = require('../../utils/TimeLocal.js');
 const { createLog, updateLog, deleteLog } = require('../../utils/LogActivity.js');
-const { formatDateOnly, formatISOWithoutTimezone } = require('../../utils/FormatDate.js');
 
 exports.getAllExecutivesHistoryService = async ({ page, limit, search, sortBy, orderBy }, req) => {
     const skip = (page - 1) * limit;
@@ -25,20 +24,12 @@ exports.getAllExecutivesHistoryService = async ({ page, limit, search, sortBy, o
         deletedAt: null
     };
 
-    const [vendor_histories, total] = await Promise.all([
+    const [executives_histories, total] = await Promise.all([
         ExecutivesHistoryRepository.findAll({ skip, take: limit, where, orderBy: { [sortBy]: orderBy } }),
         ExecutivesHistoryRepository.countAll(where)
     ]);
 
-    const formatted = vendor_histories.map(v => ({
-        ...v,
-        start_term: formatDateOnly(v.start_term),
-        end_term: formatDateOnly(v.end_term),
-        createdAt: formatISOWithoutTimezone(v.createdAt),
-        updatedAt: formatISOWithoutTimezone(v.updatedAt),
-    }));
-
-    return { vendor_histories: formatted, total };
+    return { executives_histories, total };
 };
 
 exports.showExecutivesHistoryService = async (req) => {
@@ -59,13 +50,7 @@ exports.showExecutivesHistoryService = async (req) => {
         throw new HttpException("Executives history not found", 404);
     }
 
-    return {
-        ...executivesHistory,
-        start_term: formatDateOnly(executivesHistory.start_term),
-        end_term: formatDateOnly(executivesHistory.end_term),
-        createdAt: formatISOWithoutTimezone(executivesHistory.createdAt),
-        updatedAt: formatISOWithoutTimezone(executivesHistory.updatedAt),
-    };
+    return executivesHistory;
 };
 
 exports.storeExecutivesHistoryService = async (validateData, req) => {

src/services/sales/HospitalService.js

@@ -34,13 +34,7 @@ exports.getAllHospitalByAreaService = async ({ page, limit, search, sortBy, orde
         salesHospitalRepository.countAll(where)
     ]);
 
-    const formatted = hospitals.map(v => ({
-        ...v,
-        createdAt: formatISOWithoutTimezone(v.createdAt),
-        updatedAt: formatISOWithoutTimezone(v.updatedAt),
-    }));
-
-    return { hospitals: formatted, total };
+    return { hospitals, total };
 };
 
 // exports.getAllHospitalByAreaService = async (
@@ -222,9 +216,5 @@ exports.showHospitalService = async (id) => {
         throw new HttpException("Data hospital not found", 404);
     }
 
-    return {
-        ...hospital,
-        createdAt: formatISOWithoutTimezone(hospital.createdAt),
-        updatedAt: formatISOWithoutTimezone(hospital.updatedAt),
-    };
+    return hospital;
 };

src/services/sales/VendorHistoryService.js

@@ -30,15 +30,7 @@ exports.getAllVendorHistoryService = async ({ page, limit, search, sortBy, order
         VendorHistoryRepository.countAll(where)
     ]);
 
-    const formatted = vendor_histories.map(v => ({
-        ...v,
-        contract_date: formatDateOnly(v.contract_date),
-        contract_expired_date: formatDateOnly(v.contract_expired_date),
-        createdAt: formatISOWithoutTimezone(v.createdAt),
-        updatedAt: formatISOWithoutTimezone(v.updatedAt),
-    }));
-
-    return { vendor_histories: formatted, total };
+    return { vendor_histories, total };
 };
 
 exports.showVendorHistoryService = async (req) => {
@@ -59,13 +51,7 @@ exports.showVendorHistoryService = async (req) => {
         throw new HttpException("Vendor history not found", 404);
     }
 
-    return {
-        ...vendorHistory,
-        contract_date: formatDateOnly(vendorHistory.contract_date),
-        contract_expired_date: formatDateOnly(vendorHistory.contract_expired_date),
-        createdAt: formatISOWithoutTimezone(vendorHistory.createdAt),
-        updatedAt: formatISOWithoutTimezone(vendorHistory.updatedAt),
-    };
+    return vendorHistory;
 };
 
 exports.storeVendorHistoryService = async (validateData, req) => {

src/services/sales/VendorService.js

@@ -2,7 +2,6 @@ const VendorRepository = require('../../repository/sales/VendorRepository.js');
 const HttpException = require('../../utils/HttpException.js');
 const prisma = require('../../prisma/PrismaClient.js');
 const { SearchFilter } = require('../../utils/SearchFilter.js');
-const { formatISOWithoutTimezone, formatDateOnly } = require('../../utils/FormatDate.js');
 
 exports.getAllVendorService = async ({ page, limit, search, sortBy, orderBy }, req) => {
     const skip = (page - 1) * limit;
@@ -52,13 +51,7 @@ exports.getAllVendorService = async ({ page, limit, search, sortBy, orderBy }, r
         VendorRepository.countAll(where)
     ]);
 
-    const formatted = vendors.map(v => ({
-        ...v,
-        createdAt: formatISOWithoutTimezone(v.createdAt),
-        updatedAt: formatISOWithoutTimezone(v.updatedAt),
-    }));
-
-    return { vendors: formatted, total };
+    return { vendors, total };
 };
 
 // exports.showVendorService = async (id) => {