feat(miniapp): add admin billing settings foundation

2026-03-31 12:04:02 +00:00 · 2026-03-10 01:38:03 +04:00
parent 4797e4f200
commit 565ac277c1
26 changed files with 5061 additions and 11 deletions
--- a/packages/application/src/household-admin-service.test.ts
+++ b/packages/application/src/household-admin-service.test.ts
@@ -137,7 +137,37 @@ function createRepositoryStub() {
            preferredLocale: locale
          }
        : null
-    }
+    },
+    getHouseholdBillingSettings: async (householdId) => ({
+      householdId,
+      rentAmountMinor: null,
+      rentCurrency: 'USD',
+      rentDueDay: 20,
+      rentWarningDay: 17,
+      utilitiesDueDay: 4,
+      utilitiesReminderDay: 3,
+      timezone: 'Asia/Tbilisi'
+    }),
+    updateHouseholdBillingSettings: async (input) => ({
+      householdId: input.householdId,
+      rentAmountMinor: input.rentAmountMinor ?? null,
+      rentCurrency: input.rentCurrency ?? 'USD',
+      rentDueDay: input.rentDueDay ?? 20,
+      rentWarningDay: input.rentWarningDay ?? 17,
+      utilitiesDueDay: input.utilitiesDueDay ?? 4,
+      utilitiesReminderDay: input.utilitiesReminderDay ?? 3,
+      timezone: input.timezone ?? 'Asia/Tbilisi'
+    }),
+    listHouseholdUtilityCategories: async () => [],
+    upsertHouseholdUtilityCategory: async (input) => ({
+      id: input.slug ?? 'utility-category-1',
+      householdId: input.householdId,
+      slug: input.slug ?? 'custom',
+      name: input.name,
+      sortOrder: input.sortOrder,
+      isActive: input.isActive
+    }),
+    promoteHouseholdAdmin: async () => null
  }

  return {
--- a/packages/application/src/household-onboarding-service.test.ts
+++ b/packages/application/src/household-onboarding-service.test.ts
@@ -150,6 +150,46 @@ function createRepositoryStub() {
            preferredLocale: locale
          }
        : null
+    },
+    async getHouseholdBillingSettings(householdId) {
+      return {
+        householdId,
+        rentAmountMinor: null,
+        rentCurrency: 'USD',
+        rentDueDay: 20,
+        rentWarningDay: 17,
+        utilitiesDueDay: 4,
+        utilitiesReminderDay: 3,
+        timezone: 'Asia/Tbilisi'
+      }
+    },
+    async updateHouseholdBillingSettings(input) {
+      return {
+        householdId: input.householdId,
+        rentAmountMinor: input.rentAmountMinor ?? null,
+        rentCurrency: input.rentCurrency ?? 'USD',
+        rentDueDay: input.rentDueDay ?? 20,
+        rentWarningDay: input.rentWarningDay ?? 17,
+        utilitiesDueDay: input.utilitiesDueDay ?? 4,
+        utilitiesReminderDay: input.utilitiesReminderDay ?? 3,
+        timezone: input.timezone ?? 'Asia/Tbilisi'
+      }
+    },
+    async listHouseholdUtilityCategories() {
+      return []
+    },
+    async upsertHouseholdUtilityCategory(input) {
+      return {
+        id: input.slug ?? 'utility-category-1',
+        householdId: input.householdId,
+        slug: input.slug ?? 'custom',
+        name: input.name,
+        sortOrder: input.sortOrder,
+        isActive: input.isActive
+      }
+    },
+    async promoteHouseholdAdmin() {
+      return null
    }
  }

--- a/packages/application/src/household-setup-service.test.ts
+++ b/packages/application/src/household-setup-service.test.ts
@@ -244,6 +244,58 @@ function createRepositoryStub() {
            preferredLocale: locale
          }
        : null
