Skip to content

Commit

Permalink
Merge pull request #42 from fga-eps-mds/fix/tipo-de-equipamento
Browse files Browse the repository at this point in the history
Fix/tipo de equipamento
  • Loading branch information
JoaoVitorFarias authored Jul 9, 2023
2 parents 0041303 + 962198b commit 2eddf01
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
1 change: 1 addition & 0 deletions src/repository/movementRepository.ts
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ export class MovementRepository implements MovementRepositoryProtocol {
'equipments',
'equipments.brand',
'equipments.unit',
'equipments.type',
'destination'
],
order: { date: 'DESC' },
Expand Down
7 changes: 6 additions & 1 deletion src/repository/order-service/list-order-service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,12 @@ export class ListOrderServiceRepository
: defaultConditions

const queryResult = await this.orderServiceRepository.find({
relations: ['equipment', 'equipment.brand', 'equipment.unit'],
relations: [
'equipment',
'equipment.brand',
'equipment.unit',
'equipment.type'
],
order: { updatedAt: 'DESC' },
where: searchConditions,
take,
Expand Down

0 comments on commit 2eddf01

Please sign in to comment.