fix(order): populate version entities (#8884)

This commit is contained in:
Carlos R. L. Rodrigues authored and GitHub committed 2024-08-29 13:22:24 -03:00
1 parent 9cf1a5d709
commit 90a6f61c62
1 file changed
+7 -6
@@ -34,15 +34,17 @@ export function setFindMethods<T>(klass: Constructor<T>, entity: any) {
config.options ??= {} config.options ??= {}
config.options.populate ??= [] config.options.populate ??= []
const strategy = config.options.strategy ?? LoadStrategy.JOINED
let orderAlias = "o0" let orderAlias = "o0"
if (isRelatedEntity) { if (isRelatedEntity) {
if (entity === OrderClaim) { if (entity === OrderClaim) {
if (
config.options.populate.includes("additional_items") &&
!config.options.populate.includes("claim_items")
) {
config.options.populate.push("claim_items") config.options.populate.push("claim_items")
} }
if (strategy === LoadStrategy.JOINED) {
config.options.populate.push("order.shipping_methods")
config.options.populate.push("order.summary")
config.options.populate.push("shipping_methods")
} }
if (!config.options.populate.includes("order.items")) { if (!config.options.populate.includes("order.items")) {
@@ -60,7 +62,7 @@ export function setFindMethods<T>(klass: Constructor<T>, entity: any) {
} }
let defaultVersion = knex.raw(`"${orderAlias}"."version"`) let defaultVersion = knex.raw(`"${orderAlias}"."version"`)
const strategy = config.options.strategy ?? LoadStrategy.JOINED
if (strategy === LoadStrategy.SELECT_IN) { if (strategy === LoadStrategy.SELECT_IN) {
const sql = manager const sql = manager
.qb(Order, "_sub0") .qb(Order, "_sub0")
@@ -82,7 +84,6 @@ export function setFindMethods<T>(klass: Constructor<T>, entity: any) {
popWhere.order ??= {} popWhere.order ??= {}
popWhere.shipping_methods ??= {} popWhere.shipping_methods ??= {}
popWhere.shipping_methods.version = version
popWhere.shipping_methods.deleted_at ??= null popWhere.shipping_methods.deleted_at ??= null
popWhere.shipping_methods.shipping_method ??= {} popWhere.shipping_methods.shipping_method ??= {}