+    },
+    async getHouseholdBillingSettings(householdId) {
+      return {
+        householdId,
+        rentAmountMinor: null,
+        rentCurrency: 'USD',
+        rentDueDay: 20,
+        rentWarningDay: 17,
+        utilitiesDueDay: 4,
+        utilitiesReminderDay: 3,
+        timezone: 'Asia/Tbilisi'
+      }
+    },
+    async updateHouseholdBillingSettings(input) {
+      return {
+        householdId: input.householdId,
+        rentAmountMinor: input.rentAmountMinor ?? null,
+        rentCurrency: input.rentCurrency ?? 'USD',
+        rentDueDay: input.rentDueDay ?? 20,
+        rentWarningDay: input.rentWarningDay ?? 17,
+        utilitiesDueDay: input.utilitiesDueDay ?? 4,
+        utilitiesReminderDay: input.utilitiesReminderDay ?? 3,
+        timezone: input.timezone ?? 'Asia/Tbilisi'
+      }
+    },
+    async listHouseholdUtilityCategories() {
+      return []
+    },
+    async upsertHouseholdUtilityCategory(input) {
+      return {
+        id: input.slug ?? 'utility-category-1',
+        householdId: input.householdId,
+        slug: input.slug ?? 'custom',
+        name: input.name,
+        sortOrder: input.sortOrder,
+        isActive: input.isActive
+      }
+    },
+    async promoteHouseholdAdmin(householdId, memberId) {
+      const member = [...members.values()].find(
+        (entry) => entry.householdId === householdId && entry.id === memberId
+      )
+      if (!member) {
+        return null
+      }
+
+      const next = {
+        ...member,
+        isAdmin: true
+      }
+      members.set(`${householdId}:${member.telegramUserId}`, next)
+      return next
    }
  }

--- a/packages/application/src/locale-preference-service.test.ts
+++ b/packages/application/src/locale-preference-service.test.ts
@@ -74,7 +74,37 @@ function createRepository(): HouseholdConfigurationRepository {
            preferredLocale: locale,
            householdDefaultLocale: 'ru'
          }
-        : null
+        : null,
+    getHouseholdBillingSettings: async (householdId) => ({
+      householdId,
+      rentAmountMinor: null,
+      rentCurrency: 'USD',
+      rentDueDay: 20,
+      rentWarningDay: 17,
+      utilitiesDueDay: 4,
+      utilitiesReminderDay: 3,
+      timezone: 'Asia/Tbilisi'
+    }),
+    updateHouseholdBillingSettings: async (input) => ({
+      householdId: input.householdId,
+      rentAmountMinor: input.rentAmountMinor ?? null,
+      rentCurrency: input.rentCurrency ?? 'USD',
+      rentDueDay: input.rentDueDay ?? 20,
+      rentWarningDay: input.rentWarningDay ?? 17,
+      utilitiesDueDay: input.utilitiesDueDay ?? 4,
+      utilitiesReminderDay: input.utilitiesReminderDay ?? 3,
+      timezone: input.timezone ?? 'Asia/Tbilisi'
+    }),
+    listHouseholdUtilityCategories: async () => [],
+    upsertHouseholdUtilityCategory: async (input) => ({
+      id: input.slug ?? 'utility-category-1',
+      householdId: input.householdId,
+      slug: input.slug ?? 'custom',
+      name: input.name,
+      sortOrder: input.sortOrder,
+      isActive: input.isActive
+    }),
+    promoteHouseholdAdmin: async () => null
  }
 }

--- a/packages/application/src/miniapp-admin-service.test.ts
+++ b/packages/application/src/miniapp-admin-service.test.ts
@@ -102,11 +102,131 @@ function repository(): HouseholdConfigurationRepository {
            householdDefaultLocale: 'ru',
            isAdmin: false
          }
