chore: wip

Author: glennmichael123

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

@@ -1706,13 +1706,15 @@ export async function generateModelString(
       private fillable = ${fillable}
       private softDeletes = ${useSoftDeletes}
       protected selectFromQuery: any
+      protected withRelations: string[]
       protected updateFromQuery: any
       protected deleteFromQuery: any
       protected hasSelect: boolean
       ${declareFields}
       constructor(${formattedModelName}: Partial<${modelName}Type> | null) {
         ${constructorFields}
 
+        this.withRelations = []
         this.selectFromQuery = db.selectFrom('${tableName}')
         this.updateFromQuery = db.updateTable('${tableName}')
         this.deleteFromQuery = db.deleteFrom('${tableName}')
@@ -1958,6 +1960,8 @@ export async function generateModelString(
 
       // Method to remove a ${modelName}
       static async remove(id: number): Promise<any> {
+       const instance = new ${modelName}Model(null)
+       
         ${mittDeleteStaticFindStatement}
 
         ${instanceSoftDeleteStatementsUpdateFrom}
@@ -2158,6 +2162,12 @@ export async function generateModelString(
         return data
       }
 
+      with(relations: string[]): ${modelName}Model {
+        this.withRelations = relations
+        
+        return this
+      }
+
       async last(): Promise<${modelName}Type | undefined> {
         return await db.selectFrom('${tableName}')
           .selectAll()

storage/framework/core/payments/src/billable/transaction.ts

@@ -4,6 +4,7 @@ import { Transaction, type TransactionModel } from '../../../../orm/src/models/T
 
 export interface ManageTransaction {
   store: (user: UserModel, productId: number) => Promise<TransactionModel>
+  list: (user: UserModel) => Promise<TransactionModel[]> 
 }
 
 export const manageTransaction: ManageTransaction = (() => {

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

@@ -51,6 +51,7 @@ export class AccessTokenModel {
   private fillable = ['name', 'token', 'plain_text_token', 'abilities', 'uuid', 'team_id']
   private softDeletes = false
   protected selectFromQuery: any
+  protected withRelations: string[]
   protected updateFromQuery: any
   protected deleteFromQuery: any
   protected hasSelect: boolean
@@ -74,6 +75,7 @@ export class AccessTokenModel {
 
     this.updated_at = accesstoken?.updated_at
 
+    this.withRelations = []
     this.selectFromQuery = db.selectFrom('personal_access_tokens')
     this.updateFromQuery = db.updateTable('personal_access_tokens')
     this.deleteFromQuery = db.deleteFrom('personal_access_tokens')
@@ -271,6 +273,8 @@ export class AccessTokenModel {
 
   // Method to remove a AccessToken
   static async remove(id: number): Promise<any> {
+    const instance = new AccessTokenModel(null)
+
     return await db.deleteFrom('personal_access_tokens')
       .where('id', '=', id)
       .execute()
@@ -492,6 +496,12 @@ export class AccessTokenModel {
     return data
   }
 
+  with(relations: string[]): AccessTokenModel {
+    this.withRelations = relations
+
+    return this
+  }
+
   async last(): Promise<AccessTokenType | undefined> {
     return await db.selectFrom('personal_access_tokens')
       .selectAll()

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

@@ -59,6 +59,7 @@ export class DeploymentModel {
   private fillable = ['commit_sha', 'commit_message', 'branch', 'status', 'execution_time', 'deploy_script', 'terminal_output', 'uuid', 'user_id']
   private softDeletes = false
   protected selectFromQuery: any
+  protected withRelations: string[]
   protected updateFromQuery: any
   protected deleteFromQuery: any
   protected hasSelect: boolean
@@ -94,6 +95,7 @@ export class DeploymentModel {
 
     this.updated_at = deployment?.updated_at
 
+    this.withRelations = []
     this.selectFromQuery = db.selectFrom('deployments')
     this.updateFromQuery = db.updateTable('deployments')
     this.deleteFromQuery = db.deleteFrom('deployments')
@@ -315,6 +317,8 @@ export class DeploymentModel {
 
   // Method to remove a Deployment
   static async remove(id: number): Promise<any> {
+    const instance = new DeploymentModel(null)
+
     return await db.deleteFrom('deployments')
       .where('id', '=', id)
       .execute()
@@ -566,6 +570,12 @@ export class DeploymentModel {
     return data
   }
 
+  with(relations: string[]): DeploymentModel {
+    this.withRelations = relations
+
+    return this
+  }
+
   async last(): Promise<DeploymentType | undefined> {
     return await db.selectFrom('deployments')
       .selectAll()

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

@@ -51,6 +51,7 @@ export class ErrorModel {
   private fillable = ['type', 'message', 'stack', 'status', 'user_id', 'additional_info', 'uuid']
   private softDeletes = false
   protected selectFromQuery: any
+  protected withRelations: string[]
   protected updateFromQuery: any
   protected deleteFromQuery: any
   protected hasSelect: boolean
@@ -78,6 +79,7 @@ export class ErrorModel {
 
     this.updated_at = error?.updated_at
 
+    this.withRelations = []
     this.selectFromQuery = db.selectFrom('errors')
     this.updateFromQuery = db.updateTable('errors')
     this.deleteFromQuery = db.deleteFrom('errors')
@@ -275,6 +277,8 @@ export class ErrorModel {
 
   // Method to remove a Error
   static async remove(id: number): Promise<any> {
+    const instance = new ErrorModel(null)
+
     return await db.deleteFrom('errors')
       .where('id', '=', id)
       .execute()
@@ -512,6 +516,12 @@ export class ErrorModel {
     return data
   }
 
+  with(relations: string[]): ErrorModel {
+    this.withRelations = relations
+
+    return this
+  }
+
   async last(): Promise<ErrorType | undefined> {
     return await db.selectFrom('errors')
       .selectAll()

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

@@ -63,6 +63,7 @@ export class PaymentMethodModel {
   private fillable = ['type', 'last_four', 'brand', 'exp_month', 'exp_year', 'is_default', 'provider_id', 'uuid', 'user_id', 'transaction_id']
   private softDeletes = false
   protected selectFromQuery: any
+  protected withRelations: string[]
   protected updateFromQuery: any
   protected deleteFromQuery: any
   protected hasSelect: boolean
@@ -100,6 +101,7 @@ export class PaymentMethodModel {
 
     this.updated_at = paymentmethod?.updated_at
 
+    this.withRelations = []
     this.selectFromQuery = db.selectFrom('payment_methods')
     this.updateFromQuery = db.updateTable('payment_methods')
     this.deleteFromQuery = db.deleteFrom('payment_methods')
@@ -331,6 +333,8 @@ export class PaymentMethodModel {
 
   // Method to remove a PaymentMethod
   static async remove(id: number): Promise<any> {
+    const instance = new PaymentMethodModel(null)
+
     return await db.deleteFrom('payment_methods')
       .where('id', '=', id)
       .execute()
@@ -586,6 +590,12 @@ export class PaymentMethodModel {
     return data
   }
 
+  with(relations: string[]): PaymentMethodModel {
+    this.withRelations = relations
+
+    return this
+  }
+
   async last(): Promise<PaymentMethodType | undefined> {
     return await db.selectFrom('payment_methods')
       .selectAll()

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

@@ -52,6 +52,7 @@ export class PostModel {
   private fillable = ['title', 'body', 'uuid', 'user_id']
   private softDeletes = false
   protected selectFromQuery: any
+  protected withRelations: string[]
   protected updateFromQuery: any
   protected deleteFromQuery: any
   protected hasSelect: boolean
@@ -75,6 +76,7 @@ export class PostModel {
 
     this.updated_at = post?.updated_at
 
+    this.withRelations = []
     this.selectFromQuery = db.selectFrom('posts')
     this.updateFromQuery = db.updateTable('posts')
     this.deleteFromQuery = db.deleteFrom('posts')
@@ -290,6 +292,8 @@ export class PostModel {
 
   // Method to remove a Post
   static async remove(id: number): Promise<any> {
+    const instance = new PostModel(null)
+
     return await db.deleteFrom('posts')
       .where('id', '=', id)
       .execute()
@@ -501,6 +505,12 @@ export class PostModel {
     return data
   }
 
+  with(relations: string[]): PostModel {
+    this.withRelations = relations
+
+    return this
+  }
+
   async last(): Promise<PostType | undefined> {
     return await db.selectFrom('posts')
       .selectAll()

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

@@ -54,6 +54,7 @@ export class ProductModel {
   private fillable = ['name', 'description', 'key', 'unit_price', 'status', 'image', 'provider_id', 'uuid']
   private softDeletes = false
   protected selectFromQuery: any
+  protected withRelations: string[]
   protected updateFromQuery: any
   protected deleteFromQuery: any
   protected hasSelect: boolean
@@ -85,6 +86,7 @@ export class ProductModel {
 
     this.updated_at = product?.updated_at
 
+    this.withRelations = []
     this.selectFromQuery = db.selectFrom('products')
     this.updateFromQuery = db.updateTable('products')
     this.deleteFromQuery = db.deleteFrom('products')
@@ -288,6 +290,8 @@ export class ProductModel {
 
   // Method to remove a Product
   static async remove(id: number): Promise<any> {
+    const instance = new ProductModel(null)
+
     return await db.deleteFrom('products')
       .where('id', '=', id)
       .execute()
@@ -533,6 +537,12 @@ export class ProductModel {
     return data
   }
 
+  with(relations: string[]): ProductModel {
+    this.withRelations = relations
+
+    return this
+  }
+
   async last(): Promise<ProductType | undefined> {
     return await db.selectFrom('products')
       .selectAll()

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

@@ -49,6 +49,7 @@ export class ProjectModel {
   private fillable = ['name', 'description', 'url', 'status', 'uuid']
   private softDeletes = false
   protected selectFromQuery: any
+  protected withRelations: string[]
   protected updateFromQuery: any
   protected deleteFromQuery: any
   protected hasSelect: boolean
@@ -72,6 +73,7 @@ export class ProjectModel {
 
     this.updated_at = project?.updated_at
 
+    this.withRelations = []
     this.selectFromQuery = db.selectFrom('projects')
     this.updateFromQuery = db.updateTable('projects')
     this.deleteFromQuery = db.deleteFrom('projects')
@@ -269,6 +271,8 @@ export class ProjectModel {
 
   // Method to remove a Project
   static async remove(id: number): Promise<any> {
+    const instance = new ProjectModel(null)
+
     return await db.deleteFrom('projects')
       .where('id', '=', id)
       .execute()
@@ -490,6 +494,12 @@ export class ProjectModel {
     return data
   }
 
+  with(relations: string[]): ProjectModel {
+    this.withRelations = relations
+
+    return this
+  }
+
   async last(): Promise<ProjectType | undefined> {
     return await db.selectFrom('projects')
       .selectAll()

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

@@ -46,6 +46,7 @@ export class ReleaseModel {
   private fillable = ['version', 'uuid']
   private softDeletes = false
   protected selectFromQuery: any
+  protected withRelations: string[]
   protected updateFromQuery: any
   protected deleteFromQuery: any
   protected hasSelect: boolean
@@ -63,6 +64,7 @@ export class ReleaseModel {
 
     this.updated_at = release?.updated_at
 
+    this.withRelations = []
     this.selectFromQuery = db.selectFrom('releases')
     this.updateFromQuery = db.updateTable('releases')
     this.deleteFromQuery = db.deleteFrom('releases')
@@ -260,6 +262,8 @@ export class ReleaseModel {
 
   // Method to remove a Release
   static async remove(id: number): Promise<any> {
+    const instance = new ReleaseModel(null)
+
     return await db.deleteFrom('releases')
       .where('id', '=', id)
       .execute()
@@ -457,6 +461,12 @@ export class ReleaseModel {
     return data
   }
 
+  with(relations: string[]): ReleaseModel {
+    this.withRelations = relations
+
+    return this
+  }
+
   async last(): Promise<ReleaseType | undefined> {
     return await db.selectFrom('releases')
       .selectAll()