REFACTOR: rename 'companySite' to 'personalSite' in user DTOs and related services

docsfera.json

@@ -5461,6 +5461,66 @@
           ]
         }
       },
+      "/customers/{id}/organization-info": {
+        "get": {
+          "operationId": "CustomersController_getOrganizationInfo",
+          "parameters": [
+            {
+              "name": "id",
+              "required": true,
+              "in": "path",
+              "schema": {
+                "type": "string"
+              }
+            }
+          ],
+          "responses": {
+            "200": {
+              "description": "Organization information"
+            }
+          },
+          "tags": [
+            "Customers"
+          ],
+          "security": [
+            {
+              "access-token": []
+            },
+            {
+              "access-token": []
+            }
+          ]
+        },
+        "put": {
+          "operationId": "CustomersController_updateOrganizationInfo",
+          "parameters": [
+            {
+              "name": "id",
+              "required": true,
+              "in": "path",
+              "schema": {
+                "type": "string"
+              }
+            }
+          ],
+          "responses": {
+            "200": {
+              "description": "Organization information updated"
+            }
+          },
+          "tags": [
+            "Customers"
+          ],
+          "security": [
+            {
+              "access-token": []
+            },
+            {
+              "access-token": []
+            }
+          ]
+        }
+      },
       "/catalog/data-asset/share/{id}": {
         "get": {
           "operationId": "ShareController_getShareDataAsset",
@@ -8169,7 +8229,7 @@
             "companyName": {
               "type": "string"
             },
-            "companySite": {
+            "personalSite": {
               "type": "string"
             },
             "mfaStatus": {
@@ -8204,7 +8264,7 @@
             "hierarchy",
             "bio",
             "companyName",
-            "companySite",
+            "personalSite",
             "mfaStatus",
             "createdAt",
             "updatedAt",
@@ -8344,7 +8404,7 @@
             "companyName": {
               "type": "string"
             },
-            "companySite": {
+            "personalSite": {
               "type": "string"
             },
             "customer": {
@@ -8376,7 +8436,7 @@
             "hierarchy",
             "bio",
             "companyName",
-            "companySite",
+            "personalSite",
             "mfaStatus",
             "createdAt",
             "updatedAt",
@@ -8520,7 +8580,7 @@
             "bio": {
               "type": "string"
             },
-            "companySite": {
+            "personalSite": {
               "type": "string"
             },
             "companyName": {
@@ -8572,7 +8632,7 @@
             "companyName": {
               "type": "string"
             },
-            "companySite": {
+            "personalSite": {
               "type": "string"
             },
             "mfaStatus": {
@@ -8600,7 +8660,7 @@
             "hierarchy",
             "bio",
             "companyName",
-            "companySite",
+            "personalSite",
             "mfaStatus",
             "createdAt",
             "updatedAt",

package-lock.json

@@ -17,7 +17,7 @@
         "@aws-sdk/signature-v4": "^3.370.0",
         "@dadosfera/dadosfera-logs": "^1.0.0-beta.4",
         "@dadosfera/protospack": "2.5.3",
-        "@dadosfera/protospack-v2": "3.38.0-beta.19",
+        "@dadosfera/protospack-v2": "^3.38.0-beta.25",
         "@grpc/grpc-js": "^1.9.3",
         "@grpc/proto-loader": "^0.7.9",
         "@nestjs/cli": "^9.5.0",
@@ -1744,10 +1744,9 @@
       }
     },
     "node_modules/@dadosfera/protospack-v2": {
-      "version": "3.38.0-beta.19",
-      "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com/npm/dadosfera-npm/@dadosfera/protospack-v2/-/protospack-v2-3.38.0-beta.19.tgz",
-      "integrity": "sha512-qevGunl1IKv4POa2hhXNaDpqlh/bvnq5Hxo6534OHYPZ//S+XcRZgTrxFnylK3+uoROM8epF3Mey5GwynxY7Tw==",
-      "license": "ISC",
+      "version": "3.38.0-beta.25",
+      "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com/npm/dadosfera-npm/@dadosfera/protospack-v2/-/protospack-v2-3.38.0-beta.25.tgz",
+      "integrity": "sha512-OsOl9hJezmtWlVy+2vl3qbWP5yHmLktJ01r5aL475lcfKJtzFPZieUT9ES87C1Emrqe21E6IM/BkJK2rm/aUiA==",
       "dependencies": {
         "@grpc/grpc-js": "^1.9.3",
         "rxjs": "^7.5.5"

package.json

@@ -35,7 +35,7 @@
     "@aws-sdk/signature-v4": "^3.370.0",
     "@dadosfera/dadosfera-logs": "^1.0.0-beta.4",
     "@dadosfera/protospack": "2.5.3",
-    "@dadosfera/protospack-v2": "3.38.0-beta.19",
+    "@dadosfera/protospack-v2": "^3.38.0-beta.25",
     "@grpc/grpc-js": "^1.9.3",
     "@grpc/proto-loader": "^0.7.9",
     "@nestjs/cli": "^9.5.0",

src/modules/customers/customers.controller.ts

@@ -136,4 +136,32 @@ export class CustomersController {
     const result = await this.customersService.getAccessDashboardUrl(user.customer_name, metadata);
     return result;
   }
+
+  @Get(':id/organization-info')
+  @Authenticated()
+  @RequireAllPermissions(PERMISSIONS_GROUPS.USERS.permissions.ADMIN)
+  @ApiOkResponse({ description: 'Organization information' })
+  async getOrganizationInfo(@Param('id') id: string) {
+    this.logger.info('getOrganizationInfo', { id });
+    return this.customersService.getOrganizationInfo(id);
+  }
+
+  @Put(':id/organization-info')
+  @Authenticated()
+  @RequireAllPermissions(PERMISSIONS_GROUPS.USERS.permissions.ADMIN)
+  @HttpCode(HttpStatus.OK)
+  @ApiOkResponse({ description: 'Organization information updated' })
+  async updateOrganizationInfo(
+    @Param('id') id: string,
+    @Body() body: {
+      companyName: string;
+      companySite: string;
+      domain: string;
+      cnpj: string;
+      description: string;
+    },
+  ) {
+    return this.customersService.updateOrganizationInfo(id, body);
+  }
+
 }

src/modules/customers/customers.service.ts

@@ -223,4 +223,57 @@ export class CustomersService implements OnModuleInit {
       })
     )
   }
-}
+
+  async updateOrganizationInfo(
+    customerId: string,
+    data: {
+      companyName: string;
+      companySite: string;
+      domain: string;
+      cnpj: string;
+      description: string;
+    },
+  ) {
+    try {
+      const result = await lastValueFrom(
+        this.customerService.OrganizationUpdate({
+          customerId,
+          companyName: data.companyName || '',
+          companySite: data.companySite || '',
+          domain: data.domain || '',
+          cnpj: data.cnpj || '',
+          description: data.description || '',
+        }),
+      );
+
+      return result;
+    } catch (err) {
+      if (err.details === ErrorCodes.CUSTOMER.NOT_FOUND)
+        throw new HttpException(err.details, HttpStatus.NOT_FOUND);
+      else throw err;
+    }
+  }
+
+  async getOrganizationInfo(customerId: string) {
+    try {
+      const customerResponse = await lastValueFrom(
+        this.customerService.CustomerFindOneById({ id: customerId })
+      );
+
+      const customer = customerResponse.customer;
+      
+      return {
+        companyName: customer.companyName || '',
+        companySite: customer.companySite || '',
+        domain: customer.domain || '',
+        cnpj: customer.cnpj || '',
+        description: customer.description || ''
+      };
+    } catch (err) {
+      if (err.details === ErrorCodes.CUSTOMER.NOT_FOUND)
+        throw new HttpException(err.details, HttpStatus.NOT_FOUND);
+      else throw err;
+    }
+  }
+
+}

src/modules/customers/dtos/organization.ts

@@ -0,0 +1,27 @@
+import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
+
+export class OrganizationUpdateRequest {
+  @ApiProperty()
+  name: string;
+  @ApiPropertyOptional()
+  companySite: string;
+  @ApiProperty()
+  domain: string;
+  @ApiPropertyOptional()
+  info: string;
+  @ApiPropertyOptional()
+  cnpj: string;
+}
+
+export class OrganizationResponse {
+  @ApiProperty()
+  name: string;
+  @ApiPropertyOptional()
+  companySite: string;
+  @ApiProperty()
+  domain: string;
+  @ApiPropertyOptional()
+  info: string;
+  @ApiPropertyOptional()
+  cnpj: string;
+}

src/modules/users/dtos/entities.ts

@@ -43,7 +43,7 @@ export class User {
   @ApiProperty()
   companyName?: string;
   @ApiProperty()
-  companySite?: string;
+  personalSite?: string;
   @ApiPropertyOptional()
   customer?: Customer;
   @ApiProperty()
@@ -117,7 +117,7 @@ export class UpdateUserReq {
   @ApiPropertyOptional()
   bio?: string;
   @ApiPropertyOptional()
-  companySite?: string;
+  personalSite?: string;
   @ApiPropertyOptional()
   companyName?: string;
   @ApiPropertyOptional()

src/modules/users/users.service.ts

@@ -162,7 +162,7 @@ export class UsersService implements OnModuleInit {
         name: updateUserDTO.name,
         bio: updateUserDTO.bio,
         companyName: updateUserDTO.companyName,
-        companySite: updateUserDTO.companySite,
+        personalSite: updateUserDTO.personalSite,
         customerId,
         id,
         metabaseUserId: undefined,

src/pipes/object-validation.pipe.ts

@@ -14,10 +14,7 @@ export class ValidationPipe implements PipeTransform<any> {
       return value;
     }
     const object = plainToInstance(metatype, value);
-    const errors = await validate(object, {
-      forbidUnknownValues: false,
-      whitelist: true,
-    });
+    const errors = await validate(object);
     if (errors.length > 0) {
       const errorMessages = errors.map((err) => err.constraints);
       throw new BadRequestException(errorMessages);