Skip to content

Commit 74d4203

Browse files
chore: wip
1 parent d5e09d3 commit 74d4203

35 files changed

+29
-714
lines changed

storage/framework/core/orm/src/base.ts

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -786,6 +786,35 @@ export class BaseOrm<T, C, J> {
786786
return (this as any).hasSaved && this.isDirty(column)
787787
}
788788

789+
getOriginal(column?: keyof T): Partial<T> {
790+
if (!('originalAttributes' in this)) {
791+
throw new Error('Child class must define originalAttributes property')
792+
}
793+
794+
if (column) {
795+
return (this as any).originalAttributes[column as string]
796+
}
797+
798+
return (this as any).originalAttributes
799+
}
800+
801+
getChanges(): Partial<T> {
802+
if (!('attributes' in this) || !('originalAttributes' in this) || !('fillable' in this)) {
803+
throw new Error('Child class must define attributes, originalAttributes, and fillable properties')
804+
}
805+
806+
return (this as any).fillable.reduce((changes: Partial<T>, key: string) => {
807+
const currentValue = (this as any).attributes[key]
808+
const originalValue = (this as any).originalAttributes[key]
809+
810+
if (currentValue !== originalValue) {
811+
changes[key as keyof T] = currentValue
812+
}
813+
814+
return changes
815+
}, {} as Partial<T>)
816+
}
817+
789818
// Methods to be implemented by child classes
790819
protected mapCustomGetters(_model: T): void {}
791820

