@7365admin1/core 3.32.2-staging.81 → 3.32.2-staging.83

package/.changeset/service-provider-invite-pending-check.md

@@ -0,0 +1,17 @@
+---
+"@7365admin1/core": patch
+---
+
+Make the "an invitation is already waiting" check actually find the invitation
+
+The duplicate-invitation guard added with the existing-provider invite fix never
+fired. Invitations are written with `metadata.siteId` as an ObjectId, but the
+lookup searched for the site id as the plain string it arrived as on the request,
+and MongoDB does not treat the two as equal. The query therefore always came back
+empty: a property manager could send the same service provider a second, third
+and fourth invitation for the same site while the first was still valid, and each
+one produced another email and another pending row for them to chase.
+
+The lookup now matches either form, so older records that hold the string are
+still found. Nothing else changes: the refusal message and the status code are
+the ones already shipped.

package/dist/index.d.ts

@@ -9594,12 +9594,20 @@ declare function useNotificationRepo(): {
         pageRange: string;
     }>;
     markAsReadById: (_id: string, userId: string) => Promise<mongodb.WithId<TNotification>>;
+    markAllAsRead: (userId: string, appSlug?: string) => Promise<{
+        modifiedCount: number;
+    }>;
+    getUnreadCount: (userId: string, appSlug?: string) => Promise<{
+        unread: number;
+    }>;
 };
 
 declare function useNotificationController(): {
     add: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     getAll: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     markAsRead: (req: Request, res: Response, next: NextFunction) => Promise<void>;
+    markAllAsRead: (req: Request, res: Response, next: NextFunction) => Promise<void>;
+    getUnreadCount: (req: Request, res: Response, next: NextFunction) => Promise<void>;
 };
 
 export { ANPRMode, AccessTypeProps, AppServiceType, AssignCardConfig, BidStatus, BidType, BuildingLevelStatus, BuildingStatus, BulkCardUpdate, BulletinOrder, BulletinRecipient, BulletinSort, BulletinStatus, BulletinVideoOrder, BulletinVideoSort, CAMERA_ANPR_PERMISSIONS, CAMERA_CAPABILITIES, CAMERA_CAPABILITY_REASONS, CAMERA_NOT_PATROL_OR_CCTV, CAMERA_PTZ_PERMISSIONS, CAMERA_REQUEST_TIMEOUT_MS, CAMERA_RTSP_TIMEOUT_MS, CAMERA_SETUP_PERMISSIONS, CAMERA_SNAPSHOT_CACHE_SECONDS, CAMERA_SNAPSHOT_MAX_BYTES, CAMERA_TEST_MIN_INTERVAL_SECONDS, CAMERA_TEST_ROUND_LIMIT, CAMERA_TEST_ROUND_SECONDS, CAMERA_TYPE_ANPR, CAMERA_TYPE_IP, CAMERA_VIEW_PERMISSIONS, CLOCK_DRIFT_WARN_SECONDS, CURRENT_TIME_ENDPOINT, Camera, CameraAddressInput, CameraCapability, CameraCapabilityContext, CameraCapabilityDescriptor, CameraCapabilityEntry, CameraCapabilityReason, CameraCapabilityState, CameraCapabilityTrace, CameraDevice, CameraMembership, CameraTestStatus, CameraTransport, CameraType, DEVICE_STATUS, DOBStatus, DayOfWeek, DeviceHttpTarget, DeviceProbeResult, DynamicFormFields, EAccessCardTypes, EAccessCardUserTypes, EmailSender, EntryOrder, EntrySort, EventOrder, EventSort, EventStatus, EventType, FacilitySort, FacilityStatus, FormEntryStatus, GuestSort, GuestStatus, HID_PERMISSION_CATEGORIES, IAccessCard, IAccessCardTransaction, MAX_CAMERA_CHANNEL, MAccessCard, MAccessCardTransaction, MAddress, MAttendance, MAttendanceSettings, MBidPreloved, MBillingConfiguration, MBillingItem, MBuilding, MBuildingLevel, MBuildingUnit, MBulletinBoard, MBulletinVideo, MCategoryPreloved, MChannelPreloved, MChat, MChatPreloved, MCustomer, MCustomerSite, MDocumentManagement, MEntryPassSettings, MEventManagement, MFeedback, MFile, MFormEntry, MGuestManagement, MHidAmicoEvent, MHidAmicoIdentity, MHidAmicoReader, MHidSipAccount, MHidSitePermissions, MIncidentReport, MManpowerDesignations, MManpowerMonitoring, MManpowerRemarks, MManpowerSites, MMember, MNfcPatrolLog, MNfcPatrolRoute, MNfcPatrolSettings, MNfcPatrolSettingsUpdate, MNfcPatrolTag, MNotification, MOccurrenceBook, MOccurrenceEntry, MOccurrenceSubject, MOnlineForm, MOrg, MOvernightParkingApprovalHours, MOvernightParkingRequest, MPatrolLog, MPatrolQuestion, MPatrolRoute, MPerson, MPost, MPostFavorite, MPromoCode, MRobot, MRole, MRoleV2, MServiceProvider, MServiceProviderBilling, MSession, MSite, MSiteCamera, MSiteFacility, MSiteFacilityBooking, MStatementOfAccount, MSubcategoryPreloved, MSubscription, MSubscriptionPlan, MUnitBilling, MUser, MVehicle, MVehicleTransaction, MVerification, MVerificationV2, MVisitorTransaction, MWorkOrder, NotificationAppSlug, NotificationModule, OrgNature, OvernightParkingRequestSort, OvernightParkingRequestStatus, PATROL_CCTV_CAMERA_FILTER, PERSON_TYPES, PStatus, PTZ_ALLOWED_ACTIONS, PTZ_ALLOWED_CODES, Period, PersonStatus, PersonType, PersonTypes, PostOrder, PostSort, PostStatus, QrTagProps, ResidentAppModuleKey, SOFTWARE_VERSION_ENDPOINT, SiteAddress, SiteCategories, SiteStatus, SortFields, SortOrder, Status, SubjectOrder, SubjectSort, SubscriptionType, TAccessMngmntSettings, TActionStatus, TAddress, TAffectedEntities, TAffectedInjured, TAppServiceType, TApprovedBy, TApprover, TAttendance, TAttendanceCheckIn, TAttendanceCheckOut, TAttendanceCheckTime, TAttendanceLocation, TAttendanceSettings, TAttendanceSettingsGetBySite, TAuthorities, TAuthoritiesCalled, TBidPreloved, TBilling, TBillingConfiguration, TBillingItem, TBuilding, TBuildingLevel, TBuildingUnit, TBulletinBoard, TBulletinVideo, TCamera, TCategoryPreloved, TChannelPreloved, TChat, TChatPreloved, TCheckPoint$1 as TCheckPoint, TComplaintInfo, TComplaintReceivedTo, TCounter, TCreateNfcPatrolLog, TCustomer, TCustomerSite, TDayNumber, TDaySchedule, TDefaultAccessCard, TDesignations, TDocs, TDocumentCreate, TDocumentManagement, TEntryPassSettings, TEventManagement, TFeedback, TFeedbackMetadata, TFeedbackUpdate, TFeedbackUpdateCategory, TFeedbackUpdateServiceProvider, TFeedbackUpdateStatus, TFeedbackUpdateToCompleted, TFile, TFiles, TFolderUpdate, TFormEntry, TGetAttendancesByUserQuery, TGetAttendancesQuery, TGuestManagement, THidAmicoEvent, THidAmicoIdentity, THidAmicoReader, THidPermissionAssignment, THidPermissionCategory, THidSipAccount, THidSitePermissions, TIncidentInformation, TIncidentReport, TIncidentTypeAndTime, TInvoice, TKeyRef, TManpowerDesignations, TManpowerDesignationsUpdate, TManpowerMonitoring, TManpowerMonitoringUpdate, TManpowerRemarks, TManpowerRemarksStatusUpdate, TManpowerRemarksUpdate, TManpowerSearchFilter, TManpowerSites, TMember, TMemberUpdateStatus, TMessagePreloved, TMiniRole, TNfcPatrolLog, TNfcPatrolRoute, TNfcPatrolRouteEdit, TNfcPatrolSettings, TNfcPatrolSettingsGetBySite, TNfcPatrolSettingsUpdate, TNfcPatrolTag, TNfcPatrolTagConfigureReset, TNfcPatrolTagEdit, TNfcPatrolTagUpdateData, TNotification, TOccurrenceBook, TOccurrenceEntry, TOccurrenceSubject, TOnlineForm, TOrg, TOvernightParkingApprovalHours, TOvernightParkingRequest, TPatrolLog, TPatrolQuestion, TPatrolRoute, TPerson, TPlaceOfIncident, TPlates, TPost, TPostFavorite, TPrice, TPriceType, TPromoCode, TPromoTier, TRANSPORT_DEVICE_HTTP, TRANSPORT_RELAY_PLAYER, TRANSPORT_RTSP_FRAME, TRecipientOfComplaint, TRemarks, TResident, TResidentAppModules, TRobot, TRobotMetadata, TRole, TRoleV2, TRoute, TSOABillingItem, TSOAStatus, TServiceProvider, TServiceProviderBilling, TSession, TSessionCreate, TShifts, TSignNfcPatrolLog, TSite, TSiteCamera, TSiteFacility, TSiteFacilityBooking, TSiteInfo, TSiteInformation, TSiteMetadata, TSiteUpdateBlock, TStatementOfAccount, TSubcategoryPreloved, TSubmissionForm, TSubscription, TSubscriptionPlan, TSubscriptionPlanApplication, TUnitBilling, TUnits, TUpdateFormEntry, TUpdateName, TUser, TUserCreate, TVehicle, TVehicleTransaction, TVehicleUpdate, TVerification, TVerificationMetadata, TVerificationMetadataV2, TVerificationV2, TVisitorTransaction, TWorkOrder, TWorkOrderMetadata, TWorkOrderUpdate, TWorkOrderUpdateStatus, TWorkOrderUpdateToCompleted, TanyoneDamageToProperty, UseAccessManagementRepo, UserStatus, VehicleCategory, VehicleOrder, VehicleSort, VehicleStatus, VehicleType, VerificationLinkType, VerificationStatus, VerificationSubjectType, VerificationType, VisitorSort, VisitorStatus, addressSchema, allowedFieldsSite, allowedNatures, allowedPlanApplications, attendanceSchema, attendanceSettingsSchema, building_level_namespace_collection, building_units_namespace_collection, buildings_namespace_collection, bulletin_boards_namespace_collection, cameraBaseUrl, cameraCapabilitiesFor, cameraDevices, cameraGrant, cameraHealthSummary, cameraManagePermissions, cameraTransports, chatPrelovedEvents, chatSchema, clampPtzSpeed, clockDriftSeconds, createManpowerRemarksDaily, customerSchema, deriveCameraHost, describeCameraCapabilities, designationsSchema, deviceControlEnabled, deviceHttpEnabled, deviceHttpTargets, deviceHttpTimeoutMs, deviceProbeTtlSeconds, events_namespace_collection, facility_bookings_namespace_collection, feedbackSchema, feedbacks2_namespace_collection, feedbacks_namespace_collection, ffmpegFrameArgs, ffmpegPath, formatCapabilityTrace, formatDahuaDate, guests_namespace_collection, hasAnyCapability, hasAnyPermission, incidentReport, incidentReportLog, incidents_namespace_collection, isCameraEntitled, isPatrolCctvCamera, isRelayPlayerUrl, logCamera, manpowerDesignationsSchema, manpowerEvents, manpowerMonitoringSchema, manpowerRemarksSchema, manpowerSitesSchema, mapWithLimit, nfcPatrolSettingsSchema, nfcPatrolSettingsSchemaUpdate, occurrence_book_namespace_collection, online_forms_namespace_collection, orgSchema, overnight_parking_requests_namespace_collection, parseCameraChannel, parseCameraHost, parseDahuaFind, parseDeviceTime, parseSoftwareVersion, promoCodeSchema, ptzEndpoint, publicCameraFields, registerCameraTransport, relayForRecorder, remarksSchema, resetCameraTransports, residentAppModuleKeys, residentFormEntry, resolutionRefusalReason, resolveCamera, resolveDeviceHttp, robotSchema, rtspUrl, schema, schemaAppSlugNotification, schemaApprovedBy, schemaApprover, schemaBidPreloved, schemaBilling, schemaBillingConfiguration, schemaBillingItem, schemaBuilding, schemaBuildingLevel, schemaBuildingUnit, schemaBuildingUpdateOptions, schemaBulletinBoard, schemaBulletinVideo, schemaCategoryPreloved, schemaChannelPreloved, schemaChatPreloved, schemaCreateHidAmicoIdentity, schemaCreateNfcPatrolLog, schemaCreateNotification, schemaCustomerSite, schemaDocumentManagement, schemaEntryPassSettings, schemaEventManagement, schemaFiles, schemaFormEntry, schemaGuestManagement, schemaHidAmicoConfiguration, schemaHidAmicoEvent, schemaHidAmicoExecuteActions, schemaHidAmicoIdentity, schemaHidAmicoIdentityIdParams, schemaHidAmicoIdentityQuery, schemaHidAmicoIntercomCall, schemaHidAmicoLogQuery, schemaHidAmicoNotificationParams, schemaHidAmicoObjectOperation, schemaHidAmicoReader, schemaHidAmicoReaderIdParams, schemaHidAmicoReaderListQuery, schemaHidAmicoSetConfiguration, schemaHidAmicoSiteIdParams, schemaHidAmicoSync, schemaHidAmicoUserImageParams, schemaHidAmicoUserImageUploadQuery, schemaHidAmicoVisitorImageParams, schemaHidAmicoVisitorImageUploadQuery, schemaHidAmicoVisitorQr, schemaHidPermissionCandidateQuery, schemaHidPermissionScopeQuery, schemaHidSipAccountRequest, schemaIncidentReport, schemaListNotification, schemaMultipleDocumentManagement, schemaNfcPatrolLog, schemaNfcPatrolRoute, schemaNfcPatrolTag, schemaNfcPatrolTagUpdateData, schemaNotification, schemaOccurrenceBook, schemaOccurrenceEntry, schemaOccurrenceSubject, schemaOnlineForm, schemaOvernightParkingApprovalHours, schemaOvernightParkingRequest, schemaPatrolLog, schemaPatrolQuestion, schemaPatrolRoute, schemaPerson, schemaPlate, schemaPost, schemaPostFavorite, schemaServiceProvider, schemaServiceProviderBilling, schemaSignNfcPatrolLog, schemaSiteCamera, schemaSiteFacility, schemaSiteFacilityBooking, schemaStatementOfAccount, schemaSubcategoryPreloved, schemaUnitBilling, schemaUpdateBidPreloved, schemaUpdateBuildingLevel, schemaUpdateBulletinBoard, schemaUpdateBulletinVideo, schemaUpdateCategoryPreloved, schemaUpdateChatPreloved, schemaUpdateDocumentManagement, schemaUpdateEntryPassSettings, schemaUpdateEventManagement, schemaUpdateFolderManagement, schemaUpdateFormEntry, schemaUpdateGuestManagement, schemaUpdateHidAmicoIdentity, schemaUpdateHidAmicoReader, schemaUpdateHidSitePermissions, schemaUpdateIncidentReport, schemaUpdateNotification, schemaUpdateOccurrenceBook, schemaUpdateOccurrenceEntry, schemaUpdateOccurrenceSubject, schemaUpdateOnlineForm, schemaUpdateOptions, schemaUpdateOvernightParkingRequest, schemaUpdatePatrolLog, schemaUpdatePatrolQuestion, schemaUpdatePatrolRoute, schemaUpdatePerson, schemaUpdatePost, schemaUpdatePostFavorite, schemaUpdateServiceProviderBilling, schemaUpdateSiteBillingConfiguration, schemaUpdateSiteBillingItem, schemaUpdateSiteCamera, schemaUpdateSiteFacility, schemaUpdateSiteFacilityBooking, schemaUpdateSiteUnitBilling, schemaUpdateStatementOfAccount, schemaUpdateSubcategoryPreloved, schemaUpdateVisTrans, schemaVehicleTransaction, schemaVisitorTransaction, schemeCamera, schemeLogCamera, sessionSchema, shiftSchema, siteSchema, site_people_namespace_collection, snapshotEndpoint, snapshotRefusalReason, subscriptionPlanSchema, updateRemarksStatusEod, updateRemarksisAcknowledged, updateSiteSchema, useAccessManagementController, useAddressRepo, useAttendanceController, useAttendanceRepository, useAttendanceSettingsController, useAttendanceSettingsRepository, useAttendanceSettingsService, useAuthController, useAuthControllerV2, useAuthService, useAuthServiceV2, useBidPrelovedController, useBidPrelovedRepo, useBidPrelovedService, useBuildingController, useBuildingLevelController, useBuildingLevelRepo, useBuildingLevelService, useBuildingRepo, useBuildingService, useBuildingUnitController, useBuildingUnitRepo, useBuildingUnitService, useBulletinBoardController, useBulletinBoardRepo, useBulletinBoardService, useBulletinVideoController, useBulletinVideoRepo, useBulletinVideoService, useCameraViewController, useCameraViewService, useCategoryPrelovedController, useCategoryPrelovedRepo, useChannelPrelovedController, useChannelPrelovedRepo, useChatController, useChatPrelovedController, useChatPrelovedRepo, useChatPrelovedService, useChatRepo, useCounterModel, useCounterRepo, useCustomerController, useCustomerRepo, useCustomerSiteController, useCustomerSiteRepo, useCustomerSiteService, useDahuaService, useDashboardController, useDashboardRepo, useDocumentManagementController, useDocumentManagementRepo, useDocumentManagementService, useEntryPassSettingsController, useEntryPassSettingsRepo, useEventManagementController, useEventManagementRepo, useEventManagementService, useFeedbackController, useFeedbackRepo, useFeedbackService, useFileController, useFileRepo, useFileService, useFormEntryController, useFormEntryRepo, useGuestManagementController, useGuestManagementRepo, useGuestManagementService, useHidAmicoController, useHidAmicoRepo, useHidAmicoService, useHrmLabsAttendanceCtrl, useHrmLabsAttendanceSrvc, useIncidentReportController, useIncidentReportRepo, useIncidentReportService, useInvoiceController, useInvoiceModel, useInvoiceRepo, useManpowerDesignationCtrl, useManpowerDesignationRepo, useManpowerMonitoringCtrl, useManpowerMonitoringRepo, useManpowerMonitoringSrvc, useManpowerRemarkCtrl, useManpowerRemarksRepo, useManpowerSitesCtrl, useManpowerSitesRepo, useManpowerSitesSrvc, useMemberController, useMemberRepo, useMemberService, useNewDashboardController, useNewDashboardRepo, useNfcPatrolLogController, useNfcPatrolLogRepo, useNfcPatrolLogService, useNfcPatrolRouteController, useNfcPatrolRouteRepo, useNfcPatrolRouteService, useNfcPatrolSettingsController, useNfcPatrolSettingsRepository, useNfcPatrolSettingsService, useNfcPatrolTagController, useNfcPatrolTagRepo, useNfcPatrolTagService, useNotificationController, useNotificationRepo, useOccurrenceBookController, useOccurrenceBookRepo, useOccurrenceBookService, useOccurrenceEntryController, useOccurrenceEntryRepo, useOccurrenceEntryService, useOccurrenceSubjectController, useOccurrenceSubjectRepo, useOccurrenceSubjectService, useOnlineFormController, useOnlineFormRepo, useOrgController, useOrgControllerV2, useOrgRepo, useOvernightParkingController, useOvernightParkingRepo, useOvernightParkingRequestController, useOvernightParkingRequestRepo, useOvernightParkingRequestService, usePatrolLogController, usePatrolLogRepo, usePatrolQuestionController, usePatrolQuestionRepo, usePatrolRouteController, usePatrolRouteRepo, usePersonController, usePersonRepo, usePostFavoriteController, usePostFavoriteRepo, usePostFavoriteService, usePostPrelovedController, usePostPrelovedRepo, usePriceController, usePriceModel, usePriceRepo, usePromoCodeController, usePromoCodeRepo, useRedDotPaymentController, useRedDotPaymentRepo, useRedDotPaymentSvc, useRobotController, useRobotRepo, useRobotService, useRoleController, useRoleControllerV2, useRoleRepo, useRoleRepoV2, useRoleServiceV2, useServiceProviderBillingController, useServiceProviderBillingRepo, useServiceProviderBillingService, useServiceProviderController, useServiceProviderRepo, useSessionRepo, useSiteBillingConfigurationController, useSiteBillingConfigurationRepo, useSiteBillingItemController, useSiteBillingItemRepo, useSiteCameraController, useSiteCameraRepo, useSiteCameraService, useSiteController, useSiteFacilityBookingController, useSiteFacilityBookingRepo, useSiteFacilityBookingService, useSiteFacilityController, useSiteFacilityRepo, useSiteFacilityService, useSiteRepo, useSiteService, useSiteUnitBillingController, useSiteUnitBillingRepo, useSiteUnitBillingService, useStatementOfAccountController, useStatementOfAccountRepo, useSubcategoryPrelovedController, useSubcategoryPrelovedRepo, useSubscriptionController, useSubscriptionPlanController, useSubscriptionPlanRepo, useSubscriptionRepo, useSubscriptionService, useUserController, useUserControllerV2, useUserRepo, useUserRepoV2, useUserService, useUserServiceV2, useVehicleController, useVehicleRepo, useVehicleService, useVerificationController, useVerificationControllerV2, useVerificationRepo, useVerificationRepoV2, useVerificationService, useVerificationServiceV2, useVisitorTransactionController, useVisitorTransactionRepo, useVisitorTransactionService, useWorkOrderController, useWorkOrderRepo, useWorkOrderService, userSchema, vehicleSchema, vehicles_namespace_collection, visitorPersonRepo, visitorPersonService, visitorType, visitors_namespace_collection, wallConfig, workOrderSchema, work_orders2_namespace_collection, work_orders_namespace_collection };

