Merge pull request #45 from fga-eps-mds/fix/find-os

FIX: Correção do Filtro de OS
fga-eps-mds · Jul 10, 2023 · cdb772d · cdb772d
2 parents 5eececd + 2e2eb95
commit cdb772d
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 14 deletions.
diff --git a/src/repository/order-service/list-order-service.ts b/src/repository/order-service/list-order-service.ts
@@ -29,7 +29,7 @@ export class ListOrderServiceRepository
       equipment: {
         unit: unit ? { id: unit } : undefined,
         brand: brand ? { id: brand } : undefined,
-        type,
+        type: type ? { id: type } : undefined,
         model
       }
     }

diff --git a/src/repository/protocol/equipmentRepositoryProtocol.ts b/src/repository/protocol/equipmentRepositoryProtocol.ts
@@ -6,11 +6,11 @@ export type Query = {
   tippingNumber?: string
   serialNumber?: string
   acquisition?: string
-  type?: string
+  type?: number
   unit?: string
   situation?: string
   updatedAt?: Date
-  brand?: string
+  brand?: number
   search?: string
   model?: string
   searchTipping?: string

diff --git a/src/repository/protocol/orderServiceRepositoryProtocol.ts b/src/repository/protocol/orderServiceRepositoryProtocol.ts
@@ -1,10 +1,10 @@
 import { OrderService } from '../../domain/entities/order-service'
 
 export type FindOrderServiceUseCaseDataQuery = {
-  type?: string
+  type?: number
   unit?: string
   date?: string
-  brand?: string
+  brand?: number
   search?: string
   model?: string
   status?: string

diff --git a/src/useCases/find-order-service/find-order-service.ts b/src/useCases/find-order-service/find-order-service.ts
@@ -13,10 +13,10 @@ export class NotOSFoundError extends Error {
 }
 
 export interface FindOrderServiceUseCaseData {
-  type?: string
+  type?: number
   unit?: string
   date?: string
-  brand?: string
+  brand?: number
   search?: string
   model?: string
   status?: string

diff --git a/src/useCases/getEquipment/getEquipmentUseCase.ts b/src/useCases/getEquipment/getEquipmentUseCase.ts
@@ -14,15 +14,15 @@ export interface GetEquipmentInput {
 
   acquisition?: string
 
-  type?: string
+  type?: number
 
   situacao?: string
 
   model?: string
 
   unit?: string
 
-  brand?: string
+  brand?: number
 
   screenSize?: string
 

diff --git a/tests/find-order-service-usecase.spec.ts b/tests/find-order-service-usecase.spec.ts
@@ -55,7 +55,7 @@ describe('FindOrderService', () => {
       expectedData
     )
 
-    const query = { type: 'type1', unit: 'unit1' }
+    const query = { type: 2, unit: 'unit1' }
     const result = await findOrderServiceUseCase.execute(query)
 
     expect(

diff --git a/tests/find-orders-service.spec.ts b/tests/find-orders-service.spec.ts
@@ -44,10 +44,10 @@ const orderService: OrderService = {
 }
 
 const request: FindOrderServiceUseCaseData = {
-  type: '',
+  type: 0,
   unit: '',
   date: '',
-  brand: '',
+  brand: 0,
   search: '',
   model: '',
   status: ''

diff --git a/tests/getEquipmentUseCase.spec.ts b/tests/getEquipmentUseCase.spec.ts
@@ -67,7 +67,7 @@ describe('Should test get equipment', () => {
 
   it('should find equipmentswith genetic attributes', async () => {
     const queryRequest = {
-      type: 'CPU',
+      type: datatype.number(),
       ram_size: datatype.number().toString(),
       processor: 'i7'
     }
@@ -86,7 +86,7 @@ describe('Should test get equipment', () => {
 
   it('should not find equipment with generic attributes', async () => {
     const queryRequest = {
-      type: datatype.string(),
+      type: datatype.number(),
       ram_size: datatype.number().toString(),
       processor: datatype.string()
     }