chore: wip

Author: glennmichael123

storage/framework/core/commerce/src/customers/fetch.ts

@@ -1,4 +1,4 @@
-import type { CustomerTable } from '../types'
+import type { CustomersTable } from '../../types'
 import { db } from '@stacksjs/database'
 
 export interface FetchCustomersOptions {
@@ -11,7 +11,7 @@ export interface FetchCustomersOptions {
 }
 
 export interface PaginatedCustomers {
-  customers: CustomerTable[]
+  customers: CustomersTable[]
   pagination: {
     total: number
     currentPage: number
@@ -26,14 +26,14 @@ export interface CustomerStats {
   total: number
   active: number
   inactive: number
-  topSpenders: Partial<CustomerTable>[]
-  recentCustomers: Partial<CustomerTable>[]
+  topSpenders: Partial<CustomersTable>[]
+  recentCustomers: Partial<CustomersTable>[]
 }
 
 /**
  * Fetch all customers from the database
  */
-export async function fetchAll(): Promise<CustomerTable[]> {
+export async function fetchAll(): Promise<CustomersTable[]> {
   return await db
     .selectFrom('customers')
     .selectAll()
@@ -113,7 +113,7 @@ export async function fetchPaginated(options: FetchCustomersOptions = {}): Promi
 /**
  * Fetch a customer by ID
  */
-export async function fetchById(id: number): Promise<CustomerTable | undefined> {
+export async function fetchById(id: number): Promise<CustomersTable | undefined> {
   return await db
     .selectFrom('customers')
     .where('id', '=', id)

storage/framework/core/commerce/src/customers/store.ts

@@ -1,5 +1,5 @@
+import type { CustomerRequestType } from '@stacksjs/orm'
 import type { CustomersTable } from '../../../../orm/src/models/Customer'
-import type { CreateCustomerInput } from '../../types'
 import { db } from '@stacksjs/database'
 
 /**
@@ -8,18 +8,18 @@ import { db } from '@stacksjs/database'
  * @param data The customer data to store
  * @returns The newly created customer record
  */
-export async function store(data: CreateCustomerInput): Promise<CustomersTable | undefined> {
+export async function store(request: CustomerRequestType): Promise<CustomersTable | undefined> {
   // Set default values if not provided
   const customerData = {
-    name: data.name,
-    email: data.email,
-    phone: data.phone,
-    orders: data.orders || 0,
-    totalSpent: data.total_spent || 0,
-    lastOrder: data.last_order || new Date().toISOString().split('T')[0],
-    status: data.status || 'Active',
-    avatar: data.avatar || 'https://images.unsplash.com/photo-1472099645785-5658abf4ff4e?ixlib=rb-1.2.1&auto=format&fit=facearea&facepad=2&w=256&h=256&q=80',
-    user_id: data.user_id,
+    name: request.get('name'),
+    email: request.get('email'),
+    phone: request.get('phone'),
+    orders: Number(request.get('orders')) || 0,
+    total_spent: Number(request.get('totalSpent')) || 0,
+    last_order: request.get('lastOrder') || new Date().toISOString().split('T')[0],
+    status: request.get('status') || 'Active',
+    avatar: request.get('avatar') || 'https://images.unsplash.com/photo-1472099645785-5658abf4ff4e?ixlib=rb-1.2.1&auto=format&fit=facearea&facepad=2&w=256&h=256&q=80',
+    user_id: Number(request.get('user_id')),
   }
 
   try {
@@ -57,45 +57,3 @@ export async function store(data: CreateCustomerInput): Promise<CustomersTable |
     throw error
   }
 }
-
-/**
- * Create multiple customers at once
- *
- * @param customers Array of customer data to store
- * @returns Number of customers created
- */
-export async function bulkStore(customers: CreateCustomerInput[]): Promise<number> {
-  if (!customers.length)
-    return 0
-
-  try {
-    // Prepare customer data with defaults
-    const customersData = customers.map(data => ({
-      name: data.name,
-      email: data.email,
-      phone: data.phone,
-      orders: data.orders || 0,
-      totalSpent: data.total_spent || 0,
-      lastOrder: data.last_order || new Date().toISOString().split('T')[0],
-      status: data.status || 'Active',
-      avatar: data.avatar || 'https://images.unsplash.com/photo-1472099645785-5658abf4ff4e?ixlib=rb-1.2.1&auto=format&fit=facearea&facepad=2&w=256&h=256&q=80',
-      user_id: data.user_id,
-    }))
-
-    // Insert all customers
-    const result = await db
-      .insertInto('customers')
-      .values(customersData)
-      .execute()
-
-    // Return the number of affected rows
-    return result.length || 0
-  }
-  catch (error) {
-    if (error instanceof Error) {
-      throw new TypeError(`Failed to create customers in bulk: ${error.message}`)
-    }
-
-    throw error
-  }
-}

storage/framework/core/commerce/src/customers/update.ts

@@ -0,0 +1,68 @@
+import type { CustomerRequestType } from '@stacksjs/orm'
+import type {
+  CustomerType,
+  CustomerUpdate,
+} from '../../types'
+import { db } from '@stacksjs/database'
+
+/**
+ * Update a customer by ID
+ *
+ * @param id The ID of the customer to update
+ * @param request The updated customer data
+ * @returns The updated customer record
+ */
+export async function update(id: number, request: CustomerRequestType): Promise<CustomerType | undefined> {
+  try {
+    // Create the update data object by picking only defined properties from the request
+    const updateData: CustomerUpdate = Object.entries(request)
+      .filter(([_, value]) => value !== undefined)
+      .reduce((obj, [key, value]) => {
+        obj[key] = value
+        return obj
+      }, {} as CustomerUpdate)
+
+    // Skip update if no fields are provided
+    if (Object.keys(updateData).length === 0) {
+      // Just return the current customer
+      return await db
+        .selectFrom('customers')
+        .where('id', '=', id)
+        .selectAll()
+        .executeTakeFirst()
+    }
+
+    // Include updated_at timestamp
+    updateData.updated_at = new Date()
+
+    // Update the customer record
+    await db
+      .updateTable('customers')
+      .set(updateData)
+      .where('id', '=', id)
+      .execute()
+
+    // Retrieve the updated customer
+    const updatedCustomer = await db
+      .selectFrom('customers')
+      .where('id', '=', id)
+      .selectAll()
+      .executeTakeFirst()
+
+    return updatedCustomer
+  }
+  catch (error) {
+    // Handle specific errors
+    if (error instanceof Error) {
+      // Check for unique constraint violation on email
+      if (error.message.includes('Duplicate entry') && error.message.includes('email')) {
+        throw new Error('A customer with this email already exists')
+      }
+
+      // Re-throw the error with a more user-friendly message
+      throw new Error(`Failed to update customer: ${error.message}`)
+    }
+
+    throw error
+  }
+}

storage/framework/orm/src/models/Order.ts

@@ -1,7 +1,6 @@
 import type { Insertable, RawBuilder, Selectable, Updateable } from '@stacksjs/database'
 import type { Operator } from '@stacksjs/orm'
 import type { CouponModel } from './Coupon'
-import type { OrderModel } from './Order'
 import type { UserModel } from './User'
 import { randomUUIDv7 } from 'bun'
 import { cache } from '@stacksjs/cache'
@@ -14,7 +13,6 @@ import { DB, SubqueryBuilder } from '@stacksjs/orm'
 
 import Coupon from './Coupon'
 
-import Order from './Order'
 
 import User from './User'
 

storage/framework/server-auto-imports.json

@@ -244,4 +244,4 @@
     "transactionRequest": true,
     "userRequest": true
   }
-}
+}

storage/framework/types/server-auto-imports.d.ts

@@ -244,4 +244,4 @@ declare global {
   const teamRequest: typeof import('./../requests')['teamRequest']
   const transactionRequest: typeof import('./../requests')['transactionRequest']
   const userRequest: typeof import('./../requests')['userRequest']
-}
+}