♻️ replace direct DB query with GetModerationWithUser repository

Replace direct database query in validate controller with proper repository pattern:
- Rename GetModeration to GetModerationWithUser for clarity
- Use await-to-js pattern for error handling as per CONTRIBUTING.md
- Properly handle NotFoundError to return 404 response
- Rename error variables to avoid naming conflicts (moderation_error, domain_error, join_error)

This follows the established repository pattern and improves code consistency.

Author: douglasduteil

sources/moderations/api/src/:id/$procedures/processed.ts

@@ -7,7 +7,7 @@ import type { IdentiteProconnect_Pg_Context } from "@~/app.middleware/set_identi
 import type { UserInfoVariables_Context } from "@~/app.middleware/set_userinfo";
 import { MODERATION_EVENTS } from "@~/moderations.lib/event";
 import { mark_moderatio_as_rejected } from "@~/moderations.lib/usecase/mark_moderatio_as_rejected";
-import { GetModeration } from "@~/moderations.repository";
+import { GetModerationWithUser } from "@~/moderations.repository";
 import { Hono } from "hono";
 
 //
@@ -20,8 +20,8 @@ export default new Hono<
   async ({ text, req, notFound, var: { identite_pg, userinfo } }) => {
     const { id } = req.valid("param");
 
-    const get_moderation = await GetModeration(identite_pg);
-    const moderation = await get_moderation(id);
+    const get_moderation_with_user = GetModerationWithUser(identite_pg);
+    const moderation = await get_moderation_with_user(id);
 
     if (!moderation) return notFound();
 

sources/moderations/api/src/:id/$procedures/rejected.ts

@@ -11,7 +11,7 @@ import { reject_form_schema } from "@~/moderations.lib/schema/rejected.form";
 import { mark_moderation_as } from "@~/moderations.lib/usecase/mark_moderation_as";
 import { RespondToTicket } from "@~/moderations.lib/usecase/RespondToTicket";
 import { SendRejectedMessageToUser } from "@~/moderations.lib/usecase/SendRejectedMessageToUser";
-import { GetModeration, UpdateModerationById } from "@~/moderations.repository";
+import { GetModerationWithUser, UpdateModerationById } from "@~/moderations.repository";
 import { Hono } from "hono";
 import type { ContextType } from "./context";
 
@@ -30,8 +30,8 @@ export default new Hono<ContextType>().patch(
     const { id: moderation_id } = req.valid("param");
     const { message, reason, subject } = req.valid("form");
 
-    const get_moderation = GetModeration(identite_pg);
-    const moderation = await get_moderation(moderation_id);
+    const get_moderation_with_user = GetModerationWithUser(identite_pg);
+    const moderation = await get_moderation_with_user(moderation_id);
     const crisp = CrispApi(crisp_config);
     const update_moderation_by_id = UpdateModerationById({ pg: identite_pg });
     const respond_to_ticket = RespondToTicket();

sources/moderations/api/src/:id/$procedures/validate.ts

@@ -1,7 +1,7 @@
 //
 
 import { zValidator } from "@hono/zod-validator";
-import { HTTPError } from "@~/app.core/error";
+import { HTTPError, NotFoundError } from "@~/app.core/error";
 import type { Htmx_Header } from "@~/app.core/htmx";
 import { Entity_Schema } from "@~/app.core/schema";
 import { z_email_domain } from "@~/app.core/schema/z_email_domain";
@@ -16,7 +16,7 @@ import { MODERATION_EVENTS } from "@~/moderations.lib/event";
 import { validate_form_schema } from "@~/moderations.lib/schema/validate.form";
 import { mark_moderation_as } from "@~/moderations.lib/usecase/mark_moderation_as";
 import { MemberJoinOrganization } from "@~/moderations.lib/usecase/member_join_organization";
-import { GetModerationById } from "@~/moderations.repository";
+import { GetModerationById, GetModerationWithUser } from "@~/moderations.repository";
 import {
   AddVerifiedDomain,
   GetFicheOrganizationById,
@@ -47,18 +47,14 @@ export default new Hono<App_Context>().patch(
       get_organization_by_id: GetFicheOrganizationById({ pg: identite_pg }),
       mark_domain_as_verified: MarkDomainAsVerified(identite_pg_client),
     });
-    const moderation = await identite_pg.query.moderations.findFirst({
-      columns: {
-        comment: true,
-        id: true,
-        organization_id: true,
-        user_id: true,
-      },
-      with: { user: { columns: { email: true } } },
-      where: eq(schema.moderations.id, id),
-    });
-
-    if (!moderation) return notFound();
+    const get_moderation_with_user = GetModerationWithUser(identite_pg);
+    
+    const [moderation_error, moderation] = await to(get_moderation_with_user(id));
+    
+    if (moderation_error) {
+      if (moderation_error instanceof NotFoundError) return notFound();
+      throw moderation_error;
+    }
 
     const {
       organization_id,
@@ -71,7 +67,7 @@ export default new Hono<App_Context>().patch(
 
     //#region ✨ Add verified domain
     if (add_domain) {
-      const [error] = await to(
+      const [domain_error] = await to(
         add_verified_domain({
           organization_id,
           domain,
@@ -80,16 +76,16 @@ export default new Hono<App_Context>().patch(
         }),
       );
 
-      match(error)
+      match(domain_error)
         .with(P.instanceOf(HTTPError), () => {
-          consola.error(error);
-          sentry.captureException(error, {
+          consola.error(domain_error);
+          sentry.captureException(domain_error, {
             data: { domain, organization_id: id },
           });
         })
         .with(P.instanceOf(Error), () => {
-          consola.error(error);
-          throw error;
+          consola.error(domain_error);
+          throw domain_error;
         });
     }
     //#endregion
@@ -109,20 +105,20 @@ export default new Hono<App_Context>().patch(
       }),
       get_moderation_by_id: GetModerationById({ pg: identite_pg }),
     });
-    const [error] = await to(
+    const [join_error] = await to(
       member_join_organization({ is_external, moderation_id: id }),
     );
 
-    match(error)
+    match(join_error)
       .with(P.instanceOf(HTTPError), () => {
-        consola.error(error);
-        sentry.captureException(error, {
+        consola.error(join_error);
+        sentry.captureException(join_error, {
           data: { domain, organization_id: id },
         });
       })
       .with(P.instanceOf(Error), () => {
-        consola.error(error);
-        throw error;
+        consola.error(join_error);
+        throw join_error;
       });
 
     //#endregion

sources/moderations/lib/src/context/rejected.ts

@@ -3,14 +3,14 @@
 import type { AgentConnect_UserInfo } from "@~/app.middleware/session";
 import type { CrispApi } from "@~/crisp.lib/api";
 import type { IdentiteProconnect_PgDatabase } from "@~/identite-proconnect.database";
-import type { GetModerationDto } from "@~/moderations.repository";
+import type { GetModerationWithUserDto } from "@~/moderations.repository";
 import type { RejectedMessage } from "../schema/rejected.form";
 
 //
 
 export type RejectedModeration_Context = {
   crisp: CrispApi;
-  moderation: GetModerationDto;
+  moderation: GetModerationWithUserDto;
   pg: IdentiteProconnect_PgDatabase;
   reason: string;
   resolve_delay: number;

sources/moderations/lib/src/usecase/mark_moderatio_as_rejected.ts

@@ -5,7 +5,7 @@ import type { AgentConnect_UserInfo } from "@~/app.middleware/session";
 import type { IdentiteProconnect_PgDatabase } from "@~/identite-proconnect.database";
 import {
   UpdateModerationById,
-  type GetModerationDto,
+  type GetModerationWithUserDto,
 } from "@~/moderations.repository";
 import { append_comment } from "../comment_message";
 
@@ -17,7 +17,7 @@ export async function mark_moderatio_as_rejected({
   userinfo,
   reason,
 }: {
-  moderation: GetModerationDto;
+  moderation: GetModerationWithUserDto;
   userinfo: AgentConnect_UserInfo;
   pg: IdentiteProconnect_PgDatabase;
   reason: string;

sources/moderations/repository/src/GetModeration.test.ts

@@ -11,7 +11,7 @@ import {
   pg,
 } from "@~/identite-proconnect.database/testing";
 import { beforeAll, beforeEach, expect, test } from "bun:test";
-import { GetModeration } from "./GetModeration";
+import { GetModerationWithUser } from "./GetModerationWithUser";
 
 //
 
@@ -25,8 +25,8 @@ test("get a moderation with minimal fields", async () => {
   await create_adora_pony_user(pg);
   const moderation_id = await create_adora_pony_moderation(pg, { type: "" });
 
-  const get_moderation = GetModeration(pg);
-  const moderation = await get_moderation(moderation_id);
+  const get_moderation_with_user = GetModerationWithUser(pg);
+  const moderation = await get_moderation_with_user(moderation_id);
 
   expect(moderation).toMatchInlineSnapshot(`
     {
@@ -43,7 +43,7 @@ test("get a moderation with minimal fields", async () => {
 });
 
 test("throws NotFoundError when moderation does not exist", async () => {
-  const get_moderation = GetModeration(pg);
+  const get_moderation_with_user = GetModerationWithUser(pg);
 
-  await expect(get_moderation(999999)).rejects.toThrow("Moderation not found.");
+  await expect(get_moderation_with_user(999999)).rejects.toThrow("Moderation not found.");
 });

sources/moderations/repository/src/GetModeration.ts renamed to sources/moderations/repository/src/GetModerationWithUser.ts

@@ -9,8 +9,8 @@ import { eq } from "drizzle-orm";
 
 //
 
-export function GetModeration(pg: IdentiteProconnect_PgDatabase) {
-  return async function get_moderation(moderation_id: number) {
+export function GetModerationWithUser(pg: IdentiteProconnect_PgDatabase) {
+  return async function get_moderation_with_user(moderation_id: number) {
     const moderation = await pg.query.moderations.findFirst({
       columns: {
         id: true,
@@ -29,5 +29,5 @@ export function GetModeration(pg: IdentiteProconnect_PgDatabase) {
   };
 }
 
-export type GetModerationHandler = ReturnType<typeof GetModeration>;
-export type GetModerationDto = Awaited<ReturnType<GetModerationHandler>>;
+export type GetModerationWithUserHandler = ReturnType<typeof GetModerationWithUser>;
+export type GetModerationWithUserDto = Awaited<ReturnType<GetModerationWithUserHandler>>;

sources/moderations/repository/src/index.ts

@@ -1,7 +1,7 @@
 //
 
 export * from "./GetDuplicateModerations";
-export * from "./GetModeration";
+export * from "./GetModerationWithUser";
 export * from "./GetModerationById";
 export * from "./GetModerationForEmail";
 export * from "./GetModerationsByUserId";