refactor(vps): extract shared dieOnDatabaseError helper

guidefari · guidefari · commit d87997623930 · 2026-07-11T18:10:10.000+02:00
Review on #162 flagged dieOnDatabaseError as a likely duplicate -- correct: search, music, profile, and this PR's admin handlers each had an identical copy differing only in the log-tag prefix string. Extracted to apps/vps/src/http/handler-utils.ts as a tag -> wrapper factory, with each handler file partially applying its own tag once at module scope so call sites stay unchanged (dieOnDatabaseError(effect)).
diff --git a/apps/vps/src/http/admin.handlers.ts b/apps/vps/src/http/admin.handlers.ts
@@ -21,6 +21,9 @@ import { postsTable } from '@/db/post.schema'
 import { releasesTable } from '@/db/release.schema'
 import { showSubscriptionsTable, showsTable } from '@/db/show.schema'
 import { DatabaseError, getErrorMessage } from '@/errors'
+import { dieOnDatabaseError } from '@/http/handler-utils'
+
+const dieOnAdminDatabaseError = dieOnDatabaseError('admin')
 
 type ContentTable =
   | typeof audioTable
@@ -511,17 +514,16 @@ export const AdminHandlersLive = HttpApiBuilder.group(Api, 'admin', (handlers) =
     .handle('getAdminOverview', () =>
       Effect.gen(function* () {
         yield* requireAdmin
-        return yield* Effect.tryPromise({
-          try: () => loadAdminOverview(),
-          catch: (error) =>
-            new DatabaseError({
-              message: `Failed to fetch admin overview: ${getErrorMessage(error)}`,
-              operation: 'select',
-              table: 'admin-overview'
-            })
-        }).pipe(
-          Effect.tapError((cause) => Effect.logError('[admin] overview query failed', cause)),
-          Effect.catchTag('DatabaseError', (cause) => Effect.die(cause))
+        return yield* dieOnAdminDatabaseError(
+          Effect.tryPromise({
+            try: () => loadAdminOverview(),
+            catch: (error) =>
+              new DatabaseError({
+                message: `Failed to fetch admin overview: ${getErrorMessage(error)}`,
+                operation: 'select',
+                table: 'admin-overview'
+              })
+          })
         )
       })
     )
@@ -551,30 +553,27 @@ export const AdminHandlersLive = HttpApiBuilder.group(Api, 'admin', (handlers) =
     .handle('getNewsletterSubscribers', () =>
       Effect.gen(function* () {
         yield* requireAdmin
-        const rows = yield* Effect.tryPromise({
-          try: () =>
-            db
-              .select({
-                id: newsletterSubscribersTable.id,
-                email: newsletterSubscribersTable.email,
-                name: newsletterSubscribersTable.name,
-                source: newsletterSubscribersTable.source,
-                unsubscribedAt: newsletterSubscribersTable.unsubscribedAt,
-                createdAt: newsletterSubscribersTable.createdAt
+        const rows = yield* dieOnAdminDatabaseError(
+          Effect.tryPromise({
+            try: () =>
+              db
+                .select({
+                  id: newsletterSubscribersTable.id,
+                  email: newsletterSubscribersTable.email,
+                  name: newsletterSubscribersTable.name,
+                  source: newsletterSubscribersTable.source,
+                  unsubscribedAt: newsletterSubscribersTable.unsubscribedAt,
+                  createdAt: newsletterSubscribersTable.createdAt
+                })
+                .from(newsletterSubscribersTable)
+                .orderBy(desc(newsletterSubscribersTable.createdAt)),
+            catch: (error) =>
+              new DatabaseError({
+                message: `Failed to fetch newsletter subscribers: ${getErrorMessage(error)}`,
+                operation: 'select',
+                table: 'newsletter_subscribers'
               })
-              .from(newsletterSubscribersTable)
-              .orderBy(desc(newsletterSubscribersTable.createdAt)),
-          catch: (error) =>
-            new DatabaseError({
-              message: `Failed to fetch newsletter subscribers: ${getErrorMessage(error)}`,
-              operation: 'select',
-              table: 'newsletter_subscribers'
-            })
-        }).pipe(
-          Effect.tapError((cause) =>
-            Effect.logError('[admin] newsletter subscribers query failed', cause)
-          ),
-          Effect.catchTag('DatabaseError', (cause) => Effect.die(cause))
+          })
         )
 
         return {
diff --git a/apps/vps/src/http/handler-utils.ts b/apps/vps/src/http/handler-utils.ts
@@ -0,0 +1,17 @@
+import { Effect } from 'effect'
+
+type DatabaseErrorTag = { readonly _tag: 'DatabaseError' }
+
+// Undeclared DatabaseError becomes a logged defect (500), same as the old
+// runEffect's fallback for anything that wasn't a mapped HttpError. Shared
+// across handler groups instead of copy-pasted per group (each copy was
+// identical except the log-tag prefix) -- flagged in review on PR #162.
+export const dieOnDatabaseError =
+  (logTag: string) =>
+  <A, E, R>(effect: Effect.Effect<A, E | DatabaseErrorTag, R>) =>
+    effect.pipe(
+      Effect.tapErrorTag('DatabaseError', (cause) =>
+        Effect.logError(`[${logTag}] database operation failed`, cause)
+      ),
+      Effect.catchTag('DatabaseError', (cause) => Effect.die(cause))
+    )
diff --git a/apps/vps/src/http/music.handlers.ts b/apps/vps/src/http/music.handlers.ts
@@ -4,6 +4,7 @@ import type { ArtistResponse, CreateArtistInput, UpdateArtistInput } from '@gbfm
 import { Effect } from 'effect'
 import { HttpApiBuilder, HttpApiError } from 'effect/unstable/httpapi'
 import type { SelectMusicArtist } from '@/db/music-entity.schema'
+import { dieOnDatabaseError as makeDieOnDatabaseError } from '@/http/handler-utils'
 import { MusicEntityService } from '@/services/music-entity'
 
 const toArtistResponse = (row: SelectMusicArtist): ArtistResponse => ({
@@ -22,17 +23,7 @@ const toServiceFields = <T extends CreateArtistInput | UpdateArtistInput>(
   publishedAt: input.publishedAt ? new Date(input.publishedAt) : undefined
 })
 
-// Undeclared DatabaseError becomes a logged defect (500), same as the old
-// runEffect's fallback for anything that wasn't a mapped HttpError.
-const dieOnDatabaseError = <A, E, R>(effect: Effect.Effect<A, E | DatabaseErrorTag, R>) =>
-  effect.pipe(
-    Effect.tapErrorTag('DatabaseError', (cause) =>
-      Effect.logError('[music] database operation failed', cause)
-    ),
-    Effect.catchTag('DatabaseError', (cause) => Effect.die(cause))
-  )
-
-type DatabaseErrorTag = { readonly _tag: 'DatabaseError' }
+const dieOnDatabaseError = makeDieOnDatabaseError('music')
 
 const requireAdmin = Effect.gen(function* () {
   const { user } = yield* AuthSession
diff --git a/apps/vps/src/http/profile.handlers.ts b/apps/vps/src/http/profile.handlers.ts
@@ -1,19 +1,10 @@
 import { Api } from '@gbfm/api/api'
 import { Effect } from 'effect'
 import { HttpApiBuilder, HttpApiError } from 'effect/unstable/httpapi'
+import { dieOnDatabaseError as makeDieOnDatabaseError } from '@/http/handler-utils'
 import { ProfileService } from '@/services/profile.service'
 
-// Undeclared DatabaseError becomes a logged defect (500), same as the old
-// runEffect's fallback for anything that wasn't a mapped HttpError.
-const dieOnDatabaseError = <A, E, R>(effect: Effect.Effect<A, E | DatabaseErrorTag, R>) =>
-  effect.pipe(
-    Effect.tapErrorTag('DatabaseError', (cause) =>
-      Effect.logError('[profile] database operation failed', cause)
-    ),
-    Effect.catchTag('DatabaseError', (cause) => Effect.die(cause))
-  )
-
-type DatabaseErrorTag = { readonly _tag: 'DatabaseError' }
+const dieOnDatabaseError = makeDieOnDatabaseError('profile')
 
 export const ProfileHandlersLive = HttpApiBuilder.group(Api, 'profile', (handlers) =>
   handlers.handle('getPublicProfile', ({ params }) =>
diff --git a/apps/vps/src/http/search.handlers.ts b/apps/vps/src/http/search.handlers.ts
@@ -1,19 +1,10 @@
 import { Api } from '@gbfm/api/api'
 import { Effect } from 'effect'
 import { HttpApiBuilder } from 'effect/unstable/httpapi'
+import { dieOnDatabaseError as makeDieOnDatabaseError } from '@/http/handler-utils'
 import { SearchService } from '@/services/search.service'
 
-// Undeclared DatabaseError becomes a logged defect (500), same fallback as
-// the old runEffect for anything that wasn't a mapped HttpError.
-const dieOnDatabaseError = <A, E, R>(effect: Effect.Effect<A, E | DatabaseErrorTag, R>) =>
-  effect.pipe(
-    Effect.tapErrorTag('DatabaseError', (cause) =>
-      Effect.logError('[search] database operation failed', cause)
-    ),
-    Effect.catchTag('DatabaseError', (cause) => Effect.die(cause))
-  )
-
-type DatabaseErrorTag = { readonly _tag: 'DatabaseError' }
+const dieOnDatabaseError = makeDieOnDatabaseError('search')
 
 export const SearchHandlersLive = HttpApiBuilder.group(Api, 'search', (handlers) =>
   handlers.handle('searchContent', ({ query }) =>
