feat: move ListRepository.fetchListTimeline to TimelineRepository

pulsate-dev · Jul 21, 2024 · 7e5c35e · 7e5c35e
1 parent 2a3c07a
commit 7e5c35e
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 39 deletions.
diff --git a/pkg/timeline/adaptor/repository/dummy.test.ts b/pkg/timeline/adaptor/repository/dummy.test.ts
@@ -97,6 +97,23 @@ describe('InMemoryTimelineRepository', () => {
         .includes('DIRECT'),
     ).toBe(false);
   });
+
+  it('should fetch list timeline', async () => {
+    const actual = await repository.fetchListTimeline(['1' as NoteID]);
+    expect(Result.isOk(actual)).toBe(true);
+  });
+
+  it('should not return DIRECT notes', async () => {
+    const actual = await repository.fetchListTimeline([
+      '1' as NoteID,
+      '4' as NoteID,
+    ]);
+    expect(Result.unwrap(actual)).toStrictEqual([dummyPublicNote]);
+    expect(Result.unwrap(actual)).not.toStrictEqual([
+      dummyPublicNote,
+      dummyDirectNote,
+    ]);
+  });
 });
 
 describe('InMemoryListRepository', () => {
@@ -183,21 +200,4 @@ describe('InMemoryListRepository', () => {
       '101' as AccountID,
     ]);
   });
-
-  it('should fetch list timeline', async () => {
-    const actual = await repository.fetchListTimeline(['10' as NoteID]);
-    expect(Result.isOk(actual)).toBe(true);
-  });
-
-  it('should not return DIRECT notes', async () => {
-    const actual = await repository.fetchListTimeline([
-      '10' as NoteID,
-      '14' as NoteID,
-    ]);
-    expect(Result.unwrap(actual)).toStrictEqual([dummyPublicNote]);
-    expect(Result.unwrap(actual)).not.toStrictEqual([
-      dummyPublicNote,
-      dummyDirectNote,
-    ]);
-  });
 });
diff --git a/pkg/timeline/adaptor/repository/dummy.ts b/pkg/timeline/adaptor/repository/dummy.ts
@@ -67,6 +67,25 @@ export class InMemoryTimelineRepository implements TimelineRepository {
     return Result.ok(filtered.slice(0, beforeIndex));
   }
 
+  async fetchListTimeline(
+    noteId: NoteID[],
+  ): Promise<Result.Result<Error, Note[]>> {
+    const notes: Note[] = [];
+    for (const noteID of noteId) {
+      const n = this.data.get(noteID);
+      if (!n) {
+        return Result.err(new Error('Not found'));
+      }
+      notes.push(n);
+    }
+
+    // NOTE: filter out DIRECT notes
+    // ToDo: Consider whether to filter out when Visibility is ‘FOLLOWERS’.
+    const filtered = notes.filter((note) => note.getVisibility() !== 'DIRECT');
+
+    return Result.ok(filtered);
+  }
+
   reset(data: readonly Note[] = []) {
     this.data.clear();
     this.data = new Map(data.map((v) => [v.getID(), v]));
@@ -117,25 +136,6 @@ export class InMemoryListRepository implements ListRepository {
     return Result.ok(list.getMemberIds() as AccountID[]);
   }
 
-  async fetchListTimeline(
-    noteId: NoteID[],
-  ): Promise<Result.Result<Error, Note[]>> {
-    const notes: Note[] = [];
-    for (const noteID of noteId) {
-      const n = this.notes.get(noteID);
-      if (!n) {
-        return Result.err(new Error('Not found'));
-      }
-      notes.push(n);
-    }
-
-    // NOTE: filter out DIRECT notes
-    // ToDo: Consider whether to filter out when Visibility is ‘FOLLOWERS’.
-    const filtered = notes.filter((note) => note.getVisibility() !== 'DIRECT');
-
-    return Result.ok(filtered);
-  }
-
   reset(data: readonly List[] = [], notes: readonly Note[] = []) {
     this.listData.clear();
     this.notes.clear();

diff --git a/pkg/timeline/adaptor/repository/prisma.ts b/pkg/timeline/adaptor/repository/prisma.ts
@@ -92,4 +92,21 @@ export class PrismaTimelineRepository implements TimelineRepository {
     });
     return Result.ok(this.deserialize(homeNotes));
   }
+
+  async fetchListTimeline(
+    noteIDs: NoteID[],
+  ): Promise<Result.Result<Error, Note[]>> {
+    // ToDo: Add filter
+    const listNotes = await this.prisma.note.findMany({
+      where: {
+        id: {
+          in: noteIDs,
+        },
+      },
+      orderBy: {
+        createdAt: 'desc',
+      },
+    });
+    return Result.ok(this.deserialize(listNotes));
+  }
 }
diff --git a/pkg/timeline/model/repository.ts b/pkg/timeline/model/repository.ts
@@ -2,8 +2,7 @@ import { Ether, type Result } from '@mikuroxina/mini-fn';
 
 import type { AccountID } from '../../accounts/model/account.js';
 import type { Note, NoteID } from '../../notes/model/note.js';
-import type { ListID } from './list.js';
-import type { List } from './list.js';
+import type { List, ListID } from './list.js';
 
 export interface FetchAccountTimelineFilter {
   id: AccountID;
@@ -37,6 +36,12 @@ export interface TimelineRepository {
     noteIDs: readonly NoteID[],
     filter: FetchAccountTimelineFilter,
   ): Promise<Result.Result<Error, Note[]>>;
+
+  /**
+   * @description Fetch list timeline
+   * @param noteId IDs of the notes to be fetched
+   * */
+  fetchListTimeline(noteId: NoteID[]): Promise<Result.Result<Error, Note[]>>;
 }
 export const timelineRepoSymbol = Ether.newEtherSymbol<TimelineRepository>();
 
@@ -61,5 +66,4 @@ export interface ListRepository {
     ownerId: AccountID,
   ): Promise<Result.Result<Error, List[]>>;
   fetchListMembers(listId: ListID): Promise<Result.Result<Error, AccountID[]>>;
-  fetchListTimeline(noteId: NoteID[]): Promise<Result.Result<Error, Note[]>>;
 }