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(miniapp): refine UI and add utility bill management

Browse Source 
- Fix collapsible padding and button spacing
- Add subtotal to balance card
- Add utility bill management for admins
- Fix lints and type checks across the monorepo
- Implement rejectPendingHouseholdMember in repository and service
This commit is contained in:
whekin
2026-03-13 05:52:34 +04:00
parent 25c4928ca9
commit 94a5904f54
58 changed files with 5400 additions and 7006 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -201,6 +201,7 @@ function createHouseholdConfigurationRepository(): HouseholdConfigurationReposit
],
listPendingHouseholdMembers: async () => [],
approvePendingHouseholdMember: async () => null,
rejectPendingHouseholdMember: async () => false,
updateHouseholdDefaultLocale: async (_householdId, locale) => ({
householdId: 'household-1',
householdName: 'Kojori House',

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

@@ -127,6 +127,7 @@ function createRepository(isAdmin = false): HouseholdConfigurationRepository {
: [],
listPendingHouseholdMembers: async () => [],
approvePendingHouseholdMember: async () => null,
rejectPendingHouseholdMember: async () => false,
updateHouseholdDefaultLocale: async () => {
throw new Error('not implemented')
},

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

@@ -261,6 +261,7 @@ function createHouseholdRepository(): HouseholdConfigurationRepository {
],
listPendingHouseholdMembers: async () => [],
approvePendingHouseholdMember: async () => null,
rejectPendingHouseholdMember: async () => false,
updateHouseholdDefaultLocale: async () => household,
updateMemberPreferredLocale: async () => null,
updateHouseholdMemberDisplayName: async () => null,

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

@@ -105,6 +105,7 @@ function createRepository(): HouseholdConfigurationRepository {
},
listPendingHouseholdMembers: async () => [],
approvePendingHouseholdMember: async () => null,
rejectPendingHouseholdMember: async () => false,
updateHouseholdDefaultLocale: async () => {
throw new Error('not implemented')
},

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

@@ -520,6 +520,9 @@ function createHouseholdConfigurationRepository(): HouseholdConfigurationReposit
members.set(key, member)
return member
},
async rejectPendingHouseholdMember() {
return false
},
async updateHouseholdDefaultLocale(householdId, locale) {
const household = [...households.values()].find((entry) => entry.householdId === householdId)
if (!household) {

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

@@ -50,6 +50,7 @@ import { createMiniAppAuthHandler, createMiniAppJoinHandler } from './miniapp-au
import { createMiniAppDashboardHandler } from './miniapp-dashboard'
import {
createMiniAppApproveMemberHandler,
createMiniAppRejectMemberHandler,
createMiniAppPendingMembersHandler,
createMiniAppPromoteMemberHandler,
createMiniAppSettingsHandler,
@@ -576,6 +577,15 @@ const server = createBotWebhookServer({
logger: getLogger('miniapp-admin')
})
: undefined,
miniAppRejectMember: householdOnboardingService
? createMiniAppRejectMemberHandler({
allowedOrigins: runtime.miniAppAllowedOrigins,
botToken: runtime.telegramBotToken,
onboardingService: householdOnboardingService,
miniAppAdminService: miniAppAdminService!,
logger: getLogger('miniapp-admin')
})
: undefined,
miniAppSettings: householdOnboardingService
? createMiniAppSettingsHandler({
allowedOrigins: runtime.miniAppAllowedOrigins,

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

@@ -8,6 +8,7 @@ import type {
import {
createMiniAppApproveMemberHandler,
createMiniAppRejectMemberHandler,
createMiniAppPendingMembersHandler,
createMiniAppPromoteMemberHandler,
createMiniAppSettingsHandler,
@@ -131,6 +132,7 @@ function onboardingRepository(): HouseholdConfigurationRepository {
isAdmin: false
}
: null,
rejectPendingHouseholdMember: async (input) => input.telegramUserId === '555777',
updateHouseholdDefaultLocale: async (_householdId, locale) => ({
...household,
defaultLocale: locale
@@ -407,6 +409,60 @@ describe('createMiniAppApproveMemberHandler', () => {
})
})
describe('createMiniAppRejectMemberHandler', () => {
test('rejects a pending member 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 = createMiniAppRejectMemberHandler({
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/reject-member', {
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'
}),
pendingTelegramUserId: '555777'
})
})
)
expect(response.status).toBe(200)
expect(await response.json()).toEqual({
ok: true,
authorized: true
})
})
})
describe('createMiniAppSettingsHandler', () => {
test('returns billing settings and admin members for an authenticated admin', async () => {
const authDate = Math.floor(Date.now() / 1000)

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

@@ -1396,3 +1396,87 @@ export function createMiniAppApproveMemberHandler(options: {
}
}
}
export function createMiniAppRejectMemberHandler(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 readApprovalPayload(request)
const session = await sessionService.authenticate({
initData: payload.initData
})
if (!session) {
return miniAppJsonResponse(
{ ok: false, error: 'Invalid Telegram init data' },
401,
origin
)
}
if (
!session.authorized ||
!session.member ||
session.member.status !== 'active' ||
!session.member.isAdmin
) {
return miniAppJsonResponse(
{ ok: false, error: 'Admin access required for active household members' },
403,
origin
)
}
const result = await options.miniAppAdminService.rejectPendingMember({
householdId: session.member.householdId,
actorIsAdmin: session.member.isAdmin,
pendingTelegramUserId: payload.pendingTelegramUserId
})
if (result.status === 'rejected') {
const status = result.reason === 'pending_not_found' ? 404 : 403
const error =
result.reason === 'pending_not_found'
? 'Pending member not found'
: 'Admin access required'
return miniAppJsonResponse({ ok: false, error }, status, origin)
}
return miniAppJsonResponse(
{
ok: true,
authorized: true
},
200,
origin
)
} catch (error) {
return miniAppErrorResponse(error, origin, options.logger)
}
}
}
}

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

@@ -123,6 +123,7 @@ function onboardingRepository(): HouseholdConfigurationRepository {
pending = null
return member
},
rejectPendingHouseholdMember: async () => false,
updateHouseholdDefaultLocale: async (_householdId, locale) => ({
...household,
defaultLocale: locale

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

@@ -126,6 +126,7 @@ function onboardingRepository(): HouseholdConfigurationRepository {
],
listPendingHouseholdMembers: async () => [],
approvePendingHouseholdMember: async () => null,
rejectPendingHouseholdMember: async () => false,
updateHouseholdDefaultLocale: async (_householdId, locale) => ({
...household,
defaultLocale: locale

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

@@ -201,6 +201,7 @@ function onboardingRepository(): HouseholdConfigurationRepository {
listHouseholdMembersByTelegramUserId: async () => [],
listPendingHouseholdMembers: async () => [],
approvePendingHouseholdMember: async () => null,
rejectPendingHouseholdMember: async () => false,
updateHouseholdDefaultLocale: async (_householdId, locale) => ({
...household,
defaultLocale: locale

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

@@ -109,6 +109,7 @@ function repository(): HouseholdConfigurationRepository {
},
listPendingHouseholdMembers: async () => [],
approvePendingHouseholdMember: async () => null,
rejectPendingHouseholdMember: async () => false,
updateHouseholdDefaultLocale: async (_householdId, locale) => {
household.defaultLocale = locale
for (const [id, member] of members.entries()) {

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

@@ -32,6 +32,12 @@ export interface BotWebhookServerOptions {
handler: (request: Request) => Promise<Response>
}
| undefined
miniAppRejectMember?:
| {
path?: string
handler: (request: Request) => Promise<Response>
}
| undefined
miniAppSettings?:
| {
path?: string
@@ -128,6 +134,12 @@ export interface BotWebhookServerOptions {
handler: (request: Request) => Promise<Response>
}
| undefined
miniAppAddPurchase?:
| {
path?: string
handler: (request: Request) => Promise<Response>
}
| undefined
miniAppUpdatePurchase?:
| {
path?: string
@@ -201,6 +213,8 @@ export function createBotWebhookServer(options: BotWebhookServerOptions): {
options.miniAppPendingMembers?.path ?? '/api/miniapp/admin/pending-members'
const miniAppApproveMemberPath =
options.miniAppApproveMember?.path ?? '/api/miniapp/admin/approve-member'
const miniAppRejectMemberPath =
options.miniAppRejectMember?.path ?? '/api/miniapp/admin/reject-member'
const miniAppSettingsPath = options.miniAppSettings?.path ?? '/api/miniapp/admin/settings'
const miniAppUpdateSettingsPath =
options.miniAppUpdateSettings?.path ?? '/api/miniapp/admin/settings/update'
@@ -231,6 +245,8 @@ export function createBotWebhookServer(options: BotWebhookServerOptions): {
options.miniAppUpdateUtilityBill?.path ?? '/api/miniapp/admin/utility-bills/update'
const miniAppDeleteUtilityBillPath =
options.miniAppDeleteUtilityBill?.path ?? '/api/miniapp/admin/utility-bills/delete'
const miniAppAddPurchasePath =
options.miniAppAddPurchase?.path ?? '/api/miniapp/admin/purchases/add'
const miniAppUpdatePurchasePath =
options.miniAppUpdatePurchase?.path ?? '/api/miniapp/admin/purchases/update'
const miniAppDeletePurchasePath =
@@ -274,6 +290,10 @@ export function createBotWebhookServer(options: BotWebhookServerOptions): {
return await options.miniAppApproveMember.handler(request)
}
if (options.miniAppRejectMember && url.pathname === miniAppRejectMemberPath) {
return await options.miniAppRejectMember.handler(request)
}
if (options.miniAppSettings && url.pathname === miniAppSettingsPath) {
return await options.miniAppSettings.handler(request)
}
@@ -350,6 +370,10 @@ export function createBotWebhookServer(options: BotWebhookServerOptions): {
return await options.miniAppDeleteUtilityBill.handler(request)
}
if (options.miniAppAddPurchase && url.pathname === miniAppAddPurchasePath) {
return await options.miniAppAddPurchase.handler(request)
}
if (options.miniAppUpdatePurchase && url.pathname === miniAppUpdatePurchasePath) {
return await options.miniAppUpdatePurchase.handler(request)
}