mirror of
https://github.com/mauriceboe/TREK.git
synced 2026-10-18 21:16:47 +00:00
1e35a99c11
"This day" sent the entry's calendar date to the provider as both bounds, and both providers turned that date into a UTC window — Immich by concatenating a Z suffix, Synology by relying on a date-only string parsing as UTC midnight. For a reader at UTC+10 the searched window was 10:00 on the day to 09:59 the next morning, so every breakfast photo was missing while the next morning's turned up in its place, and nothing said the day was incomplete. The date headings had the mirror defect, filing a 07:32 photo under the previous day. Immich publishes the right anchor already: localDateTime is required on every search result and is what its own timeline groups by. The window is padded by a day on each side and the page narrowed again by each photo's own local date, carried through as localTakenAt; a server that does not send it falls back to the timestamp used until now, so nothing changes there. Because the padding means raw rows and answered rows are no longer the same thing, the page is filled server-side until it holds what the caller asked for, bounded so a pathological album cannot spin. Synology has no local stamp, so its anchor comes from the caller as a UTC offset, resolved for the day being searched rather than for today — a day looked up across a DST boundary would otherwise start an hour out. The MCP tool takes the same optional input, defaulting to the behaviour it has now. The picker's pagination sentinel moved out of the non-empty branch: a page the new filter empties has to keep paging, and it now says so instead of claiming there are no photos. Closes #2336
210 lines
9.4 KiB
TypeScript
210 lines
9.4 KiB
TypeScript
import { describe, it, expect, vi, beforeEach } from 'vitest';
|
|
|
|
// The MemoriesService is a thin pass-through over the legacy services/memories/*
|
|
// helpers. Mock each legacy module so we can assert the wrapper forwards every
|
|
// argument unchanged (and exercise the optional-param call sites).
|
|
|
|
const unified = vi.hoisted(() => ({
|
|
listTripPhotos: vi.fn(() => ({ data: [] })),
|
|
listTripAlbumLinks: vi.fn(() => ({ data: [] })),
|
|
createTripAlbumLink: vi.fn(() => ({ data: {} })),
|
|
removeAlbumLink: vi.fn(() => ({ data: {} })),
|
|
addTripPhotos: vi.fn(async () => ({ data: { added: 0 } })),
|
|
syncImmichAlbum: vi.fn(async () => ({ success: true, added: 0, total: 0 })),
|
|
syncSynologyAlbum: vi.fn(async () => ({ success: true, data: { added: 0, total: 0 } })),
|
|
removeTripPhoto: vi.fn(() => ({ data: {} })),
|
|
setTripPhotoSharing: vi.fn(async () => ({ data: {} })),
|
|
}));
|
|
|
|
const immich = vi.hoisted(() => ({
|
|
getConnectionSettings: vi.fn(() => ({})),
|
|
saveImmichSettings: vi.fn(async () => ({ success: true })),
|
|
setImmichAutoUpload: vi.fn(),
|
|
testConnection: vi.fn(async () => ({ connected: true })),
|
|
getConnectionStatus: vi.fn(async () => ({ connected: true })),
|
|
browseTimeline: vi.fn(async () => ({ buckets: [] })),
|
|
searchPhotos: vi.fn(async () => ({ assets: [] })),
|
|
streamImmichAsset: vi.fn(async () => undefined),
|
|
listAlbums: vi.fn(async () => ({ albums: [] })),
|
|
getAlbumPhotos: vi.fn(async () => ({ assets: [] })),
|
|
collectAlbumSelection: vi.fn(async () => ({ selection: { provider: 'immich', asset_ids: [] }, total: 0 })),
|
|
getAssetInfo: vi.fn(async () => ({ data: {} })),
|
|
isValidAssetId: vi.fn(() => true),
|
|
}));
|
|
|
|
const synology = vi.hoisted(() => ({
|
|
getSynologySettings: vi.fn(async () => ({ success: true, data: {} })),
|
|
updateSynologySettings: vi.fn(async () => ({ success: true, data: {} })),
|
|
getSynologyStatus: vi.fn(async () => ({ success: true, data: {} })),
|
|
testSynologyConnection: vi.fn(async () => ({ success: true, data: {} })),
|
|
listSynologyAlbums: vi.fn(async () => ({ success: true, data: {} })),
|
|
getSynologyAlbumPhotos: vi.fn(async () => ({ success: true, data: {} })),
|
|
collectSynologyAlbumSelection: vi.fn(async () => ({ success: true, data: { selection: { provider: 'synologyphotos', asset_ids: [] }, total: 0 } })),
|
|
searchSynologyPhotos: vi.fn(async () => ({ success: true, data: {} })),
|
|
getSynologyAssetInfo: vi.fn(async () => ({ success: true, data: {} })),
|
|
streamSynologyAsset: vi.fn(async () => undefined),
|
|
}));
|
|
|
|
const helpers = vi.hoisted(() => ({ canAccessUserPhoto: vi.fn(() => true) }));
|
|
|
|
const ws = vi.hoisted(() => ({ broadcast: vi.fn() }));
|
|
vi.mock('../../../src/websocket', () => ws);
|
|
|
|
import { MemoriesService } from '../../../src/nest/memories/memories.service';
|
|
import { RealtimeService } from '../../../src/nest/realtime/realtime.service';
|
|
import type { UnifiedMemoriesService } from '../../../src/nest/memories/unified-memories.service';
|
|
import type { ImmichService } from '../../../src/nest/memories/immich.service';
|
|
import type { SynologyService } from '../../../src/nest/memories/synology.service';
|
|
import type { MemoriesAccessService } from '../../../src/nest/memories/memories-access.service';
|
|
|
|
const res = {} as import('express').Response;
|
|
|
|
describe('MemoriesService (delegation wrapper over services/memories/*)', () => {
|
|
let svc: MemoriesService;
|
|
|
|
beforeEach(() => {
|
|
vi.clearAllMocks();
|
|
svc = new MemoriesService(
|
|
new RealtimeService(),
|
|
unified as unknown as UnifiedMemoriesService,
|
|
immich as unknown as ImmichService,
|
|
synology as unknown as SynologyService,
|
|
helpers as unknown as MemoriesAccessService,
|
|
);
|
|
});
|
|
|
|
it('access check + broadcast forward verbatim', () => {
|
|
helpers.canAccessUserPhoto.mockReturnValue(false);
|
|
expect(svc.canAccessUserPhoto(1, 2, '5', 'a', 'immich')).toBe(false);
|
|
expect(helpers.canAccessUserPhoto).toHaveBeenCalledWith(1, 2, '5', 'a', 'immich');
|
|
|
|
svc.broadcast('5', 'memories:updated', { userId: 1 }, 'sock');
|
|
expect(ws.broadcast).toHaveBeenCalledWith('5', 'memories:updated', { userId: 1 }, 'sock');
|
|
});
|
|
|
|
it('broadcast forwards an absent socket id as undefined', () => {
|
|
svc.broadcast('5', 'memories:updated', { userId: 1 });
|
|
expect(ws.broadcast).toHaveBeenCalledWith('5', 'memories:updated', { userId: 1 }, undefined);
|
|
});
|
|
|
|
it('unified methods delegate', async () => {
|
|
svc.listTripPhotos('5', 7);
|
|
expect(unified.listTripPhotos).toHaveBeenCalledWith('5', 7);
|
|
|
|
const selections = [{ provider: 'immich', asset_ids: ['a'] }];
|
|
await svc.addTripPhotos('5', 7, true, selections, 'sock');
|
|
expect(unified.addTripPhotos).toHaveBeenCalledWith('5', 7, true, selections, 'sock');
|
|
|
|
await svc.setTripPhotoSharing('5', 7, 9, false);
|
|
expect(unified.setTripPhotoSharing).toHaveBeenCalledWith('5', 7, 9, false);
|
|
|
|
svc.removeTripPhoto('5', 7, 9);
|
|
expect(unified.removeTripPhoto).toHaveBeenCalledWith('5', 7, 9);
|
|
|
|
svc.listTripAlbumLinks('5', 7);
|
|
expect(unified.listTripAlbumLinks).toHaveBeenCalledWith('5', 7);
|
|
|
|
svc.removeAlbumLink('5', 'l1', 7);
|
|
expect(unified.removeAlbumLink).toHaveBeenCalledWith('5', 'l1', 7);
|
|
});
|
|
|
|
it('createTripAlbumLink forwards a passphrase when present and omits it when absent', () => {
|
|
svc.createTripAlbumLink('5', 7, 'immich', 'a1', 'Trip', 'secret');
|
|
expect(unified.createTripAlbumLink).toHaveBeenCalledWith('5', 7, 'immich', 'a1', 'Trip', 'secret');
|
|
|
|
svc.createTripAlbumLink('5', 7, 'immich', 'a1', 'Trip');
|
|
expect(unified.createTripAlbumLink).toHaveBeenLastCalledWith('5', 7, 'immich', 'a1', 'Trip', undefined);
|
|
});
|
|
|
|
it('immich methods delegate', async () => {
|
|
svc.immichGetConnectionSettings(7);
|
|
expect(immich.getConnectionSettings).toHaveBeenCalledWith(7);
|
|
|
|
await svc.immichSaveSettings(7, 'u', 'k', '1.2.3.4');
|
|
expect(immich.saveImmichSettings).toHaveBeenCalledWith(7, 'u', 'k', '1.2.3.4');
|
|
|
|
svc.immichSetAutoUpload(7, true);
|
|
expect(immich.setImmichAutoUpload).toHaveBeenCalledWith(7, true);
|
|
|
|
await svc.immichGetConnectionStatus(7);
|
|
expect(immich.getConnectionStatus).toHaveBeenCalledWith(7);
|
|
|
|
await svc.immichTestConnection('u', 'k');
|
|
expect(immich.testConnection).toHaveBeenCalledWith('u', 'k');
|
|
|
|
await svc.immichBrowseTimeline(7);
|
|
expect(immich.browseTimeline).toHaveBeenCalledWith(7);
|
|
|
|
await svc.immichSearchPhotos(7, 'f', 't', 2, 50);
|
|
expect(immich.searchPhotos).toHaveBeenCalledWith(7, 'f', 't', 2, 50);
|
|
|
|
expect(svc.immichIsValidAssetId('abc')).toBe(true);
|
|
expect(immich.isValidAssetId).toHaveBeenCalledWith('abc');
|
|
|
|
await svc.immichGetAssetInfo(7, 'a', 2);
|
|
expect(immich.getAssetInfo).toHaveBeenCalledWith(7, 'a', 2);
|
|
|
|
await svc.immichStreamAsset(res, 7, 'a', 'thumbnail', 2);
|
|
expect(immich.streamImmichAsset).toHaveBeenCalledWith(res, 7, 'a', 'thumbnail', 2);
|
|
|
|
await svc.immichListAlbums(7);
|
|
expect(immich.listAlbums).toHaveBeenCalledWith(7);
|
|
|
|
await svc.immichGetAlbumPhotos(7, 'al1');
|
|
expect(immich.getAlbumPhotos).toHaveBeenCalledWith(7, 'al1');
|
|
|
|
await svc.immichSyncAlbumAssets('5', 'l1', 7, 'sock');
|
|
expect(unified.syncImmichAlbum).toHaveBeenCalledWith('5', 'l1', 7, 'sock');
|
|
});
|
|
|
|
it('synology methods delegate', async () => {
|
|
await svc.synologyGetSettings(7);
|
|
expect(synology.getSynologySettings).toHaveBeenCalledWith(7);
|
|
|
|
await svc.synologyUpdateSettings(7, 'u', 'a', 'p', true);
|
|
expect(synology.updateSynologySettings).toHaveBeenCalledWith(7, 'u', 'a', 'p', true);
|
|
|
|
await svc.synologyGetStatus(7);
|
|
expect(synology.getSynologyStatus).toHaveBeenCalledWith(7);
|
|
|
|
await svc.synologyTestConnection(7, 'u', 'a', 'p', '123', false);
|
|
expect(synology.testSynologyConnection).toHaveBeenCalledWith(7, 'u', 'a', 'p', '123', false);
|
|
|
|
await svc.synologyListAlbums(7);
|
|
expect(synology.listSynologyAlbums).toHaveBeenCalledWith(7);
|
|
|
|
await svc.synologySyncAlbumLink(7, '5', 'l1', 'sock');
|
|
expect(unified.syncSynologyAlbum).toHaveBeenCalledWith(7, '5', 'l1', 'sock');
|
|
|
|
await svc.synologySearchPhotos(7, 'f', 't', 0, 100);
|
|
expect(synology.searchSynologyPhotos).toHaveBeenCalledWith(7, 'f', 't', 0, 100, 0);
|
|
|
|
// The zone the days are meant in has to reach the provider, and it is a
|
|
// different thing from the pagination offset sitting next to it (#2336).
|
|
await svc.synologySearchPhotos(7, 'f', 't', 0, 100, 600);
|
|
expect(synology.searchSynologyPhotos).toHaveBeenLastCalledWith(7, 'f', 't', 0, 100, 600);
|
|
});
|
|
|
|
it('synology album-photos forwards a passphrase when present and omits it when absent', async () => {
|
|
await svc.synologyGetAlbumPhotos(7, 'al1', 'secret');
|
|
expect(synology.getSynologyAlbumPhotos).toHaveBeenCalledWith(7, 'al1', 'secret');
|
|
|
|
await svc.synologyGetAlbumPhotos(7, 'al1');
|
|
expect(synology.getSynologyAlbumPhotos).toHaveBeenLastCalledWith(7, 'al1', undefined);
|
|
});
|
|
|
|
it('synology asset-info + stream forward a passphrase when present and omit it when absent', async () => {
|
|
await svc.synologyGetAssetInfo(7, 'p1', 2, 'secret');
|
|
expect(synology.getSynologyAssetInfo).toHaveBeenCalledWith(7, 'p1', 2, 'secret');
|
|
|
|
await svc.synologyGetAssetInfo(7, 'p1', 2);
|
|
expect(synology.getSynologyAssetInfo).toHaveBeenLastCalledWith(7, 'p1', 2, undefined);
|
|
|
|
await svc.synologyStreamAsset(res, 7, 2, 'p1', 'thumbnail', 'sm', 'secret');
|
|
expect(synology.streamSynologyAsset).toHaveBeenCalledWith(res, 7, 2, 'p1', 'thumbnail', 'sm', 'secret');
|
|
|
|
await svc.synologyStreamAsset(res, 7, 2, 'p1', 'original', 'xl');
|
|
expect(synology.streamSynologyAsset).toHaveBeenLastCalledWith(res, 7, 2, 'p1', 'original', 'xl', undefined);
|
|
});
|
|
});
|