🚚 (core): move userinfo_to_username to core schema (#497)

Author: douglasduteil

packages/~/app/core/src/schema/z_username.test.ts

@@ -0,0 +1,15 @@
+//
+
+import { expect, test } from "bun:test";
+import { z_username } from "./z_username";
+
+//
+
+test("transform userinfo to username", () => {
+  expect(
+    z_username.parse({
+      given_name: "Jean",
+      usual_name: "Mich",
+    }),
+  ).toEqual("Jean Mich");
+});

packages/~/app/core/src/schema/z_username.ts

@@ -0,0 +1,14 @@
+//
+
+import { z } from "zod";
+
+//
+
+export const z_username = z
+  .object({
+    given_name: z.string().default(""),
+    usual_name: z.string().default(""),
+  })
+  .transform(({ given_name, usual_name }) => {
+    return `${given_name} ${usual_name}`;
+  });

packages/~/app/layout/src/__snapshots__/main.test.tsx.snap

@@ -85,7 +85,7 @@ exports[`Main Layout 1`] = `
         "
         class="flex min-h-screen flex-col"
       >
-        <div class="flex flex-1 flex-col"><div class="flex min-h-full flex-grow flex-col"><header role="banner" class="fr-header"><div class="fr-header__body"><div class="fr-container"><div class="fr-header__body-row"><div class="fr-header__brand fr-enlarge-link"><div class="fr-header__brand-top"><div class="fr-header__logo"><p class="fr-logo">République<br/>Française</p></div></div><div class="fr-header__service"><a href="/" title="Accueil "><p class="fr-header__service-title">Hyyypertool</p></a><p class="fr-header__service-tagline">hyyyyyyyypertool</p></div></div><div class="fr-header__tools"><div class="fr-header__tools-links"><ul class="fr-btns-group"><li><a class="fr-btn fr-btn--sm fr-btn--tertiary-no-outline fr-fi-logout-box-r-line fr-btn--icon-left" href="/auth/logout">undefined undefined</a></li></ul></div></div></div></div></div><div class="fr-header__menu fr-modal"><div class="fr-container"><nav class="fr-nav" id="navigation-494" role="navigation" aria-label="Menu principal"><ul class="fr-nav__list"><li class="fr-nav__item"><a class="fr-nav__link" href="/moderations" target="_self">Moderations</a></li><li class="fr-nav__item"><a class="fr-nav__link" href="/users" target="_self">Utilisateurs</a></li><li class="fr-nav__item"><a class="fr-nav__link" href="/organizations" target="_self">Organisations</a></li><li class="fr-nav__item"><a class="fr-nav__link" href="/organizations/domains" target="_self">Domaines à verifier</a></li></ul></nav></div></div></header><div class="relative flex flex-1 flex-col">✅</div></div></div>
+        <div class="flex flex-1 flex-col"><div class="flex min-h-full flex-grow flex-col"><header role="banner" class="fr-header"><div class="fr-header__body"><div class="fr-container"><div class="fr-header__body-row"><div class="fr-header__brand fr-enlarge-link"><div class="fr-header__brand-top"><div class="fr-header__logo"><p class="fr-logo">République<br/>Française</p></div></div><div class="fr-header__service"><a href="/" title="Accueil "><p class="fr-header__service-title">Hyyypertool</p></a><p class="fr-header__service-tagline">hyyyyyyyypertool</p></div></div><div class="fr-header__tools"><div class="fr-header__tools-links"><ul class="fr-btns-group"><li><a class="fr-btn fr-btn--sm fr-btn--tertiary-no-outline fr-fi-logout-box-r-line fr-btn--icon-left" href="/auth/logout">Lara Croft</a></li></ul></div></div></div></div></div><div class="fr-header__menu fr-modal"><div class="fr-container"><nav class="fr-nav" id="navigation-494" role="navigation" aria-label="Menu principal"><ul class="fr-nav__list"><li class="fr-nav__item"><a class="fr-nav__link" href="/moderations" target="_self">Moderations</a></li><li class="fr-nav__item"><a class="fr-nav__link" href="/users" target="_self">Utilisateurs</a></li><li class="fr-nav__item"><a class="fr-nav__link" href="/organizations" target="_self">Organisations</a></li><li class="fr-nav__item"><a class="fr-nav__link" href="/organizations/domains" target="_self">Domaines à verifier</a></li></ul></nav></div></div></header><div class="relative flex flex-1 flex-col">✅</div></div></div>
         <footer class="container mx-auto flex flex-row justify-between p-2">
           <div>© 2222 🇫🇷</div>
           <a

packages/~/app/layout/src/main.test.tsx

@@ -17,7 +17,7 @@ beforeAll(() => {
 test("Main Layout", async () => {
   const app = new Hono()
     .use(set_config({}))
-    .use(set_userinfo({}))
+    .use(set_userinfo({ given_name: "Lara", usual_name: "Croft" }))
     .use(set_nonce("nonce"))
     .use(jsxRenderer(Main_Layout))
     .get("/", (c) => {

packages/~/app/layout/src/main.tsx

@@ -1,5 +1,6 @@
 //
 
+import { z_username } from "@~/app.core/schema/z_username";
 import type { UserInfoVariables_Context } from "@~/app.middleware/set_userinfo";
 import { urls } from "@~/app.urls";
 import type { PropsWithChildren } from "hono/jsx";
@@ -11,7 +12,7 @@ export function Main_Layout({ children }: PropsWithChildren) {
   const {
     var: { userinfo },
   } = useRequestContext<UserInfoVariables_Context>();
-  const username = userinfo_to_username(userinfo);
+  const username = z_username.parse(userinfo);
   return (
     <Root_Layout>
       <div class="flex min-h-full flex-grow flex-col">
@@ -38,17 +39,6 @@ export function Main_Layout({ children }: PropsWithChildren) {
   );
 }
 
-/**
- * @todo(dougalsduteil) Move this to another package
- */
-export function userinfo_to_username(userinfo: {
-  given_name: string;
-  usual_name: string;
-}) {
-  const { given_name, usual_name } = userinfo;
-  return `${given_name} ${usual_name}`;
-}
-
 //
 
 function Brand() {

packages/~/moderations/lib/src/usecase/create_and_send_email_to_user.ts

@@ -1,7 +1,7 @@
 //
 
 import { NotFoundError } from "@~/app.core/error";
-import { userinfo_to_username } from "@~/app.layout";
+import { z_username } from "@~/app.core/schema/z_username";
 import { create_conversation } from "@~/crisp.lib";
 import { update_moderation_by_id } from "@~/moderations.repository/update_moderation_by_id";
 import type {
@@ -22,9 +22,9 @@ export async function create_and_send_email_to_user(
     where: (table, { eq }) => eq(table.id, moderation.user_id),
   });
   if (!user) throw new NotFoundError(`User not found`);
-  const nickname = userinfo_to_username({
-    given_name: user.given_name ?? "",
-    usual_name: user.family_name ?? "",
+  const nickname = z_username.parse({
+    given_name: user.given_name,
+    usual_name: user.family_name,
   });
   const { session_id } = await create_conversation(crisp_config, {
     email: to,

packages/~/moderations/lib/src/usecase/mark_moderatio_as_rejected.ts

@@ -1,6 +1,6 @@
 //
 
-import { userinfo_to_username } from "@~/app.layout";
+import { z_username } from "@~/app.core/schema/z_username";
 import type { AgentConnect_UserInfo } from "@~/app.middleware/session";
 import type { get_moderation_dto } from "@~/moderations.repository/get_moderation";
 import { update_moderation_by_id } from "@~/moderations.repository/update_moderation_by_id";
@@ -19,7 +19,7 @@ export async function mark_moderatio_as_rejected({
   pg: MonComptePro_PgDatabase;
 }) {
   const { comment, id: moderation_id } = moderation;
-  const moderated_by = userinfo_to_username(userinfo);
+  const moderated_by = z_username.parse(userinfo);
 
   await update_moderation_by_id(pg, {
     comment: append_comment(comment, {

packages/~/moderations/lib/src/usecase/mark_moderation_as.ts

@@ -1,6 +1,6 @@
 //
 
-import { userinfo_to_username } from "@~/app.layout";
+import { z_username } from "@~/app.core/schema/z_username";
 import type { AgentConnect_UserInfo } from "@~/app.middleware/session";
 import { update_moderation_by_id } from "@~/moderations.repository/update_moderation_by_id";
 import type { MonComptePro_PgDatabase, schema } from "@~/moncomptepro.database";
@@ -21,7 +21,7 @@ export async function mark_moderation_as(
   type: Comment_Type["type"],
 ) {
   const { comment, id: moderation_id } = moderation;
-  const username = userinfo_to_username(userinfo);
+  const username = z_username.parse(userinfo);
   const moderated_by = `${username} <${userinfo.email}>`;
 
   await update_moderation_by_id(pg, {

packages/~/moderations/lib/src/usecase/respond_to_ticket.ts

@@ -1,7 +1,7 @@
 //
 
 import { NotFoundError } from "@~/app.core/error";
-import { userinfo_to_username } from "@~/app.layout";
+import { z_username } from "@~/app.core/schema/z_username";
 import { get_user, is_crisp_ticket, send_message } from "@~/crisp.lib";
 import { get_full_ticket, send_zammad_response } from "@~/zammad.lib";
 import {
@@ -48,7 +48,7 @@ async function respond_in_conversation(
     get_user(crisp_config, { email: userinfo.email }),
   );
   const user = found_user ?? {
-    nickname: userinfo_to_username(userinfo),
+    nickname: z_username.parse(userinfo),
     email: userinfo.email,
   };
 

packages/~/moderations/lib/src/usecase/send_rejected_message_to_user.ts

@@ -1,5 +1,5 @@
 import { NotFoundError } from "@~/app.core/error";
-import { userinfo_to_username } from "@~/app.layout";
+import { z_username } from "@~/app.core/schema/z_username";
 import { to as await_to } from "await-to-js";
 import consola from "consola";
 import type {
@@ -16,7 +16,7 @@ export async function send_rejected_message_to_user(
   { message: text_body, subject }: RejectedMessage,
 ) {
   const { moderation, userinfo } = context;
-  const username = userinfo_to_username(userinfo);
+  const username = z_username.parse(userinfo);
   const body = text_body.concat(`  \n\n${username}`);
   const to = moderation.user.email;