Merge pull request #119 from souravbhowmik1999/formCreate

Get Tenant form related changes
tekdi · Dec 18, 2024 · 073300f · 073300f
2 parents 9499086 + c0ea73a
commit 073300f
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 19 deletions.
diff --git a/src/forms/forms.service.ts b/src/forms/forms.service.ts
@@ -30,8 +30,11 @@ export class FormsService {
           HttpStatus.BAD_REQUEST
         );
       }
+
+
       const { context, contextType, tenantId } = requiredData;
       const validationResult = await this.validateFormInput(requiredData);
+
       if (validationResult.error) {
         return APIResponse.error(
           response,
@@ -160,6 +163,7 @@ export class FormsService {
 
     if (context) {
       const validContextTypes = await this.getValidContextTypes(context);
+
       if (validContextTypes.length === 0) {
         return { error: `Invalid context: ${context}` };
       }
@@ -175,14 +179,17 @@ export class FormsService {
     return { error: null };
   }
 
-  private async getValidContextTypes(context: string): Promise<string[]> {
+
+  private async getValidContextTypes(context: string): Promise<string[]> {    
     switch (context.toLowerCase()) {
       case "users":
         return await this.getUserContextTypesFromDB();
       case "cohorts":
         return Object.values(CohortContextType);
       case "cohortmember":
         return ["COHORTMEMBER"];
+      case "tenant":
+        return ["TENANT"];
       default:
         return [];
     }

diff --git a/src/tenant/dto/tenant-update.dto.ts b/src/tenant/dto/tenant-update.dto.ts
@@ -53,14 +53,14 @@ export class TenantUpdateDto {
     @ApiPropertyOptional({
         type: String,
         description: "Status of the tenant",
-        enum: ['active', 'inactive', 'archive'],
+        enum: ['active', 'inactive', 'archived'],
         default: 'active',
     })
     @IsString()
     @IsOptional()
-    @IsIn(['active', 'inactive', 'archive'])
+    @IsIn(['active', 'inactive', 'archived'])
     @Expose()
-    status: 'active' | 'inactive' | 'archive';
+    status: 'active' | 'inactive' | 'archived';
 
     @Expose()
     @IsString()

diff --git a/src/tenant/entities/tenent.entity.ts b/src/tenant/entities/tenent.entity.ts
@@ -36,9 +36,9 @@ export class Tenant {
     @Column({
         type: 'text',
         default: 'active',
-        enum: ['active', 'inactive', 'archive'],
+        enum: ['active', 'inactive', 'archived'],
     })
-    status: 'active' | 'inactive' | 'archive'; // Status column with enum values
+    status: 'active' | 'inactive' | 'archived'; // Status column with enum values
 
     @Column("int4", { nullable: false })
     @Min(0) 

diff --git a/src/tenant/tenant.service.ts b/src/tenant/tenant.service.ts
@@ -180,21 +180,24 @@ export class TenantService {
                 );
             }
 
-            let checkExistingTenantName = await this.tenantRepository.findOne({
-                where: {
-                    "name": tenantUpdateDto?.name
+            if(tenantUpdateDto.name){
+                const checkExistingTenantName = await this.tenantRepository.findOne({
+                    where: {
+                        "name": tenantUpdateDto.name
+                    }
+                })
+                if (checkExistingTenantName) {
+                    return APIResponse.error(
+                        response,
+                        apiId,
+                        API_RESPONSES.CONFLICT,
+                        API_RESPONSES.TENANT_EXISTS,
+                        HttpStatus.CONFLICT
+                    );
                 }
-            })
-
-            if (checkExistingTenantName) {
-                return APIResponse.error(
-                    response,
-                    apiId,
-                    API_RESPONSES.CONFLICT,
-                    API_RESPONSES.TENANT_EXISTS,
-                    HttpStatus.CONFLICT
-                );
             }
+
+
 
             let result = await this.tenantRepository.update(tenantId, tenantUpdateDto);
             return APIResponse.success(