chore: wip

Author: glennmichael123

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

@@ -1689,14 +1689,14 @@ export interface ${formattedTableName}Table {
   }
 
   // Add relation foreign keys to the table interface
-  for (const relation of relations) {
-    const relationType = getRelationType(relation.relationship)
-    const relationCount = getRelationCount(relation.relationship)
+  // for (const relation of relations) {
+  //   const relationType = getRelationType(relation.relationship)
+  //   const relationCount = getRelationCount(relation.relationship)
 
-    if (relationType === 'belongsType' && !relationCount) {
-      typeString += `  ${relation.modelKey}: number\n`
-    }
-  }
+  //   if (relationType === 'belongsType' && !relationCount) {
+  //     typeString += `  ${relation.modelKey}: number\n`
+  //   }
+  // }
 
   if (useUuid) {
     typeString += `  uuid?: string\n`
@@ -1757,14 +1757,14 @@ export interface ${formattedTableName}Table {
 
     if (relationType === 'belongsType' && !relationCount) {
       const relationName = camelCase(relation.relationName || formattedModelRelation)
-      modelTypeInterface += `
-  ${relationName}Belong: () => Promise<${modelRelation}Type>`
+      modelTypeInterface += `  get ${snakeCase(relationName)}(): ${modelRelation}ModelType | undefined 
+      `
     }
 
     if (relationType === 'belongsType' && relationCount === 'many') {
       const relationName = relation.relationName || formattedModelName + plural(pascalCase(modelRelation))
-      modelTypeInterface += `
-  ${relationName}: () => Promise<${modelRelation}Type[]>`
+      modelTypeInterface += `  get ${snakeCase(relationName)}(): ${modelRelation}ModelType[] | []
+      `
     }
   }
 
@@ -1890,13 +1890,13 @@ export interface ${formattedTableName}Table {
     if (relationType === 'belongsType' && !relationCount) {
       const relationName = camelCase(relation.relationName || formattedModelRelation)
       modelTypeInterface += `
-  ${relationName}Belong: () => Promise<${modelRelation}ModelType>`
+    ${relationName}Belong: () => Promise<${modelRelation}ModelType>`
     }
 
     if (relationType === 'belongsType' && relationCount === 'many') {
       const relationName = relation.relationName || formattedModelName + plural(pascalCase(modelRelation))
       modelTypeInterface += `
-  ${relationName}: () => Promise<${modelRelation}ModelType[]>`
+    ${relationName}: () => Promise<${modelRelation}ModelType[]>`
     }
   }
 

storage/framework/orm/src/types/AuthorType.ts

@@ -7,7 +7,6 @@ export interface AuthorsTable {
   id: Generated<number>
   name?: string
   email?: string
-  user_id: number
   uuid?: string
   created_at?: string
   updated_at?: string
@@ -44,8 +43,8 @@ export interface AuthorModelType {
   get email(): string | undefined
   set email(value: string)
   get post(): PostModelType[] | []
+  get user(): UserModelType | undefined
 
-  userBelong: () => Promise<UserType>
   get uuid(): string | undefined
   set uuid(value: string)
 

storage/framework/orm/src/types/CartItemType.ts

@@ -15,7 +15,6 @@ export interface CartItemsTable {
   product_sku?: string
   product_image?: string
   notes?: string
-  cart_id: number
   uuid?: string
   created_at?: string
   updated_at?: string
@@ -69,8 +68,8 @@ export interface CartItemModelType {
   set productImage(value: string)
   get notes(): string | undefined
   set notes(value: string)
+  get cart(): CartModelType | undefined
 
-  cartBelong: () => Promise<CartType>
   get uuid(): string | undefined
   set uuid(value: string)
 

storage/framework/orm/src/types/CartType.ts

@@ -16,8 +16,6 @@ export interface CartsTable {
   currency?: string
   notes?: string
   applied_coupon_id: string
-  customer_id: number
-  coupon_id: number
   uuid?: string
   created_at?: string
   updated_at?: string
@@ -70,9 +68,9 @@ export interface CartModelType {
   get appliedCouponId(): string
   set appliedCouponId(value: string)
   get cart_item(): CartItemModelType[] | []
+  get customer(): CustomerModelType | undefined
+  get coupon(): CouponModelType | undefined
 
-  customerBelong: () => Promise<CustomerType>
-  couponBelong: () => Promise<CouponType>
   get uuid(): string | undefined
   set uuid(value: string)
 

storage/framework/orm/src/types/CouponType.ts

@@ -18,7 +18,6 @@ export interface CouponsTable {
   usage_count?: number
   start_date?: Date | string
   end_date?: Date | string
-  product_id: number
   uuid?: string
   created_at?: string
   updated_at?: string
@@ -77,8 +76,8 @@ export interface CouponModelType {
   get endDate(): Date | string | undefined
   set endDate(value: Date | string)
   get order(): OrderModelType[] | []
+  get product(): ProductModelType | undefined
 
-  productBelong: () => Promise<ProductType>
   get uuid(): string | undefined
   set uuid(value: string)
 

storage/framework/orm/src/types/CustomerType.ts

@@ -18,7 +18,6 @@ export interface CustomersTable {
   last_order?: string
   status: string | string[]
   avatar: string
-  user_id: number
   uuid?: string
   created_at?: string
   updated_at?: string
@@ -71,8 +70,8 @@ export interface CustomerModelType {
   get license_key(): LicenseKeyModelType[] | []
   get waitlist_product(): WaitlistProductModelType[] | []
   get waitlist_restaurant(): WaitlistRestaurantModelType[] | []
+  get user(): UserModelType | undefined
 
-  userBelong: () => Promise<UserType>
   get uuid(): string | undefined
   set uuid(value: string)
 

storage/framework/orm/src/types/DeploymentType.ts

@@ -11,7 +11,6 @@ export interface DeploymentsTable {
   execution_time?: number
   deploy_script?: string
   terminal_output?: string
-  user_id: number
   uuid?: string
   created_at?: string
   updated_at?: string
@@ -57,8 +56,8 @@ export interface DeploymentModelType {
   set deployScript(value: string)
   get terminalOutput(): string | undefined
   set terminalOutput(value: string)
+  get user(): UserModelType | undefined
 
-  userBelong: () => Promise<UserType>
   get uuid(): string | undefined
   set uuid(value: string)
 

storage/framework/orm/src/types/DriverType.ts

@@ -10,7 +10,6 @@ export interface DriversTable {
   vehicle_number: string
   license: string
   status?: string | string[]
-  user_id: number
   uuid?: string
   created_at?: string
   updated_at?: string
@@ -53,8 +52,8 @@ export interface DriverModelType {
   get status(): string | string[] | undefined
   set status(value: string | string[])
   get delivery_route(): DeliveryRouteModelType[] | []
+  get user(): UserModelType | undefined
 
-  userBelong: () => Promise<UserType>
   get uuid(): string | undefined
   set uuid(value: string)
 

storage/framework/orm/src/types/GiftCardType.ts

@@ -20,7 +20,6 @@ export interface GiftCardsTable {
   expiry_date?: Date | string
   last_used_date?: Date | string
   template_id?: string
-  customer_id: number
   uuid?: string
   created_at?: string
   updated_at?: string
@@ -83,8 +82,8 @@ export interface GiftCardModelType {
   get templateId(): string | undefined
   set templateId(value: string)
   get order(): OrderModelType[] | []
+  get customer(): CustomerModelType | undefined
 
-  customerBelong: () => Promise<CustomerType>
   get uuid(): string | undefined
   set uuid(value: string)
 

storage/framework/orm/src/types/LicenseKeyType.ts

@@ -10,9 +10,6 @@ export interface LicenseKeysTable {
   template: string | string[]
   expiry_date: Date | string
   status?: string | string[]
-  customer_id: number
-  product_id: number
-  order_id: number
   uuid?: string
   created_at?: string
   updated_at?: string
@@ -52,10 +49,10 @@ export interface LicenseKeyModelType {
   set expiryDate(value: Date | string)
   get status(): string | string[] | undefined
   set status(value: string | string[])
+  get customer(): CustomerModelType | undefined
+  get product(): ProductModelType | undefined
+  get order(): OrderModelType | undefined
 
-  customerBelong: () => Promise<CustomerType>
-  productBelong: () => Promise<ProductType>
-  orderBelong: () => Promise<OrderType>
   get uuid(): string | undefined
   set uuid(value: string)