@etus/bhono-app 0.1.5 → 0.1.7

package/templates/base/src/server/routes/health/handlers.ts

@@ -1,16 +1,16 @@
 import type { Context } from 'hono'
 import type { HonoEnv } from '../../types'
-import { sql } from 'drizzle-orm'
+import { queryOne } from '../../db/sql'
 
 async function checkDatabase(c: Context<HonoEnv>): Promise<'up' | 'down'> {
   try {
-    const db = c.var.db
+    const db = c.env.DB
     if (!db) {
       return 'down'
     }
 
-    // Simple connectivity check using run() for D1
-    await db.run(sql`SELECT 1`)
+    // Simple connectivity check using D1
+    await queryOne(db, 'SELECT 1 AS ok')
     return 'up'
   } catch {
     return 'down'

package/templates/base/src/server/routes/index.ts

@@ -51,3 +51,12 @@ api.doc('/doc', openApiConfig)
 api.get('/swagger', swaggerUI({ url: '/api/doc' }))
 
 export { api }
+
+// Re-export individual routers for testing
+export { users } from './users'
+export { accounts } from './accounts'
+export { invitationsRouter } from './invitations'
+export { audits } from './audits'
+export { storage } from './storage'
+export { health } from './health'
+export { auth } from './auth'

package/templates/base/src/server/routes/invitations/handlers.ts

@@ -34,11 +34,12 @@ export const createInvitationHandler: RouteHandler<typeof createInvitationRoute,
   const env = c.env
   const ctx = getServiceContext(c)
 
-  if (!db) {
+  const invitationsDb = env.DB ?? db
+  if (!invitationsDb) {
     throw new HTTPException(500, { message: 'Database not initialized' })
   }
 
-  const result = await invitationsService.create(db, env, ctx, body)
+  const result = await invitationsService.create(invitationsDb, env, ctx, body)
 
   return c.json(result, 200)
 }
@@ -47,11 +48,12 @@ export const listInvitationsHandler: RouteHandler<typeof listInvitationsRoute, H
   const db = c.get('db')
   const ctx = getServiceContext(c)
 
-  if (!db) {
+  const invitationsDb = c.env.DB ?? db
+  if (!invitationsDb) {
     throw new HTTPException(500, { message: 'Database not initialized' })
   }
 
-  const invitations = await invitationsService.list(db, ctx)
+  const invitations = await invitationsService.list(invitationsDb, ctx)
 
   return c.json({ data: invitations }, 200)
 }
@@ -61,11 +63,12 @@ export const revokeInvitationHandler: RouteHandler<typeof revokeInvitationRoute,
   const db = c.get('db')
   const ctx = getServiceContext(c)
 
-  if (!db) {
+  const invitationsDb = c.env.DB ?? db
+  if (!invitationsDb) {
     throw new HTTPException(500, { message: 'Database not initialized' })
   }
 
-  await invitationsService.revoke(db, ctx, id)
+  await invitationsService.revoke(invitationsDb, ctx, id)
 
   return c.body(null, 204)
 }

package/templates/base/src/server/routes/openapi.ts

@@ -11,4 +11,4 @@ export const openApiConfig = {
     { url: 'http://localhost:3000', description: 'Development server' },
   ],
   security: [{ SessionCookie: [] }],
-} as const
+}

package/templates/base/src/server/routes/users/handlers.ts

