/** * Unit tests for the DI-native PackingService — PACK-SVC-001 through * PACK-SVC-049 moved from the legacy tests/unit/services/packingService.test.ts * (real in-memory SQLite so the SQL logic is exercised faithfully), plus the * wrapper-helper cases (canEdit, the #858 broadcast scoping, getItemPrivacy, * notifyTagged) carried over from the old delegation suite — now running * against real SQL — PACK-SVC-050 pinning the packing.bridge delegation, and * PACK-SVC-051..053 pinning the post-migration fixes over the legacy quirks * ('Other' category default, bodyKeys-gated weight_limit_grams, quantity clamp). * * The trailing "Admin template CRUD" blocks carry ADMIN-SVC-031..044 and * ADMIN-SVC-056..064 over from tests/unit/services/adminService.test.ts with * their IDs preserved — those functions moved into PackingService with the * 2026-08 admin fold, since this service already owned all three template * tables. */ import { describe, it, expect, vi, beforeAll, beforeEach, afterAll } from 'vitest'; // ── DB setup ────────────────────────────────────────────────────────────────── vi.mock('../../../src/db/database', async () => { const { createSnapshotTestDb } = await import('../../helpers/db-mock'); const db = createSnapshotTestDb(); // Trip access reads through TripsRepository now; the module only hands out the handle. return { db, closeDb: () => {}, reinitialize: () => {} }; }); vi.mock('../../../src/config', () => ({ JWT_SECRET: 'test-secret', ENCRYPTION_KEY: 'a1b2c3d4e5f6a7b8c9d0e1f2a3b4c5d6a7b8c9d0e1f2a3b4c5d6a7b8c9d0e1f2', updateJwtSecret: () => {}, })); const { broadcastMock } = vi.hoisted(() => ({ broadcastMock: vi.fn() })); vi.mock('../../../src/websocket', () => ({ broadcast: broadcastMock })); const checkPermission = vi.fn(() => true); const permissionsStub = { checkPermission } as unknown as PermissionsService; const { send } = vi.hoisted(() => ({ send: vi.fn(() => Promise.resolve()) })); import { db as testDb } from '../../../src/db/database'; import { resetTestDb } from '../../helpers/test-db'; import { createUser, createAdmin, createTrip, addTripMember } from '../../helpers/factories'; import type { PermissionsService } from '../../../src/nest/permissions/permissions.service'; import { PackingService, isInvalidBagRef } from '../../../src/nest/packing/packing.service'; // Was packing.bridge, deleted with the other three that had no consumer outside the // container. The assertions stayed; they point at the service now. const bridgeListItems = (tripId: string | number, viewerId?: number) => svc.listItems(tripId, viewerId); import { RealtimeService } from '../../../src/nest/realtime/realtime.service'; import { notificationsStub } from '../../helpers/notifications'; import { countRows, findRow, findRows, insertRow, updateRows } from '../../helpers/factories/rows'; import { addTripMember as addTripMemberRow } from '../../helpers/factories/trips'; import { PackingBags } from '../../../src/db/entities/PackingBags.entity'; import { PackingItems } from '../../../src/db/entities/PackingItems.entity'; import { PackingTemplateCategories } from '../../../src/db/entities/PackingTemplateCategories.entity'; import { PackingTemplateItems } from '../../../src/db/entities/PackingTemplateItems.entity'; import { PackingTemplates } from '../../../src/db/entities/PackingTemplates.entity'; import { Trips } from '../../../src/db/entities/Trips.entity'; const orm = () => sharedTestOrm(testDb); /** An unchecked item on the list, the way the old fixtures wrote them. */ async function addItem(tripId: number, name: string, category: string, sortOrder: number): Promise { return insertRow(await orm(), PackingItems, { trip: tripId, name, category, checked: 0, sort_order: sortOrder }); } async function tripItems(tripId: number) { return findRows(await orm(), PackingItems, { trip: tripId }); } /** The stored item; fails the case when it is gone. */ async function itemRow(id: number) { const row = await findRow(await orm(), PackingItems, { id }); if (!row) throw new Error(`no packing item ${id}`); return row; } /** Every item of every category of the template. */ async function templateItems(templateId: number) { const categoryIds = (await findRows(await orm(), PackingTemplateCategories, { template: templateId })).map((c) => c.id); return findRows(await orm(), PackingTemplateItems, { category: { $in: categoryIds } }); } import { createTestUnitOfWork, createTestTripsRepo, createTestTripMembersRepo, sharedTestOrm } from '../../helpers/test-uow'; import { createTestPackingItemsRepo, createTestPackingItemContributorsRepo, createTestPackingBagsRepo, createTestPackingCategoryAssigneesRepo, createTestPackingTemplatesRepo, createTestPackingTemplateCategoriesRepo, createTestPackingTemplateItemsRepo, } from '../../helpers/packing-repos'; let svc: PackingService; let packingItemsRepoDirect: Awaited>; let packingBagsRepoDirect: Awaited>; let packingTemplatesRepoDirect: Awaited>; let packingCategoryAssigneesRepoDirect: Awaited>; let packingItemContributorsRepoDirect: Awaited>; // ── Lifecycle ───────────────────────────────────────────────────────────────── beforeAll(async () => { packingItemsRepoDirect = await createTestPackingItemsRepo(testDb); packingBagsRepoDirect = await createTestPackingBagsRepo(testDb); packingTemplatesRepoDirect = await createTestPackingTemplatesRepo(testDb); packingCategoryAssigneesRepoDirect = await createTestPackingCategoryAssigneesRepo(testDb); packingItemContributorsRepoDirect = await createTestPackingItemContributorsRepo(testDb); svc = new PackingService( permissionsStub, new RealtimeService(), notificationsStub(send), await createTestUnitOfWork(testDb), packingItemsRepoDirect, packingItemContributorsRepoDirect, packingBagsRepoDirect, packingCategoryAssigneesRepoDirect, packingTemplatesRepoDirect, await createTestPackingTemplateCategoriesRepo(testDb), await createTestPackingTemplateItemsRepo(testDb), await createTestTripsRepo(testDb), await createTestTripMembersRepo(testDb), ); }); beforeEach(() => { resetTestDb(testDb); vi.clearAllMocks(); }); afterAll(() => { testDb.close(); }); // ── saveAsTemplate ──────────────────────────────────────────────────────────── describe('saveAsTemplate', () => { it('PACK-SVC-001: saves packing items as a template with correct categories and item count', async () => { const { user } = createUser(testDb); const trip = createTrip(testDb, user.id); await addItem(trip.id, 'Shirt', 'Clothes', 0); await addItem(trip.id, 'Shorts', 'Clothes', 1); await addItem(trip.id, 'Toothbrush', 'Toiletries', 2); const result = await svc.saveAsTemplate(trip.id, user.id, 'My Template'); expect(result).not.toBeNull(); expect(result!.name).toBe('My Template'); expect(result!.categoryCount).toBe(2); expect(result!.itemCount).toBe(3); const template = await findRow(await orm(), PackingTemplates, { id: result!.id }); expect(template).not.toBeNull(); expect(template!.name).toBe('My Template'); expect(template!.created_by).toBe(user.id); }); it('PACK-SVC-002: returns null when trip has no packing items', async () => { const { user } = createUser(testDb); const trip = createTrip(testDb, user.id); const result = await svc.saveAsTemplate(trip.id, user.id, 'Empty'); expect(result).toBeNull(); }); }); describe('templates carry weight, quantity and bag (#1131)', () => { it('PACK-SVC-1131-1: a saved template keeps each item\'s weight, count and bag name, and applying it restores them', async () => { const { user } = createUser(testDb); const source = createTrip(testDb, user.id); const bagId = await insertRow(await orm(), PackingBags, { trip: source.id, name: 'Backpack', color: '#111111' }); await insertRow(await orm(), PackingItems, { trip: source.id, name: 'Socks', category: 'Clothes', checked: 1, sort_order: 0, weight_grams: 60, quantity: 4, bag: bagId, }); await addItem(source.id, 'Charger', 'Tech', 1); const saved = (await svc.saveAsTemplate(source.id, user.id, 'Hiking'))!; const rows = (await templateItems(saved.id)) .sort((a, b) => a.name.localeCompare(b.name)) .map(({ name, weight_grams, quantity, bag_name }) => ({ name, weight_grams, quantity, bag_name })); expect(rows).toEqual([ { name: 'Charger', weight_grams: null, quantity: 1, bag_name: null }, { name: 'Socks', weight_grams: 60, quantity: 4, bag_name: 'Backpack' }, ]); // A fresh trip has no bag of that name, so applying creates one. const target = createTrip(testDb, user.id); const added = (await svc.applyTemplate(target.id, saved.id)) as any[]; const socks = added.find(i => i.name === 'Socks'); expect(socks).toMatchObject({ weight_grams: 60, quantity: 4, checked: 0 }); const bag = await findRow(await orm(), PackingBags, { trip: target.id }); expect(bag?.name).toBe('Backpack'); expect(socks.bag_id).toBe(bag?.id); expect(added.find(i => i.name === 'Charger')).toMatchObject({ weight_grams: null, quantity: 1, bag_id: null }); }); it('PACK-SVC-1131-2: applying reuses a bag the trip already has under that name', async () => { const { user } = createUser(testDb); const trip = createTrip(testDb, user.id); const existing = await insertRow(await orm(), PackingBags, { trip: trip.id, name: 'Duffel', color: '#222222' }); const templateId = await seedTemplate(user.id, ['Towel']); await updateRows(await orm(), PackingTemplateItems, { name: 'Towel' }, { bag_name: 'Duffel', weight_grams: 400 }); const [towel] = (await svc.applyTemplate(trip.id, templateId)) as any[]; expect(towel).toMatchObject({ bag_id: Number(existing), weight_grams: 400 }); expect(await countRows(await orm(), PackingBags, { trip: trip.id })).toBe(1); }); }); // ── listTemplates ─────────────────────────────────────────────────────────────── describe('listTemplates', () => { it('PACK-SVC-LIST-001: returns templates with id, name and item_count', async () => { const { user } = createUser(testDb); const trip = createTrip(testDb, user.id); await addItem(trip.id, 'Shirt', 'Clothes', 0); await addItem(trip.id, 'Toothbrush', 'Toiletries', 1); const saved = await svc.saveAsTemplate(trip.id, user.id, 'Weekend'); const templates = await svc.listTemplates(); expect(templates).toHaveLength(1); expect(templates[0]).toMatchObject({ id: saved!.id, name: 'Weekend', item_count: 2 }); }); it('PACK-SVC-LIST-002: returns an empty array when no templates exist', async () => { expect(await svc.listTemplates()).toEqual([]); }); }); // ── applyTemplate ───────────────────────────────────────────────────────────── /** A one-category template with the given item names. Returns its id. */ async function seedTemplate(userId: number, itemNames: string[]): Promise { const templateId = await insertRow(await orm(), PackingTemplates, { name: 'Camping', createdByRef: userId }); const catId = await insertRow(await orm(), PackingTemplateCategories, { template: templateId, name: 'Gear', sort_order: 0 }); for (const [i, name] of itemNames.entries()) { await insertRow(await orm(), PackingTemplateItems, { category: catId, name, sort_order: i }); } return templateId; } describe('template positions', () => { it('PACK-SVC-002b: template categories and items added at the same time take one position each', async () => { const { user } = createUser(testDb); const templateId = await seedTemplate(user.id, ['Tent']); // seedTemplate's own category holds position 0 and its item position 0. const categories = await Promise.all(['Kitchen', 'Sleep', 'Clothes'].map((name) => svc.createTemplateCategory(String(templateId), name))); const catIds = categories.map((c) => (c as { category: { id: number } }).category.id); expect((await findRows(await orm(), PackingTemplateCategories, { template: templateId }, { sort_order: 'asc' })) .map((r) => r.sort_order)).toEqual([0, 1, 2, 3]); await Promise.all(['Stove', 'Pot', 'Lighter'].map((name) => svc.createTemplateItem(String(templateId), String(catIds[0]), name))); expect((await findRows(await orm(), PackingTemplateItems, { category: catIds[0] }, { sort_order: 'asc' })) .map((r) => r.sort_order)).toEqual([0, 1, 2]); }); }); describe('applyTemplate', () => { it('PACK-SVC-003: adds template items to a trip packing list', async () => { const { user } = createUser(testDb); const trip = createTrip(testDb, user.id); // Insert a template with one category and two items directly const templateId = await insertRow(await orm(), PackingTemplates, { name: 'Camping', createdByRef: user.id }); const catId = await insertRow(await orm(), PackingTemplateCategories, { template: templateId, name: 'Gear', sort_order: 0 }); await insertRow(await orm(), PackingTemplateItems, { category: catId, name: 'Tent', sort_order: 0 }); await insertRow(await orm(), PackingTemplateItems, { category: catId, name: 'Sleeping Bag', sort_order: 1 }); const result = await svc.applyTemplate(trip.id, templateId); expect(result).not.toBeNull(); expect(Array.isArray(result)).toBe(true); expect((result as any[]).length).toBe(2); const items = await tripItems(trip.id); expect(items.length).toBe(2); expect(items.map((i: any) => i.name)).toContain('Tent'); expect(items.map((i: any) => i.name)).toContain('Sleeping Bag'); }); it('PACK-SVC-004: returns null when template has no items', async () => { const { user } = createUser(testDb); const trip = createTrip(testDb, user.id); const templateId = await insertRow(await orm(), PackingTemplates, { name: 'Empty Template', createdByRef: user.id }); const result = await svc.applyTemplate(trip.id, templateId); expect(result).toBeNull(); }); // #1565: the applied items must land in the view the user is on, not always Common. it('PACK-SVC-046: applies into the personal list when visibility is personal', async () => { const { user } = createUser(testDb); const trip = createTrip(testDb, user.id); const templateId = await seedTemplate(user.id, ['Tent']); const result = await svc.applyTemplate(trip.id, templateId, 'personal', user.id) as any[]; expect(result[0].is_private).toBe(1); expect(result[0].owner_id).toBe(user.id); expect((await svc.listItems(trip.id, user.id)).filter((i: any) => i.is_private)).toHaveLength(1); }); it('PACK-SVC-047: a personally applied template stays hidden from other members', async () => { const { user } = createUser(testDb); const { user: other } = createUser(testDb, { username: 'other' }); const trip = createTrip(testDb, user.id); await addTripMemberRow(await orm(), trip.id, other.id); const templateId = await seedTemplate(user.id, ['Tent']); await svc.applyTemplate(trip.id, templateId, 'personal', user.id); expect(await svc.listItems(trip.id, other.id)).toHaveLength(0); }); it('PACK-SVC-048: applies into the common pool by default, leaving items unowned', async () => { const { user } = createUser(testDb); const trip = createTrip(testDb, user.id); const templateId = await seedTemplate(user.id, ['Tent']); const result = await svc.applyTemplate(trip.id, templateId, 'common', user.id) as any[]; expect(result[0].is_private).toBe(0); // Unowned, so any member may still re-share it (setItemSharing claims a null owner). expect(result[0].owner_id).toBeNull(); }); it('PACK-SVC-049: falls back to common when no owner is given, so items stay visible', async () => { const { user } = createUser(testDb); const trip = createTrip(testDb, user.id); const templateId = await seedTemplate(user.id, ['Tent']); // A private item with no owner would be invisible to everyone. const result = await svc.applyTemplate(trip.id, templateId, 'personal') as any[]; expect(result[0].is_private).toBe(0); expect(await svc.listItems(trip.id, user.id)).toHaveLength(1); }); }); // ── createBag / deleteBag ───────────────────────────────────────────────────── describe('createBag / deleteBag', () => { it('PACK-SVC-005: createBag inserts a bag and returns it', async () => { const { user } = createUser(testDb); const trip = createTrip(testDb, user.id); const result = await svc.createBag(trip.id, { name: 'Carry-On', color: '#ff0000' }) as any; expect(result).not.toBeNull(); expect(result.name).toBe('Carry-On'); expect(result.color).toBe('#ff0000'); expect(result.trip_id).toBe(trip.id); const bag = await findRow(await orm(), PackingBags, { id: result.id }); expect(bag).not.toBeNull(); expect(bag!.name).toBe('Carry-On'); }); it('PACK-SVC-005b: bags and items created at the same time take one position each', async () => { const { user } = createUser(testDb); const trip = createTrip(testDb, user.id); // Without the transaction every one of them read the same MAX and landed on 0. await Promise.all(['Carry-On', 'Checked', 'Daypack'].map((name) => svc.createBag(trip.id, { name }))); await Promise.all(['Tent', 'Stove', 'Mat'].map((name) => svc.createItem(trip.id, { name }, user.id))); const bags = await findRows(await orm(), PackingBags, { trip: trip.id }, { sort_order: 'asc' }); const items = await findRows(await orm(), PackingItems, { trip: trip.id }, { sort_order: 'asc' }); expect(bags.map((r) => r.sort_order)).toEqual([0, 1, 2]); expect(items.map((r) => r.sort_order)).toEqual([0, 1, 2]); }); it('PACK-SVC-006: deleteBag removes the bag and returns true', async () => { const { user } = createUser(testDb); const trip = createTrip(testDb, user.id); const bag = await svc.createBag(trip.id, { name: 'Checked Bag' }) as any; expect(bag).not.toBeNull(); const deleted = await svc.deleteBag(trip.id, bag.id); expect(deleted).toBe(true); expect(await findRow(await orm(), PackingBags, { id: bag.id })).toBeNull(); }); it('PACK-SVC-007: deleteBag returns false for non-existent bag', async () => { const result = await svc.deleteBag(1, 99999); expect(result).toBe(false); }); }); // ── setBagMembers ───────────────────────────────────────────────────────────── describe('setBagMembers', () => { it('PACK-SVC-008: sets bag members (replaces existing)', async () => { const { user } = createUser(testDb); const trip = createTrip(testDb, user.id); const bag = await svc.createBag(trip.id, { name: 'Main Bag' }) as any; const result = await svc.setBagMembers(trip.id, bag.id, [user.id]) as any[]; expect(result).not.toBeNull(); expect(Array.isArray(result)).toBe(true); expect(result.length).toBe(1); expect(result[0].user_id).toBe(user.id); }); it('PACK-SVC-009: setBagMembers with empty array clears all members', async () => { const { user } = createUser(testDb); const trip = createTrip(testDb, user.id); const bag = await svc.createBag(trip.id, { name: 'Main Bag' }) as any; // First add a member await svc.setBagMembers(trip.id, bag.id, [user.id]); // Then clear const result = await svc.setBagMembers(trip.id, bag.id, []) as any[]; expect(Array.isArray(result)).toBe(true); expect(result.length).toBe(0); }); it('PACK-SVC-010: setBagMembers returns null for non-existent bag', async () => { const result = await svc.setBagMembers(1, 99999, []); expect(result).toBeNull(); }); it('PACK-SVC-010a: setBagMembers drops a user who is not on the trip roster', async () => { const { user } = createUser(testDb); const outsider = createUser(testDb).user; const trip = createTrip(testDb, user.id); const bag = await svc.createBag(trip.id, { name: 'Main Bag' }) as any; // owner is on the roster; the outsider (not owner, not a member) must be filtered out const result = await svc.setBagMembers(trip.id, bag.id, [user.id, outsider.id]) as any[]; const ids = result.map((m) => m.user_id); expect(ids).toContain(user.id); expect(ids).not.toContain(outsider.id); }); it('PACK-SVC-010b: updateBag ignores an off-roster user_id, leaving the bag unassigned', async () => { const { user } = createUser(testDb); const outsider = createUser(testDb).user; const trip = createTrip(testDb, user.id); const bag = await svc.createBag(trip.id, { name: 'Main Bag' }) as any; // assigning to an outsider must not stick — the CASE keeps user_id null await svc.updateBag(trip.id, bag.id, { user_id: outsider.id }, ['user_id']); const stored = await findRow(await orm(), PackingBags, { id: bag.id }); expect(stored!.user_id).toBeNull(); // assigning to the owner (on the roster) does stick await svc.updateBag(trip.id, bag.id, { user_id: user.id }, ['user_id']); const stored2 = await findRow(await orm(), PackingBags, { id: bag.id }); expect(stored2!.user_id).toBe(user.id); }); }); // ── bulkImport with bag field ───────────────────────────────────────────────── describe('bulkImport with bag field', () => { it('PACK-SVC-011: bulk import with bag field creates the bag if it does not exist', async () => { const { user } = createUser(testDb); const trip = createTrip(testDb, user.id); const result = await svc.bulkImport(trip.id, [{ name: 'Shirt', bag: 'Carry-On' }]); expect(result).toHaveLength(1); expect(result[0]).toBeDefined(); const bags = await findRows(await orm(), PackingBags, { trip: trip.id, name: 'Carry-On' }); expect(bags).toHaveLength(1); const items = await tripItems(trip.id); expect(items).toHaveLength(1); expect(items[0].bag_id).toBe(bags[0].id); }); it('PACK-SVC-012: bulk import with same bag name reuses existing bag', async () => { const { user } = createUser(testDb); const trip = createTrip(testDb, user.id); const result = await svc.bulkImport(trip.id, [ { name: 'Shirt', bag: 'Carry-On' }, { name: 'Pants', bag: 'Carry-On' }, ]); expect(result).toHaveLength(2); const bags = await findRows(await orm(), PackingBags, { trip: trip.id, name: 'Carry-On' }); expect(bags).toHaveLength(1); const items = await tripItems(trip.id); expect(items).toHaveLength(2); expect(items[0].bag_id).toBe(bags[0].id); expect(items[1].bag_id).toBe(bags[0].id); }); }); // ── bulkImport with quantity field ──────────────────────────────────────────── describe('bulkImport with quantity field', () => { it('PACK-SVC-013: bulk import respects per-item quantity, defaults to 1, and clamps out-of-range', async () => { const { user } = createUser(testDb); const trip = createTrip(testDb, user.id); await svc.bulkImport(trip.id, [ { name: 'Socks', quantity: 5 }, { name: 'Toothbrush' }, { name: 'Batteries', quantity: 9999 }, { name: 'Charger', quantity: 0 }, ]); const byName = async (n: string) => (await findRow(await orm(), PackingItems, { trip: trip.id, name: n }))!; expect((await byName('Socks')).quantity).toBe(5); expect((await byName('Toothbrush')).quantity).toBe(1); expect((await byName('Batteries')).quantity).toBe(999); expect((await byName('Charger')).quantity).toBe(1); }); }); // ── Private items (#858) ────────────────────────────────────────────────────── describe('private items (#858)', () => { it('PACK-SVC-014: createItem stamps the owner and is_private flag', async () => { const { user } = createUser(testDb); const trip = createTrip(testDb, user.id); const shared = await svc.createItem(trip.id, { name: 'Tent' }, user.id) as any; const secret = await svc.createItem(trip.id, { name: 'Gift', is_private: true }, user.id) as any; expect(shared.is_private).toBe(0); expect(shared.owner_id).toBe(user.id); expect(secret.is_private).toBe(1); expect(secret.owner_id).toBe(user.id); }); it('PACK-SVC-015: listItems hides another member\'s private items but shows the owner theirs', async () => { const { user: owner } = createUser(testDb); const { user: other } = createUser(testDb); const trip = createTrip(testDb, owner.id); await svc.createItem(trip.id, { name: 'Shared' }, owner.id); await svc.createItem(trip.id, { name: 'Private', is_private: true }, owner.id); const ownerView = await svc.listItems(trip.id, owner.id) as any[]; const otherView = await svc.listItems(trip.id, other.id) as any[]; const unscoped = await svc.listItems(trip.id) as any[]; expect(ownerView.map(i => i.name).sort()).toEqual(['Private', 'Shared']); expect(otherView.map(i => i.name)).toEqual(['Shared']); // Without a viewer (internal callers) nothing is filtered. expect(unscoped).toHaveLength(2); }); it('PACK-SVC-016: updateItem toggles privacy and claims an unowned item for the actor', async () => { const { user } = createUser(testDb); const trip = createTrip(testDb, user.id); // Legacy-style row with no owner. const id = await insertRow(await orm(), PackingItems, { trip: trip.id, name: 'Legacy', checked: 0, sort_order: 0 }); const updated = await svc.updateItem(trip.id, id, { is_private: true }, ['is_private'], undefined, user.id) as any; expect(updated.is_private).toBe(1); expect(updated.owner_id).toBe(user.id); const back = await svc.updateItem(trip.id, id, { is_private: false }, ['is_private'], undefined, user.id) as any; expect(back.is_private).toBe(0); // Ownership is retained once claimed. expect(back.owner_id).toBe(user.id); }); it('PACK-SVC-017: deleteItem returns the removed row (with privacy fields)', async () => { const { user } = createUser(testDb); const trip = createTrip(testDb, user.id); const item = await svc.createItem(trip.id, { name: 'Private', is_private: true }, user.id) as any; const deleted = await svc.deleteItem(trip.id, item.id, user.id) as any; expect(deleted).not.toBeNull(); expect(deleted.is_private).toBe(1); expect(deleted.owner_id).toBe(user.id); expect(await svc.deleteItem(trip.id, item.id, user.id)).toBeNull(); }); it('PACK-SVC-018: bulkImport stamps the owner on every item', async () => { const { user } = createUser(testDb); const trip = createTrip(testDb, user.id); await svc.bulkImport(trip.id, [{ name: 'A' }, { name: 'B', is_private: true }], user.id); const rows = await findRows(await orm(), PackingItems, { trip: trip.id }, { name: 'asc' }); expect(rows.every(r => r.owner_id === user.id)).toBe(true); expect(rows.find(r => r.name === 'B')!.is_private).toBe(1); expect(rows.find(r => r.name === 'A')!.is_private).toBe(0); }); }); // ── Three-tier sharing (#858 follow-up) ─────────────────────────────────────── describe('three-tier packing sharing (#858)', () => { const names = (rows: any[]) => rows.map(r => r.name).sort(); it('PACK-SVC-040: existing/common items are visible to everyone (non-breaking)', async () => { const { user: owner } = createUser(testDb); const { user: other } = createUser(testDb); const trip = createTrip(testDb, owner.id); // A legacy-style row written directly (is_private defaults 0) = Common. await insertRow(await orm(), PackingItems, { trip: trip.id, name: 'Tent', checked: 0, sort_order: 0 }); await svc.createItem(trip.id, { name: 'Stove', visibility: 'common' }, owner.id); expect(names(await svc.listItems(trip.id, owner.id) as any[])).toEqual(['Stove', 'Tent']); expect(names(await svc.listItems(trip.id, other.id) as any[])).toEqual(['Stove', 'Tent']); }); it('PACK-SVC-041: a Shared item is visible to its owner + recipients only, marked with the bringer', async () => { const { user: owner } = createUser(testDb); const { user: friend } = createUser(testDb); const { user: stranger } = createUser(testDb); const trip = createTrip(testDb, owner.id); addTripMember(testDb, trip.id, friend.id); const item = await svc.createItem(trip.id, { name: 'Power bank', visibility: 'shared', recipient_ids: [friend.id] }, owner.id) as any; expect(item.is_private).toBe(1); expect(item.owner_username).toBe(owner.username); expect(item.recipients.map((r: any) => r.user_id)).toEqual([friend.id]); expect(names(await svc.listItems(trip.id, owner.id) as any[])).toEqual(['Power bank']); // bringer expect(names(await svc.listItems(trip.id, friend.id) as any[])).toEqual(['Power bank']); // covered person expect(names(await svc.listItems(trip.id, stranger.id) as any[])).toEqual([]); // nobody else }); it('PACK-SVC-042: a Personal item is visible only to its owner', async () => { const { user: owner } = createUser(testDb); const { user: other } = createUser(testDb); const trip = createTrip(testDb, owner.id); await svc.createItem(trip.id, { name: 'Diary', visibility: 'personal' }, owner.id); expect(names(await svc.listItems(trip.id, owner.id) as any[])).toEqual(['Diary']); expect(names(await svc.listItems(trip.id, other.id) as any[])).toEqual([]); }); it('PACK-SVC-043: setItemSharing changes the tier + recipients; only the owner may', async () => { const { user: owner } = createUser(testDb); const { user: friend } = createUser(testDb); const trip = createTrip(testDb, owner.id); addTripMember(testDb, trip.id, friend.id); const item = await svc.createItem(trip.id, { name: 'First aid', visibility: 'personal' }, owner.id) as any; // A non-owner who cannot see the item at all gets the missing-item answer, so // the route cannot be used to confirm that the id exists (GHSA-vh2h-288v-ggch). expect(await svc.setItemSharing(trip.id, item.id, friend.id, 'shared', [friend.id])).toBeNull(); const updated = await svc.setItemSharing(trip.id, item.id, owner.id, 'shared', [friend.id]) as any; expect(updated.recipients.map((r: any) => r.user_id)).toEqual([friend.id]); expect(names(await svc.listItems(trip.id, friend.id) as any[])).toEqual(['First aid']); // Back to common → visible to everyone, recipients cleared. await svc.setItemSharing(trip.id, item.id, owner.id, 'common', []); const { user: stranger } = createUser(testDb); expect(names(await svc.listItems(trip.id, stranger.id) as any[])).toEqual(['First aid']); }); it('PACK-SVC-044: contributors ("I can bring that too") only attach to Common items', async () => { const { user: owner } = createUser(testDb); const { user: helper } = createUser(testDb); const trip = createTrip(testDb, owner.id); const common = await svc.createItem(trip.id, { name: 'Sunscreen', visibility: 'common' }, owner.id) as any; const personal = await svc.createItem(trip.id, { name: 'Meds', visibility: 'personal' }, owner.id) as any; const withHelper = await svc.addContributor(trip.id, common.id, helper.id) as any; expect(withHelper.contributors.map((c: any) => c.user_id)).toEqual([helper.id]); // The bringer can't co-contribute to their own item, and personal items have no pool. expect(await svc.addContributor(trip.id, common.id, owner.id)).toBeNull(); expect(await svc.addContributor(trip.id, personal.id, helper.id)).toBeNull(); const cleared = await svc.removeContributor(trip.id, common.id, helper.id) as any; expect(cleared.contributors).toEqual([]); }); it('PACK-SVC-045: cloneItem copies an item onto the cloner\'s personal list', async () => { const { user: owner } = createUser(testDb); const { user: cloner } = createUser(testDb); const trip = createTrip(testDb, owner.id); const common = await svc.createItem(trip.id, { name: 'Travel adapter', category: 'Electronics', visibility: 'common' }, owner.id) as any; const clone = await svc.cloneItem(trip.id, common.id, cloner.id) as any; expect(clone.name).toBe('Travel adapter'); expect(clone.category).toBe('Electronics'); expect(clone.is_private).toBe(1); expect(clone.owner_id).toBe(cloner.id); // The clone is the cloner's alone. expect(names(await svc.listItems(trip.id, owner.id) as any[])).toEqual(['Travel adapter']); // owner sees only the common one expect(names(await svc.listItems(trip.id, cloner.id) as any[])).toEqual(['Travel adapter', 'Travel adapter']); // common + own clone }); // #207: "one person curates the list, everyone copies it" meant re-entering every // weight by hand, because a copy arrived empty. it('PACK-SVC-073: cloneItem carries the weight over', async () => { const { user: owner } = createUser(testDb); const { user: cloner } = createUser(testDb); const trip = createTrip(testDb, owner.id); const common = await svc.createItem(trip.id, { name: 'Tent', visibility: 'common', weight_grams: 2400, quantity: 2 }, owner.id) as any; const clone = await svc.cloneItem(trip.id, common.id, cloner.id) as any; expect(clone.weight_grams).toBe(2400); expect(clone.quantity).toBe(2); }); it('PACK-SVC-074: cloneItem keeps a bag nobody owns', async () => { const { user: owner } = createUser(testDb); const { user: cloner } = createUser(testDb); const trip = createTrip(testDb, owner.id); const bag = await svc.createBag(trip.id, { name: 'Car boot' }) as any; const common = await svc.createItem(trip.id, { name: 'Cool box', visibility: 'common', weight_grams: 3000, bag_id: bag.id }, owner.id) as any; const clone = await svc.cloneItem(trip.id, common.id, cloner.id) as any; expect(clone.bag_id).toBe(bag.id); }); it('PACK-SVC-075: cloneItem drops a bag that belongs to someone else', async () => { const { user: owner } = createUser(testDb); const { user: cloner } = createUser(testDb); const trip = createTrip(testDb, owner.id); addTripMember(testDb, trip.id, cloner.id); const bag = await svc.createBag(trip.id, { name: 'Owner backpack' }) as any; await svc.setBagMembers(trip.id, bag.id, [owner.id]); const common = await svc.createItem(trip.id, { name: 'Rope', visibility: 'common', weight_grams: 900, bag_id: bag.id }, owner.id) as any; const clone = await svc.cloneItem(trip.id, common.id, cloner.id) as any; // Weight still comes along — only the foreign bag is dropped, so the copy cannot // land in someone else's luggage and inflate their total. expect(clone.weight_grams).toBe(900); expect(clone.bag_id).toBeNull(); }); it('PACK-SVC-076: cloneItem keeps a bag the cloner is a member of', async () => { const { user: owner } = createUser(testDb); const { user: cloner } = createUser(testDb); const trip = createTrip(testDb, owner.id); addTripMember(testDb, trip.id, cloner.id); const bag = await svc.createBag(trip.id, { name: 'Shared duffel' }) as any; await svc.setBagMembers(trip.id, bag.id, [owner.id, cloner.id]); const common = await svc.createItem(trip.id, { name: 'Stove', visibility: 'common', bag_id: bag.id }, owner.id) as any; expect((await svc.cloneItem(trip.id, common.id, cloner.id) as any).bag_id).toBe(bag.id); }); }); // ── Post-migration fixes over the legacy quirks ─────────────────────────────── describe('legacy-quirk fixes', () => { it('PACK-SVC-051: createItem defaults the category to "Other" (unified with bulkImport)', async () => { const { user } = createUser(testDb); const trip = createTrip(testDb, user.id); const item = await svc.createItem(trip.id, { name: 'Socks' }, user.id) as any; expect(item.category).toBe('Other'); }); it('PACK-SVC-052: updateBag gates weight_limit_grams on bodyKeys — omitted keeps, explicit null clears', async () => { const { user } = createUser(testDb); const trip = createTrip(testDb, user.id); const bag = await svc.createBag(trip.id, { name: 'Duffel' }) as any; const limited = await svc.updateBag(trip.id, bag.id, { weight_limit_grams: 8000 }, ['weight_limit_grams']) as any; expect(limited.weight_limit_grams).toBe(8000); // A rename without the key must not touch the limit. const kept = await svc.updateBag(trip.id, bag.id, { name: 'Duffel XL' }, ['name']) as any; expect(kept.weight_limit_grams).toBe(8000); // An explicit null clears it. const cleared = await svc.updateBag(trip.id, bag.id, { weight_limit_grams: null }, ['weight_limit_grams']) as any; expect(cleared.weight_limit_grams).toBeNull(); }); it('PACK-SVC-053: updateItem clamps a provided quantity into 1..999', async () => { const { user } = createUser(testDb); const trip = createTrip(testDb, user.id); const item = await svc.createItem(trip.id, { name: 'Socks', quantity: 5 }, user.id) as any; expect((await svc.updateItem(trip.id, item.id, { quantity: 0 }, ['quantity'], undefined, user.id) as any).quantity).toBe(1); expect((await svc.updateItem(trip.id, item.id, { quantity: 9999 }, ['quantity'], undefined, user.id) as any).quantity).toBe(999); // Omitted key leaves the quantity unchanged. expect((await svc.updateItem(trip.id, item.id, { name: 'Wool socks' }, ['name'], undefined, user.id) as any).quantity).toBe(999); }); it('PACK-SVC-053b: a packed count keeps the box in step (#2296)', async () => { const { user } = createUser(testDb); const trip = createTrip(testDb, user.id); const item = (await svc.createItem(trip.id, { name: 'Shirts', quantity: 10 }, user.id)) as any; const put = async (data: Record) => (await svc.updateItem(trip.id, item.id, data, Object.keys(data), undefined, user.id)) as any; expect(await put({ packed_quantity: 7 })).toMatchObject({ packed_quantity: 7, checked: 0 }); // Reaching the quantity ticks the item off and drops the partial count. expect(await put({ packed_quantity: 12 })).toMatchObject({ packed_quantity: null, checked: 1 }); // Unticking starts over from nothing. expect(await put({ checked: 0 })).toMatchObject({ packed_quantity: null, checked: 0 }); expect(await put({ packed_quantity: 6 })).toMatchObject({ packed_quantity: 6, checked: 0 }); // A quantity lowered to the count finishes the item; a rename leaves it alone. expect(await put({ name: 'Tees' })).toMatchObject({ packed_quantity: 6, checked: 0 }); expect(await put({ quantity: 5 })).toMatchObject({ quantity: 5, packed_quantity: null, checked: 1 }); }); }); // ── Create-path fields + bag trip scope (#2154) ─────────────────────────────── describe('create-path fields + bag trip scope (#2154)', () => { it('PACK-SVC-054: createItem persists weight_grams, bag_id and quantity in one write', async () => { const { user } = createUser(testDb); const trip = createTrip(testDb, user.id); const bag = await svc.createBag(trip.id, { name: 'Carry-On' }) as any; const item = await svc.createItem(trip.id, { name: 'Tent', weight_grams: 250, bag_id: bag.id, quantity: 3 }, user.id) as any; expect(item).toMatchObject({ weight_grams: 250, bag_id: bag.id, quantity: 3 }); }); it('PACK-SVC-077: a bag weighs what EVERY member put in it, private items included (#2191)', async () => { const { user } = createUser(testDb); const { user: buddy } = createUser(testDb, { username: 'bag-buddy' }); const trip = createTrip(testDb, user.id); addTripMember(testDb, trip.id, buddy.id); const bag = await svc.createBag(trip.id, { name: 'Duffel' }) as any; // The reporter's repro: 500 g of mine (personal) + 300 g common + 200 g of // my buddy's personal list. Their item is invisible to me by design (#858) // and used to be missing from the weight along with it. await svc.createItem(trip.id, { name: 'Boots', weight_grams: 500, bag_id: bag.id, visibility: 'personal' }, user.id); await svc.createItem(trip.id, { name: 'Stove', weight_grams: 300, bag_id: bag.id }, user.id); await svc.createItem(trip.id, { name: 'Book', weight_grams: 200, bag_id: bag.id, visibility: 'personal' }, buddy.id); // What I am allowed to SEE is still only my own two items... const visible = await svc.listItems(trip.id, user.id) as any[]; expect(visible.map(i => i.name).sort()).toEqual(['Boots', 'Stove']); // ...but the bag weighs all three. expect((await svc.listBags(trip.id) as any[])[0].total_weight_grams).toBe(1000); }); it('PACK-SVC-078: bag weight multiplies by quantity and survives null weights (#2191)', async () => { const { user } = createUser(testDb); const trip = createTrip(testDb, user.id); const bag = await svc.createBag(trip.id, { name: 'Carry-On' }) as any; await svc.createItem(trip.id, { name: 'Socks', weight_grams: 60, bag_id: bag.id, quantity: 3 }, user.id); // No weight and no quantity: contributes nothing rather than NaN. await svc.createItem(trip.id, { name: 'Passport', bag_id: bag.id }, user.id); expect((await svc.listBags(trip.id) as any[])[0].total_weight_grams).toBe(180); }); it('PACK-SVC-079: an empty bag reports 0, and the unassigned pile is summed too (#2191)', async () => { const { user } = createUser(testDb); const trip = createTrip(testDb, user.id); const bag = await svc.createBag(trip.id, { name: 'Empty' }) as any; // 0, never undefined — the client's fallback keys off the field being absent, // so an empty bag must not read as "the server did not tell me". expect((await svc.listBags(trip.id) as any[])[0].total_weight_grams).toBe(0); expect(await svc.unassignedWeightGrams(trip.id)).toBe(0); await svc.createItem(trip.id, { name: 'Loose sandwich', weight_grams: 150 }, user.id); expect(await svc.unassignedWeightGrams(trip.id)).toBe(150); // Still empty: the loose item belongs to no bag. expect((await svc.listBags(trip.id) as any[]).find(b => b.id === bag.id).total_weight_grams).toBe(0); }); it('PACK-SVC-080: listBagsWithWeights returns bags and the unassigned pile from one pass (#2191)', async () => { const { user } = createUser(testDb); const trip = createTrip(testDb, user.id); const bag = await svc.createBag(trip.id, { name: 'Duffel' }) as any; await svc.createItem(trip.id, { name: 'Tent', weight_grams: 900, bag_id: bag.id }, user.id); await svc.createItem(trip.id, { name: 'Loose sandwich', weight_grams: 150 }, user.id); const { bags, unassigned_weight_grams } = await svc.listBagsWithWeights(trip.id) as any; expect(bags[0].total_weight_grams).toBe(900); expect(unassigned_weight_grams).toBe(150); }); it('PACK-SVC-055: createItem refuses a bag off the trip with the invalidBag sentinel, inserting nothing', async () => { const { user } = createUser(testDb); const trip = createTrip(testDb, user.id); const otherTrip = createTrip(testDb, user.id); const foreignBag = await svc.createBag(otherTrip.id, { name: 'Not yours' }) as any; // Existence alone is not enough — the bag must belong to THIS trip. expect(await svc.createItem(trip.id, { name: 'Tent', bag_id: foreignBag.id }, user.id)).toEqual({ invalidBag: true }); // A dead id refuses the same way (it used to be an SQLite FK error). expect(isInvalidBagRef(await svc.createItem(trip.id, { name: 'Tent', bag_id: 99999 }, user.id))).toBe(true); expect(await countRows(await orm(), PackingItems, { trip: trip.id })).toBe(0); }); it('PACK-SVC-056: updateItem refuses a cross-trip bag_id and leaves the row alone; null still clears', async () => { const { user } = createUser(testDb); const trip = createTrip(testDb, user.id); const otherTrip = createTrip(testDb, user.id); const own = await svc.createBag(trip.id, { name: 'Mine' }) as any; const foreign = await svc.createBag(otherTrip.id, { name: 'Not mine' }) as any; const item = await svc.createItem(trip.id, { name: 'Tent', bag_id: own.id }, user.id) as any; const refused = await svc.updateItem(trip.id, item.id, { bag_id: foreign.id }, ['bag_id'], undefined, user.id); expect(isInvalidBagRef(refused)).toBe(true); expect((await findRow(await orm(), PackingItems, { id: item.id }))!.bag_id).toBe(own.id); // Clearing the bag with an explicit null is untouched by the check. const cleared = await svc.updateItem(trip.id, item.id, { bag_id: null }, ['bag_id'], undefined, user.id) as any; expect(cleared.bag_id).toBeNull(); }); it('PACK-SVC-057: createBag persists weight_limit_grams; omitted stays null', async () => { const { user } = createUser(testDb); const trip = createTrip(testDb, user.id); const limited = await svc.createBag(trip.id, { name: 'Checked', weight_limit_grams: 23000 }) as any; expect(limited.weight_limit_grams).toBe(23000); const bare = await svc.createBag(trip.id, { name: 'Day pack' }) as any; expect(bare.weight_limit_grams).toBeNull(); }); }); // ── Wrapper helpers (carried over from the old delegation suite) ────────────── describe('canEdit', () => { it('delegates to checkPermission with packing_edit', async () => { await svc.canEdit({ user_id: 2 } as never, { id: 1, role: 'user' } as never); expect(checkPermission).toHaveBeenCalledWith('packing_edit', 'user', 2, 1, true); }); }); describe('broadcast helpers (#858 scoping)', () => { it('broadcast forwards to the websocket helper', async () => { svc.broadcast('5', 'packing:created', { item: 1 }, 'sock'); expect(broadcastMock).toHaveBeenCalledWith('5', 'packing:created', { item: 1 }, 'sock'); }); it('broadcastBagTotals pings the whole room, content-free and without excluding the sender (#2191)', async () => { // No socket exclusion on purpose: the payload carries nothing to echo, and // the writer cannot recompute a server-side total from its own write either. svc.broadcastBagTotals('5'); expect(broadcastMock).toHaveBeenCalledWith('5', 'packing:bag-totals', {}, undefined); }); it('broadcastItem broadcasts a shared item to the whole room (no onlyUserId)', async () => { svc.broadcastItem('5', 'packing:created', { item: 1 }, { is_private: 0, owner_id: 7 }, 'sock'); expect(broadcastMock).toHaveBeenCalledWith('5', 'packing:created', { item: 1 }, 'sock', undefined); }); it('broadcastItem scopes a private item to its owner', async () => { svc.broadcastItem('5', 'packing:created', { item: 1 }, { is_private: 1, owner_id: 7 }, 'sock'); expect(broadcastMock).toHaveBeenCalledWith('5', 'packing:created', { item: 1 }, 'sock', 7); }); it('broadcastItem falls back to a room broadcast when the private item has no owner', async () => { svc.broadcastItem('5', 'packing:created', { item: 1 }, { is_private: 1, owner_id: null }, 'sock'); expect(broadcastMock).toHaveBeenCalledWith('5', 'packing:created', { item: 1 }, 'sock', undefined); }); it('viewersOf: Common → null (whole room); restricted → owner + recipients', async () => { expect(svc.viewersOf({ is_private: 0, owner_id: 1 })).toBeNull(); expect(svc.viewersOf(null)).toBeNull(); expect(svc.viewersOf({ is_private: 1, owner_id: 1, recipients: [{ user_id: 2 }, { user_id: 3 }] })).toEqual([1, 2, 3]); }); it('broadcastToViewers delivers to each viewer (deduped) via onlyUserId', async () => { svc.broadcastToViewers('5', 'packing:created', { item: 1 }, [1, 2, 2], 'sock'); expect(broadcastMock).toHaveBeenCalledWith('5', 'packing:created', { item: 1 }, 'sock', 1); expect(broadcastMock).toHaveBeenCalledWith('5', 'packing:created', { item: 1 }, 'sock', 2); expect(broadcastMock).toHaveBeenCalledTimes(2); }); }); describe('getItemPrivacy', () => { it('reads the privacy fields for an item (real SQL)', async () => { const { user } = createUser(testDb); const trip = createTrip(testDb, user.id); const item = await svc.createItem(trip.id, { name: 'Gift', is_private: true }, user.id) as any; expect(await svc.getItemPrivacy(trip.id, item.id)).toEqual({ is_private: 1, owner_id: user.id }); expect(await svc.getItemPrivacy(trip.id, 99999)).toBeUndefined(); }); }); describe('notifyTagged', () => { it('does nothing when no users are tagged', async () => { await svc.notifyTagged('5', { id: 1, email: 'a@b.c' } as never, 'Clothes', []); await svc.notifyTagged('5', { id: 1, email: 'a@b.c' } as never, 'Clothes', 'nope'); await new Promise((resolve) => setTimeout(resolve, 0)); expect(send).not.toHaveBeenCalled(); }); it('queries the trip title and dispatches the notification with the resolved title', async () => { const { user } = createUser(testDb); const trip = createTrip(testDb, user.id); const { title } = (await findRow(await orm(), Trips, { id: trip.id }))!; await svc.notifyTagged(String(trip.id), { id: 1, email: 'a@b.c' } as never, 'Clothes', [2, 3]); // Flush the dynamic import().then microtask chain. await new Promise((resolve) => setTimeout(resolve, 0)); expect(send).toHaveBeenCalledWith( expect.objectContaining({ event: 'packing_tagged', actorId: 1, scope: 'trip', targetId: trip.id, params: expect.objectContaining({ trip: title, actor: 'a@b.c', category: 'Clothes', tripId: String(trip.id) }), }), ); }); it('falls back to "Untitled" when the trip row is missing (?? / default branch)', async () => { await svc.notifyTagged('999999', { id: 1, email: 'a@b.c' } as never, 'Clothes', [2]); await new Promise((resolve) => setTimeout(resolve, 0)); expect(send).toHaveBeenCalledWith( expect.objectContaining({ params: expect.objectContaining({ trip: 'Untitled' }) }), ); }); }); // ── Bridge delegation ───────────────────────────────────────────────────────── describe('PackingService — the surface the deleted bridge exposed', () => { it('PACK-SVC-050: listItems delegates to PackingService over the shared db Proxy', async () => { const { user: owner } = createUser(testDb); const { user: other } = createUser(testDb); const trip = createTrip(testDb, owner.id); await svc.createItem(trip.id, { name: 'Shared' }, owner.id); await svc.createItem(trip.id, { name: 'Private', is_private: true }, owner.id); // Unscoped (internal callers) — unfiltered; viewer-scoped — #858 filtering applies. expect(((await bridgeListItems(trip.id)) as { name: string }[]).map(i => i.name).sort()).toEqual(['Private', 'Shared']); expect(((await bridgeListItems(trip.id, other.id)) as { name: string }[]).map(i => i.name)).toEqual(['Shared']); }); }); // ── Admin template CRUD (moved from adminService, IDs preserved) ────────────── describe('Packing templates', () => { it('ADMIN-SVC-031 — createPackingTemplate returns template', async () => { const { user: admin } = createAdmin(testDb); const result = await svc.createPackingTemplate('Beach Trip', admin.id) as any; expect(result.template.name).toBe('Beach Trip'); }); it('ADMIN-SVC-032 — createPackingTemplate returns 400 for empty name', async () => { const { user: admin } = createAdmin(testDb); const result = await svc.createPackingTemplate('', admin.id) as any; expect(result.status).toBe(400); }); it('ADMIN-SVC-033 — listPackingTemplates returns array', async () => { const { user: admin } = createAdmin(testDb); await svc.createPackingTemplate('Template A', admin.id); const templates = await svc.listPackingTemplates() as any[]; expect(templates.length).toBeGreaterThanOrEqual(1); }); it('ADMIN-SVC-034 — updatePackingTemplate updates name', async () => { const { user: admin } = createAdmin(testDb); const created = await svc.createPackingTemplate('Old Name', admin.id) as any; const result = await svc.updatePackingTemplate(String(created.template.id), { name: 'New Name' }) as any; expect(result.template.name).toBe('New Name'); }); it('ADMIN-SVC-035 — updatePackingTemplate returns 404 for non-existent', async () => { const result = await svc.updatePackingTemplate('99999', { name: 'Ghost' }) as any; expect(result.status).toBe(404); }); it('ADMIN-SVC-036 — deletePackingTemplate removes template', async () => { const { user: admin } = createAdmin(testDb); const created = await svc.createPackingTemplate('To Delete', admin.id) as any; const result = await svc.deletePackingTemplate(String(created.template.id)) as any; expect(result.name).toBe('To Delete'); }); it('ADMIN-SVC-037 — deletePackingTemplate returns 404 for non-existent', async () => { const result = await svc.deletePackingTemplate('99999') as any; expect(result.status).toBe(404); }); }); describe('Template categories', () => { it('ADMIN-SVC-038 — createTemplateCategory creates a category', async () => { const { user: admin } = createAdmin(testDb); const tpl = await svc.createPackingTemplate('Tpl', admin.id) as any; const result = await svc.createTemplateCategory(String(tpl.template.id), 'Clothing') as any; expect(result.category.name).toBe('Clothing'); }); it('ADMIN-SVC-039 — createTemplateCategory returns 400 for empty name', async () => { const { user: admin } = createAdmin(testDb); const tpl = await svc.createPackingTemplate('Tpl', admin.id) as any; const result = await svc.createTemplateCategory(String(tpl.template.id), '') as any; expect(result.status).toBe(400); }); it('ADMIN-SVC-040 — createTemplateCategory returns 404 for missing template', async () => { const result = await svc.createTemplateCategory('99999', 'Clothing') as any; expect(result.status).toBe(404); }); it('ADMIN-SVC-041 — updateTemplateCategory updates name', async () => { const { user: admin } = createAdmin(testDb); const tpl = await svc.createPackingTemplate('Tpl', admin.id) as any; const cat = await svc.createTemplateCategory(String(tpl.template.id), 'Old') as any; const result = await svc.updateTemplateCategory(String(tpl.template.id), String(cat.category.id), { name: 'New' }) as any; expect(result.category.name).toBe('New'); }); it('ADMIN-SVC-042 — updateTemplateCategory returns 404 for missing category', async () => { const { user: admin } = createAdmin(testDb); const tpl = await svc.createPackingTemplate('Tpl', admin.id) as any; const result = await svc.updateTemplateCategory(String(tpl.template.id), '99999', { name: 'X' }) as any; expect(result.status).toBe(404); }); it('ADMIN-SVC-043 — deleteTemplateCategory removes category', async () => { const { user: admin } = createAdmin(testDb); const tpl = await svc.createPackingTemplate('Tpl', admin.id) as any; const cat = await svc.createTemplateCategory(String(tpl.template.id), 'Remove Me') as any; const result = await svc.deleteTemplateCategory(String(tpl.template.id), String(cat.category.id)) as any; expect(result.error).toBeUndefined(); }); it('ADMIN-SVC-044 — deleteTemplateCategory returns 404 for missing', async () => { const { user: admin } = createAdmin(testDb); const tpl = await svc.createPackingTemplate('Tpl', admin.id) as any; const result = await svc.deleteTemplateCategory(String(tpl.template.id), '99999') as any; expect(result.status).toBe(404); }); }); describe('getPackingTemplate', () => { it('ADMIN-SVC-056 — returns template with categories and items when template exists', async () => { const { user: admin } = createAdmin(testDb); const tpl = await svc.createPackingTemplate('Full Template', admin.id) as any; const cat = await svc.createTemplateCategory(String(tpl.template.id), 'Clothing') as any; await svc.createTemplateItem(String(tpl.template.id), String(cat.category.id), 'T-Shirt'); const result = await svc.getPackingTemplate(String(tpl.template.id)) as any; expect(result.template).toBeDefined(); expect(result.template.name).toBe('Full Template'); expect(Array.isArray(result.categories)).toBe(true); expect(result.categories.length).toBeGreaterThanOrEqual(1); expect(Array.isArray(result.items)).toBe(true); expect(result.items.length).toBeGreaterThanOrEqual(1); expect(result.items[0].name).toBe('T-Shirt'); }); it('ADMIN-SVC-057 — returns 404 for non-existent template', async () => { const result = await svc.getPackingTemplate('99999') as any; expect(result.status).toBe(404); expect(result.error).toBeDefined(); }); }); describe('Template items', () => { it('ADMIN-SVC-058 — createTemplateItem returns item with name', async () => { const { user: admin } = createAdmin(testDb); const tpl = await svc.createPackingTemplate('Tpl', admin.id) as any; const cat = await svc.createTemplateCategory(String(tpl.template.id), 'Gear') as any; const result = await svc.createTemplateItem(String(tpl.template.id), String(cat.category.id), 'Backpack') as any; expect(result.item).toBeDefined(); expect(result.item.name).toBe('Backpack'); }); it('ADMIN-SVC-059 — createTemplateItem returns 400 for empty name', async () => { const { user: admin } = createAdmin(testDb); const tpl = await svc.createPackingTemplate('Tpl', admin.id) as any; const cat = await svc.createTemplateCategory(String(tpl.template.id), 'Gear') as any; const result = await svc.createTemplateItem(String(tpl.template.id), String(cat.category.id), '') as any; expect(result.status).toBe(400); }); it('ADMIN-SVC-060 — createTemplateItem returns 404 for non-existent category', async () => { const { user: admin } = createAdmin(testDb); const tpl = await svc.createPackingTemplate('Tpl', admin.id) as any; const result = await svc.createTemplateItem(String(tpl.template.id), '99999', 'Item') as any; expect(result.status).toBe(404); }); it('ADMIN-SVC-061 — updateTemplateItem updates name', async () => { const { user: admin } = createAdmin(testDb); const tpl = await svc.createPackingTemplate('Tpl', admin.id) as any; const cat = await svc.createTemplateCategory(String(tpl.template.id), 'Gear') as any; const item = await svc.createTemplateItem(String(tpl.template.id), String(cat.category.id), 'Old Item') as any; const result = await svc.updateTemplateItem(String(tpl.template.id), String(item.item.id), { name: 'New Item' }) as any; expect(result.item.name).toBe('New Item'); }); it('ADMIN-SVC-062 — updateTemplateItem returns 404 for non-existent item', async () => { const result = await svc.updateTemplateItem('1', '99999', { name: 'Ghost' }) as any; expect(result.status).toBe(404); }); it('ADMIN-SVC-063 — deleteTemplateItem removes item', async () => { const { user: admin } = createAdmin(testDb); const tpl = await svc.createPackingTemplate('Tpl', admin.id) as any; const cat = await svc.createTemplateCategory(String(tpl.template.id), 'Gear') as any; const item = await svc.createTemplateItem(String(tpl.template.id), String(cat.category.id), 'To Delete') as any; const result = await svc.deleteTemplateItem(String(tpl.template.id), String(item.item.id)) as any; expect(result.error).toBeUndefined(); expect(await findRow(await orm(), PackingTemplateItems, { id: item.item.id })).toBeNull(); }); it('ADMIN-SVC-064 — deleteTemplateItem returns 404 for non-existent item', async () => { const result = await svc.deleteTemplateItem('1', '99999') as any; expect(result.status).toBe(404); }); }); // ── Quirk fix landed after the 2026-08 admin fold ───────────────────────────── describe('Template item scoping (post-fold quirk fix)', () => { it('ADMIN-SVC-076 — update/deleteTemplateItem honour :templateId instead of ignoring it', async () => { const { user: admin } = createAdmin(testDb); const tplA = await svc.createPackingTemplate('A', admin.id) as any; const tplB = await svc.createPackingTemplate('B', admin.id) as any; const catA = await svc.createTemplateCategory(String(tplA.template.id), 'Gear') as any; const item = await svc.createTemplateItem(String(tplA.template.id), String(catA.category.id), 'Tent') as any; // Template B does not own the item — both routes must 404 rather than act. expect(await svc.updateTemplateItem(String(tplB.template.id), String(item.item.id), { name: 'Hijacked' }) as any) .toMatchObject({ status: 404 }); expect(await svc.deleteTemplateItem(String(tplB.template.id), String(item.item.id)) as any) .toMatchObject({ status: 404 }); expect((await findRow(await orm(), PackingTemplateItems, { id: item.item.id }))!.name) .toBe('Tent'); // The owning template still works. expect((await svc.updateTemplateItem(String(tplA.template.id), String(item.item.id), { name: 'Tarp' }) as any).item.name) .toBe('Tarp'); expect(await svc.deleteTemplateItem(String(tplA.template.id), String(item.item.id)) as any).toEqual({}); }); }); /** * Object-level authorization on a single packing item (GHSA-vh2h-288v-ggch). * * listItems() always filtered by the three-tier rule, but every single-item path * resolved the row by trip id alone, so any member holding packing_edit could * reach another member's Personal or Shared item by id. The update response even * handed the enriched row back, which made the write a read as well. */ describe('packing item object-level authorization', () => { const restrictedTrip = async () => { const { user: owner } = createUser(testDb); const { user: intruder } = createUser(testDb); const { user: friend } = createUser(testDb); const trip = createTrip(testDb, owner.id); // The recipient is a fellow traveller; the intruder stays off the trip on purpose. addTripMember(testDb, trip.id, friend.id); const personal = await svc.createItem(trip.id, { name: 'Diary', visibility: 'personal' }, owner.id) as any; const shared = await svc.createItem(trip.id, { name: 'Power bank', visibility: 'shared', recipient_ids: [friend.id] }, owner.id) as any; const common = await svc.createItem(trip.id, { name: 'Tent', visibility: 'common' }, owner.id) as any; return { owner, intruder, friend, trip, personal, shared, common }; }; it('PACK-SVC-101: a non-viewer cannot update someone else\'s Personal item', async () => { const { trip, personal, intruder } = await restrictedTrip(); expect(await svc.updateItem(trip.id, personal.id, { name: 'pwned' }, ['name'], undefined, intruder.id)).toBeNull(); expect((await itemRow(personal.id)).name).toBe('Diary'); }); it('PACK-SVC-102: a non-recipient cannot update a Shared item', async () => { const { trip, shared, intruder } = await restrictedTrip(); expect(await svc.updateItem(trip.id, shared.id, { name: 'pwned' }, ['name'], undefined, intruder.id)).toBeNull(); }); it('PACK-SVC-103: a non-viewer cannot delete a restricted item', async () => { const { trip, personal, intruder } = await restrictedTrip(); expect(await svc.deleteItem(trip.id, personal.id, intruder.id)).toBeNull(); expect(await countRows(await orm(), PackingItems, { id: personal.id })).toBe(1); }); it('PACK-SVC-104: a non-viewer cannot clone a restricted item into their own list', async () => { const { trip, personal, intruder } = await restrictedTrip(); expect(await svc.cloneItem(trip.id, personal.id, intruder.id)).toBeNull(); }); it('L3: a non-viewer cannot add themselves as a contributor on a restricted item they cannot see', async () => { const { trip, personal, intruder } = await restrictedTrip(); expect(await svc.addContributor(trip.id, personal.id, intruder.id)).toBeNull(); }); it('L3: a non-viewer cannot remove a contributor from a restricted item they cannot see', async () => { const { owner, trip, personal, intruder } = await restrictedTrip(); // Route the contributor delete through the CALLER's own id as the acting // visibility check (unlike the controller's actual `:userId` wiring, // which is U3's own hole below) — even so, an intruder with no view // access to a Personal item must not be able to touch it. expect(await svc.removeContributor(trip.id, personal.id, intruder.id)).toBeNull(); expect((await itemRow(personal.id)).owner_id).toBe(owner.id); }); it('U3 HOLE — contributor removal checks the path user\'s visibility, not the caller\'s: an intruder who cannot see a Personal item still gets it back by naming the owner as :userId', async () => { // PRE-EXISTING on base (packing.controller.ts ~250 → packing.service.ts // removeContributor; base carries the identical shape). The controller // passes the PATH `:userId` — not `user.id`, the caller — as the third // argument to `PackingService.removeContributor`, which uses that same // id both to run the visibility check AND as the contributor row to // delete. An intruder who cannot see `owner`'s Personal item at all can // still name `owner` as `:userId`: the visibility check passes because // OWNERS can always see their own item, and the full enriched item comes // back in the response — an IDOR read of content the intruder has no // business seeing, RIGHTS-gated only by `packing_edit`, not by the // three-tier privacy model. Deliberately NOT fixed here (controller // ruling U3, pinned so it cannot be "fixed" silently); the one-line fix // is in the fix-wave report for the user: check `findVisibleInTrip` for // the CALLER, and additionally require `userId === callerId || // item.owner_id === callerId`. // The intruder is the caller in the real route (RequirePermission checks // only packing_edit, never visibility) — but the service signature never // receives the caller's id at all, only the path :userId. That gap is // the bug, so there is nothing of the intruder's identity to pass here. const { owner, trip, personal } = await restrictedTrip(); const leaked = await svc.removeContributor(trip.id, personal.id, owner.id); expect(leaked).not.toBeNull(); expect(leaked.name).toBe('Diary'); }); it('PACK-SVC-105b: a visible item the caller does not own still reports forbidden, not missing', async () => { const { trip, common, intruder } = await restrictedTrip(); expect((await svc.setItemSharing(trip.id, common.id, intruder.id, 'personal', []) as any).forbidden).toBe(true); }); it('PACK-SVC-105: a non-owner cannot re-share a restricted item they cannot see', async () => { const { trip, personal, intruder } = await restrictedTrip(); expect(await svc.setItemSharing(trip.id, personal.id, intruder.id, 'common', [])).toBeNull(); expect((await itemRow(personal.id)).is_private).toBe(1); }); it('M2-PACKING-001: refuses to update a visible-shaped item from a different trip (PackingItems.findVisibleInTrip trip-scoping)', async () => { const { user } = createUser(testDb); const tripA = createTrip(testDb, user.id); const tripB = createTrip(testDb, user.id); const itemBId = await insertRow(await orm(), PackingItems, { trip: tripB.id, name: 'Foreign item', category: 'Clothing', checked: 0 }); // itemB is a Common item the caller can see — the guard that must refuse // this is the trip filter, not the privacy predicate. const result = await svc.updateItem(tripA.id, itemBId, { name: 'Hijacked' }, ['name'], undefined, user.id); expect(result).toBeNull(); expect((await itemRow(itemBId)).name).toBe('Foreign item'); }); // Missing actor must deny rather than fall through unfiltered. it('PACK-SVC-106: an update with no actor at all is refused', async () => { const { trip, personal } = await restrictedTrip(); expect(await svc.updateItem(trip.id, personal.id, { name: 'pwned' }, ['name'])).toBeNull(); expect(await svc.deleteItem(trip.id, personal.id)).toBeNull(); }); it('PACK-SVC-107: the owner and the recipients keep working', async () => { const { trip, personal, shared, common, owner, friend, intruder } = await restrictedTrip(); expect(await svc.updateItem(trip.id, personal.id, { name: 'Diary v2' }, ['name'], undefined, owner.id)).toBeTruthy(); expect(await svc.updateItem(trip.id, shared.id, { checked: 1 }, ['checked'], undefined, friend.id)).toBeTruthy(); expect(await svc.updateItem(trip.id, common.id, { checked: 1 }, ['checked'], undefined, intruder.id)).toBeTruthy(); expect(await svc.cloneItem(trip.id, common.id, intruder.id)).toBeTruthy(); expect(await svc.deleteItem(trip.id, personal.id, owner.id)).toBeTruthy(); }); it('PACK-SVC-108: a template captures only the Common list and the actor\'s own items', async () => { const { trip, intruder } = await restrictedTrip(); const templateId = (await svc.saveAsTemplate(trip.id, intruder.id, 'Snapshot') as { id: number }).id; const rows = await templateItems(templateId); expect(rows.map(r => r.name).sort()).toEqual(['Tent']); }); }); describe('repository parity (rule 19 — full-key toEqual against the legacy statement run raw)', () => { // The legacy VISIBLE_TO_ACTOR fragment (`_shared/packing-visibility.ts`'s // own docstring quotes it byte-for-byte): // ( is_private = 0 OR owner_id = ? OR EXISTS (SELECT 1 FROM // packing_item_recipients r WHERE r.item_id = packing_items.id AND // r.user_id = ?) ) const VISIBLE_TO_ACTOR = `( is_private = 0 OR owner_id = ? OR EXISTS (SELECT 1 FROM packing_item_recipients r WHERE r.item_id = packing_items.id AND r.user_id = ?) )`; it('PACKING-REPO-001: PackingItemsRepository.listVisibleToActor matches PK5 (VISIBLE_TO_ACTOR) run raw, for the owner, a recipient and a plain member', async () => { const { user: owner } = createUser(testDb); const { user: friend } = createUser(testDb); const { user: stranger } = createUser(testDb); const trip = createTrip(testDb, owner.id); addTripMember(testDb, trip.id, friend.id); addTripMember(testDb, trip.id, stranger.id); const common = await svc.createItem(trip.id, { name: 'Common tent', visibility: 'common' }, owner.id); const personal = await svc.createItem(trip.id, { name: 'Owner diary', visibility: 'personal' }, owner.id); const shared = await svc.createItem(trip.id, { name: 'Shared map', visibility: 'shared', recipient_ids: [friend.id] }, owner.id); expect([common, personal, shared]).toHaveLength(3); for (const [actor, label] of [[owner, 'owner'], [friend, 'recipient'], [stranger, 'plain member']] as const) { const converted = await packingItemsRepoDirect.listVisibleToActor(trip.id, actor.id); // test-sql-allow: the legacy statement is the oracle the repository read is held to. const legacy = testDb.prepare(` SELECT * FROM packing_items WHERE trip_id = ? AND ${VISIBLE_TO_ACTOR} ORDER BY sort_order ASC, created_at ASC `).all(trip.id, actor.id, actor.id); expect(converted, `mismatch for ${label}`).toEqual(legacy); } // Sanity on the visibility split itself, so a predicate regression that // still byte-matches (e.g. both sides equally wrong) cannot hide. expect((await packingItemsRepoDirect.listVisibleToActor(trip.id, owner.id)).map(i => i.name).sort()).toEqual(['Common tent', 'Owner diary', 'Shared map']); expect((await packingItemsRepoDirect.listVisibleToActor(trip.id, friend.id)).map(i => i.name).sort()).toEqual(['Common tent', 'Shared map']); expect((await packingItemsRepoDirect.listVisibleToActor(trip.id, stranger.id)).map(i => i.name).sort()).toEqual(['Common tent']); }); it('PACKING-REPO-002: PackingBagsRepository.findWithAssignee matches PK46 (LEFT JOIN users) run raw, assigned and unassigned', async () => { const { user } = createUser(testDb); const trip = createTrip(testDb, user.id); const bag = (await svc.createBag(trip.id, { name: 'Backpack', color: '#123456' }))!; // test-sql-allow: the legacy statement is the oracle the repository read is held to. const legacyUnassigned = testDb.prepare('SELECT b.*, COALESCE(u.display_name, u.username) as assigned_username FROM packing_bags b LEFT JOIN users u ON b.user_id = u.id WHERE b.id = ?').get(bag.id); expect(await packingBagsRepoDirect.findWithAssignee(bag.id)).toEqual(legacyUnassigned); await packingBagsRepoDirect.update(bag.id, { user_id: [true, user.id] }); // test-sql-allow: the legacy statement is the oracle the repository read is held to. const legacyAssigned = testDb.prepare('SELECT b.*, COALESCE(u.display_name, u.username) as assigned_username FROM packing_bags b LEFT JOIN users u ON b.user_id = u.id WHERE b.id = ?').get(bag.id); const convertedAssigned = await packingBagsRepoDirect.findWithAssignee(bag.id); expect(convertedAssigned).toEqual(legacyAssigned); expect(convertedAssigned!.assigned_username).toBe(user.username); }); it('PACKING-REPO-003: PackingTemplatesRepository.listWithItemCount matches PK49 (correlated COUNT) run raw', async () => { const { user: owner } = createUser(testDb); const trip = createTrip(testDb, owner.id); await svc.createItem(trip.id, { name: 'Tent', visibility: 'common' }, owner.id); await svc.createItem(trip.id, { name: 'Stove', visibility: 'common' }, owner.id); await svc.saveAsTemplate(trip.id, owner.id, 'Camping kit'); await svc.saveAsTemplate(trip.id, owner.id, 'Empty-ish'); // second template, 0 extra items beyond dedupe const converted = await packingTemplatesRepoDirect.listWithItemCount(); // test-sql-allow: the legacy statement is the oracle the repository read is held to. const legacy = testDb.prepare(` SELECT pt.id, pt.name, (SELECT COUNT(*) FROM packing_template_items ti JOIN packing_template_categories tc ON ti.category_id = tc.id WHERE tc.template_id = pt.id) as item_count FROM packing_templates pt ORDER BY pt.created_at DESC `).all(); expect(converted).toEqual(legacy); expect(converted.length).toBeGreaterThanOrEqual(2); }); it('PACKING-REPO-004: PackingCategoryAssigneesRepository.listForCategory matches PK61 run raw', async () => { const { user: alice } = createUser(testDb, { username: 'alice' }); const { user: bob } = createUser(testDb, { username: 'bob' }); const trip = createTrip(testDb, alice.id); addTripMember(testDb, trip.id, bob.id); await svc.updateCategoryAssignees(trip.id, 'Clothing', [alice.id, bob.id]); const converted = await packingCategoryAssigneesRepoDirect.listForCategory(trip.id, 'Clothing'); // test-sql-allow: the legacy statement is the oracle the repository read is held to. const legacy = testDb.prepare(` SELECT pca.user_id, COALESCE(u.display_name, u.username) AS username, u.avatar FROM packing_category_assignees pca JOIN users u ON pca.user_id = u.id WHERE pca.trip_id = ? AND pca.category_name = ? `).all(trip.id, 'Clothing'); const sortByUser = (rows: { user_id: number }[]) => [...rows].sort((a, b) => a.user_id - b.user_id); expect(sortByUser(converted)).toEqual(sortByUser(legacy as { user_id: number }[])); expect(converted).toHaveLength(2); }); it('PACKING-REPO-005: PackingItemsRepository.listExportable matches PK54 run raw, dropping another member\'s restricted item', async () => { const { user: owner } = createUser(testDb); const { user: other } = createUser(testDb); const trip = createTrip(testDb, owner.id); addTripMember(testDb, trip.id, other.id); await svc.createItem(trip.id, { name: 'Common tent', visibility: 'common' }, owner.id); await svc.createItem(trip.id, { name: 'Owner diary', visibility: 'personal' }, owner.id); await svc.createItem(trip.id, { name: 'Other diary', visibility: 'personal' }, other.id); const converted = await packingItemsRepoDirect.listExportable(trip.id, owner.id); // test-sql-allow: the legacy statement is the oracle the repository read is held to. const legacy = testDb.prepare(` SELECT i.name, i.category, i.weight_grams, i.quantity, b.name AS bag_name FROM packing_items i LEFT JOIN packing_bags b ON b.id = i.bag_id WHERE i.trip_id = ? AND (i.is_private = 0 OR i.owner_id = ?) ORDER BY i.sort_order ASC `).all(trip.id, owner.id); expect(converted).toEqual(legacy); expect(converted.map((r) => r.name).sort()).toEqual(['Common tent', 'Owner diary']); }); it('M1: empty-id-array guards short-circuit on PackingItemContributors/PackingItems batch reads and writes', async () => { expect(await packingItemContributorsRepoDirect.listForItems([])).toEqual([]); expect(await packingItemsRepoDirect.listRecipientsForItems([])).toEqual([]); await expect(packingItemsRepoDirect.insertRecipientsIgnore(1, [])).resolves.toBeUndefined(); }); it('M1: PackingCategoryAssigneesRepository.insertIgnore short-circuits on an empty user_ids array', async () => { await expect(packingCategoryAssigneesRepoDirect.insertIgnore(1, 'Clothing', [])).resolves.toBeUndefined(); }); });