fix: order order

This commit is contained in:
Sebastian Rindom
2021-06-08 21:49:59 +02:00
parent 60da043d8b
commit 245ccdc477
2 changed files with 6 additions and 7 deletions

View File

@@ -29,12 +29,12 @@ export class OrderRepository extends Repository<Order> {
})
})
).then(flatten)
const entitiesAndRelations = entitiesIdsWithRelations.concat(entities)
const entitiesAndRelationsById = groupBy(entitiesAndRelations, "id")
return map(entitiesAndRelationsById, entityAndRelations =>
merge({}, ...entityAndRelations)
)
return map(entities, e => merge({}, ...entitiesAndRelationsById[e.id]))
}
public async findOneWithRelations(

View File

@@ -244,11 +244,10 @@ class OrderService extends BaseService {
query.select = select
}
if (relations && relations.length) {
query.relations = relations
}
let rels = relations
delete query.relations
const raw = await orderRepo.findWithRelations(query.relations, query)
const raw = await orderRepo.findWithRelations(rels, query)
const count = await orderRepo.count(query)
const orders = raw.map(r => this.decorateTotals_(r, totalsToSelect))