whekin/household-bot
1
0
Fork 0
mirror of https://github.com/whekin/household-bot.git synced 2026-03-31 14:24:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(member): add household lifecycle states

Browse Source
This commit is contained in:
whekin
2026-03-11 13:44:38 +04:00
parent 015298281c
commit 773abf2531
32 changed files with 3671 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apps/bot/src/anonymous-feedback.test.ts
View File

@@ -178,6 +178,7 @@ function createHouseholdConfigurationRepository(): HouseholdConfigurationReposit
householdId: input.householdId,
telegramUserId: input.telegramUserId,
displayName: input.displayName,
status: input.status ?? 'active',
preferredLocale: input.preferredLocale ?? null,
householdDefaultLocale: 'ru',
rentShareWeight: 1,
@@ -191,6 +192,7 @@ function createHouseholdConfigurationRepository(): HouseholdConfigurationReposit
householdId: 'household-1',
telegramUserId: '123456',
displayName: 'Stan',
status: 'active',
preferredLocale: null,
householdDefaultLocale: 'ru',
rentShareWeight: 1,
@@ -212,6 +214,7 @@ function createHouseholdConfigurationRepository(): HouseholdConfigurationReposit
householdId: 'household-1',
telegramUserId,
displayName: 'Stan',
status: 'active',
preferredLocale: locale,
householdDefaultLocale: 'ru',
rentShareWeight: 1,
@@ -249,7 +252,8 @@ function createHouseholdConfigurationRepository(): HouseholdConfigurationReposit
isActive: input.isActive
}),
promoteHouseholdAdmin: async () => null,
updateHouseholdMemberRentShareWeight: async () => null
updateHouseholdMemberRentShareWeight: async () => null,
updateHouseholdMemberStatus: async () => null
}
}
@@ -351,6 +355,7 @@ describe('registerAnonymousFeedback', () => {
householdId: 'household-1',
telegramUserId: '123456',
displayName: 'Stan',
status: 'active',
preferredLocale: 'en',
householdDefaultLocale: 'ru',
rentShareWeight: 1,

4
apps/bot/src/bot-i18n.test.ts
View File

@@ -117,6 +117,7 @@ function createRepository(isAdmin = false): HouseholdConfigurationRepository {
householdId: 'household-1',
telegramUserId: '123456',
displayName: 'Stan',
status: 'active',
preferredLocale: 'ru',
householdDefaultLocale: 'ru',
rentShareWeight: 1,
@@ -131,7 +132,8 @@ function createRepository(isAdmin = false): HouseholdConfigurationRepository {
},
updateMemberPreferredLocale: async () => null,
promoteHouseholdAdmin: async () => null,
updateHouseholdMemberRentShareWeight: async () => null
updateHouseholdMemberRentShareWeight: async () => null,
updateHouseholdMemberStatus: async () => null
}
}

5
apps/bot/src/dm-assistant.test.ts
View File

@@ -150,6 +150,7 @@ function createHouseholdRepository(): HouseholdConfigurationRepository {
householdId: 'household-1',
telegramUserId: '123456',
displayName: 'Stan',
status: 'active',
preferredLocale: null,
householdDefaultLocale: 'en',
rentShareWeight: 1,
@@ -180,6 +181,7 @@ function createHouseholdRepository(): HouseholdConfigurationRepository {
householdId: 'household-1',
telegramUserId: '123456',
displayName: 'Stan',
status: 'active',
preferredLocale: null,
householdDefaultLocale: 'en',
rentShareWeight: 1,
@@ -191,7 +193,8 @@ function createHouseholdRepository(): HouseholdConfigurationRepository {
updateHouseholdDefaultLocale: async () => household,
updateMemberPreferredLocale: async () => null,
promoteHouseholdAdmin: async () => null,
updateHouseholdMemberRentShareWeight: async () => null
updateHouseholdMemberRentShareWeight: async () => null,
updateHouseholdMemberStatus: async () => null
}
}

4
apps/bot/src/finance-commands.test.ts
View File

@@ -78,6 +78,7 @@ function createRepository(): HouseholdConfigurationRepository {
householdId: 'household-1',
telegramUserId: '123456',
displayName: 'Stan',
status: 'active',
preferredLocale: 'ru',
householdDefaultLocale: 'ru',
rentShareWeight: 1,
@@ -109,7 +110,8 @@ function createRepository(): HouseholdConfigurationRepository {
},
updateMemberPreferredLocale: async () => null,
promoteHouseholdAdmin: async () => null,
updateHouseholdMemberRentShareWeight: async () => null
updateHouseholdMemberRentShareWeight: async () => null,
updateHouseholdMemberStatus: async () => null
}
}

5
apps/bot/src/household-setup.test.ts
View File

@@ -384,6 +384,7 @@ function createHouseholdConfigurationRepository(): HouseholdConfigurationReposit
householdId: input.householdId,
telegramUserId: input.telegramUserId,
displayName: input.displayName,
status: input.status ?? existing?.status ?? 'active',
preferredLocale: input.preferredLocale ?? existing?.preferredLocale ?? null,
householdDefaultLocale: household.defaultLocale,
rentShareWeight: input.rentShareWeight ?? existing?.rentShareWeight ?? 1,
@@ -456,6 +457,7 @@ function createHouseholdConfigurationRepository(): HouseholdConfigurationReposit
householdId: pending.householdId,
telegramUserId: pending.telegramUserId,
displayName: pending.displayName,
status: 'active',
preferredLocale: null,
householdDefaultLocale: pending.householdDefaultLocale,
rentShareWeight: 1,
@@ -492,6 +494,9 @@ function createHouseholdConfigurationRepository(): HouseholdConfigurationReposit
},
async updateHouseholdMemberRentShareWeight() {
return null
},
async updateHouseholdMemberStatus() {
return null
}
}
}

