Merge pull request #149 from souravbhowmik1999/setValudation

Task #218686 refactor findUserDetails to get tenants associated with user

src/adapters/postgres/user-adapter.ts

@@ -256,9 +256,25 @@ export class PostgresUserService {
       whereClause.username = username;
     }
     let userDetails = await this.usersRepository.findOne({
-      where: whereClause
+      where: whereClause,
+      select: ["userId", "username", "name", "role", "district","state","mobile"]
     })
+
+    const tenentDetails = await this.allUsersTenent(userDetails.userId)
+
+    userDetails['tenantData'] = tenentDetails;
     return userDetails;
+
+  }
+  async allUsersTenent(userId: string){
+    const query = `
+    SELECT T.name AS tenantName, T."tenantId", UTM."Id" AS userTenantMappingId 
+    FROM public."UserTenantMapping" UTM 
+    LEFT JOIN public."Tenants" T 
+    ON T."tenantId" = UTM."tenantId" 
+    WHERE UTM."userId" = $1`;
+    const result = await this.usersRepository.query(query, [userId]);
+    return result;
   }
   async findCustomFields(userData, role) {
     let customFields = await this.fieldsRepository.find({
@@ -284,7 +300,7 @@ export class PostgresUserService {
         await this.updateBasicUserDetails(userDto.userId, userDto.userData);
         updatedData['basicDetails'] = userDto.userData;
       }
-      if (userDto.customFields.length > 0) {
+      if (userDto?.customFields?.length > 0) {
         for (let data of userDto.customFields) {
           const result = await this.updateCustomFields(userDto.userId, data);
           if (result) {

src/user/entities/user-entity.ts

@@ -1,4 +1,5 @@
-import { Entity, PrimaryColumn, Column, CreateDateColumn, UpdateDateColumn } from "typeorm";
+import { Entity, PrimaryColumn, Column, CreateDateColumn, UpdateDateColumn, OneToMany } from "typeorm";
+import { UserTenantMapping } from "src/userTenantMapping/entities/user-tenant-mapping.entity";
 
 @Entity({ name: "Users" })
 export class User {
@@ -53,4 +54,12 @@ export class User {
   @Column({ default: "active" })
   status: string;
   userRoleMappings: User;
+
+
+  // @OneToMany(() => CohortMembers, cohortMember => cohortMember.cohort)
+  // cohortMembers: CohortMembers[];
+
+  @OneToMany(() => UserTenantMapping, userTenantMapping => userTenantMapping.user)
+  userTenantMapping: UserTenantMapping[];
+
 }

src/userTenantMapping/entities/user-tenant-mapping.entity.ts

@@ -4,8 +4,11 @@ import {
     Column,
     CreateDateColumn,
     UpdateDateColumn,
+    ManyToOne,
+    JoinColumn,
   } from "typeorm";
-
+  import { User } from "src/user/entities/user-entity";
+
   @Entity({ name: "UserTenantMapping" })
   export class UserTenantMapping {
     @PrimaryGeneratedColumn("uuid")
@@ -34,5 +37,12 @@ import {
 
     @Column()
     updatedBy: string;
+
+
+
+    @ManyToOne(() => User, user => user.userTenantMapping)
+    @JoinColumn({ name: 'userId' })
+    user: User; 
+
   }