chore: wip

glennmichael123 · glennmichael123 · commit c787e4749a76 · 2024-11-05T18:44:52.000+08:00
diff --git a/app/Actions/Payment/CreateInvoiceSubscription.ts b/app/Actions/Payment/CreateInvoiceSubscription.ts
@@ -8,9 +8,7 @@ export default new Action({
   async handle() {
     const user = await User.find(1)
 
-    const subscription = await user?.newSubscriptionInvoice('stacks_pro_yearly', {
-      allowPromotions: true,
-    })
+    const subscription = await user?.newSubscriptionInvoice('stacks_pro_monthly')
 
     return subscription
   },
diff --git a/app/Actions/Payment/CreateSubscriptionAction.ts b/app/Actions/Payment/CreateSubscriptionAction.ts
@@ -8,7 +8,7 @@ export default new Action({
   async handle() {
     const user = await User.find(1)
 
-    const subscription = await user?.newSubscription('stacks_pro_yearly', {
+    const subscription = await user?.newSubscription('stacks_pro_monthly', {
       allowPromotions: true, // Example option for allowing promotions
     })
 
diff --git a/database/migrations/1730798824336-create-projects-table.ts b/database/migrations/1730798824336-create-projects-table.ts
diff --git a/database/migrations/1730798824342-create-subscriber_emails-table.ts b/database/migrations/1730798824342-create-subscriber_emails-table.ts
diff --git a/database/migrations/1730798824346-create-personal_access_tokens-table.ts b/database/migrations/1730798824346-create-personal_access_tokens-table.ts
@@ -9,6 +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('undefined.id').onDelete('cascade')
+      ) 
     .addColumn('created_at', 'timestamp', col => col.notNull().defaultTo(sql`CURRENT_TIMESTAMP`))
     .addColumn('updated_at', 'timestamp')
     .execute()
diff --git a/database/migrations/1730798824348-create-team_personal_access_tokens-table.ts b/database/migrations/1730798824348-create-team_personal_access_tokens-table.ts
@@ -1,10 +1,9 @@
 import type { Database } from '@stacksjs/database'
-
 export async function up(db: Database<any>) {
   await db.schema
     .createTable('team_personal_access_tokens')
     .addColumn('id', 'integer', col => col.primaryKey().autoIncrement())
     .addColumn('team_id', 'integer')
     .addColumn('accesstoken_id', 'integer')
     .execute()
-}
+    }
diff --git a/database/migrations/1730798824348-create-team_users-table.ts b/database/migrations/1730798824348-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/1730798824349-create-teams-table.ts b/database/migrations/1730798824349-create-teams-table.ts
@@ -13,6 +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('undefined.id').onDelete('cascade')
+      ) 
+    .addColumn('user_id', 'integer', (col) =>
+        col.references('undefined.id').onDelete('cascade')
+      ) 
     .addColumn('created_at', 'timestamp', col => col.notNull().defaultTo(sql`CURRENT_TIMESTAMP`))
     .addColumn('updated_at', 'timestamp')
     .execute()
diff --git a/database/migrations/1730798824351-create-subscribers-table.ts b/database/migrations/1730798824351-create-subscribers-table.ts
@@ -6,6 +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('undefined.id').onDelete('cascade')
+      ) 
     .addColumn('created_at', 'timestamp', col => col.notNull().defaultTo(sql`CURRENT_TIMESTAMP`))
     .addColumn('updated_at', 'timestamp')
     .execute()
diff --git a/database/migrations/1730798824353-create-deployments-table.ts b/database/migrations/1730798824353-create-deployments-table.ts
@@ -12,6 +12,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('undefined.id').onDelete('cascade')
+      ) 
     .addColumn('created_at', 'timestamp', col => col.notNull().defaultTo(sql`CURRENT_TIMESTAMP`))
     .addColumn('updated_at', 'timestamp')
     .execute()
diff --git a/database/migrations/1730798824356-create-releases-table.ts b/database/migrations/1730798824356-create-releases-table.ts
diff --git a/database/migrations/1730798824357-create-user_teams-table.ts b/database/migrations/1730798824357-create-user_teams-table.ts
@@ -1,10 +1,9 @@
 import type { Database } from '@stacksjs/database'
-
 export async function up(db: Database<any>) {
   await db.schema
     .createTable('user_teams')
     .addColumn('id', 'integer', col => col.primaryKey().autoIncrement())
     .addColumn('user_id', 'integer')
     .addColumn('team_id', 'integer')
     .execute()
-}
+    }
diff --git a/database/migrations/1730798824358-create-passkeys-table.ts b/database/migrations/1730798824358-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/1730798824358-create-stripe-subscriptions-table.ts b/database/migrations/1730798824358-create-stripe-subscriptions-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
@@ -14,7 +14,7 @@ export async function up(db: Database<any>) {
     .addColumn('trial_ends_at', 'timestamp')
     .addColumn('ends_at', 'timestamp')
     .addColumn('last_used_at', 'text')
-    .addColumn('updated_at', 'timestamp', col => col.notNull())
+    .addColumn('updated_at', 'timestamp')
     .addColumn('created_at', 'timestamp', col => col.notNull().defaultTo(sql.raw('CURRENT_TIMESTAMP')))
     .execute()
-}
+    }
diff --git a/database/migrations/1730798824359-create-users-table.ts b/database/migrations/1730798824359-create-users-table.ts
@@ -10,6 +10,15 @@ export async function up(db: Database<any>) {
     .addColumn('name', '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('undefined.id').onDelete('cascade')
+      ) 
+    .addColumn('deployment_id', 'integer', (col) =>
+        col.references('undefined.id').onDelete('cascade')
+      ) 
+    .addColumn('post_id', 'integer', (col) =>
+        col.references('undefined.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/1730798824361-create-posts-table.ts b/database/migrations/1730798824361-create-posts-table.ts
@@ -7,6 +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('undefined.id').onDelete('cascade')
+      ) 
     .addColumn('created_at', 'timestamp', col => col.notNull().defaultTo(sql`CURRENT_TIMESTAMP`))
     .addColumn('updated_at', 'timestamp')
     .execute()
diff --git a/database/migrations/1730798824363-create-errors-table.ts b/database/migrations/1730798824363-create-errors-table.ts
diff --git a/storage/framework/core/database/src/drivers/sqlite.ts b/storage/framework/core/database/src/drivers/sqlite.ts
@@ -179,12 +179,13 @@ async function createTableMigration(modelPath: string) {
 
   const model = (await import(modelPath)).default as Model
   const tableName = getTableName(model, modelPath)
+  const modelName = getModelName(model, modelPath)
 
   const twoFactorEnabled
     = model.traits?.useAuth && typeof model.traits.useAuth !== 'boolean' ? model.traits.useAuth.useTwoFactor : false
 
   await createPivotTableMigration(model, modelPath)
-  const otherModelRelations = await fetchOtherModelRelations(model, modelPath)
+  const otherModelRelations = await fetchOtherModelRelations(modelName)
 
   const useTimestamps = model?.traits?.useTimestamps ?? model?.traits?.timestampable ?? true
   const useSoftDeletes = model?.traits?.useSoftDeletes ?? model?.traits?.softDeletable ?? false
@@ -351,7 +352,7 @@ async function createSubscriptionMigration() {
   migrationContent += `    .addColumn('trial_ends_at', 'timestamp')\n`
   migrationContent += `    .addColumn('ends_at', 'timestamp')\n`
   migrationContent += `    .addColumn('last_used_at', 'text')\n`
-  migrationContent += `    .addColumn('updated_at', 'timestamp', col => col.notNull())\n`
+  migrationContent += `    .addColumn('updated_at', 'timestamp')\n`
   migrationContent += `    .addColumn('created_at', 'timestamp', col => col.notNull().defaultTo(sql.raw('CURRENT_TIMESTAMP')))\n`
   migrationContent += `    .execute()\n`
   migrationContent += `    }\n`
diff --git a/storage/framework/core/orm/src/utils.ts b/storage/framework/core/orm/src/utils.ts
@@ -1147,18 +1147,11 @@ export async function generateModelString(
       return customer
     }
 
-     async newSubscriptionInvoice(
-      priceId: string,
+    async newSubscriptionInvoice(
+    priceId: string,
       options: SubscriptionOptions = {},
     ): Promise<{ subscription: Stripe.Subscription, paymentIntent?: Stripe.PaymentIntent }> {
-      const priceStripe = await managePrice.retrieveByLookupKey(priceId)
-
-      if (!priceStripe)
-        throw new Error('Price does not exist in stripe')
-
-      const price = priceStripe.id
-
-      return await this.newSubscription(price, { ...options, days_until_due: 30, collection_method: 'send_invoice' })
+      return await this.newSubscription(priceId, { ...options, days_until_due: 15, collection_method: 'send_invoice' })
     }
 
   async newSubscription(
@@ -1170,48 +1163,32 @@ export async function generateModelString(
     if (!price)
       throw new Error('Price does not exist in stripe')
 
-    // Map price IDs to Stripe subscription items
     const subscriptionItems = [{
       price: price.id,
       quantity: 1,
     }]
 
-    // Ensure the customer is retrieved correctly
     const customer = await this.createOrGetStripeUser({}).then((customer) => {
       if (!customer || !customer.id) {
         throw new Error('Customer does not exist in Stripe')
       }
       return customer.id // Ensure customer.id is always a string
     })
 
-    // Configure optional subscription parameters based on options
-    const newOptions: Partial<Stripe.SubscriptionCreateParams> = {
-      items: subscriptionItems,
-      automatic_tax: options.enableTax ? { enabled: true } : undefined,
-      payment_behavior: options.allowPromotions ? 'default_incomplete' : undefined,
-      trial_period_days: options.trialDays,
-    }
-
-    // Define core subscription parameters, including customer association and expansion options
     const defaultOptions: Stripe.SubscriptionCreateParams = {
-      customer, // This is guaranteed to be a string
+      customer,
       payment_behavior: 'default_incomplete',
       expand: ['latest_invoice.payment_intent'],
-      // Apply trial_days only if specified
-      trial_period_days: options.trialDays || undefined,
-      items: subscriptionItems, // Add the subscription items here
+      items: subscriptionItems,
     }
 
-    // Merge new options with default options, giving priority to provided options
     const mergedOptions: Stripe.SubscriptionCreateParams = {
       ...defaultOptions,
-      ...newOptions,
+      ...options,
     }
 
-    // Create the subscription
     const subscription = await manageSubscription.create(this, mergedOptions)
 
-    // Retrieve the latest invoice and payment intent for further use
     const latestInvoice = subscription.latest_invoice as Stripe.Invoice | null
     const paymentIntent = latestInvoice?.payment_intent as Stripe.PaymentIntent | undefined
 
diff --git a/storage/framework/core/payments/src/billable/subscription.ts b/storage/framework/core/payments/src/billable/subscription.ts
@@ -29,14 +29,14 @@ export const manageSubscription: SubscriptionManager = (() => {
     // Create and return the subscription
     const subscription = await stripe.subscription.create(mergedParams)
 
-    await storeSubscription(subscription)
+    await storeSubscription(user, subscription)
 
     return subscription
   }
 
-  async function storeSubscription(options: Stripe.Subscription): Promise<SubscriptionModel> {
+  async function storeSubscription(user: UserModel, options: Stripe.Subscription): Promise<SubscriptionModel> {
     const data = {
-      user_id: 1,
+      user_id: user.id,
       type: 'premium',
       stripe_id: options.id,
       stripe_status: options.status,
diff --git a/storage/framework/database/models/User.ts b/storage/framework/database/models/User.ts
@@ -43,7 +43,7 @@ export default {
   },
 
   hasOne: ['Post', 'Subscriber'],
-  hasMany: ['Deployment'],
+  hasMany: ['Deployment', 'Subscription'],
 
   belongsToMany: ['Team'],
 
diff --git a/storage/framework/orm/src/models/User.ts b/storage/framework/orm/src/models/User.ts
@@ -756,14 +756,7 @@ export class UserModel {
     priceId: string,
       options: SubscriptionOptions = {},
   ): Promise<{ subscription: Stripe.Subscription, paymentIntent?: Stripe.PaymentIntent }> {
-    const priceStripe = await managePrice.retrieveByLookupKey(priceId)
-
-    if (!priceStripe)
-      throw new Error('Price does not exist in stripe')
-
-    const price = priceStripe.id
-
-    return await this.newSubscription(price, { ...options, days_until_due: 30, collection_method: 'send_invoice' })
+    return await this.newSubscription(priceId, { ...options, days_until_due: 15, collection_method: 'send_invoice' })
   }
 
   async newSubscription(
@@ -789,28 +782,18 @@ export class UserModel {
       return customer.id // Ensure customer.id is always a string
     })
 
-    // Configure optional subscription parameters based on options
-    const newOptions: Partial<Stripe.SubscriptionCreateParams> = {
-      items: subscriptionItems,
-      automatic_tax: options.enableTax ? { enabled: true } : undefined,
-      payment_behavior: options.allowPromotions ? 'default_incomplete' : undefined,
-      trial_period_days: options.trialDays,
-    }
-
     // Define core subscription parameters, including customer association and expansion options
     const defaultOptions: Stripe.SubscriptionCreateParams = {
-      customer, // This is guaranteed to be a string
+      customer,
       payment_behavior: 'default_incomplete',
       expand: ['latest_invoice.payment_intent'],
-      // Apply trial_days only if specified
-      trial_period_days: options.trialDays || undefined,
-      items: subscriptionItems, // Add the subscription items here
+      items: subscriptionItems,
     }
 
     // Merge new options with default options, giving priority to provided options
     const mergedOptions: Stripe.SubscriptionCreateParams = {
       ...defaultOptions,
-      ...newOptions,
+      ...options,
     }
 
     // Create the subscription
