create-fullstack-scaffold 0.4.3 → 0.4.4

package/template/src/server/module-tenant/services/tenant-service.ts

@@ -13,6 +13,8 @@ export async function seedTenantsIfEmpty(): Promise<void> {
   if (existing.length === 0) {
     log.info({}, 'Seeding tenants...')
 
+    const now = new Date().toISOString()
+
     const sampleTenants: NewTenant[] = [
       {
         name: 'Demo Corp',
@@ -21,6 +23,8 @@ export async function seedTenantsIfEmpty(): Promise<void> {
         plan: 'pro',
         maxUsers: 50,
         settings: JSON.stringify({ theme: 'dark', language: 'en' }),
+        createdAt: now,
+        updatedAt: now,
       },
       {
         name: 'Test Inc',
@@ -29,6 +33,8 @@ export async function seedTenantsIfEmpty(): Promise<void> {
         plan: 'free',
         maxUsers: 5,
         settings: null,
+        createdAt: now,
+        updatedAt: now,
       },
     ]
 
@@ -50,12 +56,14 @@ export async function listTenants(
 
   if (filters.status) {
     baseQuery = baseQuery.where(
-      eq(tenants.status, filters.status as TenantStatus)
+      eq(tenants.status, filters.status as 'active' | 'suspended' | 'trial')
     ) as typeof baseQuery
   }
 
   if (filters.plan) {
-    baseQuery = baseQuery.where(eq(tenants.plan, filters.plan as TenantPlan)) as typeof baseQuery
+    baseQuery = baseQuery.where(
+      eq(tenants.plan, filters.plan as 'free' | 'starter' | 'pro' | 'enterprise')
+    ) as typeof baseQuery
   }
 
   if (filters.search) {
@@ -68,12 +76,14 @@ export async function listTenants(
 
   if (filters.status) {
     countQuery = countQuery.where(
-      eq(tenants.status, filters.status as TenantStatus)
+      eq(tenants.status, filters.status as 'active' | 'suspended' | 'trial')
     ) as typeof countQuery
   }
 
   if (filters.plan) {
-    countQuery = countQuery.where(eq(tenants.plan, filters.plan as TenantPlan)) as typeof countQuery
+    countQuery = countQuery.where(
+      eq(tenants.plan, filters.plan as 'free' | 'starter' | 'pro' | 'enterprise')
+    ) as typeof countQuery
   }
 
   if (filters.search) {
@@ -87,8 +97,8 @@ export async function listTenants(
     id: row.id,
     name: row.name,
     slug: row.slug,
-    status: row.status as TenantStatus,
-    plan: row.plan as TenantPlan,
+    status: row.status as 'active' | 'suspended' | 'trial',
+    plan: row.plan as 'free' | 'starter' | 'pro' | 'enterprise',
     maxUsers: row.maxUsers,
     settings: row.settings ? (JSON.parse(row.settings) as Record<string, unknown>) : null,
     createdAt: row.createdAt,
@@ -110,8 +120,8 @@ export async function getTenantBySlug(slug: string): Promise<Tenant | null> {
     id: row.id,
     name: row.name,
     slug: row.slug,
-    status: row.status as TenantStatus,
-    plan: row.plan as TenantPlan,
+    status: row.status as 'active' | 'suspended' | 'trial',
+    plan: row.plan as 'free' | 'starter' | 'pro' | 'enterprise',
     maxUsers: row.maxUsers,
     settings: row.settings ? (JSON.parse(row.settings) as Record<string, unknown>) : null,
     createdAt: row.createdAt,
@@ -131,8 +141,8 @@ export async function getTenantById(id: number): Promise<Tenant | null> {
     id: row.id,
     name: row.name,
     slug: row.slug,
-    status: row.status as TenantStatus,
-    plan: row.plan as TenantPlan,
+    status: row.status as 'active' | 'suspended' | 'trial',
+    plan: row.plan as 'free' | 'starter' | 'pro' | 'enterprise',
     maxUsers: row.maxUsers,
     settings: row.settings ? (JSON.parse(row.settings) as Record<string, unknown>) : null,
     createdAt: row.createdAt,
@@ -172,8 +182,8 @@ export async function createTenant(input: CreateTenantInput): Promise<Tenant> {
     id: row.id,
     name: row.name,
     slug: row.slug,
-    status: row.status as TenantStatus,
-    plan: row.plan as TenantPlan,
+    status: row.status as 'active' | 'suspended' | 'trial',
+    plan: row.plan as 'free' | 'starter' | 'pro' | 'enterprise',
     maxUsers: row.maxUsers,
     settings: row.settings ? (JSON.parse(row.settings) as Record<string, unknown>) : null,
     createdAt: row.createdAt,
@@ -196,18 +206,54 @@ export async function updateTenant(id: number, input: UpdateTenantInput): Promis
     updateData.name = input.name
   }
 
-  if (input.status !== undefined) {
+  if (input.status !== undefined && input.status !== null) {
+    updateData.status = input.status
+  }
+
+  if (input.plan !== undefined && input.plan !== null) {
+    updateData.plan = input.plan
+  }
+
+  if (input.maxUsers !== undefined && input.maxUsers !== null) {
+    updateData.maxUsers = input.maxUsers
+  }
+
+  if (input.settings !== undefined) {
+    updateData.settings = input.settings ? JSON.stringify(input.settings) : null
+  }
+
+  if (input.name !== undefined) {
+    updateData.name = input.name
+  }
+
+  if (input.status !== undefined && input.status !== null) {
     updateData.status = input.status
   }
 
-  if (input.plan !== undefined) {
+  if (input.plan !== undefined && input.plan !== null) {
     updateData.plan = input.plan
   }
 
-  if (input.maxUsers !== undefined) {
+  if (input.maxUsers !== undefined && input.maxUsers !== null) {
     updateData.maxUsers = input.maxUsers
   }
 
+  if (input.name !== undefined) {
+    updateData.name = input.name
+  }
+
+  if (input.status !== undefined && input.status !== null) {
+    ;(updateData as Record<string, unknown>).status = input.status
+  }
+
+  if (input.plan !== undefined && input.plan !== null) {
+    ;(updateData as Record<string, unknown>).plan = input.plan
+  }
+
+  if (input.maxUsers !== undefined && input.maxUsers !== null) {
+    ;(updateData as Record<string, unknown>).maxUsers = input.maxUsers
+  }
+
   if (input.settings !== undefined) {
     updateData.settings = input.settings ? JSON.stringify(input.settings) : null
   }
@@ -224,8 +270,8 @@ export async function updateTenant(id: number, input: UpdateTenantInput): Promis
     id: row.id,
     name: row.name,
     slug: row.slug,
-    status: row.status as TenantStatus,
-    plan: row.plan as TenantPlan,
+    status: row.status as 'active' | 'suspended' | 'trial',
+    plan: row.plan as 'free' | 'starter' | 'pro' | 'enterprise',
     maxUsers: row.maxUsers,
     settings: row.settings ? (JSON.parse(row.settings) as Record<string, unknown>) : null,
     createdAt: row.createdAt,

package/template/src/shared/modules/merchant/index.ts

@@ -0,0 +1,9 @@
+export {
+  ProductSchema,
+  CreateProductSchema,
+  UpdateProductSchema,
+  ProductListSchema,
+  type Product,
+  type CreateProductInput,
+  type UpdateProductInput,
+} from './schemas'

package/template/src/shared/modules/merchant/schemas.ts

@@ -0,0 +1,37 @@
+import { z } from '@hono/zod-openapi'
+
+export const ProductSchema = z.object({
+  id: z.string(),
+  name: z.string().min(1).max(200),
+  description: z.string().max(1000),
+  price: z.number().positive(),
+  status: z.enum(['active', 'inactive', 'out_of_stock']),
+  stock: z.number().int().min(0),
+  imageUrl: z.string().url().nullable(),
+  createdAt: z.string().datetime(),
+  updatedAt: z.string().datetime(),
+})
+
+export const CreateProductSchema = z.object({
+  name: z.string().min(1).max(200),
+  description: z.string().max(1000),
+  price: z.number().positive(),
+  status: z.enum(['active', 'inactive', 'out_of_stock']).default('active'),
+  stock: z.number().int().min(0).default(0),
+  imageUrl: z.string().url().nullable(),
+})
+
+export const UpdateProductSchema = z.object({
+  name: z.string().min(1).max(200).nullish(),
+  description: z.string().max(1000).nullish(),
+  price: z.number().positive().nullish(),
+  status: z.enum(['active', 'inactive', 'out_of_stock']).nullish(),
+  stock: z.number().int().min(0).nullish(),
+  imageUrl: z.string().url().nullable().nullish(),
+})
+
+export const ProductListSchema = z.array(ProductSchema)
+
+export type Product = z.infer<typeof ProductSchema>
+export type CreateProductInput = z.infer<typeof CreateProductSchema>
+export type UpdateProductInput = z.infer<typeof UpdateProductSchema>

package/template/src/shared/modules/tenant/index.ts

@@ -9,6 +9,7 @@ export {
   TenantSlugSchema,
   TenantListResponseSchema,
   TenantQuerySchema,
+  TenantIdResponseSchema,
   type Tenant,
   type TenantStatus,
   type TenantPlan,
@@ -19,4 +20,5 @@ export {
   type TenantSlug,
   type TenantListResponse,
   type TenantQuery,
+  type TenantIdResponse,
 } from './schemas'

package/template/src/shared/schemas/index.ts

@@ -218,6 +218,7 @@ export {
   TenantSlugSchema,
   TenantListResponseSchema,
   TenantQuerySchema,
+  TenantIdResponseSchema,
   type Tenant,
   type TenantStatus,
   type TenantPlan,
@@ -228,4 +229,30 @@ export {
   type TenantSlug,
   type TenantListResponse,
   type TenantQuery,
+  type TenantIdResponse,
 } from '../modules/tenant'
+export {
+  DisputeTypeSchema,
+  DisputeStatusSchema,
+  DisputeSchema,
+  CreateDisputeSchema,
+  UpdateDisputeSchema,
+  ResolveDisputeSchema,
+  DisputeListSchema,
+  type DisputeType,
+  type DisputeStatus,
+  type Dispute,
+  type CreateDisputeInput,
+  type UpdateDisputeInput,
+  type ResolveDisputeInput,
+} from '../modules/dispute'
+export {
+  ProductSchema,
+  CreateProductSchema,
+  UpdateProductSchema,
+  ProductListSchema,
+  type Product,
+  type CreateProductInput,
+  type UpdateProductInput,
+} from '../modules/merchant'
+export type { DeveloperProfile as User } from '../modules/auth'

package/template/src/tenant/layouts/Header.tsx

@@ -1,4 +1,4 @@
-import { Layout as AntLayout } from 'antd'
+import { Layout as AntLayout, Dropdown } from 'antd'
 import {
   MenuFoldOutlined,
   MenuUnfoldOutlined,

package/template/src/tenant/layouts/Sidebar.tsx

@@ -1,4 +1,4 @@
-import { Menu } from 'antd'
+import { Menu, Layout as AntLayout } from 'antd'
 import type { MenuProps } from 'antd'
 import {
   DashboardOutlined,

package/template/src/tenant/pages/SettingsPage.tsx

@@ -13,8 +13,7 @@ export const SettingsPage: React.FC = () => {
       form.setFieldsValue({
         name: currentTenant.name,
         slug: currentTenant.slug,
-        email: currentTenant.email,
-        settings: currentTenant.settings ? JSON.parse(currentTenant.settings) : {},
+        settings: currentTenant.settings || {},
       })
     }
   }, [currentTenant, form])
@@ -25,10 +24,10 @@ export const SettingsPage: React.FC = () => {
       return
     }
 
+    const typedValues = values as { name: string; settings: Record<string, unknown> }
     const updateData: UpdateTenantInput = {
-      name: (values as { name: string }).name,
-      email: (values as { email: string }).email,
-      settings: JSON.stringify((values as { settings: Record<string, unknown> }).settings),
+      name: typedValues.name,
+      settings: typedValues.settings,
     }
 
     const success = await updateTenant(currentTenant.id, updateData)
@@ -48,9 +47,6 @@ export const SettingsPage: React.FC = () => {
           <Form.Item name="slug" label="Slug" rules={[{ required: true }]}>
             <Input disabled />
           </Form.Item>
-          <Form.Item name="email" label="Email" rules={[{ required: true, type: 'email' }]}>
-            <Input />
-          </Form.Item>
           <Form.Item name={['settings', 'logoUrl']} label="Logo URL">
             <Input />
           </Form.Item>