@7365admin1/core 3.42.0 → 3.42.1

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @iservice365/core
 
+## 3.42.1
+
+### Patch Changes
+
+- 87c073f: 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.
+
 ## 3.42.0
 
 ### Minor Changes

package/dist/index.d.ts

@@ -1613,7 +1613,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>>;
 };
 
@@ -1621,6 +1621,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>;
@@ -2605,6 +2606,7 @@ declare function useCustomerSiteRepo(): {
         name: string;
         org: string | ObjectId;
     }) => Promise<TCustomerSite[]>;
+    countActiveByOrgAndSite: (org: string | ObjectId, site: string | ObjectId) => Promise<number>;
     getBySiteAsServiceProvider: (site: string | ObjectId) => Promise<{} | undefined>;
     getById: (id: string | ObjectId) => Promise<mongodb.WithId<bson.Document>>;
     updateCustomerSiteById: (id: string | ObjectId, payload: Partial<TCustomerSite>, session?: ClientSession) => Promise<mongodb.WithId<bson.Document>>;
@@ -2613,7 +2615,7 @@ declare function useCustomerSiteRepo(): {
 
 declare function useCustomerSiteService(): {
     add: (value: TCustomerSite) => Promise<string>;
-    addViaInvite: (invite: string) => Promise<string>;
+    addViaInvite: (invite: string) => Promise<"This site is already on your list." | "Invite accepted, successfully added site.">;
     updateCusSiteById: (customerSiteId: string, payload: Partial<TCustomerSite>) => Promise<mongodb.WithId<bson.Document>>;
 };
 
@@ -7079,6 +7081,7 @@ declare function useVerificationRepoV2(): {
     updateStatusById: (_id: string | ObjectId, status: string, session?: ClientSession) => Promise<mongodb.UpdateResult<bson.Document>>;
     countPendingOrgInvites: (orgId: string | ObjectId) => Promise<number>;
     getPendingVerificationByEmail: (email: string) => Promise<TVerificationV2 | null>;
+    getPendingServiceProviderInvite: (email: string, siteId: string) => Promise<TVerificationV2 | null>;
     updateVerificationCodeById: (_id: string | ObjectId, verificationCode: string, expireAt: string, session?: ClientSession) => Promise<mongodb.UpdateResult<bson.Document>>;
     completePendingInvites: ({ email, orgId, siteId, app, session, }: {
         email: string;