✨ suggest ministere des armees for intraf.gouv.fr emails

Author: BenoitSerrano

src/controllers/organization.ts

@@ -60,7 +60,7 @@ export const getJoinOrganizationController = async (
       do_not_propose_suggestions: optionalBooleanSchema(),
     });
 
-    const { notification, siret_hint, do_not_propose_suggestions } =
+    let { notification, siret_hint, do_not_propose_suggestions } =
       await schema.parseAsync(req.query);
 
     const { id: user_id, email } = getUserFromAuthenticatedSession(req);
@@ -74,13 +74,14 @@ export const getJoinOrganizationController = async (
       return res.redirect("/users/organization-suggestions");
     }
 
+    const emailDomain = getEmailDomain(email);
+
     return res.render("user/join-organization", {
       pageTitle: "Rejoindre une organisation",
       notifications: await getNotificationsFromRequest(req),
       csrfToken: csrfToken(req),
       siretHint: siret_hint,
-      useGendarmerieSearchHint:
-        getEmailDomain(email) === "gendarmerie.interieur.gouv.fr",
+      useGendarmerieSearchHint: emailDomain === "gendarmerie.interieur.gouv.fr",
     });
   } catch (error) {
     next(error);

src/managers/organization/join.ts

@@ -53,6 +53,7 @@ import {
   findByUserId,
   findByVerifiedEmailDomain,
   getById,
+  getBySiret,
 } from "../../repositories/organization/getters";
 import {
   linkUserToOrganization,
@@ -67,6 +68,7 @@ import {
 import { logger } from "../../services/log";
 import {
   hasLessThanFiftyEmployees,
+  isArmeeDomain,
   isCommune,
   isEducationNationaleDomain,
   isEtablissementScolaireDuPremierEtSecondDegre,
@@ -110,6 +112,13 @@ export const getOrganizationSuggestions = async ({
     return [];
   }
 
+  if (isArmeeDomain(domain)) {
+    const armeeOrganization = await getBySiret("11009001600053");
+    if (armeeOrganization) {
+      return [armeeOrganization];
+    }
+  }
+
   const organizationsSuggestions = await findByVerifiedEmailDomain(domain);
 
   if (organizationsSuggestions.length > MAX_SUGGESTED_ORGANIZATIONS) {

src/repositories/organization/getters.ts

@@ -17,6 +17,21 @@ export const findByUserId = findByUserIdFactory({
   pg: getDatabaseConnection(),
 });
 
+export const getBySiret = async (siret: string) => {
+  const connection = getDatabaseConnection();
+
+  const { rows }: QueryResult<Organization> = await connection.query(
+    `
+SELECT id, siret
+FROM organizations
+WHERE siret = $1
+`,
+    [siret],
+  );
+
+  return rows.shift();
+};
+
 export const findPendingByUserId = async (user_id: number) => {
   const connection = getDatabaseConnection();
 

src/services/organization.ts

@@ -115,6 +115,13 @@ export const isEducationNationaleDomain = (domain: string) => {
   return domain.match(/^ac-[a-zA-Z0-9-]*\.fr$/) !== null;
 };
 
+export const isArmeeDomain = (domain: string) => {
+  if (!isDomainValid(domain)) {
+    return false;
+  }
+  return domain === "intradef.gouv.fr";
+};
+
 export const getOrganizationTypeLabel = (organization: Organization) => {
   if (isEtablissementScolaireDuPremierEtSecondDegre(organization)) {
     return "établissement scolaire";