+        : null,
+    getHouseholdBillingSettings: async (householdId) => ({
+      householdId,
+      rentAmountMinor: null,
+      rentCurrency: 'USD',
+      rentDueDay: 20,
+      rentWarningDay: 17,
+      utilitiesDueDay: 4,
+      utilitiesReminderDay: 3,
+      timezone: 'Asia/Tbilisi'
+    }),
+    updateHouseholdBillingSettings: async (input) => ({
+      householdId: input.householdId,
+      rentAmountMinor: input.rentAmountMinor ?? null,
+      rentCurrency: input.rentCurrency ?? 'USD',
+      rentDueDay: input.rentDueDay ?? 20,
+      rentWarningDay: input.rentWarningDay ?? 17,
+      utilitiesDueDay: input.utilitiesDueDay ?? 4,
+      utilitiesReminderDay: input.utilitiesReminderDay ?? 3,
+      timezone: input.timezone ?? 'Asia/Tbilisi'
+    }),
+    listHouseholdUtilityCategories: async () => [],
+    upsertHouseholdUtilityCategory: async (input) => ({
+      id: input.slug ?? 'utility-category-1',
+      householdId: input.householdId,
+      slug: input.slug ?? 'custom',
+      name: input.name,
+      sortOrder: input.sortOrder,
+      isActive: input.isActive
+    }),
+    promoteHouseholdAdmin: async (householdId, memberId) =>
+      memberId === 'member-123456'
+        ? {
+            id: memberId,
+            householdId,
+            telegramUserId: '123456',
+            displayName: 'Stan',
+            preferredLocale: null,
+            householdDefaultLocale: 'ru',
+            isAdmin: true
+          }
        : null
  }
 }

 describe('createMiniAppAdminService', () => {
+  test('returns billing settings, utility categories, and members for admins', async () => {
+    const service = createMiniAppAdminService(repository())
+
+    const result = await service.getSettings({
+      householdId: 'household-1',
+      actorIsAdmin: true
+    })
+
+    expect(result).toEqual({
+      status: 'ok',
+      settings: {
+        householdId: 'household-1',
+        rentAmountMinor: null,
+        rentCurrency: 'USD',
+        rentDueDay: 20,
+        rentWarningDay: 17,
+        utilitiesDueDay: 4,
+        utilitiesReminderDay: 3,
+        timezone: 'Asia/Tbilisi'
+      },
+      categories: [],
+      members: []
+    })
+  })
+
+  test('updates billing settings for admins', async () => {
+    const service = createMiniAppAdminService(repository())
+
+    const result = await service.updateSettings({
+      householdId: 'household-1',
+      actorIsAdmin: true,
+      rentAmountMajor: '700',
+      rentCurrency: 'USD',
+      rentDueDay: 21,
+      rentWarningDay: 18,
+      utilitiesDueDay: 5,
+      utilitiesReminderDay: 4,
+      timezone: 'Asia/Tbilisi'
+    })
+
+    expect(result).toEqual({
+      status: 'ok',
+      settings: {
+        householdId: 'household-1',
+        rentAmountMinor: 70000n,
+        rentCurrency: 'USD',
+        rentDueDay: 21,
+        rentWarningDay: 18,
+        utilitiesDueDay: 5,
+        utilitiesReminderDay: 4,
+        timezone: 'Asia/Tbilisi'
+      }
+    })
+  })
+
+  test('upserts utility categories for admins', async () => {
+    const service = createMiniAppAdminService(repository())
+
+    const result = await service.upsertUtilityCategory({
+      householdId: 'household-1',
+      actorIsAdmin: true,
+      name: 'Internet',
+      sortOrder: 0,
+      isActive: true
+    })
+
+    expect(result).toEqual({
+      status: 'ok',
+      category: {
+        id: 'utility-category-1',
+        householdId: 'household-1',
+        slug: 'custom',
+        name: 'Internet',
+        sortOrder: 0,
+        isActive: true
+      }
+    })
+  })
+
  test('lists pending members for admins', async () => {
    const service = createMiniAppAdminService(repository())

@@ -167,4 +287,27 @@ describe('createMiniAppAdminService', () => {
      }
    })
  })
+
+  test('promotes an active member to household admin', async () => {
+    const service = createMiniAppAdminService(repository())
+
+    const result = await service.promoteMemberToAdmin({
+      householdId: 'household-1',
+      actorIsAdmin: true,
+      memberId: 'member-123456'
+    })
+
+    expect(result).toEqual({
+      status: 'ok',
+      member: {
+        id: 'member-123456',
+        householdId: 'household-1',
+        telegramUserId: '123456',
+        displayName: 'Stan',
+        preferredLocale: null,
+        householdDefaultLocale: 'ru',
+        isAdmin: true
+      }
+    })
+  })
 })
