chore: wip

Author: glennmichael123

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

@@ -4,8 +4,13 @@ import { DB } from '@stacksjs/orm'
 export class BaseOrm<T> {
   protected tableName: string
 
+  protected selectFromQuery: any
+  protected hasSelect: boolean = false
+
   constructor(tableName: string) {
     this.tableName = tableName
+
+    this.selectFromQuery = DB.instance.selectFrom(this.tableName)
   }
 
   // The protected helper method that does the actual work
@@ -27,18 +32,32 @@ export class BaseOrm<T> {
     return model
   }
 
+  async applyFirst(): Promise<T | undefined> {
+    let model
+
+    if (this.hasSelect) {
+      model = await this.selectFromQuery.executeTakeFirst()
+    }
+    else {
+      model = await this.selectFromQuery.selectAll().executeTakeFirst()
+    }
+
+    if (model) {
+      this.mapCustomGetters(model)
+      await this.loadRelations(model)
+    }
+
+    return model
+  }
+
   async find(id: number): Promise<T | undefined> {
     return await this.applyFind(id)
   }
 
   // Methods to be implemented by child classes
-  protected mapCustomGetters(model: any): void {
+  protected mapCustomGetters(_model: T): void {}
 
-  }
-
-  protected async loadRelations(model: any): Promise<void> {
-    // Child classes will override this
-  }
+  protected async loadRelations(_model: T): Promise<void> {}
 
   // // Method to get the first record
   // static async first<T>(tableName: string): Promise<T | undefined> {

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

@@ -1096,36 +1096,20 @@ export async function generateModelString(
         }
 
         async first(): Promise<${modelName}Model | undefined> {
-          let model
-
-          if (this.hasSelect) {
-            model = await this.selectFromQuery.executeTakeFirst()
-          }
-          else {
-            model = await this.selectFromQuery.selectAll().executeTakeFirst()
-          }
-
-          if (model) {
-            this.mapCustomGetters(model)
-            await this.loadRelations(model)
-          }
+          const model = await this.applyFirst()
 
           const data = new ${modelName}Model(model)
-  
+
           return data
         }
         
         static async first(): Promise<${modelName}Model | undefined> {
-          const instance = new ${modelName}JsonResponse(null)
-
-          const model = await DB.instance.selectFrom('${tableName}')
-            .selectAll()
-            .executeTakeFirst()
+          const instance = new ${modelName}Model(undefined)
 
-          instance.mapCustomGetters(model)
+          const model = await instance.applyFirst()
 
           const data = new ${modelName}Model(model)
-  
+
           return data
         }
 

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

@@ -321,33 +321,17 @@ export class AccessTokenModel extends BaseOrm<AccessTokenModel> {
   }
 
   async first(): Promise<AccessTokenModel | undefined> {
-    let model
-
-    if (this.hasSelect) {
-      model = await this.selectFromQuery.executeTakeFirst()
-    }
-    else {
-      model = await this.selectFromQuery.selectAll().executeTakeFirst()
-    }
-
-    if (model) {
-      this.mapCustomGetters(model)
-      await this.loadRelations(model)
-    }
+    const model = await this.applyFirst()
 
     const data = new AccessTokenModel(model)
 
     return data
   }
 
   static async first(): Promise<AccessTokenModel | undefined> {
-    const instance = new AccessTokenJsonResponse(null)
-
-    const model = await DB.instance.selectFrom('personal_access_tokens')
-      .selectAll()
-      .executeTakeFirst()
+    const instance = new AccessTokenModel(undefined)
 
-    instance.mapCustomGetters(model)
+    const model = await instance.applyFirst()
 
     const data = new AccessTokenModel(model)
 

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

@@ -361,33 +361,17 @@ export class CouponModel extends BaseOrm<CouponModel> {
   }
 
   async first(): Promise<CouponModel | undefined> {
-    let model
-
-    if (this.hasSelect) {
-      model = await this.selectFromQuery.executeTakeFirst()
-    }
-    else {
-      model = await this.selectFromQuery.selectAll().executeTakeFirst()
-    }
-
-    if (model) {
-      this.mapCustomGetters(model)
-      await this.loadRelations(model)
-    }
+    const model = await this.applyFirst()
 
     const data = new CouponModel(model)
 
     return data
   }
 
   static async first(): Promise<CouponModel | undefined> {
-    const instance = new CouponJsonResponse(null)
-
-    const model = await DB.instance.selectFrom('coupons')
-      .selectAll()
-      .executeTakeFirst()
+    const instance = new CouponModel(undefined)
 
-    instance.mapCustomGetters(model)
+    const model = await instance.applyFirst()
 
     const data = new CouponModel(model)
 

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

@@ -306,33 +306,17 @@ export class CustomerModel extends BaseOrm<CustomerModel> {
   }
 
   async first(): Promise<CustomerModel | undefined> {
-    let model
-
-    if (this.hasSelect) {
-      model = await this.selectFromQuery.executeTakeFirst()
-    }
-    else {
-      model = await this.selectFromQuery.selectAll().executeTakeFirst()
-    }
-
-    if (model) {
-      this.mapCustomGetters(model)
-      await this.loadRelations(model)
-    }
+    const model = await this.applyFirst()
 
     const data = new CustomerModel(model)
 
     return data
   }
 
   static async first(): Promise<CustomerModel | undefined> {
-    const instance = new CustomerJsonResponse(null)
-
-    const model = await DB.instance.selectFrom('customers')
-      .selectAll()
-      .executeTakeFirst()
+    const instance = new CustomerModel(undefined)
 
-    instance.mapCustomGetters(model)
+    const model = await instance.applyFirst()
 
     const data = new CustomerModel(model)
 

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

@@ -291,33 +291,17 @@ export class DeploymentModel extends BaseOrm<DeploymentModel> {
   }
 
   async first(): Promise<DeploymentModel | undefined> {
-    let model
-
-    if (this.hasSelect) {
-      model = await this.selectFromQuery.executeTakeFirst()
-    }
-    else {
-      model = await this.selectFromQuery.selectAll().executeTakeFirst()
-    }
-
-    if (model) {
-      this.mapCustomGetters(model)
-      await this.loadRelations(model)
-    }
+    const model = await this.applyFirst()
 
     const data = new DeploymentModel(model)
 
     return data
   }
 
   static async first(): Promise<DeploymentModel | undefined> {
-    const instance = new DeploymentJsonResponse(null)
-
-    const model = await DB.instance.selectFrom('deployments')
-      .selectAll()
-      .executeTakeFirst()
+    const instance = new DeploymentModel(undefined)
 
-    instance.mapCustomGetters(model)
+    const model = await instance.applyFirst()
 
     const data = new DeploymentModel(model)
 

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

@@ -251,33 +251,17 @@ export class ErrorModel extends BaseOrm<ErrorModel> {
   }
 
   async first(): Promise<ErrorModel | undefined> {
-    let model
-
-    if (this.hasSelect) {
-      model = await this.selectFromQuery.executeTakeFirst()
-    }
-    else {
-      model = await this.selectFromQuery.selectAll().executeTakeFirst()
-    }
-
-    if (model) {
-      this.mapCustomGetters(model)
-      await this.loadRelations(model)
-    }
+    const model = await this.applyFirst()
 
     const data = new ErrorModel(model)
 
     return data
   }
 
   static async first(): Promise<ErrorModel | undefined> {
-    const instance = new ErrorJsonResponse(null)
-
-    const model = await DB.instance.selectFrom('errors')
-      .selectAll()
-      .executeTakeFirst()
+    const instance = new ErrorModel(undefined)
 
-    instance.mapCustomGetters(model)
+    const model = await instance.applyFirst()
 
     const data = new ErrorModel(model)
 

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

@@ -251,33 +251,17 @@ export class FailedJobModel extends BaseOrm<FailedJobModel> {
   }
 
   async first(): Promise<FailedJobModel | undefined> {
-    let model
-
-    if (this.hasSelect) {
-      model = await this.selectFromQuery.executeTakeFirst()
-    }
-    else {
-      model = await this.selectFromQuery.selectAll().executeTakeFirst()
-    }
-
-    if (model) {
-      this.mapCustomGetters(model)
-      await this.loadRelations(model)
-    }
+    const model = await this.applyFirst()
 
     const data = new FailedJobModel(model)
 
     return data
   }
 
   static async first(): Promise<FailedJobModel | undefined> {
-    const instance = new FailedJobJsonResponse(null)
-
-    const model = await DB.instance.selectFrom('failed_jobs')
-      .selectAll()
-      .executeTakeFirst()
+    const instance = new FailedJobModel(undefined)
 
-    instance.mapCustomGetters(model)
+    const model = await instance.applyFirst()
 
     const data = new FailedJobModel(model)
 

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

@@ -370,33 +370,17 @@ export class GiftCardModel extends BaseOrm<GiftCardModel> {
   }
 
   async first(): Promise<GiftCardModel | undefined> {
-    let model
-
-    if (this.hasSelect) {
-      model = await this.selectFromQuery.executeTakeFirst()
-    }
-    else {
-      model = await this.selectFromQuery.selectAll().executeTakeFirst()
-    }
-
-    if (model) {
-      this.mapCustomGetters(model)
-      await this.loadRelations(model)
-    }
+    const model = await this.applyFirst()
 
     const data = new GiftCardModel(model)
 
     return data
   }
 
   static async first(): Promise<GiftCardModel | undefined> {
-    const instance = new GiftCardJsonResponse(null)
-
-    const model = await DB.instance.selectFrom('gift_cards')
-      .selectAll()
-      .executeTakeFirst()
+    const instance = new GiftCardModel(undefined)
 
-    instance.mapCustomGetters(model)
+    const model = await instance.applyFirst()
 
     const data = new GiftCardModel(model)
 

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

@@ -251,33 +251,17 @@ export class JobModel extends BaseOrm<JobModel> {
   }
 
   async first(): Promise<JobModel | undefined> {
-    let model
-
-    if (this.hasSelect) {
-      model = await this.selectFromQuery.executeTakeFirst()
-    }
-    else {
-      model = await this.selectFromQuery.selectAll().executeTakeFirst()
-    }
-
-    if (model) {
-      this.mapCustomGetters(model)
-      await this.loadRelations(model)
-    }
+    const model = await this.applyFirst()
 
     const data = new JobModel(model)
 
     return data
   }
 
   static async first(): Promise<JobModel | undefined> {
-    const instance = new JobJsonResponse(null)
-
-    const model = await DB.instance.selectFrom('jobs')
-      .selectAll()
-      .executeTakeFirst()
+    const instance = new JobModel(undefined)
 
-    instance.mapCustomGetters(model)
+    const model = await instance.applyFirst()
 
     const data = new JobModel(model)