package/dist/index.js

@@ -12480,6 +12480,11 @@ function useVerificationRepoV2() {
     }
   }
   async function getPendingServiceProviderInvite(email, siteId) {
+    const site = [siteId];
+    try {
+      site.push(new import_mongodb19.ObjectId(siteId));
+    } catch {
+    }
     try {
       return await collection.findOne(
         {
@@ -12491,7 +12496,7 @@ function useVerificationRepoV2() {
               "service-provider-create-org" /* SERVICE_PROVIDER_CREATE_ORG */
             ]
           },
-          "metadata.siteId": siteId,
+          "metadata.siteId": { $in: site },
           expireAt: { $gt: (/* @__PURE__ */ new Date()).toISOString() }
         },
         { sort: { createdAt: -1 } }
@@ -38835,7 +38840,8 @@ var schemaListNotification = import_joi60.default.object({
   user: import_joi60.default.string().hex().length(24).optional()
 });
 var schemaAppSlugNotification = import_joi60.default.object({
-  appSlug: schemaNotification.extract("appSlug")
+  appSlug: schemaNotification.extract("appSlug"),
+  user: import_joi60.default.string().hex().length(24).required()
 });
 function MNotification(value) {
   const { error } = schemaNotification.validate(value);
@@ -39023,11 +39029,53 @@ function useNotificationRepo() {
       throw new import_node_server_utils114.InternalServerError("Failed to update notification.");
     }
   }
+  async function markAllAsRead(userId, appSlug) {
+    if (!import_mongodb70.ObjectId.isValid(userId)) {
+      throw new import_node_server_utils114.BadRequestError("Invalid user ID format.");
+    }
+    try {
+      const now = /* @__PURE__ */ new Date();
+      const res = await collection().updateMany(
+        {
+          userId: new import_mongodb70.ObjectId(userId),
+          hasRead: false,
+          status: { $ne: "deleted" },
+          ...appSlug && { appSlug }
+        },
+        { $set: { hasRead: true, readAt: now, updatedAt: now } }
+      );
+      return { modifiedCount: res.modifiedCount };
+    } catch (error) {
+      if (error instanceof import_node_server_utils114.AppError)
+        throw error;
+      import_node_server_utils114.logger.log({ level: "error", message: error.message });
+      throw new import_node_server_utils114.InternalServerError("Failed to update notifications.");
+    }
+  }
+  async function getUnreadCount(userId, appSlug) {
+    if (!import_mongodb70.ObjectId.isValid(userId)) {
+      throw new import_node_server_utils114.BadRequestError("Invalid user ID format.");
+    }
+    try {
+      const unread = await collection().countDocuments({
+        userId: new import_mongodb70.ObjectId(userId),
+        status: { $ne: "deleted" },
+        hasRead: false,
+        ...appSlug && { appSlug }
+      });
+      return { unread };
+    } catch (error) {
+      import_node_server_utils114.logger.log({ level: "error", message: error.message });
+      throw new import_node_server_utils114.InternalServerError("Failed to retrieve unread count.");
+    }
+  }
   return {
     createIndexes,
     addMany,
     getByUserId,
-    markAsReadById
+    markAsReadById,
+    markAllAsRead,
+    getUnreadCount
   };
 }
 
@@ -39074,6 +39122,7 @@ var NotificationService = class {
         status: payload.status,
         module: "feedback",
         screen: "/(user)/bulletinInfo",
+        siteId: payload.siteId?.toString(),
         params: {
           id: payload.bulletinId.toString()
         }
@@ -39126,6 +39175,7 @@ var NotificationService = class {
         status: payload.status,
         module: "onlineForm",
         screen,
+        siteId: payload.siteId?.toString(),
         params
       },
       false,
@@ -39142,6 +39192,7 @@ var NotificationService = class {
         status: payload.status,
         module: "feedback",
         screen: "/(user)/(bulletin-board)",
+        siteId: payload.siteId?.toString(),
         params: {
           id: payload.bulletinId.toString()
         }
@@ -39160,6 +39211,7 @@ var NotificationService = class {
         status: payload.status,
         module: "event",
         screen: "/(user)/(events)",
+        siteId: payload.siteId?.toString(),
         params: {
           id: payload.eventId.toString()
         }
@@ -39195,6 +39247,7 @@ var NotificationService = class {
         status: payload.status,
         module: "bulletinBoard",
         screen: "/(user)/bulletinInfo",
+        siteId: payload.siteId?.toString(),
         params: {
           id: payload.bulletinId.toString()
         }
@@ -46720,14 +46773,16 @@ function useBulletinBoardService() {
             to: userIds,
             bulletinId: bulletinBoardId,
             subject: "Bulletin Board",
-            status: bulletinBoardStatus
+            status: bulletinBoardStatus,
+            siteId
           });
         }
         NotificationService.bulletinBoardCreatedForMA({
           to: userIds,
           bulletinId: bulletinBoardId,
           subject: "Bulletin Board",
-          status: bulletinBoardStatus
+          status: bulletinBoardStatus,
+          siteId
         });
       }
       if (recipients?.find((item) => item === "mechanical_electrical")) {
@@ -46744,7 +46799,8 @@ function useBulletinBoardService() {
             to: users2,
             bulletinId: bulletinBoardId,
             subject: "Bulletin Board",
-            status: bulletinBoardStatus
+            status: bulletinBoardStatus,
+            siteId
           },
           "iservice365-m-and-e-mobile-app"
         );
@@ -46763,7 +46819,8 @@ function useBulletinBoardService() {
             to: users2,
             bulletinId: bulletinBoardId,
             subject: "Bulletin Board",
-            status: bulletinBoardStatus
+            status: bulletinBoardStatus,
+            siteId
           },
           "iservice365-pest-control-mobile-app"
         );
@@ -46782,7 +46839,8 @@ function useBulletinBoardService() {
             to: users2,
             bulletinId: bulletinBoardId,
             subject: "Bulletin Board",
-            status: bulletinBoardStatus
+            status: bulletinBoardStatus,
+            siteId
           },
           "iservice365-pool-maintenance-mobile-app"
         );
