rez_core 2.0.67 → 2.0.69

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rez_core",
-  "version": "2.0.67",
+  "version": "2.0.69",
   "description": "",
   "author": "",
   "private": false,

package/src/module/auth/strategies/jwt.strategy.ts

@@ -19,7 +19,7 @@ export class JwtStrategy extends PassportStrategy(Strategy) {
 
   async validate(payload) {
     const {
-      userId,
+      id,
       sessionToken,
       appcode,
       email_id,
@@ -43,7 +43,7 @@ export class JwtStrategy extends PassportStrategy(Strategy) {
     // }
 
     let userData = {
-      id: userId,
+      id: id,
       sessionToken: sessionToken,
       appcode: appcode,
       email_id: email_id,

package/src/module/filter/service/filter.service.ts

@@ -19,6 +19,8 @@ export class FilterService {
     @Inject('SavedFilterService')
     private readonly savedFilterService: SavedFilterService,
   ) {}
+  private readonly skipLevelFilterEntities = ['USR'];
+
 
   private async gettab_value_counts(
     tableName: string,
@@ -127,6 +129,21 @@ export class FilterService {
 
     const baseWhere = this.buildWhereClauses(baseFilters, attributeMetaMap);
 
+    if (
+      level_type &&
+      level_id &&
+      !this.skipLevelFilterEntities.includes(entity_type)
+    ) {
+      baseWhere.push({
+        query: 'e.level_type = :level_type AND e.level_id = :level_id',
+        params: {
+          level_type,
+          level_id,
+        },
+      });
+    }
+    
+
     // Build query for tab counts (no tab.value filter here)
     const allTabs = await this.gettab_value_counts(
       getTableMeta.data_source,
@@ -268,6 +285,8 @@ export class FilterService {
         return this.buildSelectCondition(attr, op, val, key);
       case 'multiselect':
         return this.buildMultiSelectCondition(attr, op, val, key);
+      case 'year':
+        return this.buildYearCondition(attr, op, val, key);
       default:
         return null;
     }
@@ -338,7 +357,6 @@ export class FilterService {
     }
   }
 
-  // this can be inproved
   private buildSelectCondition(
     attr: string,
     op: string,
@@ -348,16 +366,12 @@ export class FilterService {
     switch (op) {
       case 'equal':
         return { query: `e.${attr} = :${key}`, params: { [key]: val } };
-
       case 'not_equal':
         return { query: `e.${attr} != :${key}`, params: { [key]: val } };
-
       case 'empty':
         return { query: `e.${attr} IS NULL`, params: {} };
-
       case 'not_empty':
         return { query: `e.${attr} IS NOT NULL`, params: {} };
-
       default:
         throw new BadRequestException(`Unsupported operator for select: ${op}`);
     }
@@ -385,23 +399,46 @@ export class FilterService {
           query: `e.${attr} IN (:${key})`,
           params: { [key]: val },
         };
-
       case 'not_equal':
         return {
           query: `e.${attr} NOT IN (:${key})`,
           params: { [key]: val },
         };
-
       case 'empty':
         return { query: `e.${attr} IS NULL`, params: {} };
-
       case 'not_empty':
         return { query: `e.${attr} IS NOT NULL`, params: {} };
-
       default:
         throw new BadRequestException(
           `Unsupported operator for multiselect: ${op}`,
         );
     }
   }
+
+  private buildYearCondition(attr: string, op: string, val: any, key: string) {
+    switch (op) {
+      case 'equal':
+        return {
+          query: `e.${attr} = :${key}`,
+          params: { [key]: parseInt(val, 10) },
+        };
+      case 'not_equal':
+        return {
+          query: `e.${attr} != :${key}`,
+          params: { [key]: parseInt(val, 10) },
+        };
+      case 'greater_than':
+        return {
+          query: `e.${attr} > :${key}`,
+          params: { [key]: parseInt(val, 10) },
+        };
+      case 'less_than':
+        return {
+          query: `e.${attr} < :${key}`,
+          params: { [key]: parseInt(val, 10) },
+        };
+      default:
+        throw new BadRequestException(`Unsupported operator for year: ${op}`);
+    }
+  }
 }

package/src/module/module/repository/menu.repository.ts

@@ -96,8 +96,9 @@ export class MenuRepository extends Repository<MenuData> {
       const [sch] = await this.dataSource.query(`
         SELECT s.brand_id, s.organization_id
         FROM cr_school s
-        WHERE s.id = $1
+        WHERE s.id = ?
       `, [levelId]);
+      
   
       const brandId = sch?.brand_id;
       const orgId = sch?.organization_id;

package/src/module/user/service/user-session.service.ts

@@ -34,7 +34,7 @@ export class UserSessionService {
     await this.userSessionRepository.saveSession(userSession);
 
     const payload: any = {
-      userId: user.id,
+      id: user.id,
       sessionToken,
       appcode,
       email_id: user.email_id,
@@ -74,6 +74,7 @@ export class UserSessionService {
     level_type: string;
     level_id: string;
   }> {
+    console.log(currentUser, data);
     let payload;
 
     payload = {