Skip to content

Commit 1b1adf4

Browse files
glennmichael123glennmichael123
committed
chore: wip
1 parent 52ed97c commit 1b1adf4

File tree

18 files changed

+198
-666
lines changed

18 files changed

+198
-666
lines changed

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

Lines changed: 11 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -971,9 +971,7 @@ export async function generateModelString(
971971
if (!model)
972972
return undefined
973973
974-
const result = await this.mapWith(model)
975-
976-
const data = new ${modelName}Model(result as ${modelName}Type)
974+
const data = new ${modelName}Model(model as ${modelName}Type)
977975
978976
cache.getOrSet(\`${formattedModelName}:\${id}\`, JSON.stringify(model))
979977
@@ -999,9 +997,7 @@ export async function generateModelString(
999997
if (! model)
1000998
return undefined
1001999
1002-
const result = await this.mapWith(model)
1003-
1004-
const data = new ${modelName}Model(result as ${modelName}Type)
1000+
const data = new ${modelName}Model(model as ${modelName}Type)
10051001
10061002
return data
10071003
}
@@ -1022,9 +1018,7 @@ export async function generateModelString(
10221018
if (model === undefined)
10231019
throw new ModelNotFoundException(404, 'No ${modelName}Model results found for query')
10241020
1025-
const result = await this.mapWith(model)
1026-
1027-
const data = new ${modelName}Model(result as ${modelName}Type)
1021+
const data = new ${modelName}Model(model as ${modelName}Type)
10281022
10291023
return data
10301024
}
@@ -1054,7 +1048,7 @@ export async function generateModelString(
10541048
const data = await Promise.all(models.map(async (model: ${modelName}Type) => {
10551049
const instance = new ${modelName}Model(model)
10561050
1057-
return new ${modelName}Model(results)
1051+
return new ${modelName}Model(model)
10581052
}))
10591053
10601054
return data
@@ -1068,18 +1062,14 @@ export async function generateModelString(
10681062
static async findOrFail(id: number): Promise<${modelName}Model> {
10691063
const model = await DB.instance.selectFrom('${tableName}').where('id', '=', id).selectAll().executeTakeFirst()
10701064
1071-
const instance = new ${modelName}Model(null)
1072-
10731065
${instanceSoftDeleteStatementsSelectFrom}
10741066
10751067
if (model === undefined)
10761068
throw new ModelNotFoundException(404, \`No ${modelName}Model results for \${id}\`)
10771069
10781070
cache.getOrSet(\`${formattedModelName}:\${id}\`, JSON.stringify(model))
10791071
1080-
const result = await instance.mapWith(model)
1081-
1082-
const data = new ${modelName}Model(result as ${modelName}Type)
1072+
const data = new ${modelName}Model(model as ${modelName}Type)
10831073
10841074
return data
10851075
}
@@ -1277,11 +1267,7 @@ export async function generateModelString(
12771267
}
12781268
12791269
const data = await Promise.all(models.map(async (model: ${modelName}Model) => {
1280-
const instance = new ${modelName}Model(model)
1281-
1282-
const results = await instance.mapWith(model)
1283-
1284-
return new ${modelName}Model(results)
1270+
return new ${modelName}Model(model)
12851271
}))
12861272
12871273
return data
@@ -1843,9 +1829,7 @@ export async function generateModelString(
18431829
if (!model)
18441830
return undefined
18451831
1846-
const instance = new ${modelName}Model(null)
1847-
const result = await instance.mapWith(model)
1848-
const data = new ${modelName}Model(result as ${modelName}Type)
1832+
const data = new ${modelName}Model(model as ${modelName}Type)
18491833
18501834
return data
18511835
}
@@ -1859,9 +1843,7 @@ export async function generateModelString(
18591843
if (!model)
18601844
return undefined
18611845
1862-
const instance = new ${modelName}Model(null)
1863-
const result = await instance.mapWith(model)
1864-
const data = new ${modelName}Model(result as ${modelName}Type)
1846+
const data = new ${modelName}Model(model as ${modelName}Type)
18651847
18661848
return data
18671849
}
@@ -1886,9 +1868,7 @@ export async function generateModelString(
18861868
.executeTakeFirst()
18871869
18881870
if (existing${modelName}) {
1889-
const instance = new ${modelName}Model(null)
1890-
const result = await instance.mapWith(existing${modelName})
1891-
return new ${modelName}Model(result as ${modelName}Type)
1871+
return new ${modelName}Model(existing${modelName} as ${modelName}Type)
18921872
}
18931873
else {
18941874
return await this.create(new${modelName})
@@ -1932,11 +1912,9 @@ export async function generateModelString(
19321912
throw new HttpError(500, 'Failed to fetch updated record')
19331913
}
19341914
1935-
const result = await instance.mapWith(updated${modelName})
1936-
19371915
instance.hasSaved = true
19381916
1939-
return new ${modelName}Model(result as ${modelName}Type)
1917+
return new ${modelName}Model(updated${modelName} as ${modelName}Type)
19401918
} else {
19411919
// If not found, create a new record
19421920
return await this.create(new${modelName})
@@ -1970,11 +1948,7 @@ export async function generateModelString(
19701948
if (!model)
19711949
return undefined
19721950
1973-
const instance = new ${modelName}Model(null)
1974-
1975-
const result = await instance.mapWith(model)
1976-
1977-
const data = new ${modelName}Model(result as ${modelName}Type)
1951+
const data = new ${modelName}Model(model as ${modelName}Type)
19781952
19791953
return data
19801954
}

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

Lines changed: 11 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -208,9 +208,7 @@ export class AccessTokenModel {
208208
if (!model)
209209
return undefined
210210

211-
const result = await this.mapWith(model)
212-
213-
const data = new AccessTokenModel(result as AccessTokenType)
211+
const data = new AccessTokenModel(model as AccessTokenType)
214212

215213
cache.getOrSet(`accesstoken:${id}`, JSON.stringify(model))
216214

@@ -236,9 +234,7 @@ export class AccessTokenModel {
236234
if (!model)
237235
return undefined
238236

239-
const result = await this.mapWith(model)
240-
241-
const data = new AccessTokenModel(result as AccessTokenType)
237+
const data = new AccessTokenModel(model as AccessTokenType)
242238

243239
return data
244240
}
@@ -259,9 +255,7 @@ export class AccessTokenModel {
259255
if (model === undefined)
260256
throw new ModelNotFoundException(404, 'No AccessTokenModel results found for query')
261257

262-
const result = await this.mapWith(model)
263-
264-
const data = new AccessTokenModel(result as AccessTokenType)
258+
const data = new AccessTokenModel(model as AccessTokenType)
265259

266260
return data
267261
}
@@ -290,7 +284,7 @@ export class AccessTokenModel {
290284
const data = await Promise.all(models.map(async (model: AccessTokenType) => {
291285
const instance = new AccessTokenModel(model)
292286

293-
return new AccessTokenModel(results)
287+
return new AccessTokenModel(model)
294288
}))
295289

296290
return data
@@ -303,16 +297,12 @@ export class AccessTokenModel {
303297
static async findOrFail(id: number): Promise<AccessTokenModel> {
304298
const model = await DB.instance.selectFrom('personal_access_tokens').where('id', '=', id).selectAll().executeTakeFirst()
305299

306-
const instance = new AccessTokenModel(null)
307-
308300
if (model === undefined)
309301
throw new ModelNotFoundException(404, `No AccessTokenModel results for ${id}`)
310302

311303
cache.getOrSet(`accesstoken:${id}`, JSON.stringify(model))
312304

313-
const result = await instance.mapWith(model)
314-
315-
const data = new AccessTokenModel(result as AccessTokenType)
305+
const data = new AccessTokenModel(model as AccessTokenType)
316306

317307
return data
318308
}
@@ -509,11 +499,7 @@ export class AccessTokenModel {
509499
}
510500

511501
const data = await Promise.all(models.map(async (model: AccessTokenModel) => {
512-
const instance = new AccessTokenModel(model)
513-
514-
const results = await instance.mapWith(model)
515-
516-
return new AccessTokenModel(results)
502+
return new AccessTokenModel(model)
517503
}))
518504

519505
return data
@@ -1094,9 +1080,7 @@ export class AccessTokenModel {
10941080
if (!model)
10951081
return undefined
10961082

1097-
const instance = new AccessTokenModel(null)
1098-
const result = await instance.mapWith(model)
1099-
const data = new AccessTokenModel(result as AccessTokenType)
1083+
const data = new AccessTokenModel(model as AccessTokenType)
11001084

11011085
return data
11021086
}
@@ -1110,9 +1094,7 @@ export class AccessTokenModel {
11101094
if (!model)
11111095
return undefined
11121096

1113-
const instance = new AccessTokenModel(null)
1114-
const result = await instance.mapWith(model)
1115-
const data = new AccessTokenModel(result as AccessTokenType)
1097+
const data = new AccessTokenModel(model as AccessTokenType)
11161098

11171099
return data
11181100
}
@@ -1137,9 +1119,7 @@ export class AccessTokenModel {
11371119
.executeTakeFirst()
11381120

11391121
if (existingAccessToken) {
1140-
const instance = new AccessTokenModel(null)
1141-
const result = await instance.mapWith(existingAccessToken)
1142-
return new AccessTokenModel(result as AccessTokenType)
1122+
return new AccessTokenModel(existingAccessToken as AccessTokenType)
11431123
}
11441124
else {
11451125
return await this.create(newAccessToken)
@@ -1183,11 +1163,9 @@ export class AccessTokenModel {
11831163
throw new HttpError(500, 'Failed to fetch updated record')
11841164
}
11851165

1186-
const result = await instance.mapWith(updatedAccessToken)
1187-
11881166
instance.hasSaved = true
11891167

1190-
return new AccessTokenModel(result as AccessTokenType)
1168+
return new AccessTokenModel(updatedAccessToken as AccessTokenType)
11911169
}
11921170
else {
11931171
// If not found, create a new record
@@ -1222,11 +1200,7 @@ export class AccessTokenModel {
12221200
if (!model)
12231201
return undefined
12241202

1225-
const instance = new AccessTokenModel(null)
1226-
1227-
const result = await instance.mapWith(model)
1228-
1229-
const data = new AccessTokenModel(result as AccessTokenType)
1203+
const data = new AccessTokenModel(model as AccessTokenType)
12301204

12311205
return data
12321206
}

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

Lines changed: 11 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -223,9 +223,7 @@ export class ActivityModel {
223223
if (!model)
224224
return undefined
225225

226-
const result = await this.mapWith(model)
227-
228-
const data = new ActivityModel(result as ActivityType)
226+
const data = new ActivityModel(model as ActivityType)
229227

230228
cache.getOrSet(`activity:${id}`, JSON.stringify(model))
231229

@@ -251,9 +249,7 @@ export class ActivityModel {
251249
if (!model)
252250
return undefined
253251

254-
const result = await this.mapWith(model)
255-
256-
const data = new ActivityModel(result as ActivityType)
252+
const data = new ActivityModel(model as ActivityType)
257253

258254
return data
259255
}
@@ -274,9 +270,7 @@ export class ActivityModel {
274270
if (model === undefined)
275271
throw new ModelNotFoundException(404, 'No ActivityModel results found for query')
276272

277-
const result = await this.mapWith(model)
278-
279-
const data = new ActivityModel(result as ActivityType)
273+
const data = new ActivityModel(model as ActivityType)
280274

281275
return data
282276
}
@@ -305,7 +299,7 @@ export class ActivityModel {
305299
const data = await Promise.all(models.map(async (model: ActivityType) => {
306300
const instance = new ActivityModel(model)
307301

308-
return new ActivityModel(results)
302+
return new ActivityModel(model)
309303
}))
310304

311305
return data
@@ -318,8 +312,6 @@ export class ActivityModel {
318312
static async findOrFail(id: number): Promise<ActivityModel> {
319313
const model = await DB.instance.selectFrom('activities').where('id', '=', id).selectAll().executeTakeFirst()
320314

321-
const instance = new ActivityModel(null)
322-
323315
if (instance.softDeletes) {
324316
instance.selectFromQuery = instance.selectFromQuery.where('deleted_at', 'is', null)
325317
}
@@ -329,9 +321,7 @@ export class ActivityModel {
329321

330322
cache.getOrSet(`activity:${id}`, JSON.stringify(model))
331323

332-
const result = await instance.mapWith(model)
333-
334-
const data = new ActivityModel(result as ActivityType)
324+
const data = new ActivityModel(model as ActivityType)
335325

336326
return data
337327
}
@@ -532,11 +522,7 @@ export class ActivityModel {
532522
}
533523

534524
const data = await Promise.all(models.map(async (model: ActivityModel) => {
535-
const instance = new ActivityModel(model)
536-
537-
const results = await instance.mapWith(model)
538-
539-
return new ActivityModel(results)
525+
return new ActivityModel(model)
540526
}))
541527

542528
return data
@@ -1144,9 +1130,7 @@ export class ActivityModel {
11441130
if (!model)
11451131
return undefined
11461132

1147-
const instance = new ActivityModel(null)
1148-
const result = await instance.mapWith(model)
1149-
const data = new ActivityModel(result as ActivityType)
1133+
const data = new ActivityModel(model as ActivityType)
11501134

11511135
return data
11521136
}
@@ -1160,9 +1144,7 @@ export class ActivityModel {
11601144
if (!model)
11611145
return undefined
11621146

1163-
const instance = new ActivityModel(null)
1164-
const result = await instance.mapWith(model)
1165-
const data = new ActivityModel(result as ActivityType)
1147+
const data = new ActivityModel(model as ActivityType)
11661148

11671149
return data
11681150
}
@@ -1187,9 +1169,7 @@ export class ActivityModel {
11871169
.executeTakeFirst()
11881170

11891171
if (existingActivity) {
1190-
const instance = new ActivityModel(null)
1191-
const result = await instance.mapWith(existingActivity)
1192-
return new ActivityModel(result as ActivityType)
1172+
return new ActivityModel(existingActivity as ActivityType)
11931173
}
11941174
else {
11951175
return await this.create(newActivity)
@@ -1233,11 +1213,9 @@ export class ActivityModel {
12331213
throw new HttpError(500, 'Failed to fetch updated record')
12341214
}
12351215

1236-
const result = await instance.mapWith(updatedActivity)
1237-
12381216
instance.hasSaved = true
12391217

1240-
return new ActivityModel(result as ActivityType)
1218+
return new ActivityModel(updatedActivity as ActivityType)
12411219
}
12421220
else {
12431221
// If not found, create a new record
@@ -1272,11 +1250,7 @@ export class ActivityModel {
12721250
if (!model)
12731251
return undefined
12741252

1275-
const instance = new ActivityModel(null)
1276-
1277-
const result = await instance.mapWith(model)
1278-
1279-
const data = new ActivityModel(result as ActivityType)
1253+
const data = new ActivityModel(model as ActivityType)
12801254

12811255
return data
12821256
}

0 commit comments

Comments
 (0)