chore: wip

glennmichael123 · glennmichael123 · commit 0b0fded836a1 · 2024-11-20T19:09:02.000+09:00
diff --git a/app/Actions/Payment/CancelSubscriptionAction.ts b/app/Actions/Payment/CancelSubscriptionAction.ts
@@ -7,11 +7,11 @@ export default new Action({
   description: 'Cancel Subscription for stripe',
   method: 'POST',
   async handle(request: RequestInstance) {
-    const subscriptionId = request.get('subscriptionId') as string
+    const providerId = request.get('providerId') as string
 
     const user = await User.find(1)
 
-    const subscription = await user?.cancelSubscription(subscriptionId)
+    const subscription = await user?.cancelSubscription(providerId)
 
     return subscription?.paymentIntent
   },
diff --git a/app/Actions/Payment/FetchActiveSubscriptionAction.ts b/app/Actions/Payment/FetchActiveSubscriptionAction.ts
@@ -8,9 +8,8 @@ export default new Action({
   async handle() {
     const user = await User.find(1)
 
-    const subscriptions = await user?.subscriptions()
+    const subscription = await user?.activeSubscription()
 
-    if (subscriptions?.length)
-      return subscriptions[0]
+    return subscription
   },
 })
diff --git a/database/migrations/1732094569483-create-projects-table.ts b/database/migrations/1732094569483-create-projects-table.ts
diff --git a/database/migrations/1732094569486-create-subscriber_emails-table.ts b/database/migrations/1732094569486-create-subscriber_emails-table.ts
diff --git a/database/migrations/1732094569488-create-personal_access_tokens-table.ts b/database/migrations/1732094569488-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('undefined.id').onDelete('cascade'))
+    .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/1732094569490-create-team_personal_access_tokens-table.ts b/database/migrations/1732094569490-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/1732094569491-create-team_users-table.ts b/database/migrations/1732094569491-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/1732094569491-create-teams-table.ts b/database/migrations/1732094569491-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('undefined.id').onDelete('cascade'))
-    .addColumn('user_id', 'integer', col =>
-      col.references('undefined.id').onDelete('cascade'))
+    .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/1732094569495-create-subscribers-table.ts b/database/migrations/1732094569495-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('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/1732094569497-create-deployments-table.ts b/database/migrations/1732094569497-create-deployments-table.ts
@@ -12,8 +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('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/1732094569500-create-releases-table.ts b/database/migrations/1732094569500-create-releases-table.ts
diff --git a/database/migrations/1732094569501-create-user_teams-table.ts b/database/migrations/1732094569501-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/1732094569502-create-passkeys-table.ts b/database/migrations/1732094569502-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/1732094569503-create-subscriptions-table.ts b/database/migrations/1732094569503-create-subscriptions-table.ts
@@ -8,16 +8,16 @@ export async function up(db: Database<any>) {
     .addColumn('type', 'varchar(512)', col => col.notNull())
     .addColumn('provider_id', 'varchar(512)', col => col.unique().notNull())
     .addColumn('provider_status', 'varchar(255)', col => col.notNull())
-    .addColumn('description', 'varchar(255)', col => col.notNull())
     .addColumn('unit_price', 'integer')
     .addColumn('provider_type', 'varchar(255)', col => col.notNull())
     .addColumn('provider_price_id', 'varchar(255)')
     .addColumn('quantity', 'integer')
     .addColumn('trial_ends_at', 'varchar(255)')
     .addColumn('ends_at', 'varchar(255)')
     .addColumn('last_used_at', 'varchar(255)')
-    .addColumn('user_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/1732094569503-create-users-table.ts b/database/migrations/1732094569503-create-users-table.ts
@@ -10,12 +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('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/1732094569505-create-posts-table.ts b/database/migrations/1732094569505-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('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/1732094569506-create-errors-table.ts b/database/migrations/1732094569506-create-errors-table.ts
diff --git a/resources/functions/billing/payments.ts b/resources/functions/billing/payments.ts
@@ -108,5 +108,5 @@ export function useBillable() {
         && Object.keys(object).length === 0)
   }
 
-  return { loadStripeElement, handleAddPaymentMethod, isEmpty }
+  return { loadStripeElement, handleAddPaymentMethod, isEmpty, convertUnixTimestampToDate }
 }
diff --git a/resources/stores/payment.ts b/resources/stores/payment.ts
@@ -52,8 +52,9 @@ export const usePaymentStore = defineStore('payment', {
     async cancelPlan(): Promise<string> {
       const url = 'http://localhost:3008/stripe/cancel-subscription'
 
-      const subscriptionId = this.getCurrentPlan.provider_id
-      const body = { subscriptionId }
+      const providerId = this.getCurrentPlan.subscription.provider_id
+      const subscriptionId = this.getCurrentPlan.subscription.id
+      const body = { providerId, subscriptionId }
       const response = await fetch(url, {
         method: 'POST',
         headers: {
@@ -63,9 +64,9 @@ export const usePaymentStore = defineStore('payment', {
         body: JSON.stringify(body),
       })
 
-      const client: any = await response.json()
-
-      return client
+      if (response.status !== 204) {
+        await response.json()
+      }
     },
 
     async fetchUserPaymentMethods(): Promise<void> {
diff --git a/resources/views/dashboard/components/billing/active-plan.vue b/resources/views/dashboard/components/billing/active-plan.vue
@@ -3,10 +3,12 @@ import { useBillable } from '../../../../functions/billing/payments'
 
 const paymentStore = usePaymentStore()
 
-const { isEmpty } = useBillable()
+const { isEmpty, convertUnixTimestampToDate } = useBillable()
 
 async function cancelPlan() {
-  paymentStore.cancelPlan()
+  await paymentStore.cancelPlan()
+
+  await paymentStore.fetchUserActivePlan()
 }
 </script>
 
@@ -18,15 +20,15 @@ async function cancelPlan() {
 
     <div class="pt-2">
       <p class="text-gray-700 font-bold">
-        {{ paymentStore.getCurrentPlan.type }} Plan
+        {{ paymentStore.getCurrentPlan.subscription.type }} Plan
       </p>
 
       <p class="pt-2 text-sm text-gray-500 font-normal italic">
-        {{ paymentStore.getCurrentPlan.description }}
+        {{ paymentStore.getCurrentPlan.subscription.description }}
       </p>
 
       <p class="pt-4 text-sm text-gray-700 font-semibold">
-        Next payment of $20 (yearly) occurs on August 30, 2025
+        Next payment of ${{ paymentStore.getCurrentPlan.subscription.unit_price / 100 }} occurs on {{ convertUnixTimestampToDate(paymentStore.getCurrentPlan.providerSubscription.current_period_end) }}
       </p>
     </div>
 
diff --git a/resources/views/dashboard/components/billing/plans.vue b/resources/views/dashboard/components/billing/plans.vue
@@ -1,7 +1,6 @@
 <script setup lang="ts">
 import { saas } from '@stacksjs/browser'
 
-console.log(saas)
 const checkedPlanType = ref('monthly')
 const selectedPlan = ref('')
 const paymentStore = usePaymentStore()
@@ -95,6 +94,8 @@ async function subscribePlan() {
     plan: selectedPlan.value,
     description: planDescription.value,
   })
+ 
+  await paymentStore.fetchUserActivePlan()
 }
 </script>
 
diff --git a/storage/framework/core/orm/src/utils.ts b/storage/framework/core/orm/src/utils.ts
@@ -1192,6 +1192,20 @@ export async function generateModelString(
       return await manageSubscription.isValid(this, type)
     }
 
+    async activeSubscription() {
+      const subscriptions = await this.subscriptions()
+
+      if (subscriptions.length) {
+        const subscription = subscriptions[0]
+
+        const providerSubscription = await manageSubscription.retrieve(this, subscription?.provider_id || '')
+
+        return { subscription, providerSubscription}
+      }
+
+      return undefined
+    }
+
     async isIncomplete(type: string): Promise<boolean> {
       return await manageSubscription.isIncomplete(this, type)
     }
@@ -1220,15 +1234,14 @@ export async function generateModelString(
       return { subscription, paymentIntent }
     }
 
-     async cancelSubscription(
-      subscriptionId: string,
-      options: Partial<Stripe.SubscriptionCreateParams> = {},
-    ): Promise<{ subscription: Stripe.Subscription, paymentIntent?: Stripe.PaymentIntent }> {
-      const subscription = await manageSubscription.cancel(this, subscriptionId, options)
-
-      return { subscription }
-    }
+      async cancelSubscription(
+        providerId: string,
+        options: Partial<Stripe.SubscriptionCreateParams> = {},
+      ): Promise<{ subscription: Stripe.Subscription, paymentIntent?: Stripe.PaymentIntent }> {
+        const subscription = await manageSubscription.cancel(providerId, options)
 
+        return { subscription }
+      }
 
     async createSetupIntent(
       options: Stripe.SetupIntentCreateParams = {}
diff --git a/storage/framework/core/payments/src/billable/subscription.ts b/storage/framework/core/payments/src/billable/subscription.ts
@@ -1,13 +1,14 @@
 import type Stripe from 'stripe'
 import type { SubscriptionModel } from '../../../../orm/src/models/Subscription'
 import type { UserModel } from '../../../../orm/src/models/User'
+import { Subscription } from '../../../../orm/src/models/Subscription'
 
 import { manageCustomer, managePrice, stripe } from '..'
-import Subscription from '../../../../orm/src/models/Subscription'
 
 export interface SubscriptionManager {
   create: (user: UserModel, type: string, lookupKey: string, params: Partial<Stripe.SubscriptionCreateParams>) => Promise<Stripe.Response<Stripe.Subscription>>
   cancel: (subscriptionId: string, params?: Partial<Stripe.SubscriptionCreateParams>) => Promise<Stripe.Response<Stripe.Subscription>>
+  retrieve: (user: UserModel, subscriptionId: string) => Promise<Stripe.Response<Stripe.Subscription>>
   isValid: (user: UserModel, type: string) => Promise<boolean>
   isIncomplete: (user: UserModel, type: string) => Promise<boolean>
 }
@@ -67,11 +68,27 @@ export const manageSubscription: SubscriptionManager = (() => {
 
     const updatedSubscription = await stripe.subscription.cancel(subscriptionId, params)
 
-    await removeStoredSubscription(user, subscriptionId)
+    await removeStoredSubscription(subscriptionId)
 
     return updatedSubscription
   }
 
+  async function retrieve(user: UserModel, subscriptionId: string): Promise<Stripe.Response<Stripe.Subscription>> {
+    if (!user.hasStripeId()) {
+      throw new Error('Customer does not exist in Stripe')
+    }
+
+    const subscription = await stripe.subscription.retrieve(subscriptionId)
+
+    return subscription
+  }
+
+  async function removeStoredSubscription(subscriptionId: string): Promise<void> {
+    const subscription = await Subscription.where('provider_id', subscriptionId).first()
+
+    subscription?.delete()
+  }
+
   async function isActive(subscription: SubscriptionModel): Promise<boolean> {
     return subscription.provider_status === 'active'
   }
@@ -109,7 +126,6 @@ export const manageSubscription: SubscriptionManager = (() => {
     const data = removeNullValues({
       user_id: user.id,
       type,
-      description: String(options.description),
       unit_price: Number(options.items.data[0].price.unit_amount),
       provider_id: options.id,
       provider_status: options.status,
@@ -132,5 +148,5 @@ export const manageSubscription: SubscriptionManager = (() => {
     ) as Partial<T>
   }
 
-  return { create, isValid, isIncomplete, cancel }
+  return { create, isValid, isIncomplete, cancel, retrieve }
 })()
diff --git a/storage/framework/database/models/generated/Subscription.ts b/storage/framework/database/models/generated/Subscription.ts
@@ -49,15 +49,6 @@ export default {
       },
     },
 
-    description: {
-      required: true,
-      fillable: true,
-      validation: {
-        rule: schema.string(),
-
-      },
-    },
-
     unitPrice: {
       fillable: true,
       validation: {
diff --git a/storage/framework/orm/src/models/Subscription.ts b/storage/framework/orm/src/models/Subscription.ts
diff --git a/storage/framework/orm/src/models/User.ts b/storage/framework/orm/src/models/User.ts
