asyavee/medusa-store
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix(medusa): MoneyAmountRepository#findManyForVariantInRegion sql statement for constraint related to price_list (#1462)

Browse Source
This commit is contained in:
Adrien de Peretti
2022-05-05 07:56:34 +02:00
committed by GitHub
parent 2260c2d09e
commit 3c75a65792
1 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/medusa/src/repositories/money-amount.ts
+9 -17
View File
@@ -126,21 +126,17 @@ export class MoneyAmountRepository extends Repository<MoneyAmount> {
const date = new Date() const date = new Date()
const qb = this.createQueryBuilder("ma") const qb = this.createQueryBuilder("ma")
.leftJoinAndSelect( .leftJoinAndSelect("ma.price_list", "price_list")
"ma.price_list",
"price_list",
"ma.price_list_id = price_list.id "
)
.where({ variant_id: variant_id }) .where({ variant_id: variant_id })
.andWhere("(ma.price_list_id is null or price_list.status = 'active')") .andWhere("(ma.price_list_id is null or price_list.status = 'active')")
.andWhere( .andWhere(
"(price_list is null or price_list.ends_at is null OR price_list.ends_at > :date) ", "(price_list.ends_at is null OR price_list.ends_at > :date)",
{ {
date: date.toUTCString(), date: date.toUTCString(),
} }
) )
.andWhere( .andWhere(
"(price_list is null or price_list.starts_at is null OR price_list.starts_at < :date)", "(price_list.starts_at is null OR price_list.starts_at < :date)",
{ {
date: date.toUTCString(), date: date.toUTCString(),
} }
@@ -155,23 +151,19 @@ export class MoneyAmountRepository extends Repository<MoneyAmount> {
) )
) )
} else if (!customer_id && !include_discount_prices) { } else if (!customer_id && !include_discount_prices) {
qb.andWhere("price_list IS null") qb.andWhere("price_list.id IS null")
} }
if (customer_id) { if (customer_id) {
qb.leftJoin("price_list.customer_groups", "cgroup") qb.leftJoin("price_list.customer_groups", "cgroup")
.leftJoin( .leftJoin("customer_group_customers", "cgc", "cgc.customer_group_id = cgroup.id")
"customer_group_customers", .andWhere("(cgc.customer_group_id is null OR cgc.customer_id = :customer_id)", {
"cgc",
"cgc.customer_group_id = cgroup.id"
)
.andWhere("(cgc is null OR cgc.customer_id = :customer_id)", {
customer_id, customer_id,
}) })
} else { } else {
qb.leftJoin("price_list.customer_groups", "cgroup").andWhere( qb
"cgroup.id is null" .leftJoin("price_list.customer_groups", "cgroup")
) .andWhere("cgroup.id is null")
} }
return await qb.getManyAndCount() return await qb.getManyAndCount()
} }