feat: fix bugs

GabrielDeSouzza · Jun 26, 2024 · 0eb5bdf · 0eb5bdf
1 parent 79b831e
commit 0eb5bdf
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 19 deletions.
diff --git a/OLC12603010 b/OLC12603010
diff --git a/OR17010120 b/OR17010120
diff --git a/prisma/dbml/schema.dbml b/prisma/dbml/schema.dbml
@@ -87,7 +87,7 @@ Table vehicles {
   Model vehicle_models [not null]
   model_id String [not null]
   OutsourcedTransportVehicle outsourced_transport_vehicle
-  OrderProcessing order_procesing
+  OrderProcessing order_procesing [not null]
 }
 
 Table vehicle_models {
@@ -647,7 +647,7 @@ Table ciots_for_legal_clients {
 Table order_procesing {
   id String [pk]
   order_processing_number String [unique, not null]
-  vehicle_id String [unique, not null]
+  vehicle_id String [not null]
   Vehicle vehicles [not null]
   total_distance Float [not null]
   total_spend_liters Float [not null]
@@ -950,7 +950,7 @@ Ref: ciots_for_legal_clients.created_by > users.id
 
 Ref: ciots_for_legal_clients.updated_by > users.id
 
-Ref: order_procesing.vehicle_id - vehicles.id
+Ref: order_procesing.vehicle_id > vehicles.id
 
 Ref: order_procesing.driver_id > own_drivers.id
 

diff --git a/prisma/migrations/20240626002918_/migration.sql b/prisma/migrations/20240626002918_/migration.sql
@@ -0,0 +1,2 @@
+-- DropIndex
+DROP INDEX "order_procesing_vehicle_id_key";
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
@@ -114,7 +114,7 @@ model Vehicle {
   Model                      VehicleModel                @relation(fields: [model_id], references: [id])
   model_id                   String
   OutsourcedTransportVehicle OutsourcedTransportVehicle?
-  OrderProcessing            OrderProcessing?
+  OrderProcessing            OrderProcessing[]
 
   @@map("vehicles")
 }
@@ -748,7 +748,7 @@ model CiotForLegalClient {
 model OrderProcessing {
   id                      String                  @id @default(uuid())
   order_processing_number String                  @unique
-  vehicle_id              String                  @unique
+  vehicle_id              String
   Vehicle                 Vehicle                 @relation(fields: [vehicle_id], references: [id])
   total_distance          Float
   total_spend_liters      Float

diff --git a/src/app/useCases/CompanyVehicleUseCases/CompanyVehicleUseCases.ts b/src/app/useCases/CompanyVehicleUseCases/CompanyVehicleUseCases.ts
@@ -78,12 +78,14 @@ export class CompanyVehicleUseCases {
         extensions: { code: HttpStatus.CONFLICT },
       });
 
-    const vehicleEntity = VehicleEntityDTO.createEntity(data.Vehicle);
+    const vehicleEntity = data.Vehicle
+      ? VehicleEntityDTO.createEntity(data.Vehicle)
+      : undefined;
     const companyVehicleEntity = new CompanyVehicle({
       carrier_company_id: data.carrier_company_id,
       created_by: data.created_by,
       updated_by: data.updated_by,
-      vehicle_id: vehicleEntity.id,
+      vehicle_id: vehicleEntity?.id,
     });
 
     return await this.companyVehicleRepository.createCompanyVehicle(

diff --git a/src/app/useCases/OrderProcessingUseCases/OrderProcessingUseCases.ts b/src/app/useCases/OrderProcessingUseCases/OrderProcessingUseCases.ts
@@ -61,7 +61,8 @@ export class OrderProcessingUseCases {
       await this.orderProcessingResitory.findOrderProcessing({
         vehicleData: { vehicleId: data.vehicle_id },
       });
-    if (orderProcesingExist)
+    console.log(orderProcesingExist);
+    if (orderProcesingExist && orderProcesingExist.status != 'COMPLETE')
       throw new GraphQLError('VEHICLE ALREADY IN USE IN AN ORDER PROCESSING ', {
         extensions: { code: HttpStatus.CONFLICT },
       });

diff --git a/src/domain/entities/PhysicalClientEntities/physicalCustomer/PhysicalCustomer.ts b/src/domain/entities/PhysicalClientEntities/physicalCustomer/PhysicalCustomer.ts
@@ -49,11 +49,6 @@ export class PhysicalCustomer extends Entity {
         maxLength: 80,
         isNullAble: true,
       },
-      {
-        field: this.props.natural_person_id,
-        fieldName: 'Natural Person ID',
-        maxLength: 200,
-      },
       {
         field: this.props.created_by,
         fieldName: 'Created By',

diff --git a/src/infra/database/prisma/services/CarrierCompany.service.ts b/src/infra/database/prisma/services/CarrierCompany.service.ts
@@ -154,7 +154,6 @@ export class CarrierCompanyPrismaService implements CarrierCompanyRepository {
         ],
       },
     });
-    console.log(carrierCompany);
 
     return CarrierCompanyPrismaDTO.PrismaToEntity(carrierCompany);
   }
@@ -185,6 +184,7 @@ export class CarrierCompanyPrismaService implements CarrierCompanyRepository {
       ),
       where: { id },
     });
+    console.log('SSSSS', carriercompanyPrisma);
 
     return CarrierCompanyPrismaDTO.PrismaToEntity(carriercompanyPrisma);
   }

