Skip to content

fix(delegate): delegate models returned in nested results don't include base fields #1662

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 27, 2024
Merged

fix(delegate): delegate models returned in nested results don't include base fields #1662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
98aec93
fix(delegate): delegate models returned in nested results don't inclu…
ymc9 Aug 27, 2024
61a9141
fix
ymc9 Aug 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions packages/runtime/src/enhancements/delegate.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,22 @@ export class DelegateProxyHandler extends DefaultPrismaProxyHandler {
if (args[kind] && typeof args[kind] === 'object') {
for (const [field, value] of Object.entries<any>(args[kind])) {
const fieldInfo = resolveField(this.options.modelMeta, model, field);
if (fieldInfo && value !== undefined) {
if (!fieldInfo) {
continue;
}

if (this.isDelegateOrDescendantOfDelegate(fieldInfo?.type) && value) {
// delegate model, recursively inject hierarchy
if (args[kind][field]) {
if (args[kind][field] === true) {
// make sure the payload is an object
args[kind][field] = {};
}
this.injectSelectIncludeHierarchy(fieldInfo.type, args[kind][field]);
}
}

if (value !== undefined) {
if (value?.orderBy) {
// `orderBy` may contain fields from base types
this.injectWhereHierarchy(fieldInfo.type, value.orderBy);
Expand Down Expand Up @@ -1127,7 +1142,7 @@ export class DelegateProxyHandler extends DefaultPrismaProxyHandler {
return destination;
};

const result = deepmerge(upMerged, downMerged, {
const result: any = deepmerge(upMerged, downMerged, {
arrayMerge: combineMerge,
isMergeableObject: (v) => isPlainObject(v) || Array.isArray(v), // avoid messing with Decimal, Date, etc.
});
Expand Down
203 changes: 203 additions & 0 deletions tests/regression/tests/issue-1645.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,203 @@
import { loadSchema } from '@zenstackhq/testtools';
describe('issue 1645', () => {
it('regression', async () => {
const { enhance } = await loadSchema(
`
model Product {
id String @id @default(cuid())
name String
slug String
description String?
sku String
price Int
onSale Boolean @default(false)
salePrice Int @default(0)
saleStartDateTime DateTime?
saleEndDateTime DateTime?
scheduledAvailability Boolean @default(false)
availabilityStartDateTime DateTime?
availabilityEndDateTime DateTime?
type String @default('VARIABLE')
image String
orderItems OrderItem[]
createdAt DateTime @default(now())
updatedAt DateTime @updatedAt

@@unique([slug])

@@allow('all', true)
}

model BaseOrder {
id String @id @default(cuid())
orderNumber String @unique @default(nanoid(16))
lineItems OrderItem[]
status String @default('PENDING')
type String @default('PARENT')
userType String?
billingAddress BillingAddress @relation(fields: [billingAddressId], references: [id])
billingAddressId String @map("billing_address_id")
shippingAddress ShippingAddress @relation(fields: [shippingAddressId], references: [id])
shippingAddressId String @map("shipping_address_id")
notes String? @default('')
createdAt DateTime @default(now())
updatedAt DateTime @updatedAt

@@allow('all', true)
@@delegate(userType)
}

model Order extends BaseOrder {
parentId String? @map("parent_id")
parent Order? @relation("OrderToParent", fields: [parentId], references: [id])
groupedOrders Order[] @relation("OrderToParent")
user User @relation(fields: [userId], references: [id], onDelete: Cascade)
userId String @map("user_id")
}

model User {
id String @id @default(cuid())
name String?
email String? @unique
emailVerified DateTime?
image String?
orders Order[]
billingAddresses BillingAddress[]
shippingAddresses ShippingAddress[]

@@allow('create,read', true)
@@allow('update,delete', auth().id == this.id)
}

model GuestUser {
id String @id @default(cuid())
name String?
email String @unique
orders GuestOrder[]
createdAt DateTime @default(now())
updatedAt DateTime @updatedAt

@@auth
@@allow('all', true)
}

model GuestOrder extends BaseOrder {
guestUser GuestUser @relation(fields: [guestUserId], references: [id], onDelete: Cascade)
guestUserId String @map("guest_user_id")
parentId String? @map("parent_id")
parent GuestOrder? @relation("OrderToParent", fields: [parentId], references: [id])
groupedOrders GuestOrder[] @relation("OrderToParent")
}

model OrderItem {
id String @id @default(cuid())
order BaseOrder @relation(fields: [orderId], references: [id], onDelete: Cascade)
orderId String @map("order_id")
product Product @relation(fields: [productId], references: [id])
productId String @map("product_id")
quantity Int
createdAt DateTime @default(now())
updatedAt DateTime @updatedAt

@@allow('all', true)
}

model OrderAddress {
id String @id @default(cuid())
firstName String
lastName String
address1 String
address2 String?
city String
state String
postalCode String
country String
email String
phone String
type String
createdAt DateTime @default(now())
updatedAt DateTime @updatedAt

@@allow('all', true)
@@delegate(type)
}

model BillingAddress extends OrderAddress {
user User? @relation(fields: [userId], references: [id], onDelete: Cascade)
userId String? @map("user_id")
order BaseOrder[]
}

model ShippingAddress extends OrderAddress {
user User? @relation(fields: [userId], references: [id], onDelete: Cascade)
userId String? @map("user_id")
order BaseOrder[]
}
`
);

const db = enhance();

await db.user.create({ data: { id: '1', name: 'John', email: 'john@example.com' } });

const shipping = await db.shippingAddress.create({
data: {
id: '1',
firstName: 'John',
lastName: 'Doe',
address1: '123 Main St',
city: 'Anytown',
state: 'CA',
postalCode: '12345',
country: 'US',
email: 'john@example.com',
phone: '123-456-7890',
user: { connect: { id: '1' } },
},
});

const billing = await db.billingAddress.create({
data: {
id: '2',
firstName: 'John',
lastName: 'Doe',
address1: '123 Main St',
city: 'Anytown',
state: 'CA',
postalCode: '12345',
country: 'US',
email: 'john@example.com',
phone: '123-456-7890',
user: { connect: { id: '1' } },
},
});

await db.order.create({
data: {
id: '1',
orderNumber: '1',
status: 'PENDING',
type: 'PARENT',
shippingAddress: { connect: { id: '1' } },
billingAddress: { connect: { id: '2' } },
user: { connect: { id: '1' } },
},
});

const updated = await db.order.update({
where: { id: '1' },
include: {
lineItems: true,
billingAddress: true,
shippingAddress: true,
},
data: {
type: 'CAMPAIGN',
},
});

console.log(updated);
expect(updated.shippingAddress).toEqual(shipping);
expect(updated.billingAddress).toEqual(billing);
});
});