From b0f8784d7ff9a68eaa2ac394634b3e14e9f1855d Mon Sep 17 00:00:00 2001
From: Joris Wouter Jonkers <74975850+ExtraToast@users.noreply.github.com>
Date: Sun, 6 Sep 2026 00:24:24 +0200
Subject: [PATCH] refactor(contribution): the bulk dialogs reach the api
 through a domain
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Frontend ADR-001 says pages and components may not import @/services/api, and
ADR-006 says domain behaviour does not hide in generic utility folders. The three
bulk dialogs broke the first and utils/contributionEmail.ts broke the second: 330
lines of contribution rules — seedSendTo, summarise, paymentDateProblem — sitting
in utils/ where nothing says which domain they belong to.

domains/contribution now owns them, with an adapter holding every @/services/api
import for the payment-email and mark-paid endpoints, and an index.ts that names
what it exposes rather than exporting a wildcard.

The membership endpoints behind MembershipStatusDialog went to domains/user
instead, against the letter of the ticket: what a membership costs is a
contribution's business, whether somebody holds one is the user's, and a folder
named for the wrong domain is the problem this ADR exists to prevent.

The enum and the response types are re-exported through the domain indexes. A
component may not reach for the client, and an enum value may not be written out
by hand in a template, so the domain is where those two rules meet.

UserSelect went the same way. It reached for findUsers directly when the typed
search landed yesterday, which was already against the rule this ticket is about,
so searchMemberAccounts joins the user adapter and the field asks the domain. Its
test now mocks that boundary rather than the generated client, which is what the
component actually depends on.

utils/bulkRow.ts, bulkDisposition.ts, bulkRejection.ts and BulkDialogScaffold.vue
stay where they are: cohorts and both membership dialogs share them, so they are
not contribution's to take.

Closes #946
---
 .../modals/bulk/MembershipStatusDialog.vue    | 24 +++++-----
 .../common/modals/bulk/PaidStatusDialog.vue   |  8 ++--
 .../paymentEmail/PaymentEmailFeesStep.vue     |  4 +-
 .../paymentEmail/PaymentEmailMembersStep.vue  |  2 +-
 .../paymentEmail/PaymentEmailReviewStep.vue   |  4 +-
 .../bulk/paymentEmail/PaymentEmailWizard.vue  | 48 ++++++++-----------
 .../src/components/form/fields/UserSelect.vue |  7 +--
 .../contribution/adapters/contributions.ts    | 10 ++++
 .../contribution/adapters/paymentEmails.ts    | 27 +++++++++++
 .../src/domains/contribution/index.ts         | 44 +++++++++++++++++
 .../contribution/paymentEmail.ts}             |  0
 .../src/domains/user/adapters/memberships.ts  | 14 ++++++
 .../src/domains/user/adapters/users.ts        | 11 ++++-
 services/frontend/src/domains/user/index.ts   |  9 +++-
 .../components/form/fields/UserSelect.test.ts | 16 +++----
 .../contribution/paymentEmail.test.ts}        |  2 +-
 .../pages/management/CommitteeManager.test.ts |  2 +
 17 files changed, 170 insertions(+), 62 deletions(-)
 create mode 100644 services/frontend/src/domains/contribution/adapters/contributions.ts
 create mode 100644 services/frontend/src/domains/contribution/adapters/paymentEmails.ts
 create mode 100644 services/frontend/src/domains/contribution/index.ts
 rename services/frontend/src/{utils/contributionEmail.ts => domains/contribution/paymentEmail.ts} (100%)
 create mode 100644 services/frontend/src/domains/user/adapters/memberships.ts
 rename services/frontend/tests/unit/{utils/contributionEmail.test.ts => domains/contribution/paymentEmail.test.ts} (99%)

diff --git a/services/frontend/src/components/common/modals/bulk/MembershipStatusDialog.vue b/services/frontend/src/components/common/modals/bulk/MembershipStatusDialog.vue
index 4e63a1c02..71fd81598 100644
--- a/services/frontend/src/components/common/modals/bulk/MembershipStatusDialog.vue
+++ b/services/frontend/src/components/common/modals/bulk/MembershipStatusDialog.vue
@@ -3,13 +3,13 @@ import {computed, ref, watch} from "vue"
 import BulkDialogScaffold from "./BulkDialogScaffold.vue"
 import {useBulkPreview} from "@/composables/useBulkPreview"
 import {useSubmitFeedback} from "@/composables/formUtils"