@@ -14,13 +14,14 @@ import type {
 export const listUsersHandler: RouteHandler<typeof listUsersRoute, HonoEnv> = async (c) => {
   const query = c.req.valid('query')
   const db = c.get('db')
+  const usersDb = c.env.DB ?? db
   const accountId = c.get('accountId')
   const user = c.get('user')
   const transactionId = c.get('transactionId')
   const ip = c.get('ip')
   const userAgent = c.get('userAgent')
 
-  if (!db || !accountId || !user) {
+  if (!db || !usersDb || !accountId || !user) {
     throw new Error('Missing required context')
   }
 
@@ -32,7 +33,7 @@ export const listUsersHandler: RouteHandler<typeof listUsersRoute, HonoEnv> = as
     userAgent,
   }
 
-  const result = await usersService.findAll(db, ctx, {
+  const result = await usersService.findAll(usersDb, ctx, {
     page: query.page,
     limit: query.limit,
     sortBy: query.sortBy,
@@ -46,13 +47,14 @@ export const listUsersHandler: RouteHandler<typeof listUsersRoute, HonoEnv> = as
 export const getUserHandler: RouteHandler<typeof getUserRoute, HonoEnv> = async (c) => {
   const { id } = c.req.valid('param')
   const db = c.get('db')
+  const usersDb = c.env.DB ?? db
   const accountId = c.get('accountId')
   const user = c.get('user')
   const transactionId = c.get('transactionId')
   const ip = c.get('ip')
   const userAgent = c.get('userAgent')
 
-  if (!db || !accountId || !user) {
+  if (!db || !usersDb || !accountId || !user) {
     throw new Error('Missing required context')
   }
 
@@ -64,7 +66,7 @@ export const getUserHandler: RouteHandler<typeof getUserRoute, HonoEnv> = async
     userAgent,
   }
 
-  const foundUser = await usersService.findById(db, ctx, id)
+  const foundUser = await usersService.findById(usersDb, ctx, id)
   return c.json({ data: foundUser }, 200)
 }
 
@@ -100,13 +102,14 @@ export const updateUserHandler: RouteHandler<typeof updateUserRoute, HonoEnv> =
   const { id } = c.req.valid('param')
   const data = c.req.valid('json')
   const db = c.get('db')
+  const usersDb = c.env.DB ?? db
   const accountId = c.get('accountId')
   const user = c.get('user')
   const transactionId = c.get('transactionId')
   const ip = c.get('ip')
   const userAgent = c.get('userAgent')
 
-  if (!db || !accountId || !user) {
+  if (!db || !usersDb || !accountId || !user) {
     throw new Error('Missing required context')
   }
 
@@ -118,7 +121,7 @@ export const updateUserHandler: RouteHandler<typeof updateUserRoute, HonoEnv> =
     userAgent,
   }
 
-  const updatedUser = await usersService.update(db, ctx, id, {
+  const updatedUser = await usersService.update(usersDb, ctx, id, {
     name: data.name,
     status: data.status,
   })
@@ -129,13 +132,14 @@ export const updateUserHandler: RouteHandler<typeof updateUserRoute, HonoEnv> =
 export const deleteUserHandler: RouteHandler<typeof deleteUserRoute, HonoEnv> = async (c) => {
   const { id } = c.req.valid('param')
   const db = c.get('db')
+  const usersDb = c.env.DB ?? db
   const accountId = c.get('accountId')
   const user = c.get('user')
   const transactionId = c.get('transactionId')
   const ip = c.get('ip')
   const userAgent = c.get('userAgent')
 
-  if (!db || !accountId || !user) {
+  if (!db || !usersDb || !accountId || !user) {
     throw new Error('Missing required context')
   }
 
@@ -147,7 +151,7 @@ export const deleteUserHandler: RouteHandler<typeof deleteUserRoute, HonoEnv> =
     userAgent,
   }
 
-  await usersService.delete(db, ctx, id)
+  await usersService.delete(usersDb, ctx, id)
   return c.body(null, 204)
 }
 
@@ -155,13 +159,14 @@ export const deleteUserHandler: RouteHandler<typeof deleteUserRoute, HonoEnv> =
 export const createBulkUserAccountsHandler: RouteHandler<typeof createBulkUserAccountsRoute, HonoEnv> = async (c) => {
   const data = c.req.valid('json')
   const db = c.get('db')
+  const usersDb = c.env.DB ?? db
   const accountId = c.get('accountId')
   const user = c.get('user')
   const transactionId = c.get('transactionId')
   const ip = c.get('ip')
   const userAgent = c.get('userAgent')
 
-  if (!db || !accountId || !user) {
+  if (!db || !usersDb || !accountId || !user) {
     throw new Error('Missing required context')
   }
 
@@ -173,20 +178,21 @@ export const createBulkUserAccountsHandler: RouteHandler<typeof createBulkUserAc
     userAgent,
   }
 
-  const result = await usersService.createUserAccounts(db, ctx, data)
+  const result = await usersService.createUserAccounts(usersDb, ctx, data)
   return c.json(result, 201)
 }
 
 export const deleteBulkUserAccountsHandler: RouteHandler<typeof deleteBulkUserAccountsRoute, HonoEnv> = async (c) => {
   const data = c.req.valid('json')
   const db = c.get('db')
+  const usersDb = c.env.DB ?? db
   const accountId = c.get('accountId')
   const user = c.get('user')
   const transactionId = c.get('transactionId')
   const ip = c.get('ip')
   const userAgent = c.get('userAgent')
 
-  if (!db || !accountId || !user) {
+  if (!db || !usersDb || !accountId || !user) {
     throw new Error('Missing required context')
   }
 
@@ -198,20 +204,21 @@ export const deleteBulkUserAccountsHandler: RouteHandler<typeof deleteBulkUserAc
     userAgent,
   }
 
-  const result = await usersService.deleteUserAccounts(db, ctx, data)
+  const result = await usersService.deleteUserAccounts(usersDb, ctx, data)
   return c.json(result, 200)
 }
 
 export const restoreUserHandler: RouteHandler<typeof restoreUserRoute, HonoEnv> = async (c) => {
   const { id } = c.req.valid('param')
   const db = c.get('db')
+  const usersDb = c.env.DB ?? db
   const accountId = c.get('accountId')
   const user = c.get('user')
   const transactionId = c.get('transactionId')
   const ip = c.get('ip')
   const userAgent = c.get('userAgent')
 
-  if (!db || !accountId || !user) {
+  if (!db || !usersDb || !accountId || !user) {
     throw new Error('Missing required context')
   }
 
@@ -223,6 +230,6 @@ export const restoreUserHandler: RouteHandler<typeof restoreUserRoute, HonoEnv>
     userAgent,
   }
 
-  const result = await usersService.restore(db, ctx, id)
+  const result = await usersService.restore(usersDb, ctx, id)
   return c.json({ data: result }, 200)
 }