storage/framework/core/orm/src/generate.ts

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1073,27 +1073,6 @@ export async function generateModelString(
10731073
${getFields}
10741074
${setFields}
10751075
1076-
getOriginal(column?: keyof ${modelName}JsonResponse): Partial<${modelName}JsonResponse> {
1077-
if (column) {
1078-
return this.originalAttributes[column]
1079-
}
1080-
1081-
return this.originalAttributes
1082-
}
1083-
1084-
getChanges(): Partial<${modelName}JsonResponse> {
1085-
return this.fillable.reduce<Partial<${modelName}JsonResponse>>((changes, key) => {
1086-
const currentValue = this.attributes[key as keyof ${formattedTableName}Table]
1087-
const originalValue = this.originalAttributes[key as keyof ${formattedTableName}Table]
1088-
1089-
if (currentValue !== originalValue) {
1090-
changes[key] = currentValue
1091-
}
1092-
1093-
return changes
1094-
}, {})
1095-
}
1096-
10971076
static select(params: (keyof ${modelName}JsonResponse)[] | RawBuilder<string> | string): ${modelName}Model {
10981077
const instance = new ${modelName}Model(undefined)
10991078

storage/framework/orm/src/models/AccessToken.ts

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -290,27 +290,6 @@ export class AccessTokenModel extends BaseOrm<AccessTokenModel, PersonalAccessTo
290290
this.attributes.updated_at = value
291291
}
292292

293-
getOriginal(column?: keyof AccessTokenJsonResponse): Partial<AccessTokenJsonResponse> {
294-
if (column) {
295-
return this.originalAttributes[column]
296-
}
297-
298-
return this.originalAttributes
299-
}
300-
301-
getChanges(): Partial<AccessTokenJsonResponse> {
302-
return this.fillable.reduce<Partial<AccessTokenJsonResponse>>((changes, key) => {
303-
const currentValue = this.attributes[key as keyof PersonalAccessTokensTable]
304-
const originalValue = this.originalAttributes[key as keyof PersonalAccessTokensTable]
305-
306-
if (currentValue !== originalValue) {
307-
changes[key] = currentValue
308-
}
309-
310-
return changes
311-
}, {})
312-
}
313-
314293
static select(params: (keyof AccessTokenJsonResponse)[] | RawBuilder<string> | string): AccessTokenModel {
315294
const instance = new AccessTokenModel(undefined)
316295

storage/framework/orm/src/models/Coupon.ts

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -330,27 +330,6 @@ export class CouponModel extends BaseOrm<CouponModel, CouponsTable, CouponJsonRe
330330
this.attributes.updated_at = value
331331
}
332332

333-
getOriginal(column?: keyof CouponJsonResponse): Partial<CouponJsonResponse> {
334-
if (column) {
335-
return this.originalAttributes[column]
336-
}
337-
338-
return this.originalAttributes
339-
}
340-
341-
getChanges(): Partial<CouponJsonResponse> {
342-
return this.fillable.reduce<Partial<CouponJsonResponse>>((changes, key) => {
343-
const currentValue = this.attributes[key as keyof CouponsTable]
344-
const originalValue = this.originalAttributes[key as keyof CouponsTable]
345-
346-
if (currentValue !== originalValue) {
347-
changes[key] = currentValue
348-
}
349-
350-
return changes
351-
}, {})
352-
}
353-
354333
static select(params: (keyof CouponJsonResponse)[] | RawBuilder<string> | string): CouponModel {
355334
const instance = new CouponModel(undefined)
356335

storage/framework/orm/src/models/Customer.ts

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -275,27 +275,6 @@ export class CustomerModel extends BaseOrm<CustomerModel, CustomersTable, Custom
275275
this.attributes.updated_at = value
276276
}
277277

278-
getOriginal(column?: keyof CustomerJsonResponse): Partial<CustomerJsonResponse> {
279-
if (column) {
280-
return this.originalAttributes[column]
281-
}
282-
283-
return this.originalAttributes
284-
}
285-
286-
getChanges(): Partial<CustomerJsonResponse> {
287-
return this.fillable.reduce<Partial<CustomerJsonResponse>>((changes, key) => {
288-
const currentValue = this.attributes[key as keyof CustomersTable]
289-
const originalValue = this.originalAttributes[key as keyof CustomersTable]
290-
291-
if (currentValue !== originalValue) {
292-
changes[key] = currentValue
293-
}
294-
295-
return changes
296-
}, {})
297-
}
298-
299278
static select(params: (keyof CustomerJsonResponse)[] | RawBuilder<string> | string): CustomerModel {
300279
const instance = new CustomerModel(undefined)
301280

storage/framework/orm/src/models/Deployment.ts

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -260,27 +260,6 @@ export class DeploymentModel extends BaseOrm<DeploymentModel, DeploymentsTable,
260260
this.attributes.updated_at = value
261261
}
262262

263-
getOriginal(column?: keyof DeploymentJsonResponse): Partial<DeploymentJsonResponse> {
264-
if (column) {
265-
return this.originalAttributes[column]
266-
}
267-
268-
return this.originalAttributes
269-
}
270-
271-
getChanges(): Partial<DeploymentJsonResponse> {
272-
return this.fillable.reduce<Partial<DeploymentJsonResponse>>((changes, key) => {
273-
const currentValue = this.attributes[key as keyof DeploymentsTable]
274-
const originalValue = this.originalAttributes[key as keyof DeploymentsTable]
275-
276-
if (currentValue !== originalValue) {
277-
changes[key] = currentValue
278-
}
279-
280-
return changes
281-
}, {})
282-
}
283-
284263
static select(params: (keyof DeploymentJsonResponse)[] | RawBuilder<string> | string): DeploymentModel {
285264
const instance = new DeploymentModel(undefined)
286265

storage/framework/orm/src/models/Error.ts

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -220,27 +220,6 @@ export class ErrorModel extends BaseOrm<ErrorModel, ErrorsTable, ErrorJsonRespon
220220
this.attributes.updated_at = value
221221
}
222222

223-
getOriginal(column?: keyof ErrorJsonResponse): Partial<ErrorJsonResponse> {
224-
if (column) {
225-
return this.originalAttributes[column]
226-
}
227-
228-
return this.originalAttributes
229-
}
230-
231-
getChanges(): Partial<ErrorJsonResponse> {
232-
return this.fillable.reduce<Partial<ErrorJsonResponse>>((changes, key) => {
233-
const currentValue = this.attributes[key as keyof ErrorsTable]
234-
const originalValue = this.originalAttributes[key as keyof ErrorsTable]
235-
236-
if (currentValue !== originalValue) {
237-
changes[key] = currentValue
238-
}
239-
240-
return changes
241-
}, {})
242-
}
243-
244223
static select(params: (keyof ErrorJsonResponse)[] | RawBuilder<string> | string): ErrorModel {
245224
const instance = new ErrorModel(undefined)
246225

storage/framework/orm/src/models/FailedJob.ts

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -220,27 +220,6 @@ export class FailedJobModel extends BaseOrm<FailedJobModel, FailedJobsTable, Fai
220220
this.attributes.updated_at = value
221221
}
222222

223-
getOriginal(column?: keyof FailedJobJsonResponse): Partial<FailedJobJsonResponse> {
224-
if (column) {
225-
return this.originalAttributes[column]
226-
}
227-
228-
return this.originalAttributes
229-
}
230-
231-
getChanges(): Partial<FailedJobJsonResponse> {
232-
return this.fillable.reduce<Partial<FailedJobJsonResponse>>((changes, key) => {
233-
const currentValue = this.attributes[key as keyof FailedJobsTable]
234-
const originalValue = this.originalAttributes[key as keyof FailedJobsTable]
235-
236-
if (currentValue !== originalValue) {
237-
changes[key] = currentValue
238-
}
239-
240-
return changes
241-
}, {})
242-
}
243-
244223
static select(params: (keyof FailedJobJsonResponse)[] | RawBuilder<string> | string): FailedJobModel {
245224
const instance = new FailedJobModel(undefined)
246225

storage/framework/orm/src/models/GiftCard.ts

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -339,27 +339,6 @@ export class GiftCardModel extends BaseOrm<GiftCardModel, GiftCardsTable, GiftCa
339339
this.attributes.updated_at = value
340340
}
341341

342-
getOriginal(column?: keyof GiftCardJsonResponse): Partial<GiftCardJsonResponse> {
343-
if (column) {
344-
return this.originalAttributes[column]
345-
}
346-
347-
return this.originalAttributes
348-
}
349-
350-
getChanges(): Partial<GiftCardJsonResponse> {
351-
return this.fillable.reduce<Partial<GiftCardJsonResponse>>((changes, key) => {
352-
const currentValue = this.attributes[key as keyof GiftCardsTable]
353-
const originalValue = this.originalAttributes[key as keyof GiftCardsTable]
354-
355-
if (currentValue !== originalValue) {
356-
changes[key] = currentValue
357-
}
358-
359-
return changes
360-
}, {})
361-
}
362-
363342
static select(params: (keyof GiftCardJsonResponse)[] | RawBuilder<string> | string): GiftCardModel {
364343
const instance = new GiftCardModel(undefined)
365344

storage/framework/orm/src/models/Job.ts

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -220,27 +220,6 @@ export class JobModel extends BaseOrm<JobModel, JobsTable, JobJsonResponse> {
220220
this.attributes.updated_at = value
221221
}
222222

223-
getOriginal(column?: keyof JobJsonResponse): Partial<JobJsonResponse> {
224-
if (column) {
225-
return this.originalAttributes[column]
226-
}
227-
228-
return this.originalAttributes
229-
}
230-
231-
getChanges(): Partial<JobJsonResponse> {
232-
return this.fillable.reduce<Partial<JobJsonResponse>>((changes, key) => {
233-
const currentValue = this.attributes[key as keyof JobsTable]
234-
const originalValue = this.originalAttributes[key as keyof JobsTable]
235-
236-
if (currentValue !== originalValue) {
237-
changes[key] = currentValue
238-
}
239-
240-
return changes
241-
}, {})
242-
}
243-
244223
static select(params: (keyof JobJsonResponse)[] | RawBuilder<string> | string): JobModel {
245224
const instance = new JobModel(undefined)
246225

storage/framework/orm/src/models/LoyaltyPoint.ts

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -249,27 +249,6 @@ export class LoyaltyPointModel extends BaseOrm<LoyaltyPointModel, LoyaltyPointsT
249249
this.attributes.updated_at = value
250250
}
251251

252-
getOriginal(column?: keyof LoyaltyPointJsonResponse): Partial<LoyaltyPointJsonResponse> {
253-
if (column) {
254-
return this.originalAttributes[column]
255-
}
256-
257-
return this.originalAttributes
258-
}
259-
260-
getChanges(): Partial<LoyaltyPointJsonResponse> {
261-
return this.fillable.reduce<Partial<LoyaltyPointJsonResponse>>((changes, key) => {
262-
const currentValue = this.attributes[key as keyof LoyaltyPointsTable]
263-
const originalValue = this.originalAttributes[key as keyof LoyaltyPointsTable]
264-
265-
if (currentValue !== originalValue) {
266-
changes[key] = currentValue
267-
}
268-
269-
return changes
270-
}, {})
271-
}
272-
273252
static select(params: (keyof LoyaltyPointJsonResponse)[] | RawBuilder<string> | string): LoyaltyPointModel {
274253
const instance = new LoyaltyPointModel(undefined)
275254

storage/framework/orm/src/models/LoyaltyReward.ts

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -279,27 +279,6 @@ export class LoyaltyRewardModel extends BaseOrm<LoyaltyRewardModel, LoyaltyRewar
279279
this.attributes.updated_at = value
280280
}
281281

282-
getOriginal(column?: keyof LoyaltyRewardJsonResponse): Partial<LoyaltyRewardJsonResponse> {
283-
if (column) {
284-
return this.originalAttributes[column]
285-
}
286-
287-
return this.originalAttributes
288-
}
289-
290-
getChanges(): Partial<LoyaltyRewardJsonResponse> {
291-
return this.fillable.reduce<Partial<LoyaltyRewardJsonResponse>>((changes, key) => {
292-
const currentValue = this.attributes[key as keyof LoyaltyRewardsTable]
293-
const originalValue = this.originalAttributes[key as keyof LoyaltyRewardsTable]
294-
295-
if (currentValue !== originalValue) {
296-
changes[key] = currentValue
297-
}
298-
299-
return changes
300-
}, {})
301-
}
302-
303282
static select(params: (keyof LoyaltyRewardJsonResponse)[] | RawBuilder<string> | string): LoyaltyRewardModel {
304283
const instance = new LoyaltyRewardModel(undefined)
305284

storage/framework/orm/src/models/Manufacturer.ts

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -227,27 +227,6 @@ export class ManufacturerModel extends BaseOrm<ManufacturerModel, ManufacturersT
227227
this.attributes.updated_at = value
228228
}
229229

230-
getOriginal(column?: keyof ManufacturerJsonResponse): Partial<ManufacturerJsonResponse> {
231-
if (column) {
232-
return this.originalAttributes[column]
233-
}
234-
235-
return this.originalAttributes
236-
}
237-
238-
getChanges(): Partial<ManufacturerJsonResponse> {
239-
return this.fillable.reduce<Partial<ManufacturerJsonResponse>>((changes, key) => {
240-
const currentValue = this.attributes[key as keyof ManufacturersTable]
241-
const originalValue = this.originalAttributes[key as keyof ManufacturersTable]
242-
243-
if (currentValue !== originalValue) {
244-
changes[key] = currentValue
245-
}
246-
247-
return changes
248-
}, {})
249-
}
250-
251230
static select(params: (keyof ManufacturerJsonResponse)[] | RawBuilder<string> | string): ManufacturerModel {
252231
const instance = new ManufacturerModel(undefined)
253232

storage/framework/orm/src/models/Order.ts

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -316,27 +316,6 @@ export class OrderModel extends BaseOrm<OrderModel, OrdersTable, OrderJsonRespon
316316
this.attributes.updated_at = value
317317
}
318318

319-
getOriginal(column?: keyof OrderJsonResponse): Partial<OrderJsonResponse> {
320-
if (column) {
321-
return this.originalAttributes[column]
322-
}
323-
324-
return this.originalAttributes
325-
}
326-
327-
getChanges(): Partial<OrderJsonResponse> {
328-
return this.fillable.reduce<Partial<OrderJsonResponse>>((changes, key) => {
329-
const currentValue = this.attributes[key as keyof OrdersTable]
330-
const originalValue = this.originalAttributes[key as keyof OrdersTable]
331-
332-
if (currentValue !== originalValue) {
333-
changes[key] = currentValue
334-
}
335-
336-
return changes
337-
}, {})
338-
}
339-
340319
static select(params: (keyof OrderJsonResponse)[] | RawBuilder<string> | string): OrderModel {
341320
const instance = new OrderModel(undefined)
342321

0 commit comments

Comments
 (0)