rez_core 5.0.72 → 5.0.74

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rez_core",
-  "version": "5.0.72",
+  "version": "5.0.74",
   "description": "",
   "author": "",
   "private": false,
@@ -47,6 +47,7 @@
     "cron-parser": "^5.4.0",
     "crypto": "^1.0.1",
     "crypto-js": "^4.2.0",
+    "dayjs": "^1.11.19",
     "dotenv": "^16.4.7",
     "exceljs": "^4.4.0",
     "firebase-admin": "^13.5.0",

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

@@ -10,6 +10,7 @@ import { EntityRelationService } from 'src/module/meta/service/entity-relation.s
 import { ResolverService } from 'src/module/meta/service/resolver.service';
 import { LoggingService } from 'src/utils/service/loggingUtil.service';
 import { ConfigService } from '@nestjs/config';
+import dayjs from 'dayjs';
 
 @Injectable()
 export class FilterService {
@@ -913,6 +914,29 @@ export class FilterService {
       return d.toISOString().split('T')[0];
     };
 
+    // FOR BUSINESS DATES
+    function moveBusinessDays(date: Date, days: number, dir: number): Date {
+      let result = new Date(date);
+
+      while (days > 0) {
+        result.setDate(result.getDate() + dir);
+
+        const day = result.getDay(); // 0 = Sun, 6 = Sat
+
+        if (day !== 0 && day !== 6) {
+          days--;
+        }
+      }
+
+      return result;
+    }
+
+    /** Return true if date is a weekday */
+    function isBusinessDay(date: Date): boolean {
+      const d = date.getDay();
+      return d !== 0 && d !== 6;
+    }
+
     switch (op) {
       // ============================================
       // BASIC COMPARISONS
@@ -1094,40 +1118,76 @@ export class FilterService {
         const targetDate = subtractBusinessDays(numVal);
 
         return {
-          query: `${dateColumn} <= :${key}`,
+          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 days = Number(val);
 
-        const businessAfter = (() => {
-          let d = new Date();
-          let count = 0;
+        // Start from today
+        const targetDate = dayjs().startOf('day');
+        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);
+        while (count < days) {
+          targetDate.add(1, 'day'); // move forward
+          const day = targetDate.day(); // 0 = Sun, 6 = Sat
 
-          return d.toISOString().split('T')[0];
-        })();
+          if (day !== 0 && day !== 6) {
+            // skip weekends
+            count++;
+          }
+        }
 
         return {
-          query: `${dateColumn} > :${key}`,
-          params: { [key]: businessAfter },
+          query: `DATE(e.${attr}) > :${key}`,
+          params: { [key]: targetDate.format('YYYY-MM-DD') },
         };
       }
 
+      // case 'is_before_business_days': {
+      //   if (isNaN(numVal)) {
+      //     throw new BadRequestException('Value must be a number');
+      //   }
+
+      //   const targetDate = subtractBusinessDays(numVal);
+
+      //   return {
+      //     query: `${dateColumn} <= :${key}`,
+      //     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)
       // ============================================

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

@@ -420,7 +420,7 @@ export class WrapperService {
             content: base64Content,
             type:
               response.headers['content-type'] || 'application/octet-stream',
-            filename: `attachment-${attachmentId}`,
+            filename: url.fileName,
             disposition: 'attachment',
           });
         }

package/src/resources/properties.yaml.ts

@@ -2,7 +2,7 @@ import { readFileSync } from 'fs';
 import * as yaml from 'js-yaml';
 import { join } from 'path';
 
-const YAML_CONFIG = `/uat.properties.yaml`;
+const YAML_CONFIG = `/dev.properties.yaml`;
 
 export default () => {
   return yaml.load(

package/src/resources/uat.properties.yaml

@@ -1,31 +1,22 @@
-DB_HOST: '43.205.35.45'
-DB_PORT: '5432'
+DB_HOST: '13.235.102.26'
+DB_PORT: '3306'
 DB_USER: 'root'
-DB_PASS: 'Rezolut123'
-DB_NAME: 'universal'
-DB_SCHEMA: 'preprod_ether_crm'
-PORT: 5001
-MS_PORT: 4021
-SSO_HOST: 'localhost'
-SSO_PORT: 4023
-ADM_HOST: 'localhost'
-ADM_PORT: 4020
+DB_PASS: 'Ether@123'
+DB_NAME: 'ether_uat'
 MASTER_KEY: '0QZ2eRJv5oVILYnyBlC+FbSGVQiWKReh'
 MASTER_IV: 'heuUQf5uPVtkotrFAOKUVw=='
 SECRET_KEY: '1hard_to_guess_secret7890a'
 CLIENT_ID: '324529881356-596sc8ksrb9lg01i7sktofqqqf0fv2ug.apps.googleusercontent.com'
 CLIENT_SECRET: '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'
-CALLBACK_URL: 'https://api.eth-qa.rezolut.in/api/enrol/auth/google/callback'
-DOMAIN_URL: 'eth-qa.rezolut.in/enrol'
-BASE_URL: 'https://ether-dev.rezolut.in'
-FE_URL: 'http://localhost:3000'
+CALLBACK_URL: 'http://ether.rezolut.in/api/admin/auth/google/callback'
+DOMAIN_URL: 'rezolut.in'
 OTP_EXPIRY: '10'
 OTP_LENGTH: '6'
 VERIFY_OTP: 'true'
 DEFAULT_OTP: '123456'
-DEFAULT_ADMIN: 'ADMIN'
-REDIRECT_BE_URL: 'http://localhost:4010/api'
 PROFILE: 'UAT'
+DEFAULT_ADMIN: 'ADMIN'
+TOKEN_EXPIRY: 1
 AWS:
   S3:
     AWS_ACCESS_KEY_ID: 'AKIAYYKIBDDSQF3KILGE'
@@ -35,17 +26,6 @@ AWS:
 EMAIL_USER: 'poornima.rezolut@gmail.com'
 EMAIL_PASSWORD: 'dakd fyau uvbv zwsb'
 
-student:
-  syncApiUrl: 'https://api.staging.stellarworldschool.com/crm/enrol/users'
-  paymentAPIKey: '3PKPjFTc5I1buIZTF8tbpxuD0ieimZc7NtVBbpKlq82ZfwdZN9v63dCgMZ5fglpg'
-  syncApiToken: 'eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJkYXRhIjp7fSwiaWF0IjoxNjYzODIzNTI5LCJhdWQiOiJhMzQzaXVia3ZqYnN2YnJpdWV3YnZqa2VidmpraWVia2IiLCJpc3MiOiJFdGhlciJ9.aYup7bZdiBZvWQ7a1D7iep7Y_8Q8Ns4nxUpzXw8vgR2kTBXBxlDIPPybZFnBzweNKC7O2z9bEo6O0pbXCBHaMg'
-lead_xcode: '314b0a5afed44676b736c0e5368c3db863275d80d443777bd1214afde4c82631'
 FIREBASE_PROJECT_ID: 'sample-d7855'
 FIREBASE_CLIENT_EMAIL: 'firebase-adminsdk-fbsvc@sample-d7855.iam.gserviceaccount.com'
 FIREBASE_PRIVATE_KEY: '-----BEGIN PRIVATE KEY-----\nMIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCwGkpDLqFYgDEW\nnrraMja7ICmd05rJlsTachdcbB25Jm2cWMv1ROfNqWEZE3b14pUJOQgCAPI79Lgj\n+nQ0ATsUWK8Th2esKT9kaHg54UZg/qKNcnM5njVn+xIXc+i/AP/eSGBLich+uljU\nRMFuKrpcN1yNa3t0ib+kZxLHE43aFM9aJYOhET6/37DUdFMZ7GyzSLH3tuy1gB2G\negFyC7ulLnyMBFtL37XOtnP3BPwbjVWdP0qv9I6c0aacS5dQ4PNjCBklnkr6tPsc\n0MYr3VUrqNd/xNNOgk26TwoOaePjjjeaSeOGO2FcBG6WsYSLoZ3zmrlCT4vBlXL7\nPaZGQGfjAgMBAAECggEAHtsMZgcWmCYl87uuK6sesdzpzdCUz3uOVGQnObdr4dQc\n4ocgfYIsR3nFHJqvflfMG0iV4Zv+1YiEdzFcCPyqOF9tlbNk8+JqTBKN9j5FkZss\nKjKCg/b3jpeMTPWvM0BelLkDvliO+7108QR3C/GKo7vDiLfrcrjsDkdNH/qKIUq3\nkHeQE0QDLaoe3sLL4mjPp5A4SnnNBInk1gQZS2iVhTgDAAlSOz7JocyVZr3QhxmF\nUlKYzzJVx8zxIJm3ymH6z6NQNbWnBGWF1eeSZgYRkJG1q+Aqm3kRU/uT3V0HPsvZ\nrg4JGkzM/qFA2mpKuj4ysWGfvERKaEe4Ua84SvbcYQKBgQDjjvgBpQL2V71Ssr2E\nWJO/8Bv3TutWODWEvTRv3woQmuZwT81yIR3R8Ir59xLK0oBQCAONvKnrB5RM5yXQ\nmR6hvyKHFUKWTRqwGCFiD4fh0joO4zQTaFDdbqMYyeTJ4r2W66wXbRXtUvuwhDlg\nmDKamZ1E+EAoYkog6/iNYIcwswKBgQDGHO0n2r8yXYm7dM+EYONGLh76IvxVXJDn\nN8igi1zI2fV3cfUuwXaVlMYUa//aRkNXrBvPdXZEvfRRRLkm6dYLbFZ4Sq6T+NUT\noYNan13R59E6UcA/Oi5jitq9l4Wwn8pDaCbmmR1xdj7+r+H9A5N3BXHeuPLy0f48\nyEY8GF8kEQKBgQDCzhmyDrlCekoxCaMEMXAK2FqYlI8S+HuYbwD85EuRe4nai/as\nxXzpxKq04rbLuvjtim7AX8p20b47N4Y/1VVL0nyUd7bRRKCcL4wkjncc8wOQyyBB\nnQPdDGHDTtL1oY38LTTduR0UVf3xVsBn2OM5RlhEOuFxsPMUy+2z2fbh0QKBgBz3\nMb14AChvAKpFw+mI+PHT4HeWEeqxJAaKY20Fs0UyiO8z3DM/2gS4wdVOjRPu3f29\njjtg4y/dzhDryV5lJgR5jJL96FR+NzktjjT7xA3ipPav6TnVWd73+E9sDgHq+vms\nCrQAgwuJzGAUeygxE6h9RU7ZH7xc850TcyFqNs7hAoGBAMviFpBfpZz/amStyan+\nIPBGpDNV8dUrRE1POIdi6M44mlrI5hkD1ldVl3wjDJtg4VGkMosltLtvC0dDcIou\nuWZT8ENKM2G400PvQ9JJYah9dTkYQL1qMxvpX+biMoRSiAswPwRQjmBQUaz1aN1g\nmXv1VJBLLZVg8x1ckLDjeD20\n-----END PRIVATE KEY-----\n'
-SUBJECT_PREFIX: true
-
-GRAYLOG_URL: 'http://35.154.14.223:12201/gelf'
-
-SERVICES: 'ADM,SSO'
-appcode: 'CRM'