Merge pull request #562 from bandada-infra/fix/get-groups-api-sdk

fix(api-sdk): fix get groups function
bandada-infra · Sep 25, 2024 · 805969e · 805969e
2 parents 89b67ae + 0f83944
commit 805969e
Show file tree

Hide file tree

Showing 6 changed files with 316 additions and 25 deletions.
diff --git a/apps/api/src/app/groups/docSchemas/group.ts b/apps/api/src/app/groups/docSchemas/group.ts
@@ -20,5 +20,5 @@ export class Group {
     @ApiProperty({ isArray: true })
     members: string
     @ApiProperty()
-    credentials: object
+    credentials: string
 }
diff --git a/apps/api/src/app/groups/dto/create-group.dto.ts b/apps/api/src/app/groups/dto/create-group.dto.ts
@@ -43,6 +43,10 @@ export class CreateGroupDto {
 
     @IsJSON()
     @IsOptional()
-    @ApiProperty()
+    @ApiProperty({
+        default:
+            '{"id":"BLOCKCHAIN_BALANCE","criteria":{"minBalance":"10","network":"Sepolia"}}',
+        type: String
+    })
     readonly credentials?: any
 }
diff --git a/libs/api-sdk/src/groups.ts b/libs/api-sdk/src/groups.ts
@@ -13,12 +13,22 @@ const url = "/groups"
  * @returns List of groups.
  */
 export async function getGroups(config: object): Promise<Group[]> {
-    const groups = await request(url, config)
+    let groups = await request(url, config)
 
-    groups.map((group: any) => ({
-        ...group,
-        credentials: JSON.parse(group.credentials)
-    }))
+    groups = groups.map((group: any) => {
+        let credentials
+
+        try {
+            credentials = JSON.parse(group.credentials)
+        } catch (error) {
+            credentials = null
+        }
+
+        return {
+            ...group,
+            credentials
+        }
+    })
 
     return groups
 }
@@ -34,12 +44,22 @@ export async function getGroupsByAdminId(
 ): Promise<Group[]> {
     const requestUrl = `${url}?adminId=${adminId}`
 
-    const groups = await request(requestUrl, config)
+    let groups = await request(requestUrl, config)
+
+    groups = groups.map((group: any) => {
+        let credentials
 
-    groups.map((group: any) => ({
-        ...group,
-        credentials: JSON.parse(group.credentials)
-    }))
+        try {
+            credentials = JSON.parse(group.credentials)
+        } catch (error) {
+            credentials = null
+        }
+
+        return {
+            ...group,
+            credentials
+        }
+    })
 
     return groups
 }
@@ -55,12 +75,22 @@ export async function getGroupsByMemberId(
 ): Promise<Group[]> {
     const requestUrl = `${url}?memberId=${memberId}`
 
-    const groups = await request(requestUrl, config)
+    let groups = await request(requestUrl, config)
+
+    groups = groups.map((group: any) => {
+        let credentials
 
-    groups.map((group: any) => ({
-        ...group,
-        credentials: JSON.parse(group.credentials)
-    }))
+        try {
+            credentials = JSON.parse(group.credentials)
+        } catch (error) {
+            credentials = null
+        }
+
+        return {
+            ...group,
+            credentials
+        }
+    })
 
     return groups
 }
@@ -76,9 +106,22 @@ export async function createGroups(
     groupsCreationDetails: Array<GroupCreationDetails>,
     apiKey: string
 ): Promise<Array<Group>> {
+    const groupsCreationDetailsRequest = groupsCreationDetails.map((group) => {
+        if (group.credentials) {
+            return {
+                ...group,
+                credentials: JSON.stringify(group.credentials)
+            }
+        }
+
+        return {
+            ...group
+        }
+    })
+
     const newConfig: any = {
         method: "post",
-        data: groupsCreationDetails,
+        data: groupsCreationDetailsRequest,
         ...config
     }
 
@@ -204,7 +247,15 @@ export async function getGroup(
 
     const group = await request(requestUrl, config)
 
-    group.credentials = JSON.parse(group.credentials)
+    let credentials
+
+    try {
+        credentials = JSON.parse(group.credentials)
+    } catch (error) {
+        credentials = null
+    }
+
+    group.credentials = credentials
 
     return group
 }