@spytecgps/nova-orm 1.1.5 → 1.1.6

package/dist/repositories/users/getUsers.js

@@ -56,6 +56,22 @@ export const getUsers = async (novaDataSource, params, logger) => {
             });
         }
         queryBuilder = queryBuilder.orderBy('user.lastname', 'DESC');
+        if (params.projectionOptions?.withSecurityRole) {
+            queryBuilder = queryBuilder
+                .leftJoinAndSelect('user.userSecurityRoles', 'userSecurityRoles')
+                .leftJoinAndSelect('userSecurityRoles.securityRole', 'securityRole');
+        }
+        if (params.projectionOptions?.withCountryInfo) {
+            queryBuilder = queryBuilder
+                .leftJoinAndSelect('user.telephoneCountry', 'telephoneCountry')
+                .leftJoinAndSelect('user.country', 'country');
+        }
+        if (params.projectionOptions?.withUserConfiguration) {
+            queryBuilder = queryBuilder.leftJoinAndSelect('user.userConfiguration', 'userConfiguration');
+        }
+        if (params.projectionOptions?.withClientAlertNotificationOverride) {
+            queryBuilder = queryBuilder.leftJoinAndSelect('user.clientAlertNotificationOverride', 'clientAlertNotificationOverride');
+        }
         let users = await queryBuilder.getMany();
         if (params.projectionOptions?.withSecurityGroupTag) {
             //TODO: Refactor this to a common function,

package/dist/repositories/users/getUsers.js.map

@@ -1 +1 @@
-{"version":3,"file":"getUsers.js","sourceRoot":"","sources":["../../../src/repositories/users/getUsers.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"getUsers.js","sourceRoot":"","sources":["../../../src/repositories/users/getUsers.ts"],"names":[],"mappings":"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"}

package/dist/types/user.d.ts

@@ -23,6 +23,10 @@ export interface GetUsersParams extends BaseSelectQueryParams {
     };
     projectionOptions?: {
         withSecurityGroupTag?: boolean;
+        withSecurityRole?: boolean;
+        withCountryInfo?: boolean;
+        withUserConfiguration?: boolean;
+        withClientAlertNotificationOverride?: boolean;
     };
 }
 export interface GetUsersIdsByPhoneAndCountryCodeParams extends BaseSelectQueryParams {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spytecgps/nova-orm",
-  "version": "1.1.5",
+  "version": "1.1.6",
   "description": "ORM with PlanetScale",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",