chore: wip

Author: glennmichael123

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

@@ -450,14 +450,18 @@ export class BaseOrm<T, C, J> {
     return this.applyTake(count)
   }
 
-  async count(): Promise<number> {
+  async applyCount(): Promise<number> {
     const result = await this.selectFromQuery
       .select(sql`COUNT(*) as count`)
       .executeTakeFirst()
 
     return result.count || 0
   }
 
+  async count(): Promise<number> {
+    return this.applyCount()
+  }
+
   applyOrderBy(column: keyof C, order: 'asc' | 'desc'): this {
     this.selectFromQuery = this.selectFromQuery.orderBy(column, order)
 

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

@@ -1264,19 +1264,7 @@ export async function generateModelString(
         static async count(): Promise<number> {
           const instance = new ${modelName}Model(undefined)
 
-          const result = await instance.selectFromQuery
-            .select(sql\`COUNT(*) as count\`)
-            .executeTakeFirst()
-          
-          return result.count || 0
-        }
-
-        async count(): Promise<number> {
-          const result = await this.selectFromQuery
-            .select(sql\`COUNT(*) as count\`)
-            .executeTakeFirst()
-          
-          return result.count || 0
+          return instance.applyCount()
         }
         
         static async max(field: keyof ${modelName}Model): Promise<number> {

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

@@ -487,19 +487,7 @@ export class AccessTokenModel extends BaseOrm<AccessTokenModel, PersonalAccessTo
   static async count(): Promise<number> {
     const instance = new AccessTokenModel(undefined)
 
-    const result = await instance.selectFromQuery
-      .select(sql`COUNT(*) as count`)
-      .executeTakeFirst()
-
-    return result.count || 0
-  }
-
-  async count(): Promise<number> {
-    const result = await this.selectFromQuery
-      .select(sql`COUNT(*) as count`)
-      .executeTakeFirst()
-
-    return result.count || 0
+    return instance.applyCount()
   }
 
   static async max(field: keyof AccessTokenModel): Promise<number> {

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

@@ -527,19 +527,7 @@ export class CouponModel extends BaseOrm<CouponModel, CouponsTable, CouponJsonRe
   static async count(): Promise<number> {
     const instance = new CouponModel(undefined)
 
-    const result = await instance.selectFromQuery
-      .select(sql`COUNT(*) as count`)
-      .executeTakeFirst()
-
-    return result.count || 0
-  }
-
-  async count(): Promise<number> {
-    const result = await this.selectFromQuery
-      .select(sql`COUNT(*) as count`)
-      .executeTakeFirst()
-
-    return result.count || 0
+    return instance.applyCount()
   }
 
   static async max(field: keyof CouponModel): Promise<number> {

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

@@ -472,19 +472,7 @@ export class CustomerModel extends BaseOrm<CustomerModel, CustomersTable, Custom
   static async count(): Promise<number> {
     const instance = new CustomerModel(undefined)
 
-    const result = await instance.selectFromQuery
-      .select(sql`COUNT(*) as count`)
-      .executeTakeFirst()
-
-    return result.count || 0
-  }
-
-  async count(): Promise<number> {
-    const result = await this.selectFromQuery
-      .select(sql`COUNT(*) as count`)
-      .executeTakeFirst()
-
-    return result.count || 0
+    return instance.applyCount()
   }
 
   static async max(field: keyof CustomerModel): Promise<number> {

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

@@ -457,19 +457,7 @@ export class DeploymentModel extends BaseOrm<DeploymentModel, DeploymentsTable,
   static async count(): Promise<number> {
     const instance = new DeploymentModel(undefined)
 
-    const result = await instance.selectFromQuery
-      .select(sql`COUNT(*) as count`)
-      .executeTakeFirst()
-
-    return result.count || 0
-  }
-
-  async count(): Promise<number> {
-    const result = await this.selectFromQuery
-      .select(sql`COUNT(*) as count`)
-      .executeTakeFirst()
-
-    return result.count || 0
+    return instance.applyCount()
   }
 
   static async max(field: keyof DeploymentModel): Promise<number> {

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

@@ -417,19 +417,7 @@ export class ErrorModel extends BaseOrm<ErrorModel, ErrorsTable, ErrorJsonRespon
   static async count(): Promise<number> {
     const instance = new ErrorModel(undefined)
 
-    const result = await instance.selectFromQuery
-      .select(sql`COUNT(*) as count`)
-      .executeTakeFirst()
-
-    return result.count || 0
-  }
-
-  async count(): Promise<number> {
-    const result = await this.selectFromQuery
-      .select(sql`COUNT(*) as count`)
-      .executeTakeFirst()
-
-    return result.count || 0
+    return instance.applyCount()
   }
 
   static async max(field: keyof ErrorModel): Promise<number> {

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

@@ -417,19 +417,7 @@ export class FailedJobModel extends BaseOrm<FailedJobModel, FailedJobsTable, Fai
   static async count(): Promise<number> {
     const instance = new FailedJobModel(undefined)
 
-    const result = await instance.selectFromQuery
-      .select(sql`COUNT(*) as count`)
-      .executeTakeFirst()
-
-    return result.count || 0
-  }
-
-  async count(): Promise<number> {
-    const result = await this.selectFromQuery
-      .select(sql`COUNT(*) as count`)
-      .executeTakeFirst()
-
-    return result.count || 0
+    return instance.applyCount()
   }
 
   static async max(field: keyof FailedJobModel): Promise<number> {

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

@@ -536,19 +536,7 @@ export class GiftCardModel extends BaseOrm<GiftCardModel, GiftCardsTable, GiftCa
   static async count(): Promise<number> {
     const instance = new GiftCardModel(undefined)
 
-    const result = await instance.selectFromQuery
-      .select(sql`COUNT(*) as count`)
-      .executeTakeFirst()
-
-    return result.count || 0
-  }
-
-  async count(): Promise<number> {
-    const result = await this.selectFromQuery
-      .select(sql`COUNT(*) as count`)
-      .executeTakeFirst()
-
-    return result.count || 0
+    return instance.applyCount()
   }
 
   static async max(field: keyof GiftCardModel): Promise<number> {

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

@@ -417,19 +417,7 @@ export class JobModel extends BaseOrm<JobModel, JobsTable, JobJsonResponse> {
   static async count(): Promise<number> {
     const instance = new JobModel(undefined)
 
-    const result = await instance.selectFromQuery
-      .select(sql`COUNT(*) as count`)
-      .executeTakeFirst()
-
-    return result.count || 0
-  }
-
-  async count(): Promise<number> {
-    const result = await this.selectFromQuery
-      .select(sql`COUNT(*) as count`)
-      .executeTakeFirst()
-
-    return result.count || 0
+    return instance.applyCount()
   }
 
   static async max(field: keyof JobModel): Promise<number> {