chore: wip

Author: glennmichael123

storage/framework/actions/src/UserShowOrmAction.ts

@@ -10,7 +10,7 @@ export default new Action({
   async handle(request: UserRequestType) {
     // const id = request.getParam('id')
 
-    const result = await User.get()
+    const result = await User.with(['posts']).get()
 
     return response.json(result)
   },

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

@@ -1911,7 +1911,7 @@ export async function generateModelString(
           }
         }
 
-        async loadRelationsHasMany(models: UserModel[]): Promise<void> {
+        async loadRelationsHasMany(models: ${modelName}Model[]): Promise<void> {
           if (!models.length)
             return
 
@@ -1920,16 +1920,16 @@ export async function generateModelString(
           for (const relation of this.withRelations) {
             const relatedRecords = await DB.instance
               .selectFrom(relation)
-              .where('user_id', 'in', modelIds)
+              .where('${formattedModelName}_id', 'in', modelIds)
               .selectAll()
               .execute()
 
-            models.map((model: UserModel) => {
+            models.map((model: ${modelName}Model) => {
               const records = relatedRecords.filter((record: any) => {
                 return record.${formattedModelName}_id === model.id
               })
 
-              model[relation] = records
+              model[relation] = records.length === 1 ? records[0] : records
 
               return model
             })

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

@@ -1165,7 +1165,7 @@ export class AccessTokenModel {
     }
   }
 
-  async loadRelationsHasMany(models: UserModel[]): Promise<void> {
+  async loadRelationsHasMany(models: AccessTokenModel[]): Promise<void> {
     if (!models.length)
       return
 
@@ -1174,16 +1174,16 @@ export class AccessTokenModel {
     for (const relation of this.withRelations) {
       const relatedRecords = await DB.instance
         .selectFrom(relation)
-        .where('user_id', 'in', modelIds)
+        .where('accesstoken_id', 'in', modelIds)
         .selectAll()
         .execute()
 
-      models.map((model: UserModel) => {
+      models.map((model: AccessTokenModel) => {
         const records = relatedRecords.filter((record: any) => {
           return record.accesstoken_id === model.id
         })
 
-        model[relation] = records
+        model[relation] = records.length === 1 ? records[0] : records
 
         return model
       })

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

@@ -1215,7 +1215,7 @@ export class ActivityModel {
     }
   }
 
-  async loadRelationsHasMany(models: UserModel[]): Promise<void> {
+  async loadRelationsHasMany(models: ActivityModel[]): Promise<void> {
     if (!models.length)
       return
 
@@ -1224,16 +1224,16 @@ export class ActivityModel {
     for (const relation of this.withRelations) {
       const relatedRecords = await DB.instance
         .selectFrom(relation)
-        .where('user_id', 'in', modelIds)
+        .where('activity_id', 'in', modelIds)
         .selectAll()
         .execute()
 
-      models.map((model: UserModel) => {
+      models.map((model: ActivityModel) => {
         const records = relatedRecords.filter((record: any) => {
           return record.activity_id === model.id
         })
 
-        model[relation] = records
+        model[relation] = records.length === 1 ? records[0] : records
 
         return model
       })

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

@@ -1230,7 +1230,7 @@ export class DeploymentModel {
     }
   }
 
-  async loadRelationsHasMany(models: UserModel[]): Promise<void> {
+  async loadRelationsHasMany(models: DeploymentModel[]): Promise<void> {
     if (!models.length)
       return
 
@@ -1239,16 +1239,16 @@ export class DeploymentModel {
     for (const relation of this.withRelations) {
       const relatedRecords = await DB.instance
         .selectFrom(relation)
-        .where('user_id', 'in', modelIds)
+        .where('deployment_id', 'in', modelIds)
         .selectAll()
         .execute()
 
-      models.map((model: UserModel) => {
+      models.map((model: DeploymentModel) => {
         const records = relatedRecords.filter((record: any) => {
           return record.deployment_id === model.id
         })
 
-        model[relation] = records
+        model[relation] = records.length === 1 ? records[0] : records
 
         return model
       })

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

@@ -1169,7 +1169,7 @@ export class ErrorModel {
     }
   }
 
-  async loadRelationsHasMany(models: UserModel[]): Promise<void> {
+  async loadRelationsHasMany(models: ErrorModel[]): Promise<void> {
     if (!models.length)
       return
 
@@ -1178,16 +1178,16 @@ export class ErrorModel {
     for (const relation of this.withRelations) {
       const relatedRecords = await DB.instance
         .selectFrom(relation)
-        .where('user_id', 'in', modelIds)
+        .where('error_id', 'in', modelIds)
         .selectAll()
         .execute()
 
-      models.map((model: UserModel) => {
+      models.map((model: ErrorModel) => {
         const records = relatedRecords.filter((record: any) => {
           return record.error_id === model.id
         })
 
-        model[relation] = records
+        model[relation] = records.length === 1 ? records[0] : records
 
         return model
       })

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

@@ -1169,7 +1169,7 @@ export class FailedJobModel {
     }
   }
 
-  async loadRelationsHasMany(models: UserModel[]): Promise<void> {
+  async loadRelationsHasMany(models: FailedJobModel[]): Promise<void> {
     if (!models.length)
       return
 
@@ -1178,16 +1178,16 @@ export class FailedJobModel {
     for (const relation of this.withRelations) {
       const relatedRecords = await DB.instance
         .selectFrom(relation)
-        .where('user_id', 'in', modelIds)
+        .where('failedjob_id', 'in', modelIds)
         .selectAll()
         .execute()
 
-      models.map((model: UserModel) => {
+      models.map((model: FailedJobModel) => {
         const records = relatedRecords.filter((record: any) => {
           return record.failedjob_id === model.id
         })
 
-        model[relation] = records
+        model[relation] = records.length === 1 ? records[0] : records
 
         return model
       })

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

@@ -1169,7 +1169,7 @@ export class JobModel {
     }
   }
 
-  async loadRelationsHasMany(models: UserModel[]): Promise<void> {
+  async loadRelationsHasMany(models: JobModel[]): Promise<void> {
     if (!models.length)
       return
 
@@ -1178,16 +1178,16 @@ export class JobModel {
     for (const relation of this.withRelations) {
       const relatedRecords = await DB.instance
         .selectFrom(relation)
-        .where('user_id', 'in', modelIds)
+        .where('job_id', 'in', modelIds)
         .selectAll()
         .execute()
 
-      models.map((model: UserModel) => {
+      models.map((model: JobModel) => {
         const records = relatedRecords.filter((record: any) => {
           return record.job_id === model.id
         })
 
-        model[relation] = records
+        model[relation] = records.length === 1 ? records[0] : records
 
         return model
       })

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

@@ -1239,7 +1239,7 @@ export class PaymentMethodModel {
     }
   }
 
-  async loadRelationsHasMany(models: UserModel[]): Promise<void> {
+  async loadRelationsHasMany(models: PaymentMethodModel[]): Promise<void> {
     if (!models.length)
       return
 
@@ -1248,16 +1248,16 @@ export class PaymentMethodModel {
     for (const relation of this.withRelations) {
       const relatedRecords = await DB.instance
         .selectFrom(relation)
-        .where('user_id', 'in', modelIds)
+        .where('paymentmethod_id', 'in', modelIds)
         .selectAll()
         .execute()
 
-      models.map((model: UserModel) => {
+      models.map((model: PaymentMethodModel) => {
         const records = relatedRecords.filter((record: any) => {
           return record.paymentmethod_id === model.id
         })
 
-        model[relation] = records
+        model[relation] = records.length === 1 ? records[0] : records
 
         return model
       })

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

@@ -1131,7 +1131,7 @@ export class PostModel {
     }
   }
 
-  async loadRelationsHasMany(models: UserModel[]): Promise<void> {
+  async loadRelationsHasMany(models: PostModel[]): Promise<void> {
     if (!models.length)
       return
 
@@ -1140,16 +1140,16 @@ export class PostModel {
     for (const relation of this.withRelations) {
       const relatedRecords = await DB.instance
         .selectFrom(relation)
-        .where('user_id', 'in', modelIds)
+        .where('post_id', 'in', modelIds)
         .selectAll()
         .execute()
 
-      models.map((model: UserModel) => {
+      models.map((model: PostModel) => {
         const records = relatedRecords.filter((record: any) => {
           return record.post_id === model.id
         })
 
-        model[relation] = records
+        model[relation] = records.length === 1 ? records[0] : records
 
         return model
       })