rez_core 2.1.37 → 2.1.39

package/package.json

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

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

@@ -7,6 +7,8 @@ import { DataSource } from 'typeorm';
 import { FilterRequestDto } from '../dto/filter-request.dto';
 import { SavedFilterService } from './saved-filter.service';
 
+import * as moment from 'moment';
+
 @Injectable()
 export class FilterService {
   constructor(
@@ -310,6 +312,41 @@ export class FilterService {
     // Get paginated data
     const entity_list = await qb.getRawMany();
 
+    // const formatDatesInRow = (row: any) => {
+    //   const formattedRow = { ...row };
+    //   for (const key of Object.keys(row)) {
+    //     if (key.endsWith('_date') && row[key]) {
+    //       formattedRow[key] = moment(row[key]).format('MMM DD, YYYY');
+    //     }
+    //   }
+    //   return formattedRow;
+    // };
+
+    // 1. Extract all date-type attribute keys
+    const dateAttributes = Object.entries(attributeMetaMap)
+      .filter(([_, attr]) => attr.data_type === 'date')
+      .map(([key]) => key); // only the keys (e.g., 'created_date', 'modified_date')
+
+    // 2. Format function using moment
+    const formatDate = (dateStr: string | null): string | null => {
+      if (!dateStr) return null;
+      return moment(dateStr).format('MMM DD, YYYY'); // e.g., "Jun 25, 2025"
+    };
+
+    // 3. Function to format only those keys in each entity row
+    const formatDatesInRow = (row: any): any => {
+      const formattedRow = { ...row };
+      for (const key of dateAttributes) {
+        if (formattedRow[key]) {
+          formattedRow[key] = formatDate(formattedRow[key]);
+        }
+      }
+      return formattedRow;
+    };
+
+    // 4. Final transformation
+    const formattedEntityList = entity_list.map(formatDatesInRow);
+
     // Count query (without pagination)
     const countQb = this.dataSource
       .createQueryBuilder()
@@ -325,7 +362,7 @@ export class FilterService {
       success: true,
       data: {
         entity_tabs: filteredTabs,
-        entity_list,
+        formattedEntityList,
         pagination: {
           total,
           page,

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

@@ -117,11 +117,35 @@ export class UserSessionService {
   }
 
   async getUserRoleMappingForApp(userId: number, appcode: string) {
-    return await this.dataSource
+    const mapping = await this.dataSource
       .getRepository(UserRoleMapping)
       .createQueryBuilder('cr_user_role_mapping')
       .where('cr_user_role_mapping.user_id = :userId', { userId })
       .andWhere('cr_user_role_mapping.appcode = :appcode', { appcode })
-      .getOne(); // You can return .getMany() if you want to let user choose
+      .getOne();
+  
+    // If not found or is already ORG/SCH, return directly
+    if (!mapping || mapping.level_type !== 'BRN') {
+      return mapping;
+    }
+  
+    //DONE
+    // If BRN, resolve first SCH under this brand
+    const schools = await this.dataSource.query(
+      `SELECT id FROM cr_school WHERE brand_id = ? ORDER BY id ASC LIMIT 1`,
+      [mapping.level_id],
+    );
+  
+    if (schools.length) {
+      return {
+        ...mapping,
+        level_type: 'SCH',
+        level_id: schools[0].id,
+      };
+    }
+  
+    // No SCH found under BRN
+    return null;
   }
+  
 }