chore: wip

Author: glennmichael123

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

@@ -1809,16 +1809,20 @@ export async function generateModelString(
 
       static async get(): Promise<${modelName}Model[]> {
         const instance = new ${modelName}Model(null)
-      
-        let models
 
+        let models
+      
         if (instance.hasSelect) {
+          ${instanceSoftDeleteStatements}
+
           models = await instance.selectFromQuery.execute()
         } else {
+          ${instanceSoftDeleteStatements}
+
           models = await instance.selectFromQuery.selectAll().execute()
         }
-      
-        const userModels = await Promise.all(models.map(async (model: ${modelName}Model) => {
+
+        const data = await Promise.all(models.map(async (model: ${modelName}Model) => {
           ${relationDeclare}
       
           ${relationStringMany}
@@ -1827,7 +1831,7 @@ export async function generateModelString(
           return model
         }))
         
-        return userModels
+        return data
       }
 
 

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

@@ -163,11 +163,11 @@ export class AccessTokenModel {
       models = await instance.selectFromQuery.selectAll().execute()
     }
 
-    const userModels = await Promise.all(models.map(async (model: AccessTokenModel) => {
+    const data = await Promise.all(models.map(async (model: AccessTokenModel) => {
       return model
     }))
 
-    return userModels
+    return data
   }
 
   // Method to get a AccessToken by criteria

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

@@ -189,15 +189,15 @@ export class DeploymentModel {
       models = await instance.selectFromQuery.selectAll().execute()
     }
 
-    const userModels = await Promise.all(models.map(async (model: DeploymentModel) => {
+    const data = await Promise.all(models.map(async (model: DeploymentModel) => {
       const instance = new DeploymentModel(model as DeploymentType)
 
       model.user = await instance.userBelong()
 
       return model
     }))
 
-    return userModels
+    return data
   }
 
   // Method to get a Deployment by criteria

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

@@ -167,11 +167,11 @@ export class ErrorModel {
       models = await instance.selectFromQuery.selectAll().execute()
     }
 
-    const userModels = await Promise.all(models.map(async (model: ErrorModel) => {
+    const data = await Promise.all(models.map(async (model: ErrorModel) => {
       return model
     }))
 
-    return userModels
+    return data
   }
 
   // Method to get a Error by criteria

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

@@ -202,7 +202,7 @@ export class PaymentMethodModel {
       models = await instance.selectFromQuery.selectAll().execute()
     }
 
-    const userModels = await Promise.all(models.map(async (model: PaymentMethodModel) => {
+    const data = await Promise.all(models.map(async (model: PaymentMethodModel) => {
       const instance = new PaymentMethodModel(model as PaymentMethodType)
 
       model.transactions = await instance.transactionsHasMany()
@@ -212,7 +212,7 @@ export class PaymentMethodModel {
       return model
     }))
 
-    return userModels
+    return data
   }
 
   // Method to get a PaymentMethod by criteria

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

@@ -170,15 +170,15 @@ export class PostModel {
       models = await instance.selectFromQuery.selectAll().execute()
     }
 
-    const userModels = await Promise.all(models.map(async (model: PostModel) => {
+    const data = await Promise.all(models.map(async (model: PostModel) => {
       const instance = new PostModel(model as PostType)
 
       model.user = await instance.userBelong()
 
       return model
     }))
 
-    return userModels
+    return data
   }
 
   // Method to get a Post by criteria

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

@@ -174,11 +174,11 @@ export class ProductModel {
       models = await instance.selectFromQuery.selectAll().execute()
     }
 
-    const userModels = await Promise.all(models.map(async (model: ProductModel) => {
+    const data = await Promise.all(models.map(async (model: ProductModel) => {
       return model
     }))
 
-    return userModels
+    return data
   }
 
   // Method to get a Product by criteria

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

@@ -161,11 +161,11 @@ export class ProjectModel {
       models = await instance.selectFromQuery.selectAll().execute()
     }
 
-    const userModels = await Promise.all(models.map(async (model: ProjectModel) => {
+    const data = await Promise.all(models.map(async (model: ProjectModel) => {
       return model
     }))
 
-    return userModels
+    return data
   }
 
   // Method to get a Project by criteria

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

@@ -152,11 +152,11 @@ export class ReleaseModel {
       models = await instance.selectFromQuery.selectAll().execute()
     }
 
-    const userModels = await Promise.all(models.map(async (model: ReleaseModel) => {
+    const data = await Promise.all(models.map(async (model: ReleaseModel) => {
       return model
     }))
 
-    return userModels
+    return data
   }
 
   // Method to get a Release by criteria

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

@@ -152,11 +152,11 @@ export class SubscriberModel {
       models = await instance.selectFromQuery.selectAll().execute()
     }
 
-    const userModels = await Promise.all(models.map(async (model: SubscriberModel) => {
+    const data = await Promise.all(models.map(async (model: SubscriberModel) => {
       return model
     }))
 
-    return userModels
+    return data
   }
 
   // Method to get a Subscriber by criteria

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

@@ -164,17 +164,25 @@ export class SubscriberEmailModel {
     let models
 
     if (instance.hasSelect) {
+      if (instance.softDeletes) {
+        query = query.where('deleted_at', 'is', null)
+      }
+
       models = await instance.selectFromQuery.execute()
     }
     else {
+      if (instance.softDeletes) {
+        query = query.where('deleted_at', 'is', null)
+      }
+
       models = await instance.selectFromQuery.selectAll().execute()
     }
 
-    const userModels = await Promise.all(models.map(async (model: SubscriberEmailModel) => {
+    const data = await Promise.all(models.map(async (model: SubscriberEmailModel) => {
       return model
     }))
 
-    return userModels
+    return data
   }
 
   // Method to get a SubscriberEmail by criteria

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

@@ -198,15 +198,15 @@ export class SubscriptionModel {
       models = await instance.selectFromQuery.selectAll().execute()
     }
 
-    const userModels = await Promise.all(models.map(async (model: SubscriptionModel) => {
+    const data = await Promise.all(models.map(async (model: SubscriptionModel) => {
       const instance = new SubscriptionModel(model as SubscriptionType)
 
       model.user = await instance.userBelong()
 
       return model
     }))
 
-    return userModels
+    return data
   }
 
   // Method to get a Subscription by criteria

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

@@ -177,11 +177,11 @@ export class TeamModel {
       models = await instance.selectFromQuery.selectAll().execute()
     }
 
-    const userModels = await Promise.all(models.map(async (model: TeamModel) => {
+    const data = await Promise.all(models.map(async (model: TeamModel) => {
       return model
     }))
 
-    return userModels
+    return data
   }
 
   // Method to get a Team by criteria

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

@@ -202,7 +202,7 @@ export class TransactionModel {
       models = await instance.selectFromQuery.selectAll().execute()
     }
 
-    const userModels = await Promise.all(models.map(async (model: TransactionModel) => {
+    const data = await Promise.all(models.map(async (model: TransactionModel) => {
       const instance = new TransactionModel(model as TransactionType)
 
       model.user = await instance.userBelong()
@@ -212,7 +212,7 @@ export class TransactionModel {
       return model
     }))
 
-    return userModels
+    return data
   }
 
   // Method to get a Transaction by criteria

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

@@ -226,7 +226,7 @@ export class UserModel {
       models = await instance.selectFromQuery.selectAll().execute()
     }
 
-    const userModels = await Promise.all(models.map(async (model: UserModel) => {
+    const data = await Promise.all(models.map(async (model: UserModel) => {
       const instance = new UserModel(model as UserType)
 
       model.deployments = await instance.deploymentsHasMany()
@@ -240,7 +240,7 @@ export class UserModel {
       return model
     }))
 
-    return userModels
+    return data
   }
 
   // Method to get a User by criteria