chore: wip

Author: glennmichael123

storage/framework/core/payments/src/billable/subscription.ts

@@ -1,9 +1,10 @@
 import type Stripe from 'stripe'
-import type { SubscriptionModel } from '../../../../orm/src/models/Subscription'
+import type { SubscriptionModel, SubscriptionsTable } from '../../../../orm/src/models/Subscription'
 import type { UserModel } from '../../../../orm/src/models/User'
 import { manageCustomer, managePrice, stripe } from '..'
 
 import { Subscription } from '../../../../orm/src/models/Subscription'
+import { db } from '@stacksjs/database'
 
 export interface SubscriptionManager {
   create: (user: UserModel, type: string, lookupKey: string, params: Partial<Stripe.SubscriptionCreateParams>) => Promise<Stripe.Response<Stripe.Subscription>>
@@ -184,14 +185,17 @@ export const manageSubscription: SubscriptionManager = (() => {
     return subscriptionModel
   }
 
-  async function updateSubscription(activeSubId: number, type: string, options: Stripe.Subscription): Promise<SubscriptionModel> {
-    const subscription = await Subscription.find(activeSubId) as SubscriptionModel
-
-    subscription?.update({
-      type,
-      provider_price_id: options.items.data[0].price.id,
-      unit_price: Number(options.items.data[0].price.unit_amount),
-    })
+  async function updateSubscription(activeSubId: number, type: string, options: Stripe.Subscription): Promise<SubscriptionsTable | undefined> {
+    const subscription = await db.selectFrom('subscriptions').where('id', '=', activeSubId).selectAll().executeTakeFirst()
+
+    await db?.updateTable('subscriptions')
+      .set({
+        type,
+        provider_price_id: options.items.data[0].price.id,
+        unit_price: Number(options.items.data[0].price.unit_amount),
+      })
+      .where('id', '=', activeSubId)
+      .executeTakeFirst()
 
     return subscription
   }

storage/framework/core/payments/src/billable/transaction.ts

@@ -1,16 +1,15 @@
-import type { PaymentTransactionModel } from '../../../../orm/src/models/PaymentTransaction'
+import type { PaymentTransactionModel, PaymentTransactionsTable } from '../../../../orm/src/models/PaymentTransaction'
 import type { UserModel } from '../../../../orm/src/models/User'
-import PaymentProduct from '../../../../orm/src/models/PaymentProduct'
-import { PaymentTransaction } from '../../../../orm/src/models/PaymentTransaction'
+import { db } from '@stacksjs/database'
 
 export interface ManageTransaction {
-  store: (user: UserModel, productId: number) => Promise<PaymentTransactionModel>
-  list: (user: UserModel) => Promise<PaymentTransactionModel[]>
+  store: (user: UserModel, productId: number) => Promise<PaymentTransactionsTable>
+  list: (user: UserModel) => Promise<PaymentTransactionsTable[]>
 }
 
 export const manageTransaction: ManageTransaction = (() => {
-  async function store(user: UserModel, productId: number): Promise<PaymentTransactionModel> {
-    const product = await PaymentProduct.find(productId)
+  async function store(user: UserModel, productId: number): Promise<PaymentTransactionsTable> {
+    const product = await db.selectFrom('payment_products').where('id', '=', productId).selectAll().executeTakeFirst()
 
     const data = {
       name: product?.name,
@@ -22,13 +21,15 @@ export const manageTransaction: ManageTransaction = (() => {
       user_id: user.id,
     }
 
-    const transaction = await PaymentTransaction.create(data)
+    const createdTransaction = await db.insertInto('payment_transactions').values(data).executeTakeFirst()
+
+    const transaction = await db.selectFrom('payment_transactions').where('id', '=', Number(createdTransaction.insertId)).selectAll().executeTakeFirst()
 
     return transaction
   }
 
-  async function list(user: UserModel): Promise<PaymentTransactionModel[]> {
-    const transaction = await PaymentTransaction.where('user_id', user.id).get()
+  async function list(user: UserModel): Promise<PaymentTransactionsTable[]> {
+    const transaction = await db.selectFrom('payment_transactions').where('user_id', '=', user.id).selectAll().execute()
 
     return transaction
   }

storage/framework/orm/src/types.ts

@@ -54,7 +54,6 @@ export interface Database {
   personal_access_tokens: PersonalAccessTokensTable
   team_users: TeamUsersTable
   teams: TeamsTable
-  requests: RequestsTable
   activities: ActivitiesTable
   subscribers: SubscribersTable
   deployments: DeploymentsTable