fix(medusa): Select config should be undefined if length === 0 (#2469)

This commit is contained in:
Adrien de Peretti authored and GitHub committed 2022-10-20 13:25:23 +02:00
1 parent 2f00bd100a
commit 13611e3e53
3 files changed
+14 -38

No files matched your search

+5
View File
@@ -0,0 +1,5 @@
---
"@medusajs/medusa": patch
---
fix(medusa): Select config should be undefined if length === 0
+1 -5
View File
@@ -334,11 +334,7 @@ class CartService extends TransactionBaseService {
query.relations = relations query.relations = relations
} }
if (select && select.length > 0) { query.select = select?.length ? select : undefined
query.select = select
} else {
query.select = undefined
}
const queryRelations = query.relations const queryRelations = query.relations
query.relations = undefined query.relations = undefined
+8 -33
View File
@@ -166,25 +166,8 @@ class OrderService extends TransactionBaseService {
order: { created_at: "DESC" }, order: { created_at: "DESC" },
} }
): Promise<Order[]> { ): Promise<Order[]> {
const orderRepo = this.manager_.getCustomRepository(this.orderRepository_) const [orders] = await this.listAndCount(selector, config)
const query = buildQuery(selector, config) return orders
const { select, relations, totalsToSelect } =
this.transformQueryForTotals(config)
if (select && select.length) {
query.select = select
}
if (relations && relations.length) {
query.relations = relations
}
const raw = await orderRepo.find(query)
return await Promise.all(
raw.map(async (r) => await this.decorateTotals(r, totalsToSelect))
)
} }
/** /**
@@ -241,11 +224,9 @@ class OrderService extends TransactionBaseService {
const { select, relations, totalsToSelect } = const { select, relations, totalsToSelect } =
this.transformQueryForTotals(config) this.transformQueryForTotals(config)
if (select && select.length) {
query.select = select query.select = select
}
const rels = relations const rels = relations
delete query.relations delete query.relations
const raw = await orderRepo.findWithRelations(rels, query) const raw = await orderRepo.findWithRelations(rels, query)
@@ -314,14 +295,14 @@ class OrderService extends TransactionBaseService {
select = select.filter((v) => !totalFields.includes(v)) select = select.filter((v) => !totalFields.includes(v))
} }
const toSelect = [...select] const toSelect = select
if (toSelect.length > 0 && toSelect.indexOf("tax_rate") === -1) { if (toSelect.length > 0 && toSelect.indexOf("tax_rate") === -1) {
toSelect.push("tax_rate") toSelect.push("tax_rate")
} }
return { return {
relations, relations,
select: toSelect, select: toSelect.length ? toSelect : undefined,
totalsToSelect, totalsToSelect,
} }
} }
@@ -349,9 +330,7 @@ class OrderService extends TransactionBaseService {
query.relations = relations query.relations = relations
} }
if (select && select.length > 0) { query.select = select?.length ? select : undefined
query.select = select
}
const rels = query.relations const rels = query.relations
delete query.relations delete query.relations
@@ -389,9 +368,7 @@ class OrderService extends TransactionBaseService {
query.relations = relations query.relations = relations
} }
if (select && select.length > 0) { query.select = select?.length ? select : undefined
query.select = select
}
const raw = await orderRepo.findOne(query) const raw = await orderRepo.findOne(query)
@@ -428,9 +405,7 @@ class OrderService extends TransactionBaseService {
query.relations = relations query.relations = relations
} }
if (select && select.length > 0) { query.select = select?.length ? select : undefined
query.select = select
}
const rels = query.relations const rels = query.relations
delete query.relations delete query.relations