@7365admin1/core 3.32.2-staging.34 → 3.32.2-staging.36

package/dist/index.d.ts

@@ -1590,7 +1590,7 @@ declare function useServiceProviderRepo(): {
         siteId?: string | ObjectId | undefined;
         orgId?: string | ObjectId | undefined;
         serviceProviderOrgId?: string | ObjectId | undefined;
-    }) => Promise<{} | null>;
+    }) => Promise<{}>;
     updateStatusById: (_id: string | ObjectId, status: string) => Promise<mongodb.UpdateResult<bson.Document>>;
 };
 
@@ -1598,6 +1598,7 @@ declare function useServiceProviderController(): {
     createServiceProvider: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     getServiceProviders: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     getByProviderOrg: (req: Request, res: Response, next: NextFunction) => Promise<void>;
+    getByEmail: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     getServiceProviderNames: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     getServiceProviderTypes: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     getServiceProviderById: (req: Request, res: Response, next: NextFunction) => Promise<void>;

package/dist/index.js

@@ -19430,7 +19430,7 @@ function useServiceProviderRepo() {
         import_node_server_utils56.logger.info(`Cache hit for key: ${cacheKey}`);
         return cachedData;
       }
-      const data = await collection.findOne(query);
+      const data = await collection.find(query).toArray();
       setCache(cacheKey, data, 15 * 60).then(() => {
         import_node_server_utils56.logger.info(`Cache set for key: ${cacheKey}`);
       }).catch((err) => {
@@ -20285,6 +20285,7 @@ function useServiceProviderController() {
     getServiceProviderById: _getServiceProviderById,
     getServiceProviders: _getServiceProviders,
     getByServiceProviderOrgIdType: _getByServiceProviderOrgIdType,
+    getByEmail: _getByEmail,
     updateStatusById: _updateStatusById
   } = useServiceProviderRepo();
   const { createServiceProvider: _createServiceProvider } = useServiceProviderService();
@@ -20523,10 +20524,34 @@ function useServiceProviderController() {
       return;
     }
   }
+  async function getByEmail(req, res, next) {
+    const validation = import_joi31.default.object({
+      email: import_joi31.default.string().email().required(),
+      orgId: import_joi31.default.string().hex().optional().allow("", null),
+      siteId: import_joi31.default.string().hex().optional().allow("", null),
+      serviceProviderOrgId: import_joi31.default.string().hex().optional().allow("", null)
+    });
+    const { error, value } = validation.validate(req.query);
+    if (error) {
+      import_node_server_utils62.logger.log({ level: "error", message: error.message });
+      next(new import_node_server_utils62.BadRequestError(error.message));
+      return;
+    }
+    try {
+      const data = await _getByEmail(value);
+      res.json(data);
+      return;
+    } catch (error2) {
+      import_node_server_utils62.logger.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
   return {
     createServiceProvider,
     getServiceProviders,
     getByProviderOrg,
+    getByEmail,
     getServiceProviderNames,
     getServiceProviderTypes,
     getServiceProviderById,
@@ -25328,9 +25353,9 @@ function usePersonRepo() {
           { email: { $regex: search, $options: "i" } },
           { nric: { $regex: search, $options: "i" } },
           { "plates.plateNumber": { $regex: search, $options: "i" } },
-          { contact: { $regex: makeContainsRegex(contact) } },
-          { contacts: { $regex: makeContainsRegex(contact) } },
-          { plateNumbers: { $regex: makeContainsRegex(plateNumber) } }
+          { contact: { $regex: makeContainsRegex(search) } },
+          { contacts: { $regex: makeContainsRegex(search) } },
+          { plateNumbers: { $regex: makeContainsRegex(search) } }
         ]
       },
       ...import_mongodb45.ObjectId.isValid(org) && { org: new import_mongodb45.ObjectId(org) },
@@ -35702,7 +35727,7 @@ function useVisitorTransactionService() {
         value.unitName = unit?.name;
       }
       const { nric = "", name = "", contact = "", plateNumber = "", email = "", site = "", type = "guest", company, createdBy } = value;
-      if (/^(guest|walk-in|contractor|delivery)$/.test(type)) {
+      if (/^(guest|walk-in|contractor|delivery)$/.test(type) && site) {
         await addUpdateFromVisitor({
           nric,
           name,
@@ -35933,7 +35958,7 @@ function useVisitorTransactionService() {
         value.checkIn = isNaN(parsed.getTime()) ? null : parsed;
       }
       const { nric = "", name = "", contact = "", plateNumber = "", email = "", site = "", type = "guest", company, createdBy } = value;
-      if (/^(guest|walk-in|contractor|delivery)$/.test(type) && !value.checkOut) {
+      if (/^(guest|walk-in|contractor|delivery)$/.test(type) && site) {
         await addUpdateFromVisitor({
           nric,
           name,
@@ -36117,7 +36142,9 @@ function useVisitorTransactionService() {
               value.site,
               session,
               void 0,
-              id
+              id,
+              void 0,
+              true
             );
             item.receivedDate = /* @__PURE__ */ new Date();
             item.status = "Not Returned" /* NOT_RETURNED */;
@@ -36166,7 +36193,9 @@ function useVisitorTransactionService() {
               value.site,
               session,
               void 0,
-              id
+              id,
+              void 0,
+              true
             );
             item.receivedDate = /* @__PURE__ */ new Date();
             item.status = "Not Returned" /* NOT_RETURNED */;