+import type {BulkActionResult, BulkMembershipPreview} from "@/domains/user"
 import {
-  endMemberships,
-  previewBulkEnd,
-  previewBulkStart,
-  startMemberships,
-} from "@/services/api/blueshell/sdk.gen"
-import type {BulkActionResult, BulkMembershipPreview} from "@/services/api"
+  endTheMemberships,
+  readMembershipEnd,
+  readMembershipStart,
+  startTheMemberships,
+} from "@/domains/user"
 import {parseBulkRejection, type BulkRejection} from "@/utils/bulkRejection"
 import {bulkRowsFromPreview} from "@/utils/bulkPreviewRows"
 import type {BulkTarget} from "@/utils/bulkTarget"
@@ -60,8 +60,8 @@ interface DialogConfig {
   dateSentence: string
   /** Past tense for the result line, e.g. "3 ended, 1 skipped". */
   appliedVerb: string
-  previewApi: typeof previewBulkEnd | typeof previewBulkStart
-  submitApi: typeof endMemberships | typeof startMemberships
+  previewApi: typeof readMembershipEnd | typeof readMembershipStart
+  submitApi: typeof endTheMemberships | typeof startTheMemberships
   help: {title: string; body: string}
 }
 
@@ -72,8 +72,8 @@ const configMap: Record<MembershipAction, DialogConfig> = {
     icon: "mdi-account-remove",
     dateSentence: "Memberships end on",
     appliedVerb: "ended",
-    previewApi: previewBulkEnd,
-    submitApi: endMemberships,
+    previewApi: readMembershipEnd,
+    submitApi: endTheMemberships,
     help: {
       title: "End membership",
       body:
@@ -90,8 +90,8 @@ const configMap: Record<MembershipAction, DialogConfig> = {
     icon: "mdi-account-plus",
     dateSentence: "Memberships start on",
     appliedVerb: "started",
-    previewApi: previewBulkStart,
-    submitApi: startMemberships,
+    previewApi: readMembershipStart,
+    submitApi: startTheMemberships,
     help: {
       title: "Start membership",
       body:
diff --git a/services/frontend/src/components/common/modals/bulk/PaidStatusDialog.vue b/services/frontend/src/components/common/modals/bulk/PaidStatusDialog.vue
index 19421f132..92364cc50 100644
--- a/services/frontend/src/components/common/modals/bulk/PaidStatusDialog.vue
+++ b/services/frontend/src/components/common/modals/bulk/PaidStatusDialog.vue
@@ -3,7 +3,7 @@ import {computed, ref, watch} from "vue"
 import BulkDialogScaffold from "./BulkDialogScaffold.vue"
 import {useBulkPreview} from "@/composables/useBulkPreview"
 import {useSubmitFeedback} from "@/composables/formUtils"
-import {markPaid, markUnpaid} from "@/services/api/blueshell/sdk.gen"
+import {recordPaid, recordUnpaid, type BulkContributionCall} from "@/domains/contribution"
 import {parseBulkRejection, type BulkRejection} from "@/utils/bulkRejection"
 import {computeMarkPaidRows, computeMarkUnpaidRows} from "@/utils/bulkCompute"
 import type {BulkTarget} from "@/utils/bulkTarget"
@@ -46,7 +46,7 @@ interface DialogConfig {
   confirmLabel: string
   icon: string
   computeRows: (targets: BulkTarget[]) => ReturnType<typeof computeMarkPaidRows>
-  submitApi: typeof markPaid | typeof markUnpaid
+  submitApi: BulkContributionCall
   help: {title: string; body: string}
 }
 
@@ -56,7 +56,7 @@ const configMap: Record<"paid" | "unpaid", DialogConfig> = {
     confirmLabel: "Mark paid",
     icon: "mdi-cash-check",
     computeRows: (targets: BulkTarget[]) => computeMarkPaidRows(targets),
-    submitApi: markPaid,
+    submitApi: recordPaid,
     help: {
       title: "Mark as paid",
       body:
@@ -71,7 +71,7 @@ const configMap: Record<"paid" | "unpaid", DialogConfig> = {
     confirmLabel: "Mark unpaid",
     icon: "mdi-cash-remove",
     computeRows: (targets: BulkTarget[]) => computeMarkUnpaidRows(targets),
-    submitApi: markUnpaid,
+    submitApi: recordUnpaid,
     help: {
       title: "Mark as unpaid",
       body:
diff --git a/services/frontend/src/components/common/modals/bulk/paymentEmail/PaymentEmailFeesStep.vue b/services/frontend/src/components/common/modals/bulk/paymentEmail/PaymentEmailFeesStep.vue
index 39abafee0..5cd8c9459 100644
--- a/services/frontend/src/components/common/modals/bulk/paymentEmail/PaymentEmailFeesStep.vue
+++ b/services/frontend/src/components/common/modals/bulk/paymentEmail/PaymentEmailFeesStep.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import {computed} from "vue"
-import {ContributionEmailKind, type ContributionPeriodResponse} from "@/services/api"
+import {ContributionEmailKind, type ContributionPeriodResponse} from "@/domains/contribution"
 import {useNarrowLayout} from "@/composables/useNarrowLayout"
 import {formatBulkDate} from "@/utils/bulkDisposition"
 import {BulkFeeType, type BulkRow} from "@/utils/bulkRow"
@@ -13,7 +13,7 @@ import {
   switchedDescription,
   kindFor,
   switchedNote,
-} from "@/utils/contributionEmail"
+} from "@/domains/contribution"
 import {effectiveAmount, feeTypeItems} from "@/utils/feePreview"
 
 /**
diff --git a/services/frontend/src/components/common/modals/bulk/paymentEmail/PaymentEmailMembersStep.vue b/services/frontend/src/components/common/modals/bulk/paymentEmail/PaymentEmailMembersStep.vue
index 821228a30..6526325f9 100644
--- a/services/frontend/src/components/common/modals/bulk/paymentEmail/PaymentEmailMembersStep.vue
+++ b/services/frontend/src/components/common/modals/bulk/paymentEmail/PaymentEmailMembersStep.vue
@@ -4,7 +4,7 @@ import {useNarrowLayout} from "@/composables/useNarrowLayout"
 import {useTableSort} from "@/composables/useTableSort"
 import {formatBulkDate, reasonLabel, rowColorClass} from "@/utils/bulkDisposition"
 import type {BulkRow} from "@/utils/bulkRow"
-import {isSelectable, lastAskedOn} from "@/utils/contributionEmail"
+import {isSelectable, lastAskedOn} from "@/domains/contribution"
 import {memberTypeLabel} from "@/utils/memberType"
 
 /**
diff --git a/services/frontend/src/components/common/modals/bulk/paymentEmail/PaymentEmailReviewStep.vue b/services/frontend/src/components/common/modals/bulk/paymentEmail/PaymentEmailReviewStep.vue
index 5c8f27254..71d829be1 100644
--- a/services/frontend/src/components/common/modals/bulk/paymentEmail/PaymentEmailReviewStep.vue
+++ b/services/frontend/src/components/common/modals/bulk/paymentEmail/PaymentEmailReviewStep.vue
@@ -1,8 +1,8 @@
 <script lang="ts" setup>
-import {ContributionEmailKind, type ContributionPeriodResponse} from "@/services/api"
+import {ContributionEmailKind, type ContributionPeriodResponse} from "@/domains/contribution"
 import {useNarrowLayout} from "@/composables/useNarrowLayout"
 import type {BulkFeeType, BulkRow} from "@/utils/bulkRow"
-import {contributionEmailLabels, kindFor} from "@/utils/contributionEmail"
+import {contributionEmailLabels, kindFor} from "@/domains/contribution"
 import {effectiveAmount, feeTypeLabels} from "@/utils/feePreview"
 
 /**
diff --git a/services/frontend/src/components/common/modals/bulk/paymentEmail/PaymentEmailWizard.vue b/services/frontend/src/components/common/modals/bulk/paymentEmail/PaymentEmailWizard.vue
index 46423bc1b..9c17713ad 100644
--- a/services/frontend/src/components/common/modals/bulk/paymentEmail/PaymentEmailWizard.vue
+++ b/services/frontend/src/components/common/modals/bulk/paymentEmail/PaymentEmailWizard.vue
@@ -12,11 +12,11 @@ import {useEmailPreview} from "@/composables/useEmailPreview"
 import {useSubmitFeedback} from "@/composables/formUtils"
 import {
   ContributionEmailKind,
-  previewBulkContributionEmail,
-  readContributionEmail,
-  sendPaymentEmails,
-} from "@/services/api"
-import type {ContributionPeriodResponse} from "@/services/api"
+  type ContributionPeriodResponse,
+  readOneEmail,
+  readSelection,
+  sendTheEmails,
+} from "@/domains/contribution"
 import {parseBulkRejection, type BulkRejection} from "@/utils/bulkRejection"
 import type {BulkFeeType, BulkRow} from "@/utils/bulkRow"
 import {
@@ -33,7 +33,7 @@ import {
   toBulkRows,
   willSend,
   type PaymentEmailChoices,
-} from "@/utils/contributionEmail"
+} from "@/domains/contribution"
 
 /**
  * Sending a period's payment emails, as three questions asked one at a time: who the batch
@@ -192,9 +192,7 @@ async function loadRows(carry?: {made: PaymentEmailChoices; contradicted: number
   if (periodId == null || props.userIds.length === 0) return
   loading.value = true
   loadError.value = null
-  const {data} = await previewBulkContributionEmail({
-    body: {contributionPeriodId: periodId, userIds: props.userIds},
-  })
+  const {data} = await readSelection(periodId, props.userIds)
   loading.value = false
   if (!data) {
     loadError.value = "The selection could not be read."
@@ -266,14 +264,12 @@ async function onPreview(userId: number) {
   const row = rows.value.find((r) => r.userId === userId)
   if (periodId == null || !row) return
   await showEmailPreview(async () => {
-    const {data} = await readContributionEmail({
-      query: {
-        kind: kindFor(row, kindSelections.value),
-        contributionPeriodId: periodId,
-        userId,
-        date: dateFor(row),
-        feeType: feeTypeSelections.value[userId],
-      },
+    const {data} = await readOneEmail({
+      kind: kindFor(row, kindSelections.value),
+      contributionPeriodId: periodId,
+      userId,
+      date: dateFor(row),
+      feeType: feeTypeSelections.value[userId],
     })
     return data ?? null
   })
@@ -327,16 +323,14 @@ async function onFinalSend() {
   submitting.value = true
   let ok = false
   try {
-    const response = await sendPaymentEmails({
-      body: {
-        contributionPeriodId: periodId,
-        userIds: recipients.value.map((row) => row.userId),
-        forciblyIncludedUserIds: forcedUserIds(rows.value, sendTo.value),
-        kindOverrides: changedKinds(recipients.value, kindSelections.value),
-        paymentDueDate: sendsReminders.value ? paymentDueDate.value : undefined,
-        debitDate: sendsNotifications.value ? debitDate.value : undefined,
-        feeTypeOverrides: changedFeeTypes(recipients.value, feeTypeSelections.value),
-      },
+    const response = await sendTheEmails({
+      contributionPeriodId: periodId,
+      userIds: recipients.value.map((row) => row.userId),
+      forciblyIncludedUserIds: forcedUserIds(rows.value, sendTo.value),
+      kindOverrides: changedKinds(recipients.value, kindSelections.value),
+      paymentDueDate: sendsReminders.value ? paymentDueDate.value : undefined,
+      debitDate: sendsNotifications.value ? debitDate.value : undefined,
+      feeTypeOverrides: changedFeeTypes(recipients.value, feeTypeSelections.value),
     })
     // The generated client returns a refusal rather than throwing.
     const refused = parseBulkRejection(response)
diff --git a/services/frontend/src/components/form/fields/UserSelect.vue b/services/frontend/src/components/form/fields/UserSelect.vue
index 163f3376e..c883771c6 100644
--- a/services/frontend/src/components/form/fields/UserSelect.vue
+++ b/services/frontend/src/components/form/fields/UserSelect.vue
@@ -1,6 +1,7 @@
 <script lang="ts" setup>
 import {onBeforeUnmount, ref, watch} from "vue"
-import {findUsers, type UserDetailResponse} from "@/services/api"
+import {searchMemberAccounts} from "@/domains/user"
+import type {UserDetailResponse} from "@/services/api"
 import {VAutocomplete} from "vuetify/components"
 
 type Rule = (v: UserDetailResponse | undefined) => true | string
@@ -64,10 +65,10 @@ async function ask(term: string): Promise<void> {
   const mine = ++latest
   loading.value = true
   try {
-    const resp = await findUsers({query: {search: term, page: 0, size: PAGE}})
+    const found = await searchMemberAccounts(term, PAGE)
     // An older answer must not overwrite a newer one: the reader has typed since.
     if (mine !== latest) return
-    options.value = mergeSelected(resp.data?.content ?? [])
+    options.value = mergeSelected(found)
   } finally {
     if (mine === latest) loading.value = false
   }
diff --git a/services/frontend/src/domains/contribution/adapters/contributions.ts b/services/frontend/src/domains/contribution/adapters/contributions.ts
new file mode 100644
index 000000000..917577041
--- /dev/null
+++ b/services/frontend/src/domains/contribution/adapters/contributions.ts
@@ -0,0 +1,10 @@
+/**
+ * Recording what a member has paid, in bulk. Idempotent on both sides: a member already in
+ * the state asked for is skipped rather than written twice.
+ */
+import {markPaid, markUnpaid} from "@/services/api"
+
+export type BulkContributionCall = typeof markPaid
+
+export const recordPaid: BulkContributionCall = markPaid
+export const recordUnpaid: BulkContributionCall = markUnpaid
diff --git a/services/frontend/src/domains/contribution/adapters/paymentEmails.ts b/services/frontend/src/domains/contribution/adapters/paymentEmails.ts
new file mode 100644
index 000000000..dd9d5fba4
--- /dev/null
+++ b/services/frontend/src/domains/contribution/adapters/paymentEmails.ts
@@ -0,0 +1,27 @@
+/**
+ * Contribution domain adapter — the only file in this domain that imports from
+ * `@/services/api` (frontend ADR-002). Everything else, dialogs included, comes through here.
+ *
+ * The return types are inferred rather than named: the generated client answers a refusal
+ * instead of throwing, and an alias written by hand here loses the error half of that union,
+ * which is precisely what the callers read.
+ */
+import {previewBulkContributionEmail, readContributionEmail, sendPaymentEmails} from "@/services/api"
+
+/** The query the endpoint documents, not a restatement of it that would accept more. */
+export type ReadEmailQuery = NonNullable<Parameters<typeof readContributionEmail>[0]>["query"]
+export type SendPaymentEmailsBody = NonNullable<Parameters<typeof sendPaymentEmails>[0]>["body"]
+
+/** What the send would do to a selection, before anybody is written to. */
+export function readSelection(contributionPeriodId: number, userIds: number[]) {
+  return previewBulkContributionEmail({body: {contributionPeriodId, userIds}})
+}
+
+/** One member's email as they would receive it. */
+export function readOneEmail(query: ReadEmailQuery) {
+  return readContributionEmail({query})
+}
+
+export function sendTheEmails(body: SendPaymentEmailsBody) {
+  return sendPaymentEmails({body})
+}
diff --git a/services/frontend/src/domains/contribution/index.ts b/services/frontend/src/domains/contribution/index.ts
new file mode 100644
index 000000000..ecddf0b4f
--- /dev/null
+++ b/services/frontend/src/domains/contribution/index.ts
@@ -0,0 +1,44 @@
+/**
+ * The contribution domain's public API: its own files import each other directly, and anything
+ * outside it comes through here (frontend ADR-001). Re-exported by name rather than with
+ * `export *`, because the list of names is the promise being made.
+ */
+export {ContributionEmailKind, type ContributionPeriodResponse} from "@/services/api"
+export {
+  readOneEmail,
+  readSelection,
+  sendTheEmails,
+  type ReadEmailQuery,
+  type SendPaymentEmailsBody,
+} from "./adapters/paymentEmails"
+export {recordPaid, recordUnpaid, type BulkContributionCall} from "./adapters/contributions"
+export {
+  changedFeeTypes,
+  changedKinds,
+  contributionEmailItems,
+  contributionEmailLabels,
+  countByKind,
+  forcedUserIds,
+  isReCharged,
+  isSelectable,
+  isSwitched,
+  kindFor,
+  lastAskedOn,
+  lastSentOfKind,
+  PERIOD_OVERHANG_MONTHS,
+  paymentDateProblem,
+  periodDateWindow,
+  reChargedDescription,
+  reapplyChoices,
+  seedChoices,
+  seedSendTo,
+  summarise,
+  switchedDescription,
+  switchedNote,
+  toBulkRow,
+  toBulkRows,
+  willSend,
+  type FlaggedMember,
+  type PaymentEmailChoices,
+  type PaymentEmailSummary,
+} from "./paymentEmail"
diff --git a/services/frontend/src/utils/contributionEmail.ts b/services/frontend/src/domains/contribution/paymentEmail.ts
similarity index 100%
rename from services/frontend/src/utils/contributionEmail.ts
rename to services/frontend/src/domains/contribution/paymentEmail.ts
diff --git a/services/frontend/src/domains/user/adapters/memberships.ts b/services/frontend/src/domains/user/adapters/memberships.ts
new file mode 100644
index 000000000..574fa41b9
--- /dev/null
+++ b/services/frontend/src/domains/user/adapters/memberships.ts
@@ -0,0 +1,14 @@
+/**
+ * Starting and ending memberships in bulk. A membership belongs to the user domain rather than
+ * to contribution: what one costs is a contribution's business, whether somebody holds one is
+ * this domain's.
+ *
+ * Re-exported under the names the dialogs read them by, so a component names an intention
+ * rather than an endpoint.
+ */
+import {endMemberships, previewBulkEnd, previewBulkStart, startMemberships} from "@/services/api"
+
+export const readMembershipStart = previewBulkStart
+export const readMembershipEnd = previewBulkEnd
+export const startTheMemberships = startMemberships
+export const endTheMemberships = endMemberships
diff --git a/services/frontend/src/domains/user/adapters/users.ts b/services/frontend/src/domains/user/adapters/users.ts
index a99f5daf0..42b085bd5 100644
--- a/services/frontend/src/domains/user/adapters/users.ts
+++ b/services/frontend/src/domains/user/adapters/users.ts
@@ -2,7 +2,7 @@
  * User domain adapter — the only file in this domain that imports from @/services/api
  * (per frontend ADR-002). Everything else imports from here.
  */
-import {findUsers} from "@/services/api"
+import {findUsers, type UserDetailResponse} from "@/services/api"
 
 /**
  * An account here, as the thing attaching one needs to name it: who it belongs to, and how to
@@ -39,3 +39,12 @@ export async function loadMemberAccounts(): Promise<MemberAccount[] | null> {
     }))
     .sort((a, b) => a.name.localeCompare(b.name))
 }
+
+/**
+ * The accounts whose name, username or Discord handle carries what somebody typed, one page of
+ * them. A picker cannot hold the whole table, so it asks as the reader types (#1139).
+ */
+export async function searchMemberAccounts(term: string, size: number): Promise<UserDetailResponse[]> {
+  const res = await findUsers({query: {search: term, page: 0, size}})
+  return res.data?.content ?? []
+}
diff --git a/services/frontend/src/domains/user/index.ts b/services/frontend/src/domains/user/index.ts
index 1d6f2eced..3f307ed28 100644
--- a/services/frontend/src/domains/user/index.ts
+++ b/services/frontend/src/domains/user/index.ts
@@ -7,4 +7,11 @@
  * This is the first one in the codebase, so it is also the pattern: re-export by name rather
  * than with `export *`, because the list of names is the promise being made.
  */
-export {loadMemberAccounts, type MemberAccount} from "./adapters/users"
+export {loadMemberAccounts, searchMemberAccounts, type MemberAccount} from "./adapters/users"
+export {
+  endTheMemberships,
+  readMembershipEnd,
+  readMembershipStart,
+  startTheMemberships,
+} from "./adapters/memberships"
+export type {BulkActionResult, BulkMembershipPreview} from "@/services/api"
diff --git a/services/frontend/tests/unit/components/form/fields/UserSelect.test.ts b/services/frontend/tests/unit/components/form/fields/UserSelect.test.ts
index cea975b0f..9168dbee4 100644
--- a/services/frontend/tests/unit/components/form/fields/UserSelect.test.ts
+++ b/services/frontend/tests/unit/components/form/fields/UserSelect.test.ts
@@ -2,8 +2,8 @@ import {beforeEach, describe, expect, it, vi} from "vitest"
 import {shallowMount} from "@vue/test-utils"
 import UserSelect from "@/components/form/fields/UserSelect.vue"
 
-const {mockFindUsers} = vi.hoisted(() => ({mockFindUsers: vi.fn()}))
-vi.mock("@/services/api", () => ({findUsers: mockFindUsers}))
+const {mockSearch} = vi.hoisted(() => ({mockSearch: vi.fn()}))
+vi.mock("@/domains/user", () => ({searchMemberAccounts: mockSearch}))
 
 const alice = {id: 7, fullName: "Alice", roles: ["MEMBER"]}
 const zoe = {id: 5410, fullName: "Zoe", roles: ["MEMBER"]}
@@ -34,8 +34,8 @@ async function type(wrapper: ReturnType<typeof mountSelect>, term: string) {
 describe("UserSelect", () => {
   beforeEach(() => {
     vi.useFakeTimers()
-    mockFindUsers.mockReset()
-    mockFindUsers.mockResolvedValue({data: {content: [zoe]}})
+    mockSearch.mockReset()
+    mockSearch.mockResolvedValue([zoe])
   })
 
   it("shows the picked user once the list arrives after mount", async () => {
@@ -66,7 +66,7 @@ describe("UserSelect", () => {
 
     await type(wrapper, "Zoe")
 
-    expect(mockFindUsers).toHaveBeenCalledWith({query: {search: "Zoe", page: 0, size: 20}})
+    expect(mockSearch).toHaveBeenCalledWith("Zoe", 20)
     expect(offered(wrapper)).toContainEqual(expect.objectContaining({id: zoe.id}))
   })
 
@@ -86,8 +86,8 @@ describe("UserSelect", () => {
     await wrapper.findComponent({name: "VAutocomplete"}).vm.$emit("update:search", "Zo")
     await type(wrapper, "Zoe")
 
-    expect(mockFindUsers).toHaveBeenCalledTimes(1)
-    expect(mockFindUsers).toHaveBeenCalledWith({query: {search: "Zoe", page: 0, size: 20}})
+    expect(mockSearch).toHaveBeenCalledTimes(1)
+    expect(mockSearch).toHaveBeenCalledWith("Zoe", 20)
   })
 
   it("does not ask again for the name it is already showing", async () => {
@@ -95,6 +95,6 @@ describe("UserSelect", () => {
 
     await type(wrapper, "Alice")
 
-    expect(mockFindUsers).not.toHaveBeenCalled()
+    expect(mockSearch).not.toHaveBeenCalled()
   })
 })
diff --git a/services/frontend/tests/unit/utils/contributionEmail.test.ts b/services/frontend/tests/unit/domains/contribution/paymentEmail.test.ts
similarity index 99%
rename from services/frontend/tests/unit/utils/contributionEmail.test.ts
rename to services/frontend/tests/unit/domains/contribution/paymentEmail.test.ts
index 7ec9bf93c..da95bda61 100644
--- a/services/frontend/tests/unit/utils/contributionEmail.test.ts
+++ b/services/frontend/tests/unit/domains/contribution/paymentEmail.test.ts
@@ -28,7 +28,7 @@ import {
   toBulkRow,
   toBulkRows,
   willSend,
-} from "@/utils/contributionEmail"
+} from "@/domains/contribution"
 
 function apiRow(
   overrides: Partial<BulkContributionEmailRowResponse> = {},
diff --git a/services/frontend/tests/unit/pages/management/CommitteeManager.test.ts b/services/frontend/tests/unit/pages/management/CommitteeManager.test.ts
index d3854c9a0..9ed77aba1 100644
--- a/services/frontend/tests/unit/pages/management/CommitteeManager.test.ts
+++ b/services/frontend/tests/unit/pages/management/CommitteeManager.test.ts
@@ -24,6 +24,8 @@ vi.mock("@/services/api", () => ({
   createCommittee: vi.fn(),
 }))
 
+vi.mock("@/domains/user", () => ({searchMemberAccounts: vi.fn().mockResolvedValue([])}))
+
 vi.mock("@/plugins/handleNetworkError.ts", () => ({
   $handleNetworkError: mockHandleNetworkError,
   $showStatusMessage: vi.fn(),