refactor(users): filter at the top level (#545)

Author: douglasduteil

packages/~/app/middleware/src/session/Session_Context.ts

@@ -1,6 +1,6 @@
 import type { Env } from "hono";
-import { Session } from "hono-sessions";
-import { BaseClient, TokenSet } from "openid-client";
+import type { Session } from "hono-sessions";
+import type { BaseClient, TokenSet } from "openid-client";
 import type { AgentConnect_UserInfo } from "./AgentConnect_UserInfo";
 
 //

packages/~/infra/moncomptepro/lib/src/index.ts

@@ -3,16 +3,16 @@
 import { fetch_mcp_admin_api } from "./fetch";
 
 //
-
-export async function join_organization({
-  is_external,
-  organization_id,
-  user_id,
-}: {
+export type JoinOrganizationHandler = (options: {
   is_external: boolean;
   organization_id: number;
   user_id: number;
-}): Promise<{}> {
+}) => Promise<{}>;
+export const join_organization: JoinOrganizationHandler = async ({
+  is_external,
+  organization_id,
+  user_id,
+}) => {
   return fetch_mcp_admin_api({
     endpoint: "/api/admin/join-organization",
     method: "POST",
@@ -22,7 +22,7 @@ export async function join_organization({
       user_id: String(user_id),
     },
   });
-}
+};
 
 export async function mark_domain_as_verified({
   domain,

packages/~/infra/moncomptepro/lib/src/sdk.ts

@@ -30,12 +30,13 @@ const MAIN_ORGANIZATION_MANAGER_MODULE: {
 } = await import(`${MONCOMPTEPRO_MODULE}/src/managers/organization/main`);
 
 // import "@numerique-gouv/moncomptepro/src/managers/organization/join";
+export type ForceJoinOrganizationHandler = (options: {
+  organization_id: number;
+  user_id: number;
+  is_external?: boolean;
+}) => Promise<UserOrganizationLink>;
 const JOIN_ORGANIZATION_MANAGER_MODULE: {
-  forceJoinOrganization(options: {
-    organization_id: number;
-    user_id: number;
-    is_external?: boolean;
-  }): Promise<UserOrganizationLink>;
+  forceJoinOrganization: ForceJoinOrganizationHandler;
 } = await import(`${MONCOMPTEPRO_MODULE}/src/managers/organization/join`);
 
 //

packages/~/moderations/api/src/:id/$procedures/validate.ts

@@ -12,7 +12,11 @@ import { mark_moderation_as } from "@~/moderations.lib/usecase/mark_moderation_a
 import { MemberJoinOrganization } from "@~/moderations.lib/usecase/member_join_organization";
 import { GetModerationById } from "@~/moderations.repository";
 import { schema } from "@~/moncomptepro.database";
-import { send_moderation_processed_email } from "@~/moncomptepro.lib/index";
+import {
+  join_organization,
+  send_moderation_processed_email,
+} from "@~/moncomptepro.lib/index";
+import { forceJoinOrganization } from "@~/moncomptepro.lib/sdk";
 import { add_verified_domain } from "@~/organizations.lib/usecase/add_verified_domain";
 import { GetOrganizationById } from "@~/organizations.repository";
 import { GetMember } from "@~/users.repository";
@@ -98,8 +102,13 @@ export default new Hono<App_Context>().patch(
       .with("AS_EXTERNAL", () => true)
       .exhaustive();
     const member_join_organization = MemberJoinOrganization({
-      get_member: GetMember({ pg: moncomptepro_pg }),
+      force_join_organization: forceJoinOrganization,
+      get_member: GetMember({
+        pg: moncomptepro_pg,
+        columns: { updated_at: true },
+      }),
       get_moderation_by_id: GetModerationById({ pg: moncomptepro_pg }),
+      join_organization: join_organization,
     });
     const [error] = await to(
       member_join_organization({ is_external, moderation_id: id }),

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

@@ -1,19 +1,23 @@
 //
 
-import { type GetModerationByIdHandler } from "@~/moderations.repository";
-import { join_organization } from "@~/moncomptepro.lib";
-import { forceJoinOrganization } from "@~/moncomptepro.lib/sdk";
-import { type GetMemberHandler } from "@~/users.repository";
+import type { GetModerationByIdHandler } from "@~/moderations.repository";
+import type { JoinOrganizationHandler } from "@~/moncomptepro.lib";
+import type { ForceJoinOrganizationHandler } from "@~/moncomptepro.lib/sdk";
+import type { GetMemberHandler } from "@~/users.repository";
 import { to as await_to } from "await-to-js";
 
 //
 
 export function MemberJoinOrganization({
+  force_join_organization,
   get_member,
   get_moderation_by_id,
+  join_organization,
 }: {
-  get_member: GetMemberHandler;
+  force_join_organization: ForceJoinOrganizationHandler;
+  get_member: GetMemberHandler<{ updated_at: true }>;
   get_moderation_by_id: GetModerationByIdHandler;
+  join_organization: JoinOrganizationHandler;
 }) {
   return async function member_join_organization({
     moderation_id,
@@ -33,14 +37,11 @@ export function MemberJoinOrganization({
     );
 
     const [get_member_err] = await await_to(
-      get_member(
-        { organization_id, user_id },
-        { columns: { updated_at: true } },
-      ),
+      get_member({ organization_id, user_id }),
     );
 
     if (get_member_err) {
-      await forceJoinOrganization({
+      await force_join_organization({
         is_external,
         organization_id,
         user_id,

packages/~/users/repository/src/get_member.test.ts

@@ -28,17 +28,15 @@ test("get an organization member", async () => {
     user_id,
   });
 
-  const get_member = GetMember({ pg });
-  const organization = await get_member(
-    { organization_id, user_id },
-    {
-      columns: {
-        is_external: true,
-        organization_id: true,
-        user_id: true,
-      },
+  const get_member = GetMember({
+    pg,
+    columns: {
+      is_external: true,
+      organization_id: true,
+      user_id: true,
     },
-  );
+  });
+  const organization = await get_member({ organization_id, user_id });
 
   expect(organization).toEqual({
     is_external: false,

packages/~/users/repository/src/get_member.ts

@@ -5,16 +5,19 @@ import { schema, type MonComptePro_PgDatabase } from "@~/moncomptepro.database";
 import { and, eq } from "drizzle-orm";
 
 //
+type UsersOrganizationsColumns =
+  keyof typeof schema.users_organizations._.columns;
 
-export function GetMember({ pg }: { pg: MonComptePro_PgDatabase }) {
-  type UsersOrganizationsColumns =
-    keyof typeof schema.users_organizations._.columns;
-  return async function get_member_by_id<
-    TColumns extends Partial<Record<UsersOrganizationsColumns, true>>,
-  >(
-    { organization_id, user_id }: { organization_id: number; user_id: number },
-    { columns }: { columns: TColumns },
-  ) {
+export function GetMember<
+  TColumns extends Partial<Record<UsersOrganizationsColumns, true>>,
+>({ pg, columns }: { pg: MonComptePro_PgDatabase; columns: TColumns }) {
+  return async function get_member_by_id({
+    organization_id,
+    user_id,
+  }: {
+    organization_id: number;
+    user_id: number;
+  }) {
     const member = await pg.query.users_organizations.findFirst({
       columns,
       where: and(
@@ -29,4 +32,6 @@ export function GetMember({ pg }: { pg: MonComptePro_PgDatabase }) {
   };
 }
 
-export type GetMemberHandler = ReturnType<typeof GetMember>;
+export type GetMemberHandler<
+  TColumns extends Partial<Record<UsersOrganizationsColumns, true>>,
+> = ReturnType<typeof GetMember<TColumns>>;