--- a/packages/application/src/miniapp-admin-service.ts
+++ b/packages/application/src/miniapp-admin-service.ts
@@ -1,10 +1,75 @@
 import type {
+  HouseholdBillingSettingsRecord,
  HouseholdConfigurationRepository,
  HouseholdMemberRecord,
-  HouseholdPendingMemberRecord
+  HouseholdPendingMemberRecord,
+  HouseholdUtilityCategoryRecord
 } from '@household/ports'
+import { Money, type CurrencyCode } from '@household/domain'
+
+function isValidDay(value: number): boolean {
+  return Number.isInteger(value) && value >= 1 && value <= 31
+}
+
+function parseCurrency(raw: string): CurrencyCode {
+  const normalized = raw.trim().toUpperCase()
+  if (normalized !== 'USD' && normalized !== 'GEL') {
+    throw new Error(`Unsupported currency: ${raw}`)
+  }
+
+  return normalized
+}

 export interface MiniAppAdminService {
+  getSettings(input: { householdId: string; actorIsAdmin: boolean }): Promise<
+    | {
+        status: 'ok'
+        settings: HouseholdBillingSettingsRecord
+        categories: readonly HouseholdUtilityCategoryRecord[]
+        members: readonly HouseholdMemberRecord[]
+      }
+    | {
+        status: 'rejected'
+        reason: 'not_admin'
+      }
+  >
+  updateSettings(input: {
+    householdId: string
+    actorIsAdmin: boolean
+    rentAmountMajor?: string
+    rentCurrency?: string
+    rentDueDay: number
+    rentWarningDay: number
+    utilitiesDueDay: number
+    utilitiesReminderDay: number
+    timezone: string
+  }): Promise<
+    | {
+        status: 'ok'
+        settings: HouseholdBillingSettingsRecord
+      }
+    | {
+        status: 'rejected'
+        reason: 'not_admin' | 'invalid_settings'
+      }
+  >
+  upsertUtilityCategory(input: {
+    householdId: string
+    actorIsAdmin: boolean
+    slug?: string
+    name: string
+    sortOrder: number
+    isActive: boolean
+  }): Promise<
+    | {
+        status: 'ok'
+        category: HouseholdUtilityCategoryRecord
+      }
+    | {
+        status: 'rejected'
+        reason: 'not_admin' | 'invalid_category'
+      }
+  >
  listPendingMembers(input: { householdId: string; actorIsAdmin: boolean }): Promise<
    | {
        status: 'ok'
@@ -29,12 +94,144 @@ export interface MiniAppAdminService {
        reason: 'not_admin' | 'pending_not_found'
      }
  >
+  promoteMemberToAdmin(input: {
+    householdId: string
+    actorIsAdmin: boolean
+    memberId: string
+  }): Promise<
+    | {
+        status: 'ok'
+        member: HouseholdMemberRecord
+      }
+    | {
+        status: 'rejected'
+        reason: 'not_admin' | 'member_not_found'
+      }
+  >
 }

 export function createMiniAppAdminService(
  repository: HouseholdConfigurationRepository
 ): MiniAppAdminService {
  return {
+    async getSettings(input) {
+      if (!input.actorIsAdmin) {
+        return {
+          status: 'rejected',
+          reason: 'not_admin'
+        }
+      }
+
+      const [settings, categories, members] = await Promise.all([
+        repository.getHouseholdBillingSettings(input.householdId),
+        repository.listHouseholdUtilityCategories(input.householdId),
+        repository.listHouseholdMembers(input.householdId)
+      ])
+
+      return {
+        status: 'ok',
+        settings,
+        categories,
+        members
+      }
+    },
+
+    async updateSettings(input) {
+      if (!input.actorIsAdmin) {
+        return {
+          status: 'rejected',
+          reason: 'not_admin'
+        }
+      }
+
+      if (
+        !isValidDay(input.rentDueDay) ||
+        !isValidDay(input.rentWarningDay) ||
+        !isValidDay(input.utilitiesDueDay) ||
+        !isValidDay(input.utilitiesReminderDay) ||
+        input.timezone.trim().length === 0 ||
+        input.rentWarningDay > input.rentDueDay ||
+        input.utilitiesReminderDay > input.utilitiesDueDay
+      ) {
+        return {
+          status: 'rejected',
+          reason: 'invalid_settings'
+        }
+      }
+
+      let rentAmountMinor: bigint | null | undefined
+      let rentCurrency: CurrencyCode | undefined
+
+      if (input.rentAmountMajor && input.rentAmountMajor.trim().length > 0) {
+        rentCurrency = parseCurrency(input.rentCurrency ?? 'USD')
+        rentAmountMinor = Money.fromMajor(input.rentAmountMajor, rentCurrency).amountMinor
+      } else if (input.rentAmountMajor === '') {
+        rentAmountMinor = null
+        rentCurrency = parseCurrency(input.rentCurrency ?? 'USD')
+      }
+
+      const settings = await repository.updateHouseholdBillingSettings({
+        householdId: input.householdId,
+        ...(rentAmountMinor !== undefined
+          ? {
+              rentAmountMinor
+            }
+          : {}),
+        ...(rentCurrency
+          ? {
+              rentCurrency
+            }
+          : {}),
+        rentDueDay: input.rentDueDay,
+        rentWarningDay: input.rentWarningDay,
+        utilitiesDueDay: input.utilitiesDueDay,
+        utilitiesReminderDay: input.utilitiesReminderDay,
+        timezone: input.timezone.trim()
+      })
+
+      return {
+        status: 'ok',
+        settings
+      }
+    },
+
+    async upsertUtilityCategory(input) {
+      if (!input.actorIsAdmin) {
+        return {
+          status: 'rejected',
+          reason: 'not_admin'
+        }
+      }
+
+      if (
+        input.name.trim().length === 0 ||
+        !Number.isInteger(input.sortOrder) ||
+        input.sortOrder < 0
+      ) {
+        return {
+          status: 'rejected',
+          reason: 'invalid_category'
+        }
+      }
+
+      const category = await repository.upsertHouseholdUtilityCategory({
+        householdId: input.householdId,
+        ...(input.slug
+          ? {
+              slug: input.slug
+            }
+          : {}),
+        name: input.name.trim(),
+        sortOrder: input.sortOrder,
+        isActive: input.isActive
+      })
+
+      return {
+        status: 'ok',
+        category
+      }
+    },
+
    async listPendingMembers(input) {
      if (!input.actorIsAdmin) {
        return {
@@ -73,6 +270,28 @@ export function createMiniAppAdminService(
        status: 'approved',
        member
      }
+    },
+
+    async promoteMemberToAdmin(input) {
+      if (!input.actorIsAdmin) {
+        return {
+          status: 'rejected',
+          reason: 'not_admin'
+        }
+      }
+
+      const member = await repository.promoteHouseholdAdmin(input.householdId, input.memberId)
+      if (!member) {
+        return {
+          status: 'rejected',
+          reason: 'member_not_found'
+        }
+      }
+
+      return {
+        status: 'ok',
+        member
+      }
    }
  }
 }