Skip to content

Commit 05ce2da

Browse files
glennmichael123glennmichael123
committed
chore: wip
1 parent 680feac commit 05ce2da

File tree

18 files changed

+433
-289
lines changed

18 files changed

+433
-289
lines changed

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

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -953,7 +953,11 @@ export async function generateModelString(
953953
}
954954
955955
select(params: (keyof ${modelName}Type)[] | RawBuilder<string> | string): ${modelName}Model {
956-
return ${modelName}Model.select(params)
956+
this.selectFromQuery = this.selectFromQuery.select(params)
957+
958+
this.hasSelect = true
959+
960+
return this
957961
}
958962
959963
static select(params: (keyof ${modelName}Type)[] | RawBuilder<string> | string): ${modelName}Model {
@@ -966,27 +970,31 @@ export async function generateModelString(
966970
967971
return instance
968972
}
969-
970-
async find(id: number): Promise<${modelName}Model | undefined> {
971-
return await ${modelName}Model.find(id)
972-
}
973-
974-
// Method to find a ${modelName} by ID
975-
static async find(id: number): Promise<${modelName}Model | undefined> {
973+
974+
async applyFind(id: number): Promise<${modelName}Model | undefined> {
976975
const model = await DB.instance.selectFrom('${tableName}').where('id', '=', id).selectAll().executeTakeFirst()
977976
978977
if (!model)
979978
return undefined
980979
981-
const instance = new ${modelName}Model(null)
982-
983-
const result = await instance.mapWith(model)
980+
const result = await this.mapWith(model)
984981
985982
const data = new ${modelName}Model(result as ${modelName}Type)
986983
987984
cache.getOrSet(\`${formattedModelName}:\${id}\`, JSON.stringify(model))
988985
989986
return data
987+
}
988+
989+
async find(id: number): Promise<${modelName}Model | undefined> {
990+
return await this.applyFind(id)
991+
}
992+
993+
// Method to find a ${modelName} by ID
994+
static async find(id: number): Promise<${modelName}Model | undefined> {
995+
const instance = new ${modelName}Model(null)
996+
997+
return await instance.applyFind(id)
990998
}
991999
9921000
async first(): Promise<${modelName}Model | undefined> {
@@ -1579,19 +1587,19 @@ export async function generateModelString(
15791587
}
15801588
15811589
orWhere(...conditions: [string, any][]): ${modelName}Model {
1582-
this.selectFromQuery = this.selectFromQuery.where((eb) => {
1590+
this.selectFromQuery = this.selectFromQuery.where((eb: any) => {
15831591
return eb.or(
15841592
conditions.map(([column, value]) => eb(column, '=', value))
15851593
)
15861594
})
15871595
1588-
this.updateFromQuery = this.updateFromQuery.where((eb) => {
1596+
this.updateFromQuery = this.updateFromQuery.where((eb: any) => {
15891597
return eb.or(
15901598
conditions.map(([column, value]) => eb(column, '=', value))
15911599
)
15921600
})
15931601
1594-
this.deleteFromQuery = this.deleteFromQuery.where((eb) => {
1602+
this.deleteFromQuery = this.deleteFromQuery.where((eb: any) => {
15951603
return eb.or(
15961604
conditions.map(([column, value]) => eb(column, '=', value))
15971605
)
@@ -1603,19 +1611,19 @@ export async function generateModelString(
16031611
static orWhere(...conditions: [string, any][]): ${modelName}Model {
16041612
const instance = new ${modelName}Model(null)
16051613
1606-
instance.selectFromQuery = instance.selectFromQuery.where((eb) => {
1614+
instance.selectFromQuery = instance.selectFromQuery.where((eb: any) => {
16071615
return eb.or(
16081616
conditions.map(([column, value]) => eb(column, '=', value))
16091617
)
16101618
})
16111619
1612-
instance.updateFromQuery = instance.updateFromQuery.where((eb) => {
1620+
instance.updateFromQuery = instance.updateFromQuery.where((eb: any) => {
16131621
return eb.or(
16141622
conditions.map(([column, value]) => eb(column, '=', value))
16151623
)
16161624
})
16171625
1618-
instance.deleteFromQuery = instance.deleteFromQuery.where((eb) => {
1626+
instance.deleteFromQuery = instance.deleteFromQuery.where((eb: any) => {
16191627
return eb.or(
16201628
conditions.map(([column, value]) => eb(column, '=', value))
16211629
)

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

Lines changed: 24 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,11 @@ export class AccessTokenModel {
184184
}
185185

186186
select(params: (keyof AccessTokenType)[] | RawBuilder<string> | string): AccessTokenModel {
187-
return AccessTokenModel.select(params)
187+
this.selectFromQuery = this.selectFromQuery.select(params)
188+
189+
this.hasSelect = true
190+
191+
return this
188192
}
189193

190194
static select(params: (keyof AccessTokenType)[] | RawBuilder<string> | string): AccessTokenModel {
@@ -198,20 +202,13 @@ export class AccessTokenModel {
198202
return instance
199203
}
200204

201-
async find(id: number): Promise<AccessTokenModel | undefined> {
202-
return await AccessTokenModel.find(id)
203-
}
204-
205-
// Method to find a AccessToken by ID
206-
static async find(id: number): Promise<AccessTokenModel | undefined> {
205+
async applyFind(id: number): Promise<AccessTokenModel | undefined> {
207206
const model = await DB.instance.selectFrom('personal_access_tokens').where('id', '=', id).selectAll().executeTakeFirst()
208207

209208
if (!model)
210209
return undefined
211210

212-
const instance = new AccessTokenModel(null)
213-
214-
const result = await instance.mapWith(model)
211+
const result = await this.mapWith(model)
215212

216213
const data = new AccessTokenModel(result as AccessTokenType)
217214

@@ -220,6 +217,17 @@ export class AccessTokenModel {
220217
return data
221218
}
222219

220+
async find(id: number): Promise<AccessTokenModel | undefined> {
221+
return await this.applyFind(id)
222+
}
223+
224+
// Method to find a AccessToken by ID
225+
static async find(id: number): Promise<AccessTokenModel | undefined> {
226+
const instance = new AccessTokenModel(null)
227+
228+
return await instance.applyFind(id)
229+
}
230+
223231
async first(): Promise<AccessTokenModel | undefined> {
224232
return await AccessTokenModel.first()
225233
}
@@ -797,19 +805,19 @@ export class AccessTokenModel {
797805
}
798806

799807
orWhere(...conditions: [string, any][]): AccessTokenModel {
800-
this.selectFromQuery = this.selectFromQuery.where((eb) => {
808+
this.selectFromQuery = this.selectFromQuery.where((eb: any) => {
801809
return eb.or(
802810
conditions.map(([column, value]) => eb(column, '=', value)),
803811
)
804812
})
805813

806-
this.updateFromQuery = this.updateFromQuery.where((eb) => {
814+
this.updateFromQuery = this.updateFromQuery.where((eb: any) => {
807815
return eb.or(
808816
conditions.map(([column, value]) => eb(column, '=', value)),
809817
)
810818
})
811819

812-
this.deleteFromQuery = this.deleteFromQuery.where((eb) => {
820+
this.deleteFromQuery = this.deleteFromQuery.where((eb: any) => {
813821
return eb.or(
814822
conditions.map(([column, value]) => eb(column, '=', value)),
815823
)
@@ -821,19 +829,19 @@ export class AccessTokenModel {
821829
static orWhere(...conditions: [string, any][]): AccessTokenModel {
822830
const instance = new AccessTokenModel(null)
823831

824-
instance.selectFromQuery = instance.selectFromQuery.where((eb) => {
832+
instance.selectFromQuery = instance.selectFromQuery.where((eb: any) => {
825833
return eb.or(
826834
conditions.map(([column, value]) => eb(column, '=', value)),
827835
)
828836
})
829837

830-
instance.updateFromQuery = instance.updateFromQuery.where((eb) => {
838+
instance.updateFromQuery = instance.updateFromQuery.where((eb: any) => {
831839
return eb.or(
832840
conditions.map(([column, value]) => eb(column, '=', value)),
833841
)
834842
})
835843

836-
instance.deleteFromQuery = instance.deleteFromQuery.where((eb) => {
844+
instance.deleteFromQuery = instance.deleteFromQuery.where((eb: any) => {
837845
return eb.or(
838846
conditions.map(([column, value]) => eb(column, '=', value)),
839847
)

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

Lines changed: 24 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,11 @@ export class ActivityModel {
199199
}
200200

201201
select(params: (keyof ActivityType)[] | RawBuilder<string> | string): ActivityModel {
202-
return ActivityModel.select(params)
202+
this.selectFromQuery = this.selectFromQuery.select(params)
203+
204+
this.hasSelect = true
205+
206+
return this
203207
}
204208

205209
static select(params: (keyof ActivityType)[] | RawBuilder<string> | string): ActivityModel {
@@ -213,20 +217,13 @@ export class ActivityModel {
213217
return instance
214218
}
215219

216-
async find(id: number): Promise<ActivityModel | undefined> {
217-
return await ActivityModel.find(id)
218-
}
219-
220-
// Method to find a Activity by ID
221-
static async find(id: number): Promise<ActivityModel | undefined> {
220+
async applyFind(id: number): Promise<ActivityModel | undefined> {
222221
const model = await DB.instance.selectFrom('activities').where('id', '=', id).selectAll().executeTakeFirst()
223222

224223
if (!model)
225224
return undefined
226225

227-
const instance = new ActivityModel(null)
228-
229-
const result = await instance.mapWith(model)
226+
const result = await this.mapWith(model)
230227

231228
const data = new ActivityModel(result as ActivityType)
232229

@@ -235,6 +232,17 @@ export class ActivityModel {
235232
return data
236233
}
237234

235+
async find(id: number): Promise<ActivityModel | undefined> {
236+
return await this.applyFind(id)
237+
}
238+
239+
// Method to find a Activity by ID
240+
static async find(id: number): Promise<ActivityModel | undefined> {
241+
const instance = new ActivityModel(null)
242+
243+
return await instance.applyFind(id)
244+
}
245+
238246
async first(): Promise<ActivityModel | undefined> {
239247
return await ActivityModel.first()
240248
}
@@ -827,19 +835,19 @@ export class ActivityModel {
827835
}
828836

829837
orWhere(...conditions: [string, any][]): ActivityModel {
830-
this.selectFromQuery = this.selectFromQuery.where((eb) => {
838+
this.selectFromQuery = this.selectFromQuery.where((eb: any) => {
831839
return eb.or(
832840
conditions.map(([column, value]) => eb(column, '=', value)),
833841
)
834842
})
835843

836-
this.updateFromQuery = this.updateFromQuery.where((eb) => {
844+
this.updateFromQuery = this.updateFromQuery.where((eb: any) => {
837845
return eb.or(
838846
conditions.map(([column, value]) => eb(column, '=', value)),
839847
)
840848
})
841849

842-
this.deleteFromQuery = this.deleteFromQuery.where((eb) => {
850+
this.deleteFromQuery = this.deleteFromQuery.where((eb: any) => {
843851
return eb.or(
844852
conditions.map(([column, value]) => eb(column, '=', value)),
845853
)
@@ -851,19 +859,19 @@ export class ActivityModel {
851859
static orWhere(...conditions: [string, any][]): ActivityModel {
852860
const instance = new ActivityModel(null)
853861

854-
instance.selectFromQuery = instance.selectFromQuery.where((eb) => {
862+
instance.selectFromQuery = instance.selectFromQuery.where((eb: any) => {
855863
return eb.or(
856864
conditions.map(([column, value]) => eb(column, '=', value)),
857865
)
858866
})
859867

860-
instance.updateFromQuery = instance.updateFromQuery.where((eb) => {
868+
instance.updateFromQuery = instance.updateFromQuery.where((eb: any) => {
861869
return eb.or(
862870
conditions.map(([column, value]) => eb(column, '=', value)),
863871
)
864872
})
865873

866-
instance.deleteFromQuery = instance.deleteFromQuery.where((eb) => {
874+
instance.deleteFromQuery = instance.deleteFromQuery.where((eb: any) => {
867875
return eb.or(
868876
conditions.map(([column, value]) => eb(column, '=', value)),
869877
)

0 commit comments

Comments
 (0)