fix: fix legalPersonEntityDto im app layer

GabrielDeSouzza · Jun 9, 2024 · 1696927 · 1696927
1 parent 0e08a3b
commit 1696927
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 11 deletions.
diff --git a/src/app/dtos/LegalPerson/LegalPersonEntityDto.ts b/src/app/dtos/LegalPerson/LegalPersonEntityDto.ts
@@ -37,7 +37,7 @@ export class LegalPersonEntityDto {
       complement: update?.complement,
       city: update?.city,
       uf: update?.uf,
-      cep: update.cep,
+      cep: update?.cep,
       first_phone: update?.first_phone,
       second_phone: update?.second_phone,
       third_phone: update?.third_phone,

diff --git a/src/app/useCases/CarrierCompanyCases/CarrierCompanyUseCases.ts b/src/app/useCases/CarrierCompanyCases/CarrierCompanyUseCases.ts
@@ -97,6 +97,7 @@ export class CarrierCompanyUseCases {
       created_by: null,
       legalPersonId: null,
     });
+    console.log(request);
     const legalPerson = LegalPersonEntityDto.updateEntity(request.LegalPerson);
 
     return this.carrierCompanyRepository.updateCarrierCompany(

diff --git a/src/app/useCases/FreightExpenseUseCases/FreightExpenseUseCases.ts b/src/app/useCases/FreightExpenseUseCases/FreightExpenseUseCases.ts
@@ -49,6 +49,7 @@ export class FreightExpenseUseCases {
     return this.freightExpenseRepository.findAllFreightExpense(request);
   }
   async createFreightExpense(data: CreateFreightExpenseDTO) {
+    console.log(data);
     if (data.legalClientOrderId && data.physicalCustomerOrderId)
       throw new GraphQLError('SEND ONLY ORDER', {
         extensions: { code: HttpStatus.BAD_REQUEST },

diff --git a/src/app/useCases/LegalClientUseCases/LegalClientUseCase.ts b/src/app/useCases/LegalClientUseCases/LegalClientUseCase.ts
@@ -82,11 +82,20 @@ export class LegalClientUseCases {
       created_by: data.created_by,
       legal_person_id: data.legal_person_id,
     });
-    const legalPerson = LegalPersonEntityDto.createEntity(data.LegalPerson);
+
+    if (data.LegalPerson) {
+      const legalPerson = LegalPersonEntityDto.createEntity(data.LegalPerson);
+
+      return this.legalClientRepository.createLegalClient(
+        legalClient,
+        legalPerson,
+        data.legal_person_id,
+      );
+    }
 
     return this.legalClientRepository.createLegalClient(
       legalClient,
-      legalPerson,
+      null,
       data.legal_person_id,
     );
   }

diff --git a/src/app/useCases/LegalPersonUseCases/LegalPersonUseCases.ts b/src/app/useCases/LegalPersonUseCases/LegalPersonUseCases.ts
@@ -41,10 +41,13 @@ export class LegalPersonUseCases {
       state_registration: data?.state_registration,
       id: data?.id,
     });
-    console.log(person);
     if (person) {
       let errors = '';
 
+      if (data.id == person.id) {
+        errors += 'EMPRESA JÁ CADASTRADA';
+      }
+
       if (data.cnpj == person.cnpj) {
         errors += 'CNPJ IN USE;';
       }

diff --git a/src/domain/entities/OrdersEntities/FreightExpense/FreightExpense.ts b/src/domain/entities/OrdersEntities/FreightExpense/FreightExpense.ts
@@ -40,12 +40,6 @@ export class FreightExpense extends Entity {
         fieldName: 'Expense Name',
         maxLength: 80,
       },
-      {
-        field: this.props.legalClientOrderId,
-        fieldName: 'Order Id',
-        maxLength: 1000,
-        isNullAble: true,
-      },
       {
         field: this.props.value,
         fieldName: 'Value',

diff --git a/src/infra/graphql/entities/IncidentGraphql/Incident.input.ts b/src/infra/graphql/entities/IncidentGraphql/Incident.input.ts
@@ -28,7 +28,7 @@ export class IncidentInput
   date_incident: Date;
   @Field()
   @IsUUID()
-  @IsNotEmpty()
+  @IsNotEmpty({ message: 'O PROCESSAMENTO DE ID NÃO PODE SER VAZIO' })
   order_process_id: string;
   @Field(() => Date, { nullable: true })
   @Field(() => Date)