Merge pull request #581 from bandada-infra/feat/group-types

Add type to group entity
bandada-infra · Oct 27, 2024 · 8f4285d · 8f4285d
2 parents 0d3482c + 8ded485
commit 8f4285d
Show file tree

Hide file tree

Showing 17 changed files with 133 additions and 12 deletions.
diff --git a/apps/api/src/app/credentials/credentials.service.test.ts b/apps/api/src/app/credentials/credentials.service.test.ts
@@ -83,6 +83,7 @@ describe("CredentialsService", () => {
             {
                 name: "Group1",
                 description: "This is a description",
+                type: "off-chain",
                 treeDepth: 16,
                 fingerprintDuration: 3600,
                 credentials: JSON.stringify({
@@ -104,6 +105,7 @@ describe("CredentialsService", () => {
                 {
                     name: "Group2",
                     description: "This is a description",
+                    type: "off-chain",
                     treeDepth: 16,
                     fingerprintDuration: 3600
                 },
@@ -186,6 +188,7 @@ describe("CredentialsService", () => {
                 {
                     name: "Group2",
                     description: "This is a description",
+                    type: "off-chain",
                     treeDepth: 16,
                     fingerprintDuration: 3600,
                     credentials: JSON.stringify({
@@ -232,6 +235,7 @@ describe("CredentialsService", () => {
                 {
                     name: "Group2",
                     description: "This is a description",
+                    type: "off-chain",
                     treeDepth: 16,
                     fingerprintDuration: 3600,
                     credentials: JSON.stringify({
@@ -337,6 +341,7 @@ describe("CredentialsService", () => {
                 {
                     name: "Group2",
                     description: "This is a description",
+                    type: "off-chain",
                     treeDepth: 16,
                     fingerprintDuration: 3600,
                     credentials: JSON.stringify({
@@ -387,6 +392,7 @@ describe("CredentialsService", () => {
                 {
                     name: "Group3",
                     description: "This is a description",
+                    type: "off-chain",
                     treeDepth: 16,
                     fingerprintDuration: 3600,
                     credentials: JSON.stringify({
@@ -439,6 +445,7 @@ describe("CredentialsService", () => {
                 {
                     name: "Group4",
                     description: "This is a description",
+                    type: "off-chain",
                     treeDepth: 16,
                     fingerprintDuration: 3600,
                     credentials: JSON.stringify({
@@ -492,6 +499,7 @@ describe("CredentialsService", () => {
                 {
                     name: "Group5",
                     description: "This is a description",
+                    type: "off-chain",
                     treeDepth: 16,
                     fingerprintDuration: 3600,
                     credentials: JSON.stringify({

diff --git a/apps/api/src/app/groups/docSchemas/group.ts b/apps/api/src/app/groups/docSchemas/group.ts
@@ -8,6 +8,8 @@ export class Group {
     @ApiProperty()
     description: string
     @ApiProperty()
+    type: string
+    @ApiProperty()
     admin: string
     @ApiProperty()
     treeDepth: number

diff --git a/apps/api/src/app/groups/docSchemas/groupResponse.ts b/apps/api/src/app/groups/docSchemas/groupResponse.ts
@@ -8,6 +8,8 @@ export class GroupResponse {
     @ApiProperty()
     description: string
     @ApiProperty()
+    type: string
+    @ApiProperty()
     adminId: string
     @ApiProperty()
     treeDepth: number

diff --git a/apps/api/src/app/groups/dto/create-group.dto.ts b/apps/api/src/app/groups/dto/create-group.dto.ts
@@ -8,9 +8,11 @@ import {
     MinLength,
     NotContains,
     IsNumberString,
-    IsJSON
+    IsJSON,
+    IsEnum
 } from "class-validator"
 import { ApiProperty } from "@nestjs/swagger"
+import { GroupType } from "../types"
 
 export class CreateGroupDto {
     @IsString()
@@ -30,6 +32,12 @@ export class CreateGroupDto {
     @ApiProperty()
     readonly description: string
 
+    @IsEnum(["on-chain", "off-chain"])
+    @ApiProperty({
+        enum: ["on-chain", "off-chain"]
+    })
+    readonly type: GroupType
+
     @IsNumber()
     @Min(16, { message: "The tree depth must be between 16 and 32." })
     @Max(32, { message: "The tree depth must be between 16 and 32." })

diff --git a/apps/api/src/app/groups/entities/group.entity.ts b/apps/api/src/app/groups/entities/group.entity.ts
@@ -12,6 +12,7 @@ import {
 import { OAuthAccount } from "../../credentials/entities/credentials-account.entity"
 import { Member } from "./member.entity"
 import { Invite } from "../../invites/entities/invite.entity"
+import { GroupType } from "../types"
 
 @Entity("groups")
 export class Group {
@@ -25,6 +26,13 @@ export class Group {
     @Column()
     description: string
 
+    @Column({
+        type: "simple-enum",
+        enum: ["on-chain", "off-chain"],
+        nullable: true
+    })
+    type: GroupType
+
     @Column({ name: "admin_id" })
     adminId: string