chore: wip

glennmichael123 · glennmichael123 · commit 3d1d423485a2 · 2024-12-19T21:37:52.000+08:00
diff --git a/database/migrations/1734614781538-create-projects-table.ts b/database/migrations/1734614781538-create-projects-table.ts
diff --git a/database/migrations/1734614781543-create-subscriber_emails-table.ts b/database/migrations/1734614781543-create-subscriber_emails-table.ts
diff --git a/database/migrations/1734614781546-create-personal_access_tokens-table.ts b/database/migrations/1734614781546-create-personal_access_tokens-table.ts
@@ -9,8 +9,9 @@ export async function up(db: Database<any>) {
     .addColumn('token', 'varchar(512)', col => col.unique())
     .addColumn('plain_text_token', 'varchar(512)')
     .addColumn('abilities', 'text')
-    .addColumn('team_id', 'integer', col =>
-      col.references('teams.id').onDelete('cascade'))
+    .addColumn('team_id', 'integer', (col) =>
+        col.references('teams.id').onDelete('cascade')
+      ) 
     .addColumn('created_at', 'timestamp', col => col.notNull().defaultTo(sql`CURRENT_TIMESTAMP`))
     .addColumn('updated_at', 'timestamp')
     .execute()
diff --git a/database/migrations/1734614781549-create-personal_access_token_teams-table.ts b/database/migrations/1734614781549-create-personal_access_token_teams-table.ts
@@ -1,10 +1,9 @@
 import type { Database } from '@stacksjs/database'
-
 export async function up(db: Database<any>) {
   await db.schema
     .createTable('personal_access_token_teams')
     .addColumn('id', 'integer', col => col.primaryKey().autoIncrement())
     .addColumn('team_id', 'integer')
     .addColumn('personal_access_token_id', 'integer')
     .execute()
-}
+    }
diff --git a/database/migrations/1734614781549-create-team_users-table.ts b/database/migrations/1734614781549-create-team_users-table.ts
@@ -1,10 +1,9 @@
 import type { Database } from '@stacksjs/database'
