rez_core 3.1.202 → 3.1.204

package/package.json

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

package/src/config/database.config.ts

@@ -15,7 +15,7 @@ export class MySqlConfiguration implements TypeOrmOptionsFactory {
       password: this.configService.get('DB_PASS') || 'Rezolut@123',
       database: this.configService.get('DB_NAME') || 'core',
       entities: [__dirname + '/../module/**/*.entity.{ts,js}'],
-      synchronize: true,
+      synchronize: false,
       autoLoadEntities: true,
       poolSize: 5,
     };

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

@@ -13,7 +13,7 @@ export class SchoolRepository {
     return await this.dataSource
       .createQueryBuilder()
       .select(['*'])
-      .from('eth_school_profile', 'sch')
+      .from('sso_school', 'sch')
       .where('sch.organization_id = :orgId', { orgId })
       .getRawMany();
   }
@@ -22,7 +22,7 @@ export class SchoolRepository {
     return await this.dataSource
       .createQueryBuilder()
       .select(['*'])
-      .from('eth_school_profile', 'sch')
+      .from('sso_school', 'sch')
       .where('sch.brand_id = :brdId', { brdId })
       .getRawMany();
   }
@@ -77,7 +77,7 @@ export class SchoolRepository {
           'brand_profile',
           'brand_profile.parent_id = brn.id AND brand_profile.organization_id = org.id',
         )
-        .innerJoin('eth_school_profile', 'school', 'school.brand_id = brn.id')
+        .innerJoin('sso_school', 'school', 'school.brand_id = brn.id')
         .leftJoin('eth_address', 'address', 'address.parent_id = school.id')
         .where('org.id = :orgId', { orgId: currentORGLevel_id })
         .distinct(true)
@@ -203,7 +203,7 @@ export class SchoolRepository {
         ])
         .from('sso_user_role_mapping', 'urm')
         .innerJoin('sso_organization', 'brand', 'brand.id = urm.level_id')
-        .innerJoin('eth_school_profile', 'school', 'school.brand_id = brand.id')
+        .innerJoin('sso_school', 'school', 'school.brand_id = brand.id')
         .innerJoin('eth_address', 'address', 'address.parent_id = school.id')
         .where('urm.user_id = :userId', { userId })
         .andWhere('urm.appcode = :appCode', { appCode })
@@ -223,7 +223,7 @@ export class SchoolRepository {
           'school.status AS school_status',
         ])
         .from('sso_user_role_mapping', 'urm')
-        .innerJoin('eth_school_profile', 'school', 'school.id = urm.level_id')
+        .innerJoin('sso_school', 'school', 'school.id = urm.level_id')
         .innerJoin('sso_organization', 'brand', 'brand.id = school.brand_id')
         .innerJoin('eth_address', 'address', 'address.parent_id = school.id')
         .where('urm.user_id = :userId', { userId })

package/src/module/lead/repository/lead.repository.ts

@@ -33,7 +33,7 @@ export class LeadRepository {
     return await this.dataSource
       .createQueryBuilder()
       .select(['*'])
-      .from('eth_school_profile', 'sch')
+      .from('sso_school', 'sch')
       .where('sch.brand_id = :brdId', { brdId: brand_id })
       .andWhere('sch.organization_id = :orgId', { orgId: organization_id })
       .getRawMany();

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

@@ -141,7 +141,7 @@ export class MenuRepository extends Repository<MenuData> {
       const [sch] = await this.dataSource.query(
         `
         SELECT s.brand_id, s.organization_id
-        FROM eth_school_profile s
+        FROM sso_school s
         WHERE s.id = ?
       `,
         [levelId],

package/src/module/module/service/module-access.service.ts

@@ -185,7 +185,7 @@ export class ModuleAccessService {
     // Step 3: If level_type is SCH, check school status using raw query
     if (level_type === 'SCH') {
       const result = await this.dataSource.query(
-        `SELECT * FROM eth_school_profile WHERE id = ${level_id}`,
+        `SELECT * FROM sso_school WHERE id = ${level_id}`,
         [level_id],
       );
 

package/src/module/user/service/login.service.ts

@@ -215,7 +215,7 @@ export class LoginService {
       const brandId = brnAccesses[0].level_id;
 
       const rows = await this.dataSource.query(
-        `SELECT id FROM eth_school_profile WHERE brand_id = ? ORDER BY id ASC LIMIT 1`,
+        `SELECT id FROM sso_school WHERE brand_id = ? ORDER BY id ASC LIMIT 1`,
         [brandId],
       );
 

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

@@ -150,7 +150,7 @@ export class UserSessionService {
     //DONE
     // If BRN, resolve first SCH under this brand
     const schools = await this.dataSource.query(
-      `SELECT id FROM eth_school_profile WHERE brand_id = ? ORDER BY id ASC LIMIT 1`,
+      `SELECT id FROM sso_school WHERE brand_id = ? ORDER BY id ASC LIMIT 1`,
       [mapping.level_id],
     );
 

package/src/module/workflow/controller/action.controller.ts

@@ -55,6 +55,22 @@ export class ActionController {
     return result;
   }
 
+  @Post('/get_dependent_action')
+  @HttpCode(HttpStatus.OK)
+  async getDependentActions(
+    @Req() req: Request & { user: any },
+    @Body() body: { stage_id: number; action_id?: number },
+  ) {
+    const loggedInUser = req.user.userData;
+
+    const result = this.actionService.getDependentActions(
+      loggedInUser,
+      body.stage_id,
+      body.action_id,
+    );
+    return result;
+  }
+
   @Post('/getaction')
   @HttpCode(HttpStatus.OK)
   async getAction(

package/src/module/workflow/repository/action.repository.ts

@@ -167,6 +167,46 @@ export class ActionRepository {
     return enrichedResult;
   }
 
+  async getDependentActions(
+    loggedInUser: UserData,
+    stage_id: number,
+    action_id?: number,
+  ) {
+    // Step 1: Get all action_ids for the provided stage_id
+    const stageActions = await this.dataSource.query(
+      `
+    SELECT action_id 
+    FROM cr_wf_stage_action_mapping 
+    WHERE stage_id = ?
+    `,
+      [stage_id],
+    );
+
+    if (!stageActions?.length) return [];
+
+    const actionIds = stageActions.map((sa) => sa.action_id);
+
+    // Step 2: Fetch action details except the provided action_id incase it is provided
+    const filteredActionIds = action_id
+      ? actionIds.filter((id) => id !== action_id)
+      : actionIds;
+
+    const actionResults = await this.dataSource
+      .createQueryBuilder()
+      .select(['a.id AS action_id', 'a.name AS action_name'])
+      .from('cr_wf_action', 'a')
+      .andWhere('a.id IN(:...actionIds)', { actionIds: filteredActionIds })
+      .getRawMany();
+
+    // Step 3: Format result
+    const enrichedResult = actionResults.map((row) => ({
+      value: row.action_id,
+      label: row.action_name,
+    }));
+
+    return enrichedResult;
+  }
+
   async getAction(
     organization_id: number,
     stage_id: number,

package/src/module/workflow/service/action.service.ts

@@ -246,6 +246,18 @@ export class ActionService extends EntityServiceImpl {
     return this.actionRepository.getActions(loggedInUser, stage_id);
   }
 
+  async getDependentActions(
+    loggedInUser: UserData,
+    stage_id: number,
+    action_id: number | undefined,
+  ) {
+    return this.actionRepository.getDependentActions(
+      loggedInUser,
+      stage_id,
+      action_id,
+    );
+  }
+
   async getAction(
     loggedInUser: UserData,
     stage_id: number,

package/src/resources/dev.properties.yaml

@@ -4,7 +4,7 @@ DB_HOST: '13.234.25.234'
 DB_PORT: '3306'
 DB_USER: 'root'
 DB_PASS: 'Rezolut@123'
-DB_NAME: 'package_core'
+DB_NAME: 'ether_dev'
 MASTER_KEY: '0QZ2eRJv5oVILYnyBlC+FbSGVQiWKReh'
 MASTER_IV: 'heuUQf5uPVtkotrFAOKUVw=='
 SECRET_KEY: '1hard_to_guess_secret7890a'

package/src/resources/uat.properties.yaml

@@ -1,16 +1,31 @@
-DB_HOST: "13.200.182.92"
-DB_PORT: "3306"
-DB_USER: "root"
-DB_PASS: "ether"
-DB_NAME: "ether_core"
-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: "http://localhost:3000/auth/google/callback"
-OTP_EXPIRY: "10"
-OTP_LENGTH: "6"
-VERIFY_OTP: "false"
-DEFAULT_OTP: "123456"
-TOKEN_EXPIRY: 1
+DB_HOST: '13.235.102.26'
+DB_PORT: '3306'
+DB_USER: 'root'
+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: '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'
+PROFILE: 'UAT'
+DEFAULT_ADMIN: 'ADMIN'
+TOKEN_EXPIRY: 1
+AWS:
+  S3:
+    AWS_ACCESS_KEY_ID: 'AKIAYYKIBDDSQF3KILGE'
+    AWS_SECRET_KEY: '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'
+    AWS_REGION: 'ap-south-1'
+    BUCKET_NAME: 'testether'
+EMAIL_USER: 'poornima.rezolut@gmail.com'
+EMAIL_PASSWORD: 'dakd fyau uvbv zwsb'
+
+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'