diff --git a/src/infra/graphql/entities/VehicleTypeGraphql/vehicle-type.resolver.ts b/src/infra/graphql/entities/VehicleTypeGraphql/vehicle-type.resolver.ts
@@ -53,6 +53,8 @@ export class VehicleTypeResolver {
 
   @Query(() => VehicleTypeModel)
   async getVehicleType(@Args() request: GetVehicleTypeArgs) {
+    console.log(request);
+
     return this.vehicleTypeUseCase.getVehicleType(request);
   }
 

diff --git a/src/infra/graphql/generated/schema.gql b/src/infra/graphql/generated/schema.gql
@@ -3948,7 +3948,7 @@ input VehicleOrderByWithRelationInput {
   CompanyVehicle: CompanyVehicleOrderByWithRelationInput
   Maintenance: MaintenanceOrderByRelationAggregateInput
   Model: VehicleModelOrderByWithRelationInput
-  OrderProcessing: OrderProcessingOrderByWithRelationInput
+  OrderProcessing: OrderProcessingOrderByRelationAggregateInput
   OutsourcedTransportVehicle: OutsourcedTransportVehicleOrderByWithRelationInput
   OutsourcedVehicle: OutsourcedVehicleOrderByWithRelationInput
   antt: SortOrder
@@ -4056,7 +4056,7 @@ input VehicleWhereInput {
   Model: VehicleModelWhereInput
   NOT: [VehicleWhereInput!]
   OR: [VehicleWhereInput!]
-  OrderProcessing: OrderProcessingWhereInput
+  OrderProcessing: OrderProcessingListRelationFilter
   OutsourcedTransportVehicle: OutsourcedTransportVehicleWhereInput
   OutsourcedVehicle: OutsourcedVehicleWhereInput
   antt: StringFilter

diff --git a/src/infra/services/generatePdf/templates/test.ejs b/src/infra/services/generatePdf/templates/test.ejs
@@ -335,7 +335,7 @@ img{
         </td>
 
       </tr>
-      <tr style="width: 50%; font-size: 0.4rem; vertical-align: top;">
+      <tr style="width: 50%; font-size: 10px; vertical-align: top;">
         <td colspan="2" rowspan="4" style="height: 100px; ">
           <% orderData.expenses.forEach(expense=> { %>
           <span style="margin: 1px;">
@@ -351,7 +351,7 @@ img{
         </td>
 
       </tr>
-      <tr style="width: 50%; font-size: 0.4rem;">
+      <tr style="width: 50%; font-size: 10px;">
         <td colspan="2" rowspan="1" style="height: 40px;vertical-align: top;">
           <span style="float: left;"> PROD PREDOMIN </span>
           <span style="float: right;">
@@ -389,7 +389,7 @@ img{
         </td>
 
       </tr>
-      <tr style="font-size: 0.4rem;">
+      <tr style="font-size: 10px;">
         <td colspan="2" rowspan="1" style="height: 40px; vertical-align: top;">
           <span> SITUAÇÃO TRIBUTARIA</span>
           <br>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		-- DropIndex
		DROP INDEX "order_procesing_vehicle_id_key";