Merge pull request #1841 from proconnect-gouv/douglasduteil/track-the-sp-name-from-the-session-in-created-moderations

Author: rdubigny

src/controllers/organization.ts

@@ -143,6 +143,7 @@ export const postJoinOrganizationMiddleware = async (
       user_id,
       confirmed,
       certificationRequested: req.session.certificationDirigeantRequested,
+      sp_name: req.session.spName,
     });
 
     if (req.session.mustReturnOneOrganizationInPayload) {

src/managers/organization/join.ts

@@ -171,11 +171,13 @@ export const joinOrganization = async ({
   user_id,
   confirmed = false,
   certificationRequested = false,
+  sp_name,
 }: {
   organization: Organization;
   user_id: number;
   confirmed: boolean;
   certificationRequested?: boolean;
+  sp_name?: string;
 }): Promise<UserOrganizationLink> => {
   const { siret } = organization;
 
@@ -435,6 +437,7 @@ export const joinOrganization = async ({
       organization_id,
       type: ModerationTypeSchema.enum.non_verified_domain,
       ticket_id: null,
+      sp_name,
     });
     return await linkUserToOrganization({
       organization_id,
@@ -501,9 +504,11 @@ export const greetForCertification = async ({
 export const createPendingModeration = async ({
   user,
   organization,
+  sp_name,
 }: {
   user: User;
   organization: Organization;
+  sp_name?: string;
 }) => {
   let ticket_id = null;
   const { id: user_id, email } = user;
@@ -527,6 +532,7 @@ export const createPendingModeration = async ({
   return createModeration({
     user_id,
     organization_id,
+    sp_name,
     type: ModerationTypeSchema.enum.organization_join_block,
     ticket_id,
   });

src/middlewares/navigation-guards.ts

@@ -829,8 +829,9 @@ const processPendingModerationGuard = async (prev: Pass<RequestContext>) => {
   if (!Pass.is_passing(context)) return context;
 
   const { id: moderation_id } = await createPendingModeration({
-    user,
     organization,
+    sp_name: req.session.spName,
+    user,
   });
 
   req.session.pendingModerationOrganizationId = undefined;

src/repositories/moderation.ts

@@ -10,27 +10,30 @@ import { getDatabaseConnection } from "../connectors/postgres";
 export const createModeration = async ({
   user_id,
   organization_id,
+  sp_name,
   type,
   ticket_id,
 }: {
   user_id: number;
   organization_id: number;
+  sp_name?: string;
   type: ModerationType;
   ticket_id: string | null;
 }) => {
   const connection = getDatabaseConnection();
 
   const { rows }: QueryResult<Moderation> = await connection.query(
     `
-INSERT INTO moderations (user_id, organization_id, status, type, ticket_id)
-VALUES ($1, $2, $3, $4, $5)
+INSERT INTO moderations (user_id, organization_id, status, type, ticket_id, sp_name)
+VALUES ($1, $2, $3, $4, $5, $6)
 RETURNING *;`,
     [
       user_id,
       organization_id,
       ModerationStatusSchema.enum.pending,
       type,
       ticket_id,
+      sp_name ?? null,
     ],
   );