debug: move markDomainAsVerified

numerique-gouv · Sep 17, 2024 · 64c63f3 · 64c63f3
1 parent 36ff2e4
commit 64c63f3
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 63 deletions.
diff --git a/src/controllers/api.ts b/src/controllers/api.ts
@@ -10,7 +10,7 @@ import notificationMessages from "../config/notification-messages";
 import { getOrganizationInfo } from "../connectors/api-sirene";
 import { sendModerationProcessedEmail } from "../managers/moderation";
 import { forceJoinOrganization } from "../managers/organization/join";
-import { markDomainAsVerified } from "../managers/organization/main";
+import { markDomainAsVerified } from "../managers/organization/markDomainAsVerified";
 import { getUserOrganizationLink } from "../repositories/organization/getters";
 import {
   idSchema,

diff --git a/src/managers/organization/join.ts b/src/managers/organization/join.ts
@@ -51,7 +51,8 @@ import {
 } from "../../services/organization";
 import { isEmailValid } from "../../services/security";
 import { unableToAutoJoinOrganizationMd } from "../../views/mails/unable-to-auto-join-organization";
-import { getOrganizationsByUserId, markDomainAsVerified } from "./main";
+import { getOrganizationsByUserId } from "./main";
+import { markDomainAsVerified } from "./markDomainAsVerified";
 
 export const doSuggestOrganizations = async ({
   user_id,

diff --git a/src/managers/organization/main.ts b/src/managers/organization/main.ts
@@ -1,21 +1,12 @@
-import { isEmpty, some } from "lodash-es";
+import { isEmpty } from "lodash-es";
 import { NotFoundError } from "../../config/errors";
-import {
-  addDomain,
-  findEmailDomainsByOrganizationId,
-} from "../../repositories/email-domain";
 import {
   findByUserId,
   findById as findOrganizationById,
   findPendingByUserId,
-  getUsers,
 } from "../../repositories/organization/getters";
-import {
-  deleteUserOrganization,
-  updateUserOrganizationLink,
-} from "../../repositories/organization/setters";
+import { deleteUserOrganization } from "../../repositories/organization/setters";
 import { setSelectedOrganizationId } from "../../repositories/redis/selected-organization";
-import { getEmailDomain } from "../../services/email";
 
 export const getOrganizationsByUserId = findByUserId;
 export const getOrganizationById = findOrganizationById;
@@ -50,56 +41,6 @@ export const quitOrganization = async ({
 
   return true;
 };
-export const markDomainAsVerified = async ({
-  organization_id,
-  domain,
-  domain_verification_type,
-}: {
-  organization_id: number;
-  domain: string;
-  domain_verification_type: EmailDomain["verification_type"];
-}) => {
-  const organization = await findOrganizationById(organization_id);
-  if (isEmpty(organization)) {
-    throw new NotFoundError();
-  }
-  const emailDomains = await findEmailDomainsByOrganizationId(organization_id);
-
-  if (
-    !some(emailDomains, { domain, verification_type: domain_verification_type })
-  ) {
-    await addDomain({
-      organization_id,
-      domain,
-      verification_type: domain_verification_type,
-    });
-  }
-
-  const usersInOrganization = await getUsers(organization_id);
-
-  await Promise.all(
-    usersInOrganization.map(
-      ({ id, email, verification_type: link_verification_type }) => {
-        const userDomain = getEmailDomain(email);
-        if (
-          userDomain === domain &&
-          [
-            null,
-            "no_verification_means_available",
-            "no_verification_means_for_entreprise_unipersonnelle",
-          ].includes(link_verification_type)
-        ) {
-          return updateUserOrganizationLink(organization_id, id, {
-            verification_type: "domain",
-          });
-        }
-
-        return null;
-      },
-    ),
-  );
-};
-
 export const selectOrganization = async ({
   user_id,
   organization_id,

diff --git a/src/managers/organization/markDomainAsVerified.ts b/src/managers/organization/markDomainAsVerified.ts
@@ -0,0 +1,61 @@
+import { isEmpty, some } from "lodash";
+import { NotFoundError } from "../../config/errors";
+import {
+  addDomain,
+  findEmailDomainsByOrganizationId,
+} from "../../repositories/email-domain";
+import { findById, getUsers } from "../../repositories/organization/getters";
+import { updateUserOrganizationLink } from "../../repositories/organization/setters";
+import { getEmailDomain } from "../../services/email";
+
+//
+
+export const markDomainAsVerified = async ({
+  organization_id,
+  domain,
+  domain_verification_type,
+}: {
+  organization_id: number;
+  domain: string;
+  domain_verification_type: EmailDomain["verification_type"];
+}) => {
+  const organization = await findById(organization_id);
+  if (isEmpty(organization)) {
+    throw new NotFoundError();
+  }
+  const emailDomains = await findEmailDomainsByOrganizationId(organization_id);
+
+  if (
+    !some(emailDomains, { domain, verification_type: domain_verification_type })
+  ) {
+    await addDomain({
+      organization_id,
+      domain,
+      verification_type: domain_verification_type,
+    });
+  }
+
+  const usersInOrganization = await getUsers(organization_id);
+
+  await Promise.all(
+    usersInOrganization.map(
+      ({ id, email, verification_type: link_verification_type }) => {
+        const userDomain = getEmailDomain(email);
+        if (
+          userDomain === domain &&
+          [
+            null,
+            "no_verification_means_available",
+            "no_verification_means_for_entreprise_unipersonnelle",
+          ].includes(link_verification_type)
+        ) {
+          return updateUserOrganizationLink(organization_id, id, {
+            verification_type: "domain",
+          });
+        }
+
+        return null;
+      },
+    ),
+  );
+};