-
 export async function up(db: Database<any>) {
   await db.schema
     .createTable('team_users')
     .addColumn('id', 'integer', col => col.primaryKey().autoIncrement())
     .addColumn('team_id', 'integer')
     .addColumn('user_id', 'integer')
     .execute()
-}
+    }
diff --git a/database/migrations/1734614781550-create-teams-table.ts b/database/migrations/1734614781550-create-teams-table.ts
@@ -13,10 +13,12 @@ export async function up(db: Database<any>) {
     .addColumn('description', 'varchar(255)')
     .addColumn('path', 'varchar(255)')
     .addColumn('is_personal', 'boolean')
-    .addColumn('accesstoken_id', 'integer', col =>
-      col.references('personal_access_tokens.id').onDelete('cascade'))
-    .addColumn('user_id', 'integer', col =>
-      col.references('users.id').onDelete('cascade'))
+    .addColumn('accesstoken_id', 'integer', (col) =>
+        col.references('personal_access_tokens.id').onDelete('cascade')
+      ) 
+    .addColumn('user_id', 'integer', (col) =>
+        col.references('users.id').onDelete('cascade')
+      ) 
     .addColumn('created_at', 'timestamp', col => col.notNull().defaultTo(sql`CURRENT_TIMESTAMP`))
     .addColumn('updated_at', 'timestamp')
     .execute()
diff --git a/database/migrations/1734614781554-create-subscribers-table.ts b/database/migrations/1734614781554-create-subscribers-table.ts
@@ -6,8 +6,9 @@ export async function up(db: Database<any>) {
     .createTable('subscribers')
     .addColumn('id', 'integer', col => col.primaryKey().autoIncrement())
     .addColumn('subscribed', 'boolean')
-    .addColumn('user_id', 'integer', col =>
-      col.references('users.id').onDelete('cascade'))
+    .addColumn('user_id', 'integer', (col) =>
+        col.references('users.id').onDelete('cascade')
+      ) 
     .addColumn('created_at', 'timestamp', col => col.notNull().defaultTo(sql`CURRENT_TIMESTAMP`))
     .addColumn('updated_at', 'timestamp')
     .execute()
diff --git a/database/migrations/1734614781557-create-deployments-table.ts b/database/migrations/1734614781557-create-deployments-table.ts
@@ -13,8 +13,9 @@ export async function up(db: Database<any>) {
     .addColumn('execution_time', 'integer')
     .addColumn('deploy_script', 'varchar(255)')
     .addColumn('terminal_output', 'varchar(255)')
-    .addColumn('user_id', 'integer', col =>
-      col.references('users.id').onDelete('cascade'))
+    .addColumn('user_id', 'integer', (col) =>
+        col.references('users.id').onDelete('cascade')
+      ) 
     .addColumn('created_at', 'timestamp', col => col.notNull().defaultTo(sql`CURRENT_TIMESTAMP`))
     .addColumn('updated_at', 'timestamp')
     .execute()
diff --git a/database/migrations/1734614781560-create-releases-table.ts b/database/migrations/1734614781560-create-releases-table.ts
diff --git a/database/migrations/1734614781562-create-passkeys-table.ts b/database/migrations/1734614781562-create-passkeys-table.ts
@@ -1,5 +1,5 @@
 import type { Database } from '@stacksjs/database'
-import { sql } from '@stacksjs/database'
+ import { sql } from '@stacksjs/database'
 
 export async function up(db: Database<any>) {
   await db.schema
@@ -17,4 +17,4 @@ export async function up(db: Database<any>) {
     .addColumn('last_used_at', 'text')
     .addColumn('created_at', 'timestamp', col => col.notNull().defaultTo(sql.raw('CURRENT_TIMESTAMP')))
     .execute()
-}
+    }
diff --git a/database/migrations/1734614781564-create-payment_methods-table.ts b/database/migrations/1734614781564-create-payment_methods-table.ts
@@ -13,8 +13,12 @@ export async function up(db: Database<any>) {
     .addColumn('exp_year', 'integer', col => col.notNull())
     .addColumn('is_default', 'boolean')
     .addColumn('provider_id', 'varchar(255)')
-    .addColumn('user_id', 'integer', col =>
-      col.references('users.id').onDelete('cascade'))
+    .addColumn('user_id', 'integer', (col) =>
+        col.references('users.id').onDelete('cascade')
+      ) 
+    .addColumn('transaction_id', 'integer', (col) =>
+        col.references('transactions.id').onDelete('cascade')
+      ) 
     .addColumn('created_at', 'timestamp', col => col.notNull().defaultTo(sql`CURRENT_TIMESTAMP`))
     .addColumn('updated_at', 'timestamp')
     .execute()
diff --git a/database/migrations/1734614781564-create-subscriptions-table.ts b/database/migrations/1734614781564-create-subscriptions-table.ts
@@ -16,8 +16,9 @@ export async function up(db: Database<any>) {
     .addColumn('trial_ends_at', 'varchar(255)')
     .addColumn('ends_at', 'varchar(255)')
     .addColumn('last_used_at', 'varchar(255)')
-    .addColumn('user_id', 'integer', col =>
-      col.references('users.id').onDelete('cascade'))
+    .addColumn('user_id', 'integer', (col) =>
+        col.references('users.id').onDelete('cascade')
+      ) 
     .addColumn('created_at', 'timestamp', col => col.notNull().defaultTo(sql`CURRENT_TIMESTAMP`))
     .addColumn('updated_at', 'timestamp')
     .execute()
diff --git a/database/migrations/1734614781565-create-transactions-table.ts b/database/migrations/1734614781565-create-transactions-table.ts
@@ -12,8 +12,12 @@ export async function up(db: Database<any>) {
     .addColumn('brand', 'varchar(50)', col => col.notNull())
     .addColumn('type', 'varchar(50)', col => col.notNull())
     .addColumn('provider_id', 'varchar(255)')
-    .addColumn('user_id', 'integer', col =>
-      col.references('users.id').onDelete('cascade'))
+    .addColumn('user_id', 'integer', (col) =>
+        col.references('users.id').onDelete('cascade')
+      ) 
+    .addColumn('paymentmethod_id', 'integer', (col) =>
+        col.references('payment_methods.id').onDelete('cascade')
+      ) 
     .addColumn('created_at', 'timestamp', col => col.notNull().defaultTo(sql`CURRENT_TIMESTAMP`))
     .addColumn('updated_at', 'timestamp')
     .execute()
diff --git a/database/migrations/1734614781566-create-products-table.ts b/database/migrations/1734614781566-create-products-table.ts
diff --git a/database/migrations/1734614781566-create-users-table.ts b/database/migrations/1734614781566-create-users-table.ts
@@ -11,12 +11,24 @@ export async function up(db: Database<any>) {
     .addColumn('password', 'varchar(255)', col => col.notNull())
     .addColumn('job_title', 'varchar(255)', col => col.notNull())
     .addColumn('stripe_id', 'varchar(255)')
-    .addColumn('team_id', 'integer', col =>
-      col.references('teams.id').onDelete('cascade'))
-    .addColumn('deployment_id', 'integer', col =>
-      col.references('deployments.id').onDelete('cascade'))
-    .addColumn('post_id', 'integer', col =>
-      col.references('posts.id').onDelete('cascade'))
+    .addColumn('team_id', 'integer', (col) =>
+        col.references('teams.id').onDelete('cascade')
+      ) 
+    .addColumn('deployment_id', 'integer', (col) =>
+        col.references('deployments.id').onDelete('cascade')
+      ) 
+    .addColumn('post_id', 'integer', (col) =>
+        col.references('posts.id').onDelete('cascade')
+      ) 
+    .addColumn('paymentmethod_id', 'integer', (col) =>
+        col.references('payment_methods.id').onDelete('cascade')
+      ) 
+    .addColumn('transaction_id', 'integer', (col) =>
+        col.references('transactions.id').onDelete('cascade')
+      ) 
+    .addColumn('subscription_id', 'integer', (col) =>
+        col.references('subscriptions.id').onDelete('cascade')
+      ) 
     .addColumn('public_passkey', 'text')
     .addColumn('created_at', 'timestamp', col => col.notNull().defaultTo(sql`CURRENT_TIMESTAMP`))
     .addColumn('updated_at', 'timestamp')
diff --git a/database/migrations/1734614781570-create-posts-table.ts b/database/migrations/1734614781570-create-posts-table.ts
@@ -7,8 +7,9 @@ export async function up(db: Database<any>) {
     .addColumn('id', 'integer', col => col.primaryKey().autoIncrement())
     .addColumn('title', 'varchar(255)')
     .addColumn('body', 'varchar(255)')
-    .addColumn('user_id', 'integer', col =>
-      col.references('users.id').onDelete('cascade'))
+    .addColumn('user_id', 'integer', (col) =>
+        col.references('users.id').onDelete('cascade')
+      ) 
     .addColumn('created_at', 'timestamp', col => col.notNull().defaultTo(sql`CURRENT_TIMESTAMP`))
     .addColumn('updated_at', 'timestamp')
     .execute()
diff --git a/database/migrations/1734614781571-create-errors-table.ts b/database/migrations/1734614781571-create-errors-table.ts
diff --git a/storage/framework/core/buddy/src/commands/generate.ts b/storage/framework/core/buddy/src/commands/generate.ts
@@ -129,7 +129,7 @@ export function generate(buddy: CLI): void {
     .option('--verbose', descriptions.verbose, { default: false })
     .action(async (options: GeneratorOptions) => {
       log.debug('Running `buddy generate:component-meta` ...', options)
-      await generateComponentMeta(options)
+      await generateComponentMeta()
     })
 
   buddy
diff --git a/storage/framework/core/database/src/seeder.ts b/storage/framework/core/database/src/seeder.ts
@@ -2,13 +2,13 @@ import type { Model, RelationConfig } from '@stacksjs/types'
 import { randomUUIDv7 } from 'bun'
 import { italic, log } from '@stacksjs/cli'
 import { db } from '@stacksjs/database'
-import { fetchOtherModelRelations, getModelName, getRelationType, modelTableName } from '@stacksjs/orm'
+import { fetchOtherModelRelations, getModelName, getRelationType, getTableName } from '@stacksjs/orm'
 import { path } from '@stacksjs/path'
 import { makeHash } from '@stacksjs/security'
 import { fs } from '@stacksjs/storage'
 import { singular, snakeCase } from '@stacksjs/strings'
 
-async function seedModel(name: string, model?: Model) {
+async function seedModel(name: string, modelPath: string, model: Model) {
   if (model?.traits?.useSeeder === false || model?.traits?.seedable === false) {
     log.info(`Skipping seeding for ${italic(name)}`)
     return
@@ -23,10 +23,7 @@ async function seedModel(name: string, model?: Model) {
     return
   }
 
-  if (!model)
-    model = (await import(path.userModelsPath(name))) as Model
-
-  const tableName = await modelTableName(model)
+  const tableName = await getTableName(model, modelPath)
 
   const ormModel = (await import(path.storagePath(`framework/orm/src/models/${name}`))).default
 
@@ -35,7 +32,7 @@ async function seedModel(name: string, model?: Model) {
 
   log.info(`Seeding ${seedCount} records into ${italic(tableName)}`)
 
-  const modelName = getModelName(model, path.userModelsPath(name))
+  const modelName = getModelName(model, modelPath)
 
   const otherRelations = await fetchOtherModelRelations(modelName)
 
@@ -51,6 +48,7 @@ async function seedModel(name: string, model?: Model) {
         record[formattedFieldName] = field?.factory ? await makeHash('Test@123', { algorithm: 'bcrypt' }) : undefined
       else record[formattedFieldName] = field?.factory ? field.factory() : undefined
     }
+    
 
     if (otherRelations?.length) {
       for (let j = 0; j < otherRelations.length; j++) {
@@ -75,8 +73,13 @@ async function seedPivotRelation(relation: RelationConfig): Promise<any> {
   const record: any = {}
   const record2: any = {}
   const pivotRecord: any = {}
+  let modelInstance: Model
+
+  if (fs.existsSync(path.userModelsPath(`${relation?.model}.ts`)))
+    modelInstance = (await import(path.userModelsPath(`${relation?.model}.ts`))).default as Model
+  else
+    modelInstance = (await import(path.storagePath(`framework/database/models/generated/${relation?.model}.ts`))).default as Model
 
-  const modelInstance = (await import(path.userModelsPath(`${relation?.model}.ts`))).default as Model
   const relationModelInstance = (await import(path.userModelsPath(`${relation?.relationModel}.ts`))).default
 
   const useUuid = modelInstance?.traits?.useUuid || false
@@ -129,8 +132,13 @@ async function seedPivotRelation(relation: RelationConfig): Promise<any> {
 }
 
 async function seedModelRelation(modelName: string): Promise<bigint | number> {
-  const modelInstance = (await import(path.userModelsPath(modelName))).default
+  let modelInstance: Model
 
+  if (fs.existsSync(path.userModelsPath(`${modelName}.ts`)))
+    modelInstance = (await import(path.userModelsPath(`${modelName}.ts`))).default as Model
+  else
+    modelInstance = (await import(path.storagePath(`framework/database/models/generated/${modelName}.ts`))).default as Model
+  
   if (!modelInstance)
     return 1
 
@@ -191,12 +199,14 @@ export async function seed(): Promise<void> {
   for (const file of modelFiles) {
     const modelPath = path.join(modelsDir, file)
     const model = await import(modelPath)
-    await seedModel(file, model.default)
+
+    await seedModel(file, modelPath, model.default)
   }
 
   for (const coreModel of coreModelFiles) {
-    const modelPath = path.join(coreModelsDir, coreModel)
-    const model = await import(modelPath)
-    await seedModel(coreModel, model.default)
+    const coreModelPath = path.join(coreModelsDir, coreModel)
+    const modelCore = await import(coreModelPath)
+
+    await seedModel(coreModel, coreModelPath, modelCore.default)
   }
 }