@@ -46801,7 +46859,8 @@ function useBulletinBoardService() {
             to: users2,
             bulletinId: bulletinBoardId,
             subject: "Bulletin Board",
-            status: bulletinBoardStatus
+            status: bulletinBoardStatus,
+            siteId
           },
           "iservice365-landscaping-mobile-app"
         );
@@ -46820,7 +46879,8 @@ function useBulletinBoardService() {
             to: users2,
             bulletinId: bulletinBoardId,
             subject: "Bulletin Board",
-            status: bulletinBoardStatus
+            status: bulletinBoardStatus,
+            siteId
           },
           "iservice365-hygiene-mobile-app"
         );
@@ -48761,7 +48821,8 @@ function useEventManagementService() {
         NotificationService.eventCreatedForMA({
           to: userIds,
           eventId: response,
-          status: value.status
+          status: value.status,
+          siteId: value.site
         });
       }
       await session?.commitTransaction();
@@ -74181,7 +74242,8 @@ function useFormEntryRepo() {
       await NotificationService.onlineFormRequestStatusUpdated({
         to: userId,
         onlineFormId: onlineFormRequest._id,
-        status: onlineFormRequest.status
+        status: onlineFormRequest.status,
+        siteId: onlineFormRequest.site
       });
       return res.modifiedCount;
     } catch (error) {
@@ -77973,7 +78035,9 @@ function useNotificationController() {
   const {
     addMany: _addMany,
     getByUserId: _getByUserId,
-    markAsReadById: _markAsReadById
+    markAsReadById: _markAsReadById,
+    markAllAsRead: _markAllAsRead,
+    getUnreadCount: _getUnreadCount
   } = useNotificationRepo();
   async function add(req, res, next) {
     const { error, value } = schemaCreateNotification.validate(req.body);
@@ -78042,10 +78106,47 @@ function useNotificationController() {
       return;
     }
   }
+  async function markAllAsRead(req, res, next) {
+    const { error, value } = schemaAppSlugNotification.validate(req.query);
+    if (error) {
+      next(new import_node_server_utils271.BadRequestError(error.message));
+      return;
+    }
+    try {
+      const data = await _markAllAsRead(value.user, value.appSlug || void 0);
+      res.status(200).json({ message: "success", data });
+      return;
+    } catch (error2) {
+      import_node_server_utils271.logger.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
+  async function getUnreadCount(req, res, next) {
+    const { error, value } = schemaAppSlugNotification.validate(req.query);
+    if (error) {
+      next(new import_node_server_utils271.BadRequestError(error.message));
+      return;
+    }
+    try {
+      const data = await _getUnreadCount(
+        value.user,
+        value.appSlug || void 0
+      );
+      res.status(200).json({ data });
+      return;
+    } catch (error2) {
+      import_node_server_utils271.logger.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
   return {
     add,
     getAll,
-    markAsRead
+    markAsRead,
+    markAllAsRead,
+    getUnreadCount
   };
 }
 // Annotate the CommonJS export names for ESM import in node: