@eeplatform/core 1.0.1 → 1.0.2

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @eeplatform/core
 
+## 1.0.2
+
+### Patch Changes
+
+- 77ac8e2: Revise schools, members and role queries
+
 ## 1.0.1
 
 ### Patch Changes

package/dist/index.d.ts

@@ -2384,13 +2384,13 @@ declare function MSchool(value: TSchool): TSchool;
 declare function useSchoolRepo(): {
     createIndex: () => Promise<void>;
     add: (value: TSchool, session?: ClientSession) => Promise<ObjectId>;
-    getAll: ({ page, limit, sort, status, region, division, search, }?: {
+    getAll: ({ page, limit, sort, status, org, app, search, }?: {
         page?: number | undefined;
         limit?: number | undefined;
         sort?: Record<string, number> | undefined;
         status?: string | undefined;
-        region?: string | undefined;
-        division?: string | undefined;
+        org?: string | undefined;
+        app?: string | undefined;
         search?: string | undefined;
     }) => Promise<{}>;
     updateStatusById: (_id: string | ObjectId, status: string, session?: ClientSession) => Promise<mongodb.UpdateResult<bson.Document>>;

package/dist/index.js

@@ -11804,10 +11804,12 @@ var MUser = class {
     this.createdAt = value.createdAt ?? (/* @__PURE__ */ new Date()).toISOString();
     this.updatedAt = value.updatedAt ?? "";
     this.deletedAt = value.deletedAt ?? "";
-    try {
-      value.defaultOrg = new import_mongodb3.ObjectId(value.defaultOrg);
-    } catch (error) {
-      throw new Error("Invalid defaultOrg ID.");
+    if (value.defaultOrg) {
+      try {
+        value.defaultOrg = new import_mongodb3.ObjectId(value.defaultOrg);
+      } catch (error) {
+        throw new Error("Invalid defaultOrg ID.");
+      }
     }
     this.defaultOrg = value.defaultOrg;
   }
@@ -12847,9 +12849,6 @@ function useVerificationService() {
     if (!metadata.app) {
       throw new import_nodejs_utils6.BadRequestError("App metadata is required.");
     }
-    if (!metadata.org || !metadata.orgName) {
-      throw new import_nodejs_utils6.BadRequestError("Organization metadata is required.");
-    }
     try {
       const user = await getUserByEmail(email);
       const dir = __dirname;
@@ -12861,7 +12860,7 @@ function useVerificationService() {
           context: {
             validity: VERIFICATION_USER_INVITE_DURATION,
             link: `${APP_MAIN}/verify/member-invite/${res2}`,
-            organization_name: metadata.orgName
+            organization_name: metadata.app === "admin" ? "Admin" : metadata.orgName
           },
           filePath: filePath2
         });
@@ -13032,11 +13031,6 @@ function useVerificationService() {
             "App metadata is required for member invite."
           );
         }
-        if (!_id.metadata?.org || !_id.metadata?.orgName) {
-          throw new import_nodejs_utils6.BadRequestError(
-            "Organization metadata is required for member invite."
-          );
-        }
         if (!_id.metadata?.role || !_id.metadata?.roleName) {
           throw new import_nodejs_utils6.BadRequestError(
             "Role metadata is required for member invite."
@@ -13046,8 +13040,8 @@ function useVerificationService() {
           {
             user: user._id?.toString() ?? "",
             type: _id.metadata?.app,
-            org: _id.metadata?.org,
-            orgName: _id.metadata?.orgName,
+            org: _id.metadata?.org ?? "",
+            orgName: _id.metadata?.orgName ?? "",
             role: _id.metadata?.role,
             roleName: _id.metadata?.roleName,
             name: `${user.firstName} ${user.lastName}`
@@ -13166,8 +13160,8 @@ function useVerificationController() {
       app: import_joi2.default.string().required(),
       role: import_joi2.default.string().hex().required(),
       roleName: import_joi2.default.string().required(),
-      org: import_joi2.default.string().required(),
-      orgName: import_joi2.default.string().required()
+      org: import_joi2.default.string().hex().optional().optional().allow("", null),
+      orgName: import_joi2.default.string().optional().optional().allow("", null)
     });
     const { error } = validation.validate(req.body);
     if (error) {
@@ -17980,9 +17974,6 @@ function useUserService() {
         throw new import_nodejs_utils12.BadRequestError("Invitation expired.");
       }
       const email = invitation.email;
-      if (!invitation.metadata.org) {
-        throw new import_nodejs_utils12.BadRequestError("Invitation does not have an organization.");
-      }
       const _user = await getUserByEmail(invitation.email);
       let userId = _user?._id ?? "";
       if (!_user) {
@@ -18007,8 +17998,8 @@ function useUserService() {
           role: invitation.metadata?.role,
           roleName: invitation.metadata?.roleName,
           type: invitation.metadata?.app,
-          org: invitation.metadata?.org,
-          orgName: invitation.metadata?.orgName
+          org: invitation.metadata?.org ?? "",
+          orgName: invitation.metadata?.orgName ?? ""
         },
         session
       );
@@ -26524,8 +26515,8 @@ function useSchoolRepo() {
     limit = 20,
     sort = {},
     status = "active",
-    region = "",
-    division = "",
+    org = "",
+    app = "admin",
     search = ""
   } = {}) {
     page = Math.max(0, page - 1);
@@ -26543,20 +26534,12 @@ function useSchoolRepo() {
       query.$text = { $search: search };
       cacheKeyOptions.search = search;
     }
-    if (region) {
-      try {
-        query.region = new import_mongodb38.ObjectId(region);
-        cacheKeyOptions.region = region;
-      } catch (error) {
-        throw new import_nodejs_utils63.BadRequestError("Invalid region.");
-      }
-    }
-    if (division) {
+    if (org) {
       try {
-        query.division = new import_mongodb38.ObjectId(division);
-        cacheKeyOptions.division = division;
+        query[app] = new import_mongodb38.ObjectId(org);
+        cacheKeyOptions[app] = org;
       } catch (error) {
-        throw new import_nodejs_utils63.BadRequestError("Invalid division.");
+        throw new import_nodejs_utils63.BadRequestError("Invalid org.");
       }
     }
     try {
@@ -26846,8 +26829,8 @@ function useSchoolController() {
       sort: import_joi32.default.string().optional().allow(null, ""),
       sortOrder: import_joi32.default.string().optional().allow(null, ""),
       status: import_joi32.default.string().optional().allow(null, ""),
-      region: import_joi32.default.string().hex().optional().allow(null, ""),
-      division: import_joi32.default.string().hex().optional().allow(null, ""),
+      org: import_joi32.default.string().hex().optional().allow(null, ""),
+      app: import_joi32.default.string().optional().allow(null, ""),
       search: import_joi32.default.string().optional().allow(null, "")
     });
     const { error } = validation.validate(req.query);
@@ -26867,8 +26850,8 @@ function useSchoolController() {
       });
     }
     const status = req.query.status ?? "active";
-    const region = req.query.region ?? "";
-    const division = req.query.division ?? "";
+    const org = req.query.org ?? "";
+    const app = req.query.app ?? "admin";
     const search = req.query.search ?? "";
     try {
       const schools = await _getAll({
@@ -26876,8 +26859,8 @@ function useSchoolController() {
         limit,
         sort: sortObj,
         status,
-        region,
-        division,
+        org,
+        app,
         search
       });
       res.status(200).json(schools);