chore: wip

Author: glennmichael123

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

@@ -984,6 +984,7 @@ export async function generateModelString(
   const formattedTableName = pascalCase(tableName) // users -> Users
   const formattedModelName = modelName.toLowerCase() // User -> user
 
+  let relationDeclare = ''
   let relationString = ''
 
   let instanceSoftDeleteStatements = ''
@@ -993,6 +994,7 @@ export async function generateModelString(
   let thisSoftDeleteStatementsUpdateFrom = ''
 
   let fieldString = ''
+  let hasBelongsType = false
   let constructorFields = ''
   let jsonFields = '{\n'
   let declareFields = ''
@@ -1092,10 +1094,6 @@ export async function generateModelString(
     }
   }
 
-  relationString += `
-    const instance = new ${modelName}Model(model as ${modelName}Type)\n
-  `
-
   for (const relation of relations) {
     const modelRelation = relation.model
     const foreignKeyRelation = relation.foreignKey
@@ -1173,18 +1171,19 @@ export async function generateModelString(
     }
 
     if (relationType === 'belongsType' && !relationCount) {
+      hasBelongsType = true
       const relationName = camelCase(relation.relationName || formattedModelRelation)
 
       declareFields += `public ${snakeCase(relationName)}: any\n`
       constructorFields += `this.${snakeCase(relationName)} = ${formattedModelName}?.${snakeCase(relationName)}\n`
       fieldString += `${snakeCase(relationName)}?: any\n`
       relationString += `
-        model.${relationName} = await instance.${relationName}()\n
+        model.${snakeCase(relationName)} = await instance.${relationName}Belong()\n
       `
-      jsonFields += `${relationName}: this.${relationName},\n`
+      jsonFields += `${snakeCase(relationName)}: this.${snakeCase(relationName)},\n`
 
       relationMethods += `
-      async ${relationName}() {
+      async ${relationName}Belong() {
         if (this.${modelKeyRelation} === undefined)
           throw new HttpError(500, 'Relation Error!')
 
@@ -1225,6 +1224,12 @@ export async function generateModelString(
     }
   }
 
+  if (hasBelongsType) {
+    relationDeclare += `
+      const instance = new ${modelName}Model(model as ${modelName}Type)\n
+    `
+  }
+
   declareFields += `public id: number \n   `
 
   constructorFields += `this.id = ${formattedModelName}?.id || 1\n   `
@@ -2101,7 +2106,7 @@ export async function generateModelString(
 
         if (! model)
           return undefined
-
+        ${relationDeclare}
         ${relationString}
 
         const data = new ${modelName}Model(model as ${modelName}Type)

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

@@ -490,8 +490,6 @@ export class AccessTokenModel {
     if (!model)
       return undefined
 
-    const instance = new AccessTokenModel(model as AccessTokenType)
-
     const data = new AccessTokenModel(model as AccessTokenType)
 
     return data

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

@@ -538,7 +538,7 @@ export class DeploymentModel {
 
     const instance = new DeploymentModel(model as DeploymentType)
 
-    model.user = await instance.user()
+    model.user = await instance.userBelong()
 
     const data = new DeploymentModel(model as DeploymentType)
 
@@ -656,7 +656,7 @@ export class DeploymentModel {
       .execute()
   }
 
-  async user() {
+  async userBelong() {
     if (this.user_id === undefined)
       throw new HttpError(500, 'Relation Error!')
 

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

@@ -506,8 +506,6 @@ export class ErrorModel {
     if (!model)
       return undefined
 
-    const instance = new ErrorModel(model as ErrorType)
-
     const data = new ErrorModel(model as ErrorType)
 
     return data

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

@@ -543,7 +543,7 @@ export class PaymentMethodModel {
 
     const instance = new PaymentMethodModel(model as PaymentMethodType)
 
-    model.user = await instance.user()
+    model.user = await instance.userBelong()
 
     const data = new PaymentMethodModel(model as PaymentMethodType)
 
@@ -661,7 +661,7 @@ export class PaymentMethodModel {
       .execute()
   }
 
-  async user() {
+  async userBelong() {
     if (this.user_id === undefined)
       throw new HttpError(500, 'Relation Error!')
 

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

@@ -473,7 +473,7 @@ export class PostModel {
 
     const instance = new PostModel(model as PostType)
 
-    model.user = await instance.user()
+    model.user = await instance.userBelong()
 
     const data = new PostModel(model as PostType)
 
@@ -591,7 +591,7 @@ export class PostModel {
       .execute()
   }
 
-  async user() {
+  async userBelong() {
     if (this.user_id === undefined)
       throw new HttpError(500, 'Relation Error!')
 

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

@@ -527,8 +527,6 @@ export class ProductModel {
     if (!model)
       return undefined
 
-    const instance = new ProductModel(model as ProductType)
-
     const data = new ProductModel(model as ProductType)
 
     return data

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

@@ -484,8 +484,6 @@ export class ProjectModel {
     if (!model)
       return undefined
 
-    const instance = new ProjectModel(model as ProjectType)
-
     const data = new ProjectModel(model as ProjectType)
 
     return data

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

@@ -451,8 +451,6 @@ export class ReleaseModel {
     if (!model)
       return undefined
 
-    const instance = new ReleaseModel(model as ReleaseType)
-
     const data = new ReleaseModel(model as ReleaseType)
 
     return data

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

@@ -455,8 +455,6 @@ export class SubscriberModel {
     if (!model)
       return undefined
 
-    const instance = new SubscriberModel(model as SubscriberType)
-
     const data = new SubscriberModel(model as SubscriberType)
 
     return data