10
apps/bot/src/index.ts
View File

@@ -49,6 +49,7 @@ import {
createMiniAppPendingMembersHandler,
createMiniAppPromoteMemberHandler,
createMiniAppSettingsHandler,
createMiniAppUpdateMemberStatusHandler,
createMiniAppUpdateMemberRentWeightHandler,
createMiniAppUpdateSettingsHandler,
createMiniAppUpsertUtilityCategoryHandler
@@ -536,6 +537,15 @@ const server = createBotWebhookServer({
logger: getLogger('miniapp-admin')
})
: undefined,
miniAppUpdateMemberStatus: householdOnboardingService
? createMiniAppUpdateMemberStatusHandler({
allowedOrigins: runtime.miniAppAllowedOrigins,
botToken: runtime.telegramBotToken,
onboardingService: householdOnboardingService,
miniAppAdminService: miniAppAdminService!,
logger: getLogger('miniapp-admin')
})
: undefined,
miniAppBillingCycle: householdOnboardingService
? createMiniAppBillingCycleHandler({
allowedOrigins: runtime.miniAppAllowedOrigins,

95
apps/bot/src/miniapp-admin.test.ts
View File

@@ -11,6 +11,7 @@ import {
createMiniAppPendingMembersHandler,
createMiniAppPromoteMemberHandler,
createMiniAppSettingsHandler,
createMiniAppUpdateMemberStatusHandler,
createMiniAppUpdateSettingsHandler
} from './miniapp-admin'
import { buildMiniAppInitData } from './telegram-miniapp-test-helpers'
@@ -75,6 +76,7 @@ function onboardingRepository(): HouseholdConfigurationRepository {
householdId: household.householdId,
telegramUserId: input.telegramUserId,
displayName: input.displayName,
status: input.status ?? 'active',
preferredLocale: input.preferredLocale ?? null,
householdDefaultLocale: household.defaultLocale,
rentShareWeight: 1,
@@ -101,6 +103,7 @@ function onboardingRepository(): HouseholdConfigurationRepository {
householdId: household.householdId,
telegramUserId: '555777',
displayName: 'Mia',
status: 'active',
preferredLocale: null,
householdDefaultLocale: household.defaultLocale,
rentShareWeight: 1,
@@ -118,6 +121,7 @@ function onboardingRepository(): HouseholdConfigurationRepository {
householdId: household.householdId,
telegramUserId,
displayName: 'Mia',
status: 'active',
preferredLocale: locale,
householdDefaultLocale: household.defaultLocale,
rentShareWeight: 1,
@@ -162,6 +166,7 @@ function onboardingRepository(): HouseholdConfigurationRepository {
householdId,
telegramUserId: '123456',
displayName: 'Stan',
status: 'active' as const,
preferredLocale: null,
householdDefaultLocale: household.defaultLocale,
rentShareWeight: 1,
@@ -183,11 +188,26 @@ function onboardingRepository(): HouseholdConfigurationRepository {
householdId: household.householdId,
telegramUserId: '123456',
displayName: 'Stan',
status: 'active',
preferredLocale: null,
householdDefaultLocale: household.defaultLocale,
rentShareWeight,
isAdmin: false
}
: null,
updateHouseholdMemberStatus: async (_householdId, memberId, status) =>
memberId === 'member-123456'
? {
id: memberId,
householdId: household.householdId,
telegramUserId: '123456',
displayName: 'Stan',
status,
preferredLocale: null,
householdDefaultLocale: household.defaultLocale,
rentShareWeight: 1,
isAdmin: false
}
: null
}
}
@@ -202,6 +222,7 @@ describe('createMiniAppPendingMembersHandler', () => {
householdId: 'household-1',
telegramUserId: '123456',
displayName: 'Stan',
status: 'active',
preferredLocale: null,
householdDefaultLocale: 'ru',
rentShareWeight: 1,
@@ -265,6 +286,7 @@ describe('createMiniAppApproveMemberHandler', () => {
householdId: 'household-1',
telegramUserId: '123456',
displayName: 'Stan',
status: 'active',
preferredLocale: null,
householdDefaultLocale: 'ru',
rentShareWeight: 1,
@@ -309,6 +331,7 @@ describe('createMiniAppApproveMemberHandler', () => {
householdId: 'household-1',
telegramUserId: '555777',
displayName: 'Mia',
status: 'active',
preferredLocale: null,
householdDefaultLocale: 'ru',
rentShareWeight: 1,
@@ -328,6 +351,7 @@ describe('createMiniAppSettingsHandler', () => {
householdId: 'household-1',
telegramUserId: '123456',
displayName: 'Stan',
status: 'active',
preferredLocale: null,
householdDefaultLocale: 'ru',
rentShareWeight: 1,
@@ -340,6 +364,7 @@ describe('createMiniAppSettingsHandler', () => {
householdId: 'household-1',
telegramUserId: '123456',
displayName: 'Stan',
status: 'active',
preferredLocale: null,
householdDefaultLocale: 'ru',
rentShareWeight: 1,
@@ -405,6 +430,7 @@ describe('createMiniAppSettingsHandler', () => {
householdId: 'household-1',
telegramUserId: '123456',
displayName: 'Stan',
status: 'active',
preferredLocale: null,
householdDefaultLocale: 'ru',
rentShareWeight: 1,
@@ -425,6 +451,7 @@ describe('createMiniAppUpdateSettingsHandler', () => {
householdId: 'household-1',
telegramUserId: '123456',
displayName: 'Stan',
status: 'active',
preferredLocale: null,
householdDefaultLocale: 'ru',
rentShareWeight: 1,
@@ -495,6 +522,7 @@ describe('createMiniAppPromoteMemberHandler', () => {
householdId: 'household-1',
telegramUserId: '123456',
displayName: 'Stan',
status: 'active',
preferredLocale: null,
householdDefaultLocale: 'ru',
rentShareWeight: 1,
@@ -539,6 +567,7 @@ describe('createMiniAppPromoteMemberHandler', () => {
householdId: 'household-1',
telegramUserId: '123456',
displayName: 'Stan',
status: 'active',
preferredLocale: null,
householdDefaultLocale: 'ru',
rentShareWeight: 1,
@@ -547,3 +576,69 @@ describe('createMiniAppPromoteMemberHandler', () => {
})
})
})
describe('createMiniAppUpdateMemberStatusHandler', () => {
test('updates a household member status for an authenticated admin', async () => {
const authDate = Math.floor(Date.now() / 1000)
const repository = onboardingRepository()
repository.listHouseholdMembersByTelegramUserId = async () => [
{
id: 'member-123456',
householdId: 'household-1',
telegramUserId: '123456',
displayName: 'Stan',
status: 'active',
preferredLocale: null,
householdDefaultLocale: 'ru',
rentShareWeight: 1,
isAdmin: true
}
]
const handler = createMiniAppUpdateMemberStatusHandler({
allowedOrigins: ['http://localhost:5173'],
botToken: 'test-bot-token',
onboardingService: createHouseholdOnboardingService({
repository
}),
miniAppAdminService: createMiniAppAdminService(repository)
})
const response = await handler.handler(
new Request('http://localhost/api/miniapp/admin/members/status', {
method: 'POST',
headers: {
origin: 'http://localhost:5173',
'content-type': 'application/json'
},
body: JSON.stringify({
initData: buildMiniAppInitData('test-bot-token', authDate, {
id: 123456,
first_name: 'Stan',
username: 'stanislav',
language_code: 'ru'
}),
memberId: 'member-123456',
status: 'away'
})
})
)
expect(response.status).toBe(200)
expect(await response.json()).toEqual({
ok: true,
authorized: true,
member: {
id: 'member-123456',
householdId: 'household-1',
telegramUserId: '123456',
displayName: 'Stan',
status: 'away',
preferredLocale: null,
householdDefaultLocale: 'ru',
rentShareWeight: 1,
isAdmin: false
}
})
})
})

187
apps/bot/src/miniapp-admin.ts
View File

@@ -1,6 +1,10 @@
import type { HouseholdOnboardingService, MiniAppAdminService } from '@household/application'
import type { Logger } from '@household/observability'
import type { HouseholdBillingSettingsRecord } from '@household/ports'
import {
HOUSEHOLD_MEMBER_LIFECYCLE_STATUSES,
type HouseholdBillingSettingsRecord,
type HouseholdMemberLifecycleStatus
} from '@household/ports'
import type { MiniAppSessionResult } from './miniapp-auth'
import type { AssistantUsageTracker } from './dm-assistant'
@@ -217,6 +221,42 @@ async function readRentWeightPayload(request: Request): Promise<{
}
}
async function readMemberStatusPayload(request: Request): Promise<{
initData: string
memberId: string
status: HouseholdMemberLifecycleStatus
}> {
const clonedRequest = request.clone()
const payload = await readMiniAppRequestPayload(request)
if (!payload.initData) {
throw new Error('Missing initData')
}
const text = await clonedRequest.text()
let parsed: { memberId?: string; status?: string }
try {
parsed = JSON.parse(text)
} catch {
throw new Error('Invalid JSON body')
}
const memberId = parsed.memberId?.trim()
const status = parsed.status?.trim().toLowerCase()
if (!memberId || !status) {
throw new Error('Missing member status fields')
}
if (!(HOUSEHOLD_MEMBER_LIFECYCLE_STATUSES as readonly string[]).includes(status)) {
throw new Error('Invalid member status')
}
return {
initData: payload.initData,
memberId,
status: status as HouseholdMemberLifecycleStatus
}
}
function serializeBillingSettings(settings: HouseholdBillingSettingsRecord) {
return {
householdId: settings.householdId,
@@ -253,7 +293,15 @@ async function authenticateAdminSession(
if (!session.authorized || !session.member) {
return miniAppJsonResponse(
{ ok: false, error: 'Access limited to active household members' },
{ ok: false, error: 'Admin access required for active household members' },
403,
origin
)
}
if (session.member.status !== 'active' || !session.member.isAdmin) {
return miniAppJsonResponse(
{ ok: false, error: 'Admin access required for active household members' },
403,
origin
)
@@ -305,9 +353,14 @@ export function createMiniAppPendingMembersHandler(options: {
)
}
if (!session.authorized || !session.member) {
if (
!session.authorized ||
!session.member ||
session.member.status !== 'active' ||
!session.member.isAdmin
) {
return miniAppJsonResponse(
{ ok: false, error: 'Access limited to active household members' },
{ ok: false, error: 'Admin access required for active household members' },
403,
origin
)
@@ -442,9 +495,14 @@ export function createMiniAppUpdateSettingsHandler(options: {
)
}
if (!session.authorized || !session.member) {
if (
!session.authorized ||
!session.member ||
session.member.status !== 'active' ||
!session.member.isAdmin
) {
return miniAppJsonResponse(
{ ok: false, error: 'Access limited to active household members' },
{ ok: false, error: 'Admin access required for active household members' },
403,
origin
)
@@ -545,9 +603,14 @@ export function createMiniAppUpsertUtilityCategoryHandler(options: {
)
}
if (!session.authorized || !session.member) {
if (
!session.authorized ||
!session.member ||
session.member.status !== 'active' ||
!session.member.isAdmin
) {
return miniAppJsonResponse(
{ ok: false, error: 'Access limited to active household members' },
{ ok: false, error: 'Admin access required for active household members' },
403,
origin
)
@@ -636,9 +699,14 @@ export function createMiniAppPromoteMemberHandler(options: {
)
}
if (!session.authorized || !session.member) {
if (
!session.authorized ||
!session.member ||
session.member.status !== 'active' ||
!session.member.isAdmin
) {
return miniAppJsonResponse(
{ ok: false, error: 'Access limited to active household members' },
{ ok: false, error: 'Admin access required for active household members' },
403,
origin
)
@@ -718,9 +786,14 @@ export function createMiniAppUpdateMemberRentWeightHandler(options: {
)
}
if (!session.authorized || !session.member) {
if (
!session.authorized ||
!session.member ||
session.member.status !== 'active' ||
!session.member.isAdmin
) {
return miniAppJsonResponse(
{ ok: false, error: 'Access limited to active household members' },
{ ok: false, error: 'Admin access required for active household members' },
403,
origin
)
@@ -769,6 +842,87 @@ export function createMiniAppUpdateMemberRentWeightHandler(options: {
}
}
export function createMiniAppUpdateMemberStatusHandler(options: {
allowedOrigins: readonly string[]
botToken: string
onboardingService: HouseholdOnboardingService
miniAppAdminService: MiniAppAdminService
logger?: Logger
}): {
handler: (request: Request) => Promise<Response>
} {
const sessionService = createMiniAppSessionService({
botToken: options.botToken,
onboardingService: options.onboardingService
})
return {
handler: async (request) => {
const origin = allowedMiniAppOrigin(request, options.allowedOrigins)
if (request.method === 'OPTIONS') {
return miniAppJsonResponse({ ok: true }, 204, origin)
}
if (request.method !== 'POST') {
return miniAppJsonResponse({ ok: false, error: 'Method Not Allowed' }, 405, origin)
}
try {
const payload = await readMemberStatusPayload(request)
const session = await sessionService.authenticate({
initData: payload.initData
})
if (
!session ||
!session.authorized ||
!session.member ||
session.member.status !== 'active' ||
!session.member.isAdmin
) {
return miniAppJsonResponse(
{ ok: false, error: 'Admin access required for active household members' },
session ? 403 : 401,
origin
)
}
const result = await options.miniAppAdminService.updateMemberStatus({
householdId: session.member.householdId,
actorIsAdmin: session.member.isAdmin,
memberId: payload.memberId,
status: payload.status
})
if (result.status === 'rejected') {
return miniAppJsonResponse(
{
ok: false,
error:
result.reason === 'member_not_found' ? 'Member not found' : 'Admin access required'
},
result.reason === 'member_not_found' ? 404 : 403,
origin
)
}
return miniAppJsonResponse(
{
ok: true,
authorized: true,
member: result.member
},
200,
origin
)
} catch (error) {
return miniAppErrorResponse(error, origin, options.logger)
}
}
}
}
export function createMiniAppApproveMemberHandler(options: {
allowedOrigins: readonly string[]
botToken: string
@@ -809,9 +963,14 @@ export function createMiniAppApproveMemberHandler(options: {
)
}
if (!session.authorized || !session.member) {
if (
!session.authorized ||
!session.member ||
session.member.status !== 'active' ||
!session.member.isAdmin
) {
return miniAppJsonResponse(
{ ok: false, error: 'Access limited to active household members' },
{ ok: false, error: 'Admin access required for active household members' },
403,
origin
)

29
apps/bot/src/miniapp-auth.test.ts
View File

@@ -3,6 +3,7 @@ import { describe, expect, test } from 'bun:test'
import { createHouseholdOnboardingService } from '@household/application'
import type {
HouseholdConfigurationRepository,
HouseholdMemberRecord,
HouseholdTopicBindingRecord
} from '@household/ports'
@@ -19,19 +20,7 @@ function onboardingRepository(): HouseholdConfigurationRepository {
defaultLocale: 'ru' as const
}
let joinToken: string | null = 'join-token'
const members = new Map<
string,
{
id: string
householdId: string
telegramUserId: string
displayName: string
preferredLocale: 'en' | 'ru' | null
householdDefaultLocale: 'en' | 'ru'
rentShareWeight: number
isAdmin: boolean
}
>()
const members = new Map<string, HouseholdMemberRecord>()
let pending: {
householdId: string
householdName: string
@@ -97,6 +86,7 @@ function onboardingRepository(): HouseholdConfigurationRepository {
householdId: household.householdId,
telegramUserId: input.telegramUserId,
displayName: input.displayName,
status: input.status ?? 'active',
preferredLocale: input.preferredLocale ?? null,
householdDefaultLocale: household.defaultLocale,
rentShareWeight: 1,
@@ -118,11 +108,12 @@ function onboardingRepository(): HouseholdConfigurationRepository {
return null
}
const member = {
const member: HouseholdMemberRecord = {
id: `member-${pending.telegramUserId}`,
householdId: household.householdId,
telegramUserId: pending.telegramUserId,
displayName: pending.displayName,
status: 'active',
preferredLocale: null,
householdDefaultLocale: household.defaultLocale,
rentShareWeight: 1,
@@ -154,6 +145,15 @@ function onboardingRepository(): HouseholdConfigurationRepository {
}
: null
},
updateHouseholdMemberStatus: async (_householdId, memberId, status) => {
const member = [...members.values()].find((entry) => entry.id === memberId)
return member
? {
...member,
status
}
: null
},
getHouseholdBillingSettings: async (householdId) => ({
householdId,
settlementCurrency: 'GEL',
@@ -232,6 +232,7 @@ describe('createMiniAppAuthHandler', () => {
authorized: true,
member: {
displayName: 'Stan',
status: 'active',
isAdmin: true,
preferredLocale: null,
householdDefaultLocale: 'ru'

1
apps/bot/src/miniapp-auth.ts
View File

@@ -101,6 +101,7 @@ export interface MiniAppSessionResult {
id: string
householdId: string
displayName: string
status: 'active' | 'away' | 'left'
isAdmin: boolean
preferredLocale: SupportedLocale | null
householdDefaultLocale: SupportedLocale

5
apps/bot/src/miniapp-billing.test.ts
View File

@@ -71,6 +71,7 @@ function onboardingRepository(): HouseholdConfigurationRepository {
householdId: household.householdId,
telegramUserId: input.telegramUserId,
displayName: input.displayName,
status: input.status ?? 'active',
preferredLocale: input.preferredLocale ?? null,
householdDefaultLocale: household.defaultLocale,
rentShareWeight: 1,
@@ -115,6 +116,7 @@ function onboardingRepository(): HouseholdConfigurationRepository {
householdId: 'household-1',
telegramUserId: '123456',
displayName: 'Stan',
status: 'active',
preferredLocale: null,
householdDefaultLocale: 'ru',
rentShareWeight: 1,
@@ -129,7 +131,8 @@ function onboardingRepository(): HouseholdConfigurationRepository {
}),
updateMemberPreferredLocale: async () => null,
promoteHouseholdAdmin: async () => null,
updateHouseholdMemberRentShareWeight: async () => null
updateHouseholdMemberRentShareWeight: async () => null,
updateHouseholdMemberStatus: async () => null
}
}

6
apps/bot/src/miniapp-dashboard.test.ts
View File

@@ -178,6 +178,7 @@ function onboardingRepository(): HouseholdConfigurationRepository {
householdId: household.householdId,
telegramUserId: input.telegramUserId,
displayName: input.displayName,
status: input.status ?? 'active',
preferredLocale: input.preferredLocale ?? null,
householdDefaultLocale: household.defaultLocale,
rentShareWeight: 1,
@@ -225,7 +226,8 @@ function onboardingRepository(): HouseholdConfigurationRepository {
isActive: input.isActive
}),
promoteHouseholdAdmin: async () => null,
updateHouseholdMemberRentShareWeight: async () => null
updateHouseholdMemberRentShareWeight: async () => null,
updateHouseholdMemberStatus: async () => null
}
}
@@ -252,6 +254,7 @@ describe('createMiniAppDashboardHandler', () => {
householdId: 'household-1',
telegramUserId: '123456',
displayName: 'Stan',
status: 'active',
preferredLocale: null,
householdDefaultLocale: 'ru',
rentShareWeight: 1,
@@ -354,6 +357,7 @@ describe('createMiniAppDashboardHandler', () => {
householdId: 'household-1',
telegramUserId: '123456',
displayName: 'Stan',
status: 'active',
preferredLocale: null,
householdDefaultLocale: 'ru',
rentShareWeight: 1,

6
apps/bot/src/miniapp-locale.test.ts
View File

@@ -31,6 +31,7 @@ function repository(): HouseholdConfigurationRepository {
householdId: household.householdId,
telegramUserId: '123456',
displayName: 'Stan',
status: 'active',
preferredLocale: null,
householdDefaultLocale: household.defaultLocale,
rentShareWeight: 1,
@@ -44,6 +45,7 @@ function repository(): HouseholdConfigurationRepository {
householdId: household.householdId,
telegramUserId: '222222',
displayName: 'Mia',
status: 'active',
preferredLocale: null,
householdDefaultLocale: household.defaultLocale,
rentShareWeight: 1,
@@ -93,6 +95,7 @@ function repository(): HouseholdConfigurationRepository {
householdId: input.householdId,
telegramUserId: input.telegramUserId,
displayName: input.displayName,
status: input.status ?? 'active',
preferredLocale: input.preferredLocale ?? null,
householdDefaultLocale: household.defaultLocale,
rentShareWeight: 1,
@@ -161,7 +164,8 @@ function repository(): HouseholdConfigurationRepository {
isActive: input.isActive
}),
promoteHouseholdAdmin: async () => null,
updateHouseholdMemberRentShareWeight: async () => null
updateHouseholdMemberRentShareWeight: async () => null,
updateHouseholdMemberStatus: async () => null
}
}

25
apps/bot/src/server.test.ts
View File

@@ -82,6 +82,15 @@ describe('createBotWebhookServer', () => {
}
})
},
miniAppUpdateMemberStatus: {
handler: async () =>
new Response(JSON.stringify({ ok: true, authorized: true, member: {} }), {
status: 200,
headers: {
'content-type': 'application/json; charset=utf-8'
}
})
},
miniAppBillingCycle: {
handler: async () =>
new Response(JSON.stringify({ ok: true, authorized: true, cycleState: {} }), {
@@ -347,6 +356,22 @@ describe('createBotWebhookServer', () => {
})
})
test('accepts mini app member status update request', async () => {
const response = await server.fetch(
new Request('http://localhost/api/miniapp/admin/members/status', {
method: 'POST',
body: JSON.stringify({ initData: 'payload' })
})
)
expect(response.status).toBe(200)
expect(await response.json()).toEqual({
ok: true,
authorized: true,
member: {}
})
})
test('accepts mini app billing cycle request', async () => {
const response = await server.fetch(
new Request('http://localhost/api/miniapp/admin/billing-cycle', {

12
apps/bot/src/server.ts
View File

@@ -62,6 +62,12 @@ export interface BotWebhookServerOptions {
handler: (request: Request) => Promise<Response>
}
| undefined
miniAppUpdateMemberStatus?:
| {
path?: string
handler: (request: Request) => Promise<Response>
}
| undefined
miniAppBillingCycle?:
| {
path?: string
@@ -186,6 +192,8 @@ export function createBotWebhookServer(options: BotWebhookServerOptions): {
options.miniAppPromoteMember?.path ?? '/api/miniapp/admin/members/promote'
const miniAppUpdateMemberRentWeightPath =
options.miniAppUpdateMemberRentWeight?.path ?? '/api/miniapp/admin/members/rent-weight'
const miniAppUpdateMemberStatusPath =
options.miniAppUpdateMemberStatus?.path ?? '/api/miniapp/admin/members/status'
const miniAppBillingCyclePath =
options.miniAppBillingCycle?.path ?? '/api/miniapp/admin/billing-cycle'
const miniAppOpenCyclePath =
@@ -268,6 +276,10 @@ export function createBotWebhookServer(options: BotWebhookServerOptions): {
return await options.miniAppUpdateMemberRentWeight.handler(request)
}
if (options.miniAppUpdateMemberStatus && url.pathname === miniAppUpdateMemberStatusPath) {
return await options.miniAppUpdateMemberStatus.handler(request)
}
if (options.miniAppBillingCycle && url.pathname === miniAppBillingCyclePath) {
return await options.miniAppBillingCycle.handler(request)
}