rez_core 5.0.189 → 5.0.191

package/package.json

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

package/src/module/enterprise/repository/school.repository.ts

@@ -4,7 +4,8 @@ import { ReflectionHelper } from '../../../utils/service/reflection-helper.servi
 
 @Injectable()
 export class SchoolRepository {
-  constructor(private readonly reflectionHelper: ReflectionHelper) {}
+  constructor(private readonly reflectionHelper: ReflectionHelper) {
+  }
 
   async findAllByOrgId(orgId: number): Promise<any[]> {
     const schoolRepo = this.reflectionHelper.getRepoService('SSOSchool');
@@ -25,12 +26,11 @@ export class SchoolRepository {
   }
 
   async getUserContextDropdown(userId: number, appCode: string, org_id) {
-    const userRoleRepo =
-      this.reflectionHelper.getRepoService('UserRoleMapping');
+    const userRoleRepo = this.reflectionHelper.getRepoService('UserRoleMapping');
 
     const hasOrgAccess = await userRoleRepo
       .createQueryBuilder('urm')
-      .where('urm.user_id::text = :userId', { userId: String(userId) })
+      .where('urm.user_id = :userId', { userId })
       .andWhere('urm.appcode = :appCode', { appCode })
       .andWhere('urm.level_type = :levelType', { levelType: 'ORG' })
       .getRawMany();
@@ -40,8 +40,7 @@ export class SchoolRepository {
       currentORGLevel_id = org_id;
     }
 
-    const listMasterItemsRepo =
-      this.reflectionHelper.getRepoService('ListMasterItems');
+    const listMasterItemsRepo = this.reflectionHelper.getRepoService('ListMasterItems');
     const resolvedInactiveStatus = await listMasterItemsRepo.findOne({
       where: {
         code: STATUS_INACTIVE,
@@ -50,8 +49,7 @@ export class SchoolRepository {
     });
 
     if (hasOrgAccess.length > 0) {
-      const organizationRepo =
-        this.reflectionHelper.getRepoService('OrganizationData');
+      const organizationRepo = this.reflectionHelper.getRepoService('OrganizationData');
 
       const schools = await organizationRepo
         .createQueryBuilder('org')
@@ -74,7 +72,7 @@ export class SchoolRepository {
         .innerJoin(
           'sso_organization',
           'brn',
-          "brn.type = 'BRN' AND brn.parent_id::varchar = org.id::varchar",
+          'brn.type = \'BRN\' AND brn.parent_id::varchar = org.id::varchar',
         )
         // JOIN school table
         .innerJoin(
@@ -163,6 +161,7 @@ export class SchoolRepository {
           brands: Object.values(org.brands),
         }));
       } else {
+
         const orgResult = await organizationRepo.findOne({
           where: {
             id: currentORGLevel_id,
@@ -181,8 +180,8 @@ export class SchoolRepository {
         ];
       }
     } else {
-      const userRoleMappingRepo =
-        this.reflectionHelper.getRepoService('UserRoleMapping');
+
+      const userRoleMappingRepo = this.reflectionHelper.getRepoService('UserRoleMapping');
 
       const brnMappings = await userRoleMappingRepo
         .createQueryBuilder('urm')
@@ -196,17 +195,9 @@ export class SchoolRepository {
           'school.location AS school_location',
           'school.status AS school_status',
         ])
-        .innerJoin(
-          'sso_organization',
-          'brand',
-          'brand.id::text = urm.level_id::text',
-        )
-        .innerJoin(
-          'sso_school',
-          'school',
-          'school.brand_id::text = brand.id::text',
-        )
-        .where('urm.user_id::text = :userId', { userId: String(userId) })
+        .innerJoin('sso_organization', 'brand', 'brand.id = urm.level_id')
+        .innerJoin('sso_school', 'school', 'school.brand_id = brand.id')
+        .where('urm.user_id = :userId', { userId })
         .andWhere('urm.appcode = :appCode', { appCode })
         .andWhere('urm.level_type = :levelType', { levelType: 'BRN' })
         .distinct(true)
@@ -224,17 +215,9 @@ export class SchoolRepository {
           'school.location AS school_location',
           'school.status AS school_status',
         ])
-        .innerJoin(
-          'sso_school',
-          'school',
-          'school.id::text = urm.level_id::text',
-        )
-        .innerJoin(
-          'sso_organization',
-          'brand',
-          'brand.id::text = school.brand_id::text',
-        )
-        .where('urm.user_id::text = :userId', { userId: String(userId) })
+        .innerJoin('sso_school', 'school', 'school.id = urm.level_id')
+        .innerJoin('sso_organization', 'brand', 'brand.id = school.brand_id')
+        .where('urm.user_id = :userId', { userId })
         .andWhere('urm.appcode = :appCode', { appCode })
         .andWhere('urm.level_type = :levelType', { levelType: 'SCH' })
         .distinct(true)

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

@@ -26,7 +26,8 @@ export class FilterService {
     @Inject() protected readonly loggingService: LoggingService,
     private readonly configService: ConfigService,
     private readonly reflectionHelper: ReflectionHelper,
-  ) {}
+  ) {
+  }
 
   schema = this.configService.get('DB_SCHEMA');
 
@@ -81,6 +82,7 @@ export class FilterService {
         GROUP BY ${column}
     `;
 
+
     const rows = await this.entityManager.query(rawSQL, values);
 
     const total = rows.reduce(
@@ -282,6 +284,7 @@ export class FilterService {
 
     // Handle TEMPLATE entity special condition
     if (entity_type === 'TEMP' || entity_type === 'TEM') {
+
       if (level_type === 'ORG') {
         baseWhere.push({
           query: `  ((e.level_type = 'ORG' AND e.level_id = '${loggedInUser.enterprise_id}'))`,
@@ -322,7 +325,8 @@ export class FilterService {
       !customLevelId
     ) {
       baseWhere.push({
-        query: 'e.level_type = :level_type AND e.level_id = :level_id',
+        query:
+          'e.level_type = :level_type AND e.level_id = :level_id',
         params: {
           level_type,
           level_id,
@@ -899,26 +903,28 @@ export class FilterService {
     // convert to number when needed
     const numVal = Number(val);
 
-    // const subtractBusinessDays = (days: number): string => {
-    //   let d = new Date();
-    //   let count = 0;
+    // INSIDE buildDateCondition
+    const subtractBusinessDays = (days: number): string => {
+      let d = new Date();
+      let count = 0;
 
-    //   while (count < days) {
-    //     d.setDate(d.getDate() - 1);
+      while (count < days) {
+        d.setDate(d.getDate() - 1);
 
-    //     const day = d.getDay(); // 0 = Sunday, 6 = Saturday
+        const day = d.getDay(); // 0 = Sunday, 6 = Saturday
 
-    //     if (day !== 0 && day !== 6) {
-    //       count++;
-    //     }
-    //   }
+        if (day !== 0 && day !== 6) {
+          count++;
+        }
+      }
 
-    //   return d.toISOString().split('T')[0];
-    // };
+      return d.toISOString().split('T')[0];
+    };
 
     switch (op) {
+      // ============================================
       // BASIC COMPARISONS
-
+      // ============================================
       case 'equal':
       case 'is':
         return {
@@ -952,7 +958,9 @@ export class FilterService {
           params: { [key]: val },
         };
 
+      // ============================================
       // EMPTY / NOT EMPTY
+      // ============================================
       case 'empty':
         return {
           query: `e.${attr} IS NULL`,
@@ -965,12 +973,10 @@ export class FilterService {
           params: {},
         };
 
+      // ============================================
       // DAY OFFSET LOGIC (ALWAYS ADJUST -1 DAY)
-      // DAY OFFSET LOGIC – NEW RULE:
-      // +N  → future date (today + N)
-      // -N  → past date (today - |N|)
-
-      case 'is_day_before': {
+      // ============================================
+      case 'is_day_before':
         if (isNaN(numVal)) {
           throw new BadRequestException(
             'Value must be a number for is_day_before',
@@ -979,25 +985,18 @@ export class FilterService {
 
         const dayBefore = (() => {
           const d = new Date();
+          d.setDate(d.getDate() - numVal);
 
-          if (numVal >= 0) {
-            // positive → go forward
-            d.setDate(d.getDate() + numVal);
-          } else {
-            // negative → go backward
-            d.setDate(d.getDate() - Math.abs(numVal));
-          }
-
-          return d.toISOString().split('T')[0];
+          // Format as YYYY-MM-DD in IST
+          return d.toLocaleDateString('en-CA', { timeZone: 'Asia/Kolkata' });
         })();
 
         return {
-          query: `${dateColumn} < :${key}`,
+          query: `${dateColumn} <= :${key}`,
           params: { [key]: dayBefore },
         };
-      }
 
-      case 'is_day_after': {
+      case 'is_day_after':
         if (isNaN(numVal)) {
           throw new BadRequestException(
             'Value must be a number for is_day_after',
@@ -1006,15 +1005,7 @@ export class FilterService {
 
         const dayAfter = (() => {
           const d = new Date();
-
-          if (numVal >= 0) {
-            // positive → go forward
-            d.setDate(d.getDate() + numVal);
-          } else {
-            // negative → go backward
-            d.setDate(d.getDate() - Math.abs(numVal));
-          }
-
+          d.setDate(d.getDate() - 1 + numVal); // -1 because DB stores previous day
           return d.toISOString().split('T')[0];
         })();
 
@@ -1022,9 +1013,10 @@ export class FilterService {
           query: `${dateColumn} > :${key}`,
           params: { [key]: dayAfter },
         };
-      }
 
+      // ============================================
       // MONTH OFFSET LOGIC
+      // ============================================
       case 'is_month_before':
         if (isNaN(numVal)) {
           throw new BadRequestException(
@@ -1065,7 +1057,7 @@ export class FilterService {
           params: { [key]: monthAfter },
         };
 
-      //  BETWEEN
+      // ===== BETWEEN =====
       case 'between': {
         if (typeof val === 'string') {
           val = val.split(',').map((v) => v.trim());
@@ -1090,7 +1082,7 @@ export class FilterService {
         };
       }
 
-      // TODAY
+      // ===== TODAY =====
       case 'today': {
         const today = moment().format('YYYY-MM-DD');
         return {
@@ -1099,83 +1091,42 @@ export class FilterService {
         };
       }
 
+      // ============================================
       // BUSINESS DAY OFFSET LOGIC (SKIPS WEEKENDS)
       // ALWAYS ADJUST -1 DAY FOR DB SHIFT
+      // ============================================
+
       case 'is_before_business_days': {
         if (isNaN(numVal)) {
           throw new BadRequestException('Value must be a number');
         }
 
-        // if (numVal === 0) {
-        //   throw new BadRequestException(
-        //     'Zero business days offset is not valid',
-        //   );
-        // }
-
-        const abs = Math.abs(numVal);
-
-        const calcDate = (() => {
-          let d = new Date();
-          let count = 0;
-
-          if (numVal > 0) {
-            // POSITIVE → move backward
-            while (count < abs) {
-              d.setDate(d.getDate() - 1);
-              if (![0, 6].includes(d.getDay())) count++;
-            }
-          } else {
-            // NEGATIVE → move forward
-            while (count < abs) {
-              d.setDate(d.getDate() + 1);
-              if (![0, 6].includes(d.getDay())) count++;
-            }
-          }
-
-          // DB SHIFT (as per your existing logic)
-          d.setDate(d.getDate() - 1);
-
-          return d.toISOString().split('T')[0];
-        })();
+        const targetDate = subtractBusinessDays(numVal);
 
         return {
           query: `${dateColumn} <= :${key} AND EXTRACT(DOW FROM ${dateColumn}) NOT IN (0, 6)`,
-          params: { [key]: calcDate },
+          params: { [key]: targetDate },
         };
       }
 
       case 'is_after_business_days': {
         if (isNaN(numVal)) {
-          throw new BadRequestException('Value must be a number');
+          throw new BadRequestException(
+            'Value must be a number for is_after_business_days',
+          );
         }
 
-        // if (numVal === 0) {
-        //   throw new BadRequestException(
-        //     'Zero business days offset is not valid',
-        //   );
-        // }
-
-        const abs = Math.abs(numVal);
-
-        const calcDate = (() => {
+        const businessAfter = (() => {
           let d = new Date();
           let count = 0;
 
-          if (numVal > 0) {
-            // POSITIVE → move forward
-            while (count < abs) {
-              d.setDate(d.getDate() + 1);
-              if (![0, 6].includes(d.getDay())) count++;
-            }
-          } else {
-            // NEGATIVE → move backward
-            while (count < abs) {
-              d.setDate(d.getDate() - 1);
-              if (![0, 6].includes(d.getDay())) count++;
-            }
+          while (count < numVal) {
+            d.setDate(d.getDate() + 1);
+            const day = d.getDay(); // 0=Sun, 6=Sat
+            if (day !== 0 && day !== 6) count++;
           }
 
-          // DB SHIFT -1 day (KEEPING EXACT)
+          // DB shift -1 day
           d.setDate(d.getDate() - 1);
 
           return d.toISOString().split('T')[0];
@@ -1183,53 +1134,13 @@ export class FilterService {
 
         return {
           query: `${dateColumn} > :${key}`,
-          params: { [key]: calcDate },
+          params: { [key]: businessAfter },
         };
       }
 
-      // case 'is_before_business_days': {
-      //   if (isNaN(numVal)) {
-      //     throw new BadRequestException('Value must be a number');
-      //   }
-
-      //   const targetDate = subtractBusinessDays(numVal);
-
-      //   return {
-      //     query: `${dateColumn} <= :${key} AND EXTRACT(DOW FROM ${dateColumn}) NOT IN (0, 6)`,
-      //     params: { [key]: targetDate },
-      //   };
-      // }
-
-      // case 'is_after_business_days': {
-      //   if (isNaN(numVal)) {
-      //     throw new BadRequestException(
-      //       'Value must be a number for is_after_business_days',
-      //     );
-      //   }
-
-      //   const businessAfter = (() => {
-      //     let d = new Date();
-      //     let count = 0;
-
-      //     while (count < numVal) {
-      //       d.setDate(d.getDate() + 1);
-      //       const day = d.getDay(); // 0=Sun, 6=Sat
-      //       if (day !== 0 && day !== 6) count++;
-      //     }
-
-      //     // DB shift -1 day
-      //     d.setDate(d.getDate() - 1);
-
-      //     return d.toISOString().split('T')[0];
-      //   })();
-
-      //   return {
-      //     query: `${dateColumn} > :${key}`,
-      //     params: { [key]: businessAfter },
-      //   };
-      // }
-
+      // ============================================
       // IN LAST DAY (range: today to N days before)
+      // ============================================
       case 'in_last_day': {
         if (isNaN(numVal)) {
           throw new BadRequestException(
@@ -1257,7 +1168,9 @@ export class FilterService {
         };
       }
 
+      // ============================================
       // IN NEXT DAY (range: today to N days after)
+      // ============================================
       case 'in_next_day': {
         if (isNaN(numVal)) {
           throw new BadRequestException(

package/src/module/integration/service/integration.service.ts

@@ -1095,6 +1095,7 @@ export class IntegrationService {
               templateId: externalTemplateId,
               variables,
               richText,
+              subject,
             };
 
             // Handle user integration if user_id provided

package/.idea/250218_nodejs_core.iml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
-      <excludeFolder url="file://$MODULE_DIR$/temp" />
-      <excludeFolder url="file://$MODULE_DIR$/tmp" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

package/.idea/codeStyles/Project.xml

@@ -1,59 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <HTMLCodeStyleSettings>
-      <option name="HTML_SPACE_INSIDE_EMPTY_TAG" value="true" />
-    </HTMLCodeStyleSettings>
-    <JSCodeStyleSettings version="0">
-      <option name="FORCE_SEMICOLON_STYLE" value="true" />
-      <option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
-      <option name="USE_DOUBLE_QUOTES" value="false" />
-      <option name="FORCE_QUOTE_STYlE" value="true" />
-      <option name="ENFORCE_TRAILING_COMMA" value="WhenMultiline" />
-      <option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
-      <option name="SPACES_WITHIN_IMPORTS" value="true" />
-    </JSCodeStyleSettings>
-    <TypeScriptCodeStyleSettings version="0">
-      <option name="FORCE_SEMICOLON_STYLE" value="true" />
-      <option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
-      <option name="USE_DOUBLE_QUOTES" value="false" />
-      <option name="FORCE_QUOTE_STYlE" value="true" />
-      <option name="ENFORCE_TRAILING_COMMA" value="WhenMultiline" />
-      <option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
-      <option name="SPACES_WITHIN_IMPORTS" value="true" />
-    </TypeScriptCodeStyleSettings>
-    <VueCodeStyleSettings>
-      <option name="INTERPOLATION_NEW_LINE_AFTER_START_DELIMITER" value="false" />
-      <option name="INTERPOLATION_NEW_LINE_BEFORE_END_DELIMITER" value="false" />
-    </VueCodeStyleSettings>
-    <codeStyleSettings language="HTML">
-      <option name="SOFT_MARGINS" value="80" />
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-    <codeStyleSettings language="JavaScript">
-      <option name="SOFT_MARGINS" value="80" />
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-    <codeStyleSettings language="TypeScript">
-      <option name="SOFT_MARGINS" value="80" />
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-    <codeStyleSettings language="Vue">
-      <option name="SOFT_MARGINS" value="80" />
-      <indentOptions>
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-  </code_scheme>
-</component>

package/.idea/codeStyles/codeStyleConfig.xml

@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-  </state>
-</component>

package/.idea/inspectionProfiles/Project_Default.xml

@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
-  </profile>
-</component>

package/.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/250218_nodejs_core.iml" filepath="$PROJECT_DIR$/.idea/250218_nodejs_core.iml" />
-    </modules>
-  </component>
-</project>

package/.idea/prettier.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="PrettierConfiguration">
-    <option name="myConfigurationMode" value="AUTOMATIC" />
-  </component>
-</project>

package/.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>