fix(moderation): add nickname to new conversatino

numerique-gouv · Aug 29, 2024 · a5337f4 · a5337f4
1 parent b0813e1
commit a5337f4
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 4 deletions.
diff --git a/packages/~/app/layout/src/main.tsx b/packages/~/app/layout/src/main.tsx
@@ -38,6 +38,9 @@ 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;

diff --git a/packages/~/infra/crisp/lib/src/index.ts b/packages/~/infra/crisp/lib/src/index.ts
@@ -84,7 +84,11 @@ export async function get_user(config: Config, { email }: { email: string }) {
 
 export async function create_conversation(
   config: Config,
-  { email, subject }: Pick<ConversationMeta, "email" | "subject">,
+  {
+    email,
+    nickname,
+    subject,
+  }: Pick<ConversationMeta, "email" | "nickname" | "subject">,
 ) {
   const { session_id } = await fetch_crisp<CreateConversationRoute>(config, {
     endpoint: `/v1/website/${config.website_id}/conversation`,
@@ -98,6 +102,7 @@ export async function create_conversation(
     searchParams: {},
     body: {
       email,
+      nickname,
       segments: ["email", "moderation"],
       subject,
     },

diff --git a/packages/~/moderations/lib/src/usecase/create_and_send_email_to_user.ts b/packages/~/moderations/lib/src/usecase/create_and_send_email_to_user.ts
@@ -1,5 +1,7 @@
 //
 
+import { NotFoundError } from "@~/app.core/error";
+import { userinfo_to_username } from "@~/app.layout";
 import { create_conversation } from "@~/crisp.lib";
 import { update_moderation_by_id } from "@~/moderations.repository/update_moderation_by_id";
 import type {
@@ -15,15 +17,31 @@ export async function create_and_send_email_to_user(
   { message, subject, to }: RejectedFullMessage,
 ) {
   const { crisp_config, moderation, pg } = context;
+  const user = await pg.query.users.findFirst({
+    columns: { given_name: true, family_name: true },
+    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 { session_id } = await create_conversation(crisp_config, {
     email: to,
     subject,
+    nickname,
   });
 
-  await respond_to_ticket(context, { message, subject, to: session_id });
-
   await update_moderation_by_id(pg, {
     moderation_id: moderation.id,
     ticket_id: session_id,
   });
+
+  await respond_to_ticket(
+    {
+      ...context,
+      moderation: { ...context.moderation, ticket_id: session_id },
+    },
+    { message, subject, to: session_id },
+  );
 }
diff --git a/packages/~/moderations/lib/src/usecase/respond_to_ticket.ts b/packages/~/moderations/lib/src/usecase/respond_to_ticket.ts
@@ -25,7 +25,7 @@ export async function respond_to_ticket(
 ) {
   return match(context.moderation.ticket_id)
     .with(null, () => {
-      throw new NotFoundError("Ticket not found.");
+      throw new NotFoundError("No existing ticket.");
     })
     .when(is_crisp_ticket, () => respond_in_conversation(context, full_message))
     .when(is_zammad_ticket, () =>