Merge pull request #155 from souravbhowmik1999/responceBody

Cohort Member: Response body changes
tekdi · May 10, 2024 · a285e14 · a285e14
2 parents 6800b22 + 6853810
commit a285e14
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 23 deletions.
diff --git a/src/adapters/postgres/cohortMembers-adapter.ts b/src/adapters/postgres/cohortMembers-adapter.ts
@@ -85,15 +85,14 @@ export class PostgresCohortMembersService {
         role: data?.role,
         district: data?.district,
         state: data?.state,
-        mobile: data?.mobile,
-        customField: [],
+        mobile: data?.mobile
       };
 
       if (fieldShowHide === "false") {
         results.userDetails.push(userDetails);
       } else {
-        const fieldValues = await this.getFieldandFieldValues(data.userId);
-        userDetails.customField.push(fieldValues);
+        const fieldValues = await this.getFieldandFieldValues(data.userId);        
+        userDetails['customField'] = fieldValues;
         results.userDetails.push(userDetails);
       }
     }
@@ -159,11 +158,9 @@ export class PostgresCohortMembersService {
       let { limit, page, filters } = cohortMembersSearchDto;
       let offset = 0;
       if (page > 1) {
-        offset = parseInt(limit) * (page - 1);
-      }
-      if (limit.trim() === "") {
-        limit = "0";
+        offset = limit * (page - 1);
       }
+
       const whereClause = {};
       if (filters && Object.keys(filters).length > 0) {
         Object.entries(filters).forEach(([key, value]) => {
@@ -212,26 +209,23 @@ export class PostgresCohortMembersService {
       const [userData] = await this.cohortMembersRepository.findAndCount({
         where: whereClause,
         skip: offset,
-        take: parseInt(limit),
+        take: limit,
       });
-      let results = {
-        userDetails: [],
-      };
+      let results = {};
       if (whereClause["cohortId"]) {
-        let cohortDetails = await this.getUserDetails(
+        results = await this.getUserDetails(
           whereClause["cohortId"],
           "cohortId",
           "true"
         );
-        results.userDetails.push(cohortDetails);
       }
+
       if (whereClause["userId"]) {
-        let cohortDetails = await this.getUserDetails(
+        results = await this.getUserDetails(
           whereClause["userId"],
           "userId",
           "true"
         );
-        results.userDetails.push(cohortDetails);
       }
 
       return new SuccessResponse({

diff --git a/src/cohortMembers/cohortMember.service.ts b/src/cohortMembers/cohortMember.service.ts
@@ -82,13 +82,10 @@ export class CohortMembersService {
 
     try {
       let { limit, page, filters } = cohortMembersSearchDto;
-      if (!limit) {
-        limit = "0";
-      }
 
       let offset = 0;
       if (page > 1) {
-        offset = parseInt(limit) * (page - 1);
+        offset = limit * (page - 1);
       }
 
       const whereClause = {};
@@ -113,7 +110,7 @@ export class CohortMembersService {
 
         let filterDetails = {
           where: data.cohortId,
-          take: parseInt(limit),
+          take: limit,
           skip: offset,
         };
 

diff --git a/src/cohortMembers/dto/cohortMembers-search.dto.ts b/src/cohortMembers/dto/cohortMembers-search.dto.ts
@@ -2,10 +2,10 @@ import { ApiProperty, ApiPropertyOptional } from "@nestjs/swagger";
 
 export class CohortMembersSearchDto {
   @ApiProperty({
-    type: String,
+    type: Number,
     description: "Limit",
   })
-  limit: string;
+  limit: number;
 
   @ApiProperty({
     type: Number,