Skip to content

Commit f75945e

Browse files
glennmichael123glennmichael123
committed
chore: wip
1 parent 05dd64c commit f75945e

File tree

15 files changed

+138
-60
lines changed

15 files changed

+138
-60
lines changed

‎storage/framework/core/orm/src/utils.ts

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -986,6 +986,7 @@ export async function generateModelString(
986986

987987
let relationDeclare = ''
988988
let relationString = ''
989+
let relationStringThis = ''
989990

990991
let instanceSoftDeleteStatements = ''
991992
let thisSoftDeleteStatements = ''
@@ -1182,6 +1183,9 @@ export async function generateModelString(
11821183
relationString += `
11831184
model.${snakeCase(relationName)} = await instance.${relationName}Belong()\n
11841185
`
1186+
relationStringThis += `
1187+
model.${snakeCase(relationName)} = await this.${relationName}Belong()\n
1188+
`
11851189
jsonFields += `${snakeCase(relationName)}: this.${snakeCase(relationName)},\n`
11861190

11871191
relationMethods += `
@@ -1710,9 +1714,13 @@ export async function generateModelString(
17101714
if (!model)
17111715
return undefined
17121716
1717+
${relationStringThis}
1718+
1719+
const data = new ${modelName}Model(model as ${modelName}Type)
1720+
17131721
cache.getOrSet(\`${formattedModelName}:\${id}\`, JSON.stringify(model))
17141722
1715-
return this.parseResult(new ${modelName}Model(model))
1723+
return data
17161724
}
17171725
17181726
// Method to find a ${modelName} by ID
@@ -2082,11 +2090,14 @@ export async function generateModelString(
20822090
async first(): Promise<${modelName}Model | undefined> {
20832091
const model = await this.selectFromQuery.selectAll().executeTakeFirst()
20842092
2085-
if (! model) {
2093+
if (! model)
20862094
return undefined
2087-
}
20882095
2089-
return this.parseResult(new ${modelName}Model(model))
2096+
${relationStringThis}
2097+
2098+
const data = new ${modelName}Model(model as ${modelName}Type)
2099+
2100+
return data
20902101
}
20912102
20922103
async firstOrFail(): Promise<${modelName}Model | undefined> {
@@ -2111,6 +2122,7 @@ export async function generateModelString(
21112122
21122123
if (! model)
21132124
return undefined
2125+
21142126
${relationDeclare}
21152127
${relationString}
21162128

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,11 @@ export class AccessTokenModel {
9393
if (!model)
9494
return undefined
9595

96+
const data = new AccessTokenModel(model as AccessTokenType)
97+
9698
cache.getOrSet(`accesstoken:${id}`, JSON.stringify(model))
9799

98-
return this.parseResult(new AccessTokenModel(model))
100+
return data
99101
}
100102

101103
// Method to find a AccessToken by ID
@@ -460,11 +462,12 @@ export class AccessTokenModel {
460462
async first(): Promise<AccessTokenModel | undefined> {
461463
const model = await this.selectFromQuery.selectAll().executeTakeFirst()
462464

463-
if (!model) {
465+
if (!model)
464466
return undefined
465-
}
466467

467-
return this.parseResult(new AccessTokenModel(model))
468+
const data = new AccessTokenModel(model as AccessTokenType)
469+
470+
return data
468471
}
469472

470473
async firstOrFail(): Promise<AccessTokenModel | undefined> {

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

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,13 @@ export class DeploymentModel {
110110
if (!model)
111111
return undefined
112112

113+
model.user = await this.userBelong()
114+
115+
const data = new DeploymentModel(model as DeploymentType)
116+
113117
cache.getOrSet(`deployment:${id}`, JSON.stringify(model))
114118

115-
return this.parseResult(new DeploymentModel(model))
119+
return data
116120
}
117121

118122
// Method to find a Deployment by ID
@@ -511,11 +515,14 @@ export class DeploymentModel {
511515
async first(): Promise<DeploymentModel | undefined> {
512516
const model = await this.selectFromQuery.selectAll().executeTakeFirst()
513517

514-
if (!model) {
518+
if (!model)
515519
return undefined
516-
}
517520

518-
return this.parseResult(new DeploymentModel(model))
521+
model.user = await this.userBelong()
522+
523+
const data = new DeploymentModel(model as DeploymentType)
524+
525+
return data
519526
}
520527

521528
async firstOrFail(): Promise<DeploymentModel | undefined> {

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,11 @@ export class ErrorModel {
9393
if (!model)
9494
return undefined
9595

96+
const data = new ErrorModel(model as ErrorType)
97+
9698
cache.getOrSet(`error:${id}`, JSON.stringify(model))
9799

98-
return this.parseResult(new ErrorModel(model))
100+
return data
99101
}
100102

101103
// Method to find a Error by ID
@@ -476,11 +478,12 @@ export class ErrorModel {
476478
async first(): Promise<ErrorModel | undefined> {
477479
const model = await this.selectFromQuery.selectAll().executeTakeFirst()
478480

479-
if (!model) {
481+
if (!model)
480482
return undefined
481-
}
482483

483-
return this.parseResult(new ErrorModel(model))
484+
const data = new ErrorModel(model as ErrorType)
485+
486+
return data
484487
}
485488

486489
async firstOrFail(): Promise<ErrorModel | undefined> {

‎storage/framework/orm/src/models/PaymentMethod.ts

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,13 @@ export class PaymentMethodModel {
115115
if (!model)
116116
return undefined
117117

118+
model.user = await this.userBelong()
119+
120+
const data = new PaymentMethodModel(model as PaymentMethodType)
121+
118122
cache.getOrSet(`paymentmethod:${id}`, JSON.stringify(model))
119123

120-
return this.parseResult(new PaymentMethodModel(model))
124+
return data
121125
}
122126

123127
// Method to find a PaymentMethod by ID
@@ -516,11 +520,14 @@ export class PaymentMethodModel {
516520
async first(): Promise<PaymentMethodModel | undefined> {
517521
const model = await this.selectFromQuery.selectAll().executeTakeFirst()
518522

519-
if (!model) {
523+
if (!model)
520524
return undefined
521-
}
522525

523-
return this.parseResult(new PaymentMethodModel(model))
526+
model.user = await this.userBelong()
527+
528+
const data = new PaymentMethodModel(model as PaymentMethodType)
529+
530+
return data
524531
}
525532

526533
async firstOrFail(): Promise<PaymentMethodModel | undefined> {

‎storage/framework/orm/src/models/Post.ts

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,13 @@ export class PostModel {
9191
if (!model)
9292
return undefined
9393

94+
model.user = await this.userBelong()
95+
96+
const data = new PostModel(model as PostType)
97+
9498
cache.getOrSet(`post:${id}`, JSON.stringify(model))
9599

96-
return this.parseResult(new PostModel(model))
100+
return data
97101
}
98102

99103
// Method to find a Post by ID
@@ -446,11 +450,14 @@ export class PostModel {
446450
async first(): Promise<PostModel | undefined> {
447451
const model = await this.selectFromQuery.selectAll().executeTakeFirst()
448452

449-
if (!model) {
453+
if (!model)
450454
return undefined
451-
}
452455

453-
return this.parseResult(new PostModel(model))
456+
model.user = await this.userBelong()
457+
458+
const data = new PostModel(model as PostType)
459+
460+
return data
454461
}
455462

456463
async firstOrFail(): Promise<PostModel | undefined> {

‎storage/framework/orm/src/models/Product.ts

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,11 @@ export class ProductModel {
100100
if (!model)
101101
return undefined
102102

103+
const data = new ProductModel(model as ProductType)
104+
103105
cache.getOrSet(`product:${id}`, JSON.stringify(model))
104106

105-
return this.parseResult(new ProductModel(model))
107+
return data
106108
}
107109

108110
// Method to find a Product by ID
@@ -497,11 +499,12 @@ export class ProductModel {
497499
async first(): Promise<ProductModel | undefined> {
498500
const model = await this.selectFromQuery.selectAll().executeTakeFirst()
499501

500-
if (!model) {
502+
if (!model)
501503
return undefined
502-
}
503504

504-
return this.parseResult(new ProductModel(model))
505+
const data = new ProductModel(model as ProductType)
506+
507+
return data
505508
}
506509

507510
async firstOrFail(): Promise<ProductModel | undefined> {

‎storage/framework/orm/src/models/Project.ts

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,11 @@ export class ProjectModel {
8787
if (!model)
8888
return undefined
8989

90+
const data = new ProjectModel(model as ProjectType)
91+
9092
cache.getOrSet(`project:${id}`, JSON.stringify(model))
9193

92-
return this.parseResult(new ProjectModel(model))
94+
return data
9395
}
9496

9597
// Method to find a Project by ID
@@ -454,11 +456,12 @@ export class ProjectModel {
454456
async first(): Promise<ProjectModel | undefined> {
455457
const model = await this.selectFromQuery.selectAll().executeTakeFirst()
456458

457-
if (!model) {
459+
if (!model)
458460
return undefined
459-
}
460461

461-
return this.parseResult(new ProjectModel(model))
462+
const data = new ProjectModel(model as ProjectType)
463+
464+
return data
462465
}
463466

464467
async firstOrFail(): Promise<ProjectModel | undefined> {

‎storage/framework/orm/src/models/Release.ts

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,11 @@ export class ReleaseModel {
7878
if (!model)
7979
return undefined
8080

81+
const data = new ReleaseModel(model as ReleaseType)
82+
8183
cache.getOrSet(`release:${id}`, JSON.stringify(model))
8284

83-
return this.parseResult(new ReleaseModel(model))
85+
return data
8486
}
8587

8688
// Method to find a Release by ID
@@ -421,11 +423,12 @@ export class ReleaseModel {
421423
async first(): Promise<ReleaseModel | undefined> {
422424
const model = await this.selectFromQuery.selectAll().executeTakeFirst()
423425

424-
if (!model) {
426+
if (!model)
425427
return undefined
426-
}
427428

428-
return this.parseResult(new ReleaseModel(model))
429+
const data = new ReleaseModel(model as ReleaseType)
430+
431+
return data
429432
}
430433

431434
async firstOrFail(): Promise<ReleaseModel | undefined> {

‎storage/framework/orm/src/models/Subscriber.ts

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,11 @@ export class SubscriberModel {
8282
if (!model)
8383
return undefined
8484

85+
const data = new SubscriberModel(model as SubscriberType)
86+
8587
cache.getOrSet(`subscriber:${id}`, JSON.stringify(model))
8688

87-
return this.parseResult(new SubscriberModel(model))
89+
return data
8890
}
8991

9092
// Method to find a Subscriber by ID
@@ -425,11 +427,12 @@ export class SubscriberModel {
425427
async first(): Promise<SubscriberModel | undefined> {
426428
const model = await this.selectFromQuery.selectAll().executeTakeFirst()
427429

428-
if (!model) {
430+
if (!model)
429431
return undefined
430-
}
431432

432-
return this.parseResult(new SubscriberModel(model))
433+
const data = new SubscriberModel(model as SubscriberType)
434+
435+
return data
433436
}
434437

435438
async firstOrFail(): Promise<SubscriberModel | undefined> {

0 commit comments

Comments
 (0)