@stacksjs/defaults 0.75.37 → 0.75.40

package/app/Actions/Dashboard/Commerce/commerce-pos.test.ts

@@ -25,13 +25,13 @@ describe('dashboard commerce POS helpers', () => {
     expect(result.error).toContain('between 1 and 999')
   })
 
-  it('recomputes server-authoritative totals from persisted prices', () => {
+  it('recomputes server-authoritative totals from persisted prices, in minor units', () => {
     const sale = calculateCommercePosSale([
       {
         id: '4',
         name: 'Widget',
         description: '',
-        price: 12.5,
+        price: 1250,
         isAvailable: true,
         inventoryCount: 20,
         preparationTime: 4,
@@ -40,9 +40,29 @@ describe('dashboard commerce POS helpers', () => {
         categoryName: 'Unassigned category',
       },
     ], [{ productId: 4, quantity: 3, specialInstructions: '' }], 8.25)
-    expect(sale.subtotal).toBe(37.5)
-    expect(sale.taxAmount).toBe(3.09)
-    expect(sale.totalAmount).toBe(40.59)
+    // $12.50 x 3 = $37.50; 8.25% of it is 309.375 cents, which rounds to 309.
+    expect(sale.lines[0]?.lineTotal).toBe(3750)
+    expect(sale.subtotal).toBe(3750)
+    expect(sale.taxAmount).toBe(309)
+    expect(sale.totalAmount).toBe(4059)
+  })
+
+  it('refuses a product whose price is not integer minor units (stacksjs/stacks#2851)', () => {
+    expect(() => calculateCommercePosSale([
+      {
+        id: '4',
+        name: 'Widget',
+        description: '',
+        price: 12.5,
+        isAvailable: true,
+        inventoryCount: 20,
+        preparationTime: 4,
+        allergens: [],
+        categoryId: '',
+        categoryName: 'Unassigned category',
+      },
+    ], [{ productId: 4, quantity: 1, specialInstructions: '' }], 0))
+      .toThrow('expected integer minor units')
   })
 
   it('chooses an active default tax rate', () => {
@@ -81,7 +101,7 @@ describe('dashboard commerce POS helpers', () => {
         id: '4',
         name: 'Widget',
         description: '',
-        price: 12.5,
+        price: 1250,
         isAvailable: true,
         inventoryCount: 2,
         preparationTime: 4,

package/app/Actions/Dashboard/Commerce/commerce-pos.ts

@@ -51,8 +51,13 @@ export class CommercePosAvailabilityError extends Error {
   }
 }
 
+/**
+ * Amounts are integer minor units, as `products.price` is (stacksjs/stacks#2851).
+ * Line totals and sums of integers are already whole; tax is the one product
+ * that can land between two units, and it rounds to the nearest one.
+ */
 function money(value: number): number {
-  return Math.round((value + Number.EPSILON) * 100) / 100
+  return Math.round(value)
 }
 
 function value(record: any, ...keys: string[]): unknown {
@@ -206,8 +211,8 @@ export function calculateCommercePosSale(
     const id = Number(product.id)
     if (!Number.isSafeInteger(id) || id <= 0)
       throw new TypeError(`Product id "${product.id}" is invalid.`)
-    if (!Number.isFinite(product.price) || product.price < 0)
-      throw new TypeError(`Product ${id} has an invalid price.`)
+    if (!Number.isSafeInteger(product.price) || product.price < 0)
+      throw new TypeError(`Product ${id} has an invalid price: expected integer minor units.`)
     if (!Number.isSafeInteger(product.inventoryCount) || product.inventoryCount < 0)
       throw new TypeError(`Product ${id} has an invalid inventory count.`)
     return [id, product] as const

package/app/Actions/Dashboard/Commerce/commerce-product-records.ts

@@ -1,9 +1,11 @@
+import { moneyInputError, parseMoneyInput } from '@stacksjs/commerce/money'
 import { commerceTimestamp } from './commerce-record'
 
 export interface CommerceProductRecord {
   id: string
   name: string
   description: string
+  /** Integer minor units of the store currency (1999 is $19.99 in USD). */
   price: number
   imageUrl: string
   isAvailable: boolean
@@ -60,6 +62,73 @@ export interface ProductReviewSummary {
   averageRating: number
 }
 
+/**
+ * The product form as the dashboard dialog holds it: every field is the text
+ * the person typed, including the price in MAJOR units (`"19.99"`).
+ */
+export interface ProductFormFields {
+  name: string
+  description: string
+  price: string
+  imageUrl: string
+  isAvailable: boolean
+  inventoryCount: string
+  preparationTime: string
+  allergens: string
+  nutritionalInfo: string
+  categoryId: string
+  manufacturerId: string
+}
+
+/** What the dialog sends to `POST`/`PATCH /api/dashboard/commerce/products`. */
+export interface ProductWritePayload {
+  name: string
+  description: string
+  /** Integer minor units, never a decimal (stacksjs/stacks#2851). */
+  price: number
+  imageUrl: string
+  isAvailable: boolean
+  inventoryCount: number
+  preparationTime: number
+  allergens: string
+  nutritionalInfo: string
+  categoryId: number | null
+  manufacturerId: number | null
+}
+
+/** One minor unit (a cent in USD): the Product model's `price` minimum. */
+export const MIN_PRODUCT_PRICE = 1
+
+/** Why a typed price cannot be saved in `currency`, or `''` when it can. */
+export function productPriceInputError(price: string, currency: string): string {
+  return moneyInputError(price, currency, { min: MIN_PRODUCT_PRICE })
+}
+
+/**
+ * The dialog's fields as the payload the products API stores.
+ *
+ * The one place a typed price becomes the stored integer: `"19.99"` in USD is
+ * `1999`, by string arithmetic, so the dashboard writes the same unit the
+ * catalog importer and order totals read. Throws `PriceFormatError` for a
+ * price `productPriceInputError` would reject.
+ */
+export function productWritePayload(form: ProductFormFields, currency: string): ProductWritePayload {
+  const allergens = form.allergens.split(',').map(item => item.trim()).filter(Boolean)
+  return {
+    name: form.name.trim(),
+    description: form.description.trim(),
+    price: parseMoneyInput(form.price, currency, { min: MIN_PRODUCT_PRICE }),
+    imageUrl: form.imageUrl.trim(),
+    isAvailable: form.isAvailable,
+    inventoryCount: Number(form.inventoryCount),
+    preparationTime: Number(form.preparationTime),
+    allergens: JSON.stringify(allergens),
+    nutritionalInfo: form.nutritionalInfo.trim() || '{}',
+    categoryId: form.categoryId ? Number(form.categoryId) : null,
+    manufacturerId: form.manufacturerId ? Number(form.manufacturerId) : null,
+  }
+}
+
 function value(record: any, ...keys: string[]): unknown {
   for (const key of keys) {
     const result = typeof record?.get === 'function' ? record.get(key) : record?.[key]

package/app/Actions/Dashboard/Kanban/BoardDestroyAction.ts

@@ -1,6 +1,6 @@
 import type { RequestInstance } from '@stacksjs/types'
 import { Action } from '@stacksjs/actions'
-import { db } from '@stacksjs/database/runtime'
+import { db, getDatabaseDialect, sqlHelpers } from '@stacksjs/database/runtime'
 import { kanbanActionError, kanbanError } from './kanban-response'
 
 /**
@@ -33,19 +33,22 @@ export default new Action({
     try {
       await db.transaction(async (rawTrx) => {
         const qb = rawTrx as unknown as typeof db
+        // Postgres numbers its parameters, so the `?` these carried bound
+        // nothing there (stacksjs/stacks#2846).
+        const { param } = sqlHelpers(getDatabaseDialect())
         // Pivots + card-scoped children first — they reference cards.
         await qb.unsafe(
-          'DELETE FROM card_labels WHERE card_id IN (SELECT id FROM cards WHERE board_id = ?)',
+          `DELETE FROM card_labels WHERE card_id IN (SELECT id FROM cards WHERE board_id = ${param(1)})`,
           [id],
         ).execute()
         await qb.unsafe(
-          'DELETE FROM card_assignees WHERE card_id IN (SELECT id FROM cards WHERE board_id = ?)',
+          `DELETE FROM card_assignees WHERE card_id IN (SELECT id FROM cards WHERE board_id = ${param(1)})`,
           [id],
         ).execute()
         // Card comments use the same
         // card-scoped pattern as the pivots.
         await qb.unsafe(
-          'DELETE FROM card_comments WHERE card_id IN (SELECT id FROM cards WHERE board_id = ?)',
+          `DELETE FROM card_comments WHERE card_id IN (SELECT id FROM cards WHERE board_id = ${param(1)})`,
           [id],
         ).execute()
         // Cards (denormalised board_id avoids the column join).

package/app/Actions/Dashboard/Kanban/BoardShowAction.ts

@@ -1,6 +1,6 @@
 import type { RequestInstance } from '@stacksjs/types'
 import { Action } from '@stacksjs/actions'
-import { db } from '@stacksjs/database/runtime'
+import { db, getDatabaseDialect, sqlHelpers } from '@stacksjs/database/runtime'
 import { modelBoolean } from './kanban-model'
 import { kanbanActionError, kanbanError } from './kanban-response'
 
@@ -83,8 +83,11 @@ export default new Action({
     }
 
     try {
+      // Postgres numbers its parameters, so the `?` these carried bound
+      // nothing there (stacksjs/stacks#2846).
+      const { param } = sqlHelpers(getDatabaseDialect())
       const boards = await db.unsafe(
-        'SELECT * FROM boards WHERE id = ? LIMIT 1',
+        `SELECT * FROM boards WHERE id = ${param(1)} LIMIT 1`,
         [id],
       ).execute() as unknown as BoardRow[]
       const board = boards[0]
@@ -94,15 +97,15 @@ export default new Action({
 
       const [columns, cards, labels] = await Promise.all([
         db.unsafe(
-          'SELECT * FROM board_columns WHERE board_id = ? ORDER BY position ASC, id ASC',
+          `SELECT * FROM board_columns WHERE board_id = ${param(1)} ORDER BY position ASC, id ASC`,
           [id],
         ).execute() as unknown as Promise<ColumnRow[]>,
         db.unsafe(
-          'SELECT * FROM cards WHERE board_id = ? AND archived = false ORDER BY column_id ASC, position ASC, id ASC',
+          `SELECT * FROM cards WHERE board_id = ${param(1)} AND archived = false ORDER BY column_id ASC, position ASC, id ASC`,
           [id],
         ).execute() as unknown as Promise<CardRow[]>,
         db.unsafe(
-          'SELECT id, board_id, name, color FROM labels WHERE board_id = ? ORDER BY name ASC',
+          `SELECT id, board_id, name, color FROM labels WHERE board_id = ${param(1)} ORDER BY name ASC`,
           [id],
         ).execute() as unknown as Promise<LabelRow[]>,
       ])
@@ -116,7 +119,7 @@ export default new Action({
           `SELECT cl.card_id, l.id, l.name, l.color
           FROM card_labels cl
           JOIN labels l ON l.id = cl.label_id
-          WHERE cl.card_id IN (SELECT id FROM cards WHERE board_id = ? AND archived = false)
+          WHERE cl.card_id IN (SELECT id FROM cards WHERE board_id = ${param(1)} AND archived = false)
           ORDER BY l.name ASC`,
           [id],
         ).execute() as Promise<Array<{ card_id: number, id: number, name: string, color: string }>>,
@@ -124,7 +127,7 @@ export default new Action({
           `SELECT ca.card_id, ca.user_id, u.name, u.email
           FROM card_assignees ca
           LEFT JOIN users u ON u.id = ca.user_id
-          WHERE ca.card_id IN (SELECT id FROM cards WHERE board_id = ? AND archived = false)`,
+          WHERE ca.card_id IN (SELECT id FROM cards WHERE board_id = ${param(1)} AND archived = false)`,
           [id],
         ).execute() as Promise<Array<{ card_id: number, user_id: number, name: string | null, email: string | null }>>,
       ])

package/app/Actions/Dashboard/Kanban/CardAssigneesSyncAction.ts

@@ -1,6 +1,6 @@
 import type { RequestInstance } from '@stacksjs/types'
 import { Action } from '@stacksjs/actions'
-import { db } from '@stacksjs/database/runtime'
+import { db, getDatabaseDialect, sqlHelpers } from '@stacksjs/database/runtime'
 import { kanbanActionError, kanbanError } from './kanban-response'
 
 interface SyncInput {
@@ -48,13 +48,16 @@ export default new Action({
     const uniqueUserIds = Array.from(new Set(userIds))
 
     try {
-      const cardRows = await db.unsafe('SELECT id FROM cards WHERE id = ? LIMIT 1', [cardId]).execute() as Array<{ id: number }>
+      // Postgres numbers its parameters, so the `?` these carried bound
+      // nothing there, the dynamic IN lists included (stacksjs/stacks#2846).
+      const { param } = sqlHelpers(getDatabaseDialect())
+      const cardRows = await db.unsafe(`SELECT id FROM cards WHERE id = ${param(1)} LIMIT 1`, [cardId]).execute() as Array<{ id: number }>
       if (!cardRows?.length)
         return kanbanError('Card not found.', 404)
 
       // Validate user ids exist.
       if (uniqueUserIds.length > 0) {
-        const placeholders = uniqueUserIds.map(() => '?').join(',')
+        const placeholders = uniqueUserIds.map((_, index) => param(index + 1)).join(',')
         const userRows = await db.unsafe(
           `SELECT id FROM users WHERE id IN (${placeholders})`,
           uniqueUserIds,
@@ -84,7 +87,7 @@ export default new Action({
       // Return the resolved user rows for the optimistic UI to confirm.
       let assignees: Array<{ userId: number, name: string | null, email: string | null }> = []
       if (uniqueUserIds.length > 0) {
-        const placeholders = uniqueUserIds.map(() => '?').join(',')
+        const placeholders = uniqueUserIds.map((_, index) => param(index + 1)).join(',')
         const rows = await db.unsafe(
           `SELECT id, name, email FROM users WHERE id IN (${placeholders}) ORDER BY name ASC`,
           uniqueUserIds,

package/app/Actions/Dashboard/Kanban/CardLabelsSyncAction.ts

@@ -1,6 +1,6 @@
 import type { RequestInstance } from '@stacksjs/types'
 import { Action } from '@stacksjs/actions'
-import { db } from '@stacksjs/database/runtime'
+import { db, getDatabaseDialect, sqlHelpers } from '@stacksjs/database/runtime'
 import { kanbanActionError, kanbanError } from './kanban-response'
 
 interface SyncInput {
@@ -47,8 +47,11 @@ export default new Action({
 
     try {
       // Resolve the card → board so we can validate label scope.
+      // Postgres numbers its parameters, so the `?` these carried bound
+      // nothing there (stacksjs/stacks#2846).
+      const { param } = sqlHelpers(getDatabaseDialect())
       const cardRows = await db.unsafe(
-        'SELECT id, board_id FROM cards WHERE id = ? LIMIT 1',
+        `SELECT id, board_id FROM cards WHERE id = ${param(1)} LIMIT 1`,
         [cardId],
       ).execute() as Array<{ id: number, board_id: number }>
       const card = cardRows?.[0]
@@ -58,9 +61,10 @@ export default new Action({
       // Every label must belong to the same board (labels are
       // board-scoped through `labels.board_id`).
       if (uniqueLabelIds.length > 0) {
-        const placeholders = uniqueLabelIds.map(() => '?').join(',')
+        // The IN list is numbered alongside the trailing board id.
+        const placeholders = uniqueLabelIds.map((_, index) => param(index + 1)).join(',')
         const labelRows = await db.unsafe(
-          `SELECT id FROM labels WHERE id IN (${placeholders}) AND board_id = ?`,
+          `SELECT id FROM labels WHERE id IN (${placeholders}) AND board_id = ${param(uniqueLabelIds.length + 1)}`,
           [...uniqueLabelIds, card.board_id],
         ).execute() as Array<{ id: number }>
         if (labelRows.length !== uniqueLabelIds.length)
@@ -83,7 +87,7 @@ export default new Action({
       // confirm its in-flight state matches what the server stored.
       let labels: Array<{ id: number, name: string, color: string }> = []
       if (uniqueLabelIds.length > 0) {
-        const placeholders = uniqueLabelIds.map(() => '?').join(',')
+        const placeholders = uniqueLabelIds.map((_, index) => param(index + 1)).join(',')
         labels = await db.unsafe(
           `SELECT id, name, color FROM labels WHERE id IN (${placeholders}) ORDER BY name ASC`,
           uniqueLabelIds,

package/app/Actions/Dashboard/Kanban/CardShowAction.ts

@@ -1,6 +1,6 @@
 import type { RequestInstance } from '@stacksjs/types'
 import { Action } from '@stacksjs/actions'
-import { db } from '@stacksjs/database/runtime'
+import { db, getDatabaseDialect, sqlHelpers } from '@stacksjs/database/runtime'
 import { modelBoolean } from './kanban-model'
 import { kanbanActionError, kanbanError } from './kanban-response'
 
@@ -47,8 +47,11 @@ export default new Action({
     }
 
     try {
+      // Postgres numbers its parameters, so the `?` these carried bound
+      // nothing there (stacksjs/stacks#2846).
+      const { param } = sqlHelpers(getDatabaseDialect())
       const cardRows = await db.unsafe(
-        'SELECT * FROM cards WHERE id = ? LIMIT 1',
+        `SELECT * FROM cards WHERE id = ${param(1)} LIMIT 1`,
         [id],
       ).execute() as unknown as CardRow[]
       const card = cardRows?.[0]
@@ -61,7 +64,7 @@ export default new Action({
           `SELECT l.id, l.name, l.color
           FROM card_labels cl
           JOIN labels l ON l.id = cl.label_id
-          WHERE cl.card_id = ?
+          WHERE cl.card_id = ${param(1)}
           ORDER BY l.name ASC`,
           [id],
         ).execute() as Promise<Array<{ id: number, name: string, color: string }>>,
@@ -69,14 +72,14 @@ export default new Action({
           `SELECT ca.user_id, ca.assigned_by_user_id, ca.created_at, u.name, u.email
           FROM card_assignees ca
           LEFT JOIN users u ON u.id = ca.user_id
-          WHERE ca.card_id = ?`,
+          WHERE ca.card_id = ${param(1)}`,
           [id],
         ).execute() as Promise<Array<{ user_id: number, assigned_by_user_id: number | null, created_at: string | null, name: string | null, email: string | null }>>,
         db.unsafe(
           `SELECT cc.id, cc.uuid, cc.user_id, cc.body, cc.created_at, cc.updated_at, u.name, u.email
           FROM card_comments cc
           LEFT JOIN users u ON u.id = cc.user_id
-          WHERE cc.card_id = ?
+          WHERE cc.card_id = ${param(1)}
           ORDER BY cc.created_at ASC, cc.id ASC`,
           [id],
         ).execute() as Promise<Array<{ id: number, uuid: string | null, user_id: number | null, body: string, created_at: string | null, updated_at: string | null, name: string | null, email: string | null }>>,

package/app/Actions/Dashboard/Kanban/CardStoreAction.ts

@@ -1,6 +1,6 @@
 import type { RequestInstance } from '@stacksjs/types'
 import { Action } from '@stacksjs/actions'
-import { db } from '@stacksjs/database/runtime'
+import { db, getDatabaseDialect, sqlHelpers } from '@stacksjs/database/runtime'
 import { BoardColumn, Card } from '@stacksjs/orm'
 import { kanbanActionError, kanbanError } from './kanban-response'
 
@@ -54,8 +54,9 @@ export default new Action({
       if (!Number.isFinite(boardId) || boardId <= 0)
         return kanbanError('Column is not attached to a valid board.', 409)
 
+      const { param } = sqlHelpers(getDatabaseDialect())
       const maxRow = await db.unsafe(
-        'SELECT COALESCE(MAX(position), -1) AS m FROM cards WHERE column_id = ?',
+        `SELECT COALESCE(MAX(position), -1) AS m FROM cards WHERE column_id = ${param(1)}`,
         [columnId],
       ).execute() as Array<{ m: number }>
       const nextPosition = (Number(maxRow?.[0]?.m ?? -1) + 1) || 0

package/app/Actions/Dashboard/Kanban/CardsReorderAction.ts

@@ -1,6 +1,6 @@
 import type { RequestInstance } from '@stacksjs/types'
 import { Action } from '@stacksjs/actions'
-import { db } from '@stacksjs/database/runtime'
+import { db, getDatabaseDialect, sqlHelpers } from '@stacksjs/database/runtime'
 import { kanbanActionError, kanbanError } from './kanban-response'
 
 interface ColumnReorder {
@@ -86,8 +86,11 @@ export default new Action({
 
     try {
       // Verify all columns belong to the same board.
+      // Postgres numbers its parameters, so every IN list below is numbered
+      // rather than repeating `?` (stacksjs/stacks#2846).
+      const { param } = sqlHelpers(getDatabaseDialect())
       const columnIds = reorders.map(r => r.columnId)
-      const colPlaceholders = columnIds.map(() => '?').join(',')
+      const colPlaceholders = columnIds.map((_, index) => param(index + 1)).join(',')
       const colRows = await db.unsafe(
         `SELECT id, board_id FROM board_columns WHERE id IN (${colPlaceholders})`,
         columnIds,
@@ -105,9 +108,9 @@ export default new Action({
       // page from moving cards in from a sibling board).
       if (allCardIds.size > 0) {
         const cardIdList = Array.from(allCardIds)
-        const cardPlaceholders = cardIdList.map(() => '?').join(',')
+        const cardPlaceholders = cardIdList.map((_, index) => param(index + 1)).join(',')
         const cardRows = await db.unsafe(
-          `SELECT id FROM cards WHERE id IN (${cardPlaceholders}) AND board_id = ?`,
+          `SELECT id FROM cards WHERE id IN (${cardPlaceholders}) AND board_id = ${param(cardIdList.length + 1)}`,
           [...cardIdList, boardId],
         ).execute() as Array<{ id: number }>
         if (cardRows.length !== cardIdList.length) {

package/app/Actions/Dashboard/Kanban/ColumnDestroyAction.ts

@@ -1,6 +1,6 @@
 import type { RequestInstance } from '@stacksjs/types'
 import { Action } from '@stacksjs/actions'
-import { db } from '@stacksjs/database/runtime'
+import { db, getDatabaseDialect, sqlHelpers } from '@stacksjs/database/runtime'
 import { kanbanActionError, kanbanError } from './kanban-response'
 
 /**
@@ -29,17 +29,20 @@ export default new Action({
     try {
       await db.transaction(async (rawTrx) => {
         const qb = rawTrx as unknown as typeof db
+        // Postgres numbers its parameters, so the `?` these carried bound
+        // nothing there (stacksjs/stacks#2846).
+        const { param } = sqlHelpers(getDatabaseDialect())
         await qb.unsafe(
-          'DELETE FROM card_labels WHERE card_id IN (SELECT id FROM cards WHERE column_id = ?)',
+          `DELETE FROM card_labels WHERE card_id IN (SELECT id FROM cards WHERE column_id = ${param(1)})`,
           [id],
         ).execute()
         await qb.unsafe(
-          'DELETE FROM card_assignees WHERE card_id IN (SELECT id FROM cards WHERE column_id = ?)',
+          `DELETE FROM card_assignees WHERE card_id IN (SELECT id FROM cards WHERE column_id = ${param(1)})`,
           [id],
         ).execute()
         // Card comments are card-scoped children.
         await qb.unsafe(
-          'DELETE FROM card_comments WHERE card_id IN (SELECT id FROM cards WHERE column_id = ?)',
+          `DELETE FROM card_comments WHERE card_id IN (SELECT id FROM cards WHERE column_id = ${param(1)})`,
           [id],
         ).execute()
         await qb.deleteFrom('cards').where('column_id', '=', id).execute()

package/app/Actions/Dashboard/Kanban/ColumnStoreAction.ts

@@ -1,6 +1,6 @@
 import type { RequestInstance } from '@stacksjs/types'
 import { Action } from '@stacksjs/actions'
-import { db } from '@stacksjs/database/runtime'
+import { db, getDatabaseDialect, sqlHelpers } from '@stacksjs/database/runtime'
 import { Board, BoardColumn } from '@stacksjs/orm'
 import { kanbanActionError, kanbanError } from './kanban-response'
 
@@ -47,8 +47,9 @@ export default new Action({
         return kanbanError('Board not found.', 404)
       }
 
+      const { param } = sqlHelpers(getDatabaseDialect())
       const maxRow = await db.unsafe(
-        'SELECT COALESCE(MAX(position), -1) AS m FROM board_columns WHERE board_id = ?',
+        `SELECT COALESCE(MAX(position), -1) AS m FROM board_columns WHERE board_id = ${param(1)}`,
         [boardId],
       ).execute() as Array<{ m: number }>
       const nextPosition = (Number(maxRow?.[0]?.m ?? -1) + 1) || 0

package/app/Actions/Dashboard/Kanban/ColumnsReorderAction.ts

@@ -1,6 +1,6 @@
 import type { RequestInstance } from '@stacksjs/types'
 import { Action } from '@stacksjs/actions'
-import { db } from '@stacksjs/database/runtime'
+import { db, getDatabaseDialect, sqlHelpers } from '@stacksjs/database/runtime'
 import { kanbanActionError, kanbanError } from './kanban-response'
 
 interface ReorderInput {
@@ -53,9 +53,13 @@ export default new Action({
     try {
       // Verify every column actually belongs to the named board.
       // Single round-trip via a count of rows that match both criteria.
-      const placeholders = ids.map(() => '?').join(',')
+      // Postgres numbers its parameters, so the IN list has to be numbered
+      // alongside the trailing board id rather than repeating `?`
+      // (stacksjs/stacks#2846).
+      const { param } = sqlHelpers(getDatabaseDialect())
+      const placeholders = ids.map((_, index) => param(index + 1)).join(',')
       const matchRows = await db.unsafe(
-        `SELECT COUNT(*) AS c FROM board_columns WHERE id IN (${placeholders}) AND board_id = ?`,
+        `SELECT COUNT(*) AS c FROM board_columns WHERE id IN (${placeholders}) AND board_id = ${param(ids.length + 1)}`,
         [...ids, boardId],
       ).execute() as Array<{ c: number }>
       const matched = Number(matchRows?.[0]?.c ?? 0)

package/app/Actions/Dashboard/Marketing/abandoned-cart-records.test.ts

@@ -314,3 +314,42 @@ describe('composing a recovery campaign', () => {
     expect(JSON.parse(data.segment_definition).rules[1].value).toBe(4)
   })
 })
+
+describe('cart money is integer minor units (stacksjs/stacks#2851)', () => {
+  test('a 1999-cent cart is worth $19.99, and the average rounds to a whole cent', () => {
+    const result = normalizeAbandonedCarts(
+      [cart({ id: 1, total: 1999 }), cart({ id: 2, customer_id: 12, total: 1000 })],
+      [],
+      CUSTOMERS,
+      [],
+      [],
+      { now: NOW },
+    )
+
+    expect(result.records[0].value).toBe(1999)
+    expect(result.summary.openValue).toBe(2999)
+    // 1499.5 cents is not an amount anything can hold.
+    expect(result.summary.averageValue).toBe(1500)
+  })
+
+  test('the dialog\'s threshold arrives in minor units and is compared against cart totals as such', () => {
+    // RecoveryCampaignDialog sends parseMoneyInput('25.00', 'USD'), which is 2500.
+    const data = recoveryCampaignWriteData({ name: 'Recovery', subject: 'Still here', minimumValue: 2500 })
+    expect(JSON.parse(data.segment_definition).rules[2]).toEqual({ field: 'cart.value', operator: 'gte', value: 2500 })
+
+    const records = normalizeAbandonedCarts(
+      [cart({ id: 1, total: 2499 }), cart({ id: 2, customer_id: 12, total: 2500 })],
+      [],
+      CUSTOMERS,
+      [],
+      [],
+      { now: NOW },
+    ).records
+    expect(reachOf(records, 1, 2500)).toEqual({ carts: 1, value: 2500 })
+  })
+
+  test('a fractional threshold is rounded to a whole minor unit', () => {
+    const data = recoveryCampaignWriteData({ name: 'Recovery', subject: 'Still here', minimumValue: 2500.4 })
+    expect(JSON.parse(data.segment_definition).rules[2].value).toBe(2500)
+  })
+})

package/app/Actions/Dashboard/Marketing/abandoned-cart-records.ts

@@ -34,6 +34,7 @@ export interface AbandonedCartRecord {
   itemCount: number
   /** The first few product names, for a row that says what was left behind. */
   items: string[]
+  /** The cart's total, in integer minor units of `currency` (1999 is $19.99). */
   value: number
   currency: string
   abandonedAt: string
@@ -48,7 +49,7 @@ export interface AbandonedCartRecord {
 export interface AbandonedCartSummary {
   /** Carts sitting abandoned or expired right now. */
   open: number
-  /** What those carts are worth. */
+  /** What those carts are worth, in integer minor units. */
   openValue: number
   /** Of those, how many have already been written to. */
   contacted: number
@@ -57,6 +58,7 @@ export interface AbandonedCartSummary {
   recoveredValue: number
   /** Recovered as a share of everything that was ever chased. */
   recoveryRate: number
+  /** Rounded to a whole minor unit. */
   averageValue: number
   currency: string
 }
@@ -66,6 +68,7 @@ export interface RecoveryCampaignRecord {
   name: string
   status: string
   idleHours: number
+  /** The smallest cart total the campaign writes about, in integer minor units. */
   minimumValue: number
   sentCount: number
   openedCount: number
@@ -314,7 +317,7 @@ export function normalizeAbandonedCarts(
       recovered: recovered.length,
       recoveredValue,
       recoveryRate: chased > 0 ? recovered.length / chased * 100 : 0,
-      averageValue: open.length > 0 ? openValue / open.length : 0,
+      averageValue: open.length > 0 ? Math.round(openValue / open.length) : 0,
       currency: records[0]?.currency || defaultCurrency,
     },
     campaigns,
@@ -354,6 +357,7 @@ export interface RecoveryCampaignInput {
   fromAddress: string
   emailListId: number | null
   idleHours: number
+  /** Integer minor units, compared against a cart's `total`. */
   minimumValue: number
   scheduledAt: string | null
   currency: string
@@ -378,7 +382,9 @@ export function recoveryCampaignWriteData(
   currency: string
 } {
   const idleHours = Math.max(1, Math.round(Number(input.idleHours)) || DEFAULT_IDLE_HOURS)
-  const minimumValue = Math.max(0, Number(input.minimumValue) || 0)
+  // Minor units, like the cart totals it is compared against: a fraction of a
+  // cent is not a threshold anybody set.
+  const minimumValue = Math.max(0, Math.round(Number(input.minimumValue)) || 0)
   const emailListId = Number(input.emailListId ?? input.email_list_id)
   const scheduledAt = text(input.scheduledAt ?? input.scheduled_at).trim()