@etus/bhono-app 0.1.6 → 0.1.7

package/templates/base/tests/unit/server/services/users.test.ts

@@ -18,6 +18,17 @@ vi.mock('@server/db/sql', () => ({
   queryOne: vi.fn(),
   queryAll: vi.fn(),
   execute: vi.fn(),
+  toStringValue: (value: unknown) => {
+    if (typeof value === 'string') return value
+    if (typeof value === 'number' || typeof value === 'bigint') return String(value)
+    return ''
+  },
+  toNullableString: (value: unknown) => {
+    if (value === null || value === undefined) return null
+    if (typeof value === 'string') return value
+    if (typeof value === 'number' || typeof value === 'bigint') return String(value)
+    return null
+  },
 }))
 
 import { auditedUpdate, auditedDelete } from '@server/lib/audited-db'
@@ -82,7 +93,7 @@ describe('usersService', () => {
       ;(queryAll as Mock).mockResolvedValueOnce([
         {
           id: user.id,
-          google_id: user.googleId,
+          google_id: `google-${user.id}`,
           email: user.email,
           name: user.name,
           avatar_url: user.avatarUrl,
@@ -115,7 +126,7 @@ describe('usersService', () => {
       ;(queryOne as Mock)
         .mockResolvedValueOnce({
           id: user.id,
-          google_id: user.googleId,
+          google_id: `google-${user.id}`,
           email: user.email,
           name: user.name,
           avatar_url: user.avatarUrl,
@@ -138,7 +149,7 @@ describe('usersService', () => {
 
       ;(queryOne as Mock).mockResolvedValueOnce({
         id: user.id,
-        google_id: user.googleId,
+        google_id: `google-${user.id}`,
         email: user.email,
         name: user.name,
         avatar_url: user.avatarUrl,
@@ -178,7 +189,7 @@ describe('usersService', () => {
       const user = createUserFixture({ id: 'user-1' })
       ;(queryOne as Mock).mockResolvedValueOnce({
         id: user.id,
-        google_id: user.googleId,
+        google_id: `google-${user.id}`,
         email: user.email,
         name: user.name,
         avatar_url: user.avatarUrl,
@@ -201,7 +212,7 @@ describe('usersService', () => {
       const user = createUserFixture({ id: 'user-1', deletedAt: new Date().toISOString() })
       ;(queryOne as Mock).mockResolvedValueOnce({
         id: user.id,
-        google_id: user.googleId,
+        google_id: `google-${user.id}`,
         email: user.email,
         name: user.name,
         avatar_url: user.avatarUrl,
@@ -243,7 +254,7 @@ describe('usersService', () => {
       ;(queryOne as Mock)
         .mockResolvedValueOnce({
           id: user.id,
-          google_id: user.googleId,
+          google_id: `google-${user.id}`,
           email: user.email,
           name: user.name,
           avatar_url: user.avatarUrl,
@@ -274,7 +285,7 @@ describe('usersService', () => {
       ;(queryOne as Mock)
         .mockResolvedValueOnce({
           id: user.id,
-          google_id: user.googleId,
+          google_id: `google-${user.id}`,
           email: user.email,
           name: user.name,
           avatar_url: user.avatarUrl,
@@ -300,7 +311,7 @@ describe('usersService', () => {
 
       ;(queryOne as Mock).mockResolvedValueOnce({
         id: user.id,
-        google_id: user.googleId,
+        google_id: `google-${user.id}`,
         email: user.email,
         name: user.name,
         avatar_url: user.avatarUrl,
@@ -348,4 +359,348 @@ describe('usersService', () => {
       expect(logAudit).toHaveBeenCalled()
     })
   })
+
+  describe('findAll edge cases', () => {
+    const defaultPagination: PaginationQuery = { page: 1, limit: 10 }
+
+    it('should filter by query parameter', async () => {
+      ;(queryOne as Mock).mockResolvedValueOnce({ count: 1 })
+      ;(queryAll as Mock).mockResolvedValueOnce([
+        {
+          id: 'user-1',
+          google_id: 'google-1',
+          email: 'search@example.com',
+          name: 'Search User',
+          avatar_url: null,
+          status: 'active',
+          provider_ids: JSON.stringify(['google']),
+          is_super_admin: 0,
+          created_at: new Date().toISOString(),
+          updated_at: new Date().toISOString(),
+          deleted_at: null,
+        },
+      ])
+
+      const result = await usersService.findAll(db, superAdminCtx, { ...defaultPagination, query: 'search' })
+
+      expect(result.data).toHaveLength(1)
+    })
+
+    it('should filter by account for non-super-admin', async () => {
+      ;(queryOne as Mock).mockResolvedValueOnce({ count: 1 })
+      ;(queryAll as Mock).mockResolvedValueOnce([
+        {
+          id: 'user-1',
+          google_id: 'google-1',
+          email: 'user@example.com',
+          name: 'User',
+          avatar_url: null,
+          status: 'active',
+          provider_ids: '[]',
+          is_super_admin: 0,
+          created_at: new Date().toISOString(),
+          updated_at: new Date().toISOString(),
+          deleted_at: null,
+        },
+      ])
+
+      await usersService.findAll(db, ctx, defaultPagination)
+
+      // Check that account filter was applied
+      expect((queryOne as Mock).mock.calls[0][2]).toContain(ctx.accountId)
+    })
+
+    it('should handle null count result', async () => {
+      ;(queryOne as Mock).mockResolvedValueOnce(null)
+      ;(queryAll as Mock).mockResolvedValueOnce([])
+
+      const result = await usersService.findAll(db, superAdminCtx, defaultPagination)
+
+      expect(result.data).toHaveLength(0)
+      expect(result.meta.totalItems).toBe(0)
+    })
+
+    it('should parse providerIds as array', async () => {
+      ;(queryOne as Mock).mockResolvedValueOnce({ count: 1 })
+      ;(queryAll as Mock).mockResolvedValueOnce([
+        {
+          id: 'user-1',
+          google_id: 'google-1',
+          email: 'user@example.com',
+          name: 'User',
+          avatar_url: null,
+          status: 'active',
+          provider_ids: ['google', 'github'],
+          is_super_admin: 0,
+          created_at: new Date().toISOString(),
+          updated_at: new Date().toISOString(),
+          deleted_at: null,
+        },
+      ])
+
+      const result = await usersService.findAll(db, superAdminCtx, defaultPagination)
+
+      expect(result.data[0].providerIds).toEqual(['google', 'github'])
+    })
+
+    it('should handle invalid JSON in providerIds', async () => {
+      ;(queryOne as Mock).mockResolvedValueOnce({ count: 1 })
+      ;(queryAll as Mock).mockResolvedValueOnce([
+        {
+          id: 'user-1',
+          google_id: 'google-1',
+          email: 'user@example.com',
+          name: 'User',
+          avatar_url: null,
+          status: 'active',
+          provider_ids: 'invalid-json',
+          is_super_admin: 0,
+          created_at: new Date().toISOString(),
+          updated_at: new Date().toISOString(),
+          deleted_at: null,
+        },
+      ])
+
+      const result = await usersService.findAll(db, superAdminCtx, defaultPagination)
+
+      expect(result.data[0].providerIds).toEqual([])
+    })
+
+    it('should handle non-array JSON in providerIds', async () => {
+      ;(queryOne as Mock).mockResolvedValueOnce({ count: 1 })
+      ;(queryAll as Mock).mockResolvedValueOnce([
+        {
+          id: 'user-1',
+          google_id: 'google-1',
+          email: 'user@example.com',
+          name: 'User',
+          avatar_url: null,
+          status: 'active',
+          provider_ids: '{"key": "value"}',
+          is_super_admin: 0,
+          created_at: new Date().toISOString(),
+          updated_at: new Date().toISOString(),
+          deleted_at: null,
+        },
+      ])
+
+      const result = await usersService.findAll(db, superAdminCtx, defaultPagination)
+
+      expect(result.data[0].providerIds).toEqual([])
+    })
+
+    it('should handle isSuperAdmin as boolean true', async () => {
+      ;(queryOne as Mock).mockResolvedValueOnce({ count: 1 })
+      ;(queryAll as Mock).mockResolvedValueOnce([
+        {
+          id: 'user-1',
+          google_id: 'google-1',
+          email: 'user@example.com',
+          name: 'User',
+          avatar_url: null,
+          status: 'active',
+          provider_ids: '[]',
+          is_super_admin: true,
+          created_at: new Date().toISOString(),
+          updated_at: new Date().toISOString(),
+          deleted_at: null,
+        },
+      ])
+
+      const result = await usersService.findAll(db, superAdminCtx, defaultPagination)
+
+      expect(result.data[0].isSuperAdmin).toBe(true)
+    })
+
+    it('should handle isSuperAdmin as string "1"', async () => {
+      ;(queryOne as Mock).mockResolvedValueOnce({ count: 1 })
+      ;(queryAll as Mock).mockResolvedValueOnce([
+        {
+          id: 'user-1',
+          google_id: 'google-1',
+          email: 'user@example.com',
+          name: 'User',
+          avatar_url: null,
+          status: 'active',
+          provider_ids: '[]',
+          is_super_admin: '1',
+          created_at: new Date().toISOString(),
+          updated_at: new Date().toISOString(),
+          deleted_at: null,
+        },
+      ])
+
+      const result = await usersService.findAll(db, superAdminCtx, defaultPagination)
+
+      expect(result.data[0].isSuperAdmin).toBe(true)
+    })
+
+    it('should handle isSuperAdmin as string "true"', async () => {
+      ;(queryOne as Mock).mockResolvedValueOnce({ count: 1 })
+      ;(queryAll as Mock).mockResolvedValueOnce([
+        {
+          id: 'user-1',
+          google_id: 'google-1',
+          email: 'user@example.com',
+          name: 'User',
+          avatar_url: null,
+          status: 'active',
+          provider_ids: '[]',
+          is_super_admin: 'TRUE',
+          created_at: new Date().toISOString(),
+          updated_at: new Date().toISOString(),
+          deleted_at: null,
+        },
+      ])
+
+      const result = await usersService.findAll(db, superAdminCtx, defaultPagination)
+
+      expect(result.data[0].isSuperAdmin).toBe(true)
+    })
+  })
+
+  describe('update edge cases', () => {
+    it('should throw when auditedUpdate returns empty array', async () => {
+      const user = createUserFixture({ id: 'user-1' })
+
+      ;(queryOne as Mock).mockResolvedValueOnce({
+        id: user.id,
+        google_id: `google-${user.id}`,
+        email: user.email,
+        name: user.name,
+        avatar_url: user.avatarUrl,
+        status: user.status,
+        provider_ids: JSON.stringify(user.providerIds),
+        is_super_admin: user.isSuperAdmin ? 1 : 0,
+        created_at: user.createdAt,
+        updated_at: user.updatedAt,
+        deleted_at: user.deletedAt,
+      })
+
+      ;(auditedUpdate as Mock).mockResolvedValueOnce([])
+
+      await expect(usersService.update(db, superAdminCtx, user.id, { name: 'New' })).rejects.toThrow('Failed to update user')
+    })
+  })
+
+  describe('restore edge cases', () => {
+    it('should throw NotFoundError when user not found', async () => {
+      ;(queryOne as Mock).mockResolvedValueOnce(null)
+
+      await expect(usersService.restore(db, superAdminCtx, 'missing')).rejects.toThrow(NotFoundError)
+    })
+
+    it('should throw NotFoundError when restore fails', async () => {
+      const user = createUserFixture({ id: 'user-1', deletedAt: new Date().toISOString() })
+
+      ;(queryOne as Mock).mockResolvedValueOnce({
+        id: user.id,
+        google_id: `google-${user.id}`,
+        email: user.email,
+        name: user.name,
+        avatar_url: user.avatarUrl,
+        status: user.status,
+        provider_ids: JSON.stringify(user.providerIds),
+        is_super_admin: user.isSuperAdmin ? 1 : 0,
+        created_at: user.createdAt,
+        updated_at: user.updatedAt,
+        deleted_at: user.deletedAt,
+      })
+
+      ;(auditedUpdate as Mock).mockResolvedValueOnce([])
+
+      await expect(usersService.restore(db, superAdminCtx, user.id)).rejects.toThrow(NotFoundError)
+    })
+  })
+
+  describe('updateRole edge cases', () => {
+    it('should throw NotFoundError when membership not found', async () => {
+      const user = createUserFixture({ id: 'user-1' })
+
+      ;(queryOne as Mock)
+        .mockResolvedValueOnce({
+          id: user.id,
+          google_id: `google-${user.id}`,
+          email: user.email,
+          name: user.name,
+          avatar_url: user.avatarUrl,
+          status: user.status,
+          provider_ids: JSON.stringify(user.providerIds),
+          is_super_admin: user.isSuperAdmin ? 1 : 0,
+          created_at: user.createdAt,
+          updated_at: user.updatedAt,
+          deleted_at: user.deletedAt,
+        })
+        .mockResolvedValueOnce(null)
+
+      await expect(usersService.updateRole(db, superAdminCtx, user.id, 'account-1', 'ADMIN')).rejects.toThrow('User not found in account')
+    })
+  })
+
+  describe('createUserAccounts edge cases', () => {
+    it('should update existing membership', async () => {
+      const items = [{ userId: 'user-1', accountId: 'account-1', role: 'ADMIN' as const }]
+
+      ;(queryOne as Mock).mockResolvedValueOnce({ role: 'VIEWER' })
+
+      const result = await usersService.createUserAccounts(db, superAdminCtx, items)
+
+      expect(result.count).toBe(1)
+      expect(execute).toHaveBeenCalled()
+    })
+  })
+
+  describe('listUserRoles edge cases', () => {
+    it('should handle snake_case column names', async () => {
+      const user = createUserFixture({ id: 'user-1' })
+
+      ;(queryOne as Mock)
+        .mockResolvedValueOnce({
+          id: user.id,
+          google_id: `google-${user.id}`,
+          email: user.email,
+          name: user.name,
+          avatar_url: user.avatarUrl,
+          status: user.status,
+          provider_ids: JSON.stringify(user.providerIds),
+          is_super_admin: user.isSuperAdmin ? 1 : 0,
+          created_at: user.createdAt,
+          updated_at: user.updatedAt,
+          deleted_at: user.deletedAt,
+        })
+        .mockResolvedValueOnce({ ok: 1 })
+
+      ;(queryAll as Mock).mockResolvedValueOnce([{ account_id: 'account-1', role: 'ADMIN' }])
+
+      const result = await usersService.listUserRoles(db, ctx, user.id)
+
+      expect(result[0].accountId).toBe('account-1')
+    })
+  })
+
+  describe('findById edge cases', () => {
+    it('should return user for super admin without membership check', async () => {
+      const user = createUserFixture({ id: 'user-1' })
+
+      ;(queryOne as Mock).mockResolvedValueOnce({
+        id: user.id,
+        googleId: user.googleId,
+        email: user.email,
+        name: user.name,
+        avatarUrl: user.avatarUrl,
+        status: user.status,
+        providerIds: user.providerIds,
+        isSuperAdmin: user.isSuperAdmin,
+        createdAt: user.createdAt,
+        updatedAt: user.updatedAt,
+        deletedAt: user.deletedAt,
+      })
+
+      const result = await usersService.findById(db, superAdminCtx, user.id)
+
+      expect(result.id).toBe(user.id)
+      // queryOne should only be called once (no membership check)
+      expect(queryOne).toHaveBeenCalledTimes(1)
+    })
+  })
 })

package/templates/base/tests/unit/shared/schemas.test.ts

@@ -7,7 +7,7 @@ import {
   UpdateAccountSchema,
   CreateInvitationSchema,
   CreateWebhookSchema,
-} from '../index'
+} from '@shared/schemas'
 
 describe('User Schemas', () => {
   describe('CreateUserSchema', () => {

package/templates/base/vite.config.ts

@@ -18,7 +18,9 @@ export default defineConfig({
       generatedRouteTree: "./src/client/routeTree.gen.ts",
     }),
     react(),
-    cloudflare(),
+    cloudflare({
+      configPath: "./config/wrangler.json",
+    }),
     // Istanbul instrumentation for E2E coverage
     // Only add plugin when E2E_COVERAGE is true, then it instruments without additional env check
     ...(isE2ECoverage

package/templates/base/.github/workflows/test.yml

@@ -1,127 +0,0 @@
-name: Test Suite
-
-on:
-  push:
-    branches: [main, master]
-  pull_request:
-    branches: [main, master]
-
-env:
-  CI: true
-  NODE_VERSION: '20'
-
-jobs:
-  # Unit and Integration Tests (Vitest) with Coverage
-  unit-tests:
-    name: Unit Tests
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: ${{ env.NODE_VERSION }}
-          cache: 'npm'
-
-      - name: Install dependencies
-        run: npm ci
-
-      - name: Run backend tests with coverage
-        run: npm run test:coverage
-
-      - name: Run frontend tests with coverage
-        run: npm run test:coverage:client
-
-      - name: Upload coverage reports
-        uses: codecov/codecov-action@v4
-        if: always()
-        with:
-          files: ./coverage/server/lcov.info,./coverage/client/lcov.info
-          flags: unittests
-          fail_ci_if_error: false
-
-  # E2E Tests (Playwright)
-  e2e-tests:
-    name: E2E Tests
-    runs-on: ubuntu-latest
-    timeout-minutes: 30
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: ${{ env.NODE_VERSION }}
-          cache: 'npm'
-
-      - name: Install dependencies
-        run: npm ci
-
-      - name: Install Playwright browsers
-        run: npx playwright install chromium --with-deps
-
-      - name: Run E2E tests
-        run: npm run test:e2e -- --project=chromium-unauth
-
-      - name: Upload Playwright report
-        uses: actions/upload-artifact@v4
-        if: always()
-        with:
-          name: playwright-report
-          path: playwright-report/
-          retention-days: 7
-
-      - name: Upload test results
-        uses: actions/upload-artifact@v4
-        if: failure()
-        with:
-          name: test-results
-          path: test-results/
-          retention-days: 7
-
-  # Type checking
-  typecheck:
-    name: Type Check
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: ${{ env.NODE_VERSION }}
-          cache: 'npm'
-
-      - name: Install dependencies
-        run: npm ci
-
-      - name: Run type check
-        run: npx tsc --noEmit
-
-  # Linting
-  lint:
-    name: Lint
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: ${{ env.NODE_VERSION }}
-          cache: 'npm'
-
-      - name: Install dependencies
-        run: npm ci
-
-      - name: Run linter
-        run: npm run lint

package/templates/base/.husky/pre-push

@@ -1,26 +0,0 @@
-#!/usr/bin/env sh
-
-echo "🔍 Running pre-push checks..."
-
-# Type checking
-echo "📝 Type checking..."
-pnpm typecheck || {
-  echo "❌ Type check failed. Push aborted."
-  exit 1
-}
-
-# Server unit tests only (faster, more reliable)
-echo "🧪 Running server unit tests..."
-pnpm test:unit:server || {
-  echo "❌ Server unit tests failed. Push aborted."
-  exit 1
-}
-
-# Build verification
-echo "🏗️ Verifying build..."
-pnpm build || {
-  echo "❌ Build failed. Push aborted."
-  exit 1
-}
-
-echo "✅ All pre-push checks passed!"