Skip to content

✨ refactor bookmark handling to use stripBookmarkInternals for cleane… #96

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Whyjsee wants to merge 1 commit into from
Closed

✨ refactor bookmark handling to use stripBookmarkInternals for cleane… #96

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 21 additions & 8 deletions src/domain/orchestrator/bookmark.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,27 @@
import { inject, injectable } from '../../decorators/di'
import { ContextManager } from '../../utils/context'
import { BookmarkNotFoundError, BookmarkOverviewContentError } from '../../const/err'
import { BookmarkNotFoundError } from '../../const/err'
import { BookmarkService } from '../bookmark'
import { TagService } from '../tag'
import { MarkService } from '../mark'
import { MixTagsOverviewResult } from '../aigc'

type BookmarkRow = { id: number; content_key: string; content_md_key: string | null; private_user: number; [key: string]: unknown }

export function stripBookmarkInternals<T extends BookmarkRow>(
bookmark: T,
encodeId: (id: number) => number
): Omit<T, 'id' | 'content_key' | 'content_md_key' | 'private_user'> & { bookmark_id: number } {
const copy = { ...bookmark } as Record<string, unknown>
const id = copy.id as number
delete copy.id
delete copy.content_key
delete copy.content_md_key
delete copy.private_user
copy.bookmark_id = encodeId(id)
return copy as Omit<T, 'id' | 'content_key' | 'content_md_key' | 'private_user'> & { bookmark_id: number }
}

@injectable()
export class BookmarkOrchestrator {
constructor(
Expand Down Expand Up @@ -33,12 +49,11 @@ export class BookmarkOrchestrator {
this.bookmarkService.getUserBookmarkOverview(ctx.getUserId(), bmId),
this.tagService.getBookmarkTags(ctx, ctx.getUserId(), bmId)
])
const { id, content_key, content_md_key, private_user, ...bookmarkWithoutId } = res.bookmark
const { overview, key_takeaways } = this.parseOverviewRes(overviewResult.status === 'fulfilled' ? (overviewResult.value ?? null) : null)
const base = stripBookmarkInternals(res.bookmark, id => ctx.hashIds.encodeId(id))

return {
...bookmarkWithoutId,
bookmark_id: ctx.hashIds.encodeId(res.bookmark.id),
...base,
archived: res.archive_status === 1 ? 'archive' : res.archive_status === 2 ? 'later' : 'inbox',
starred: res.is_starred ? 'star' : 'unstar',
alias_title: res.alias_title,
Expand All @@ -64,13 +79,11 @@ export class BookmarkOrchestrator {
this.bookmarkService.getUserBookmarkOverview(userId, bmId)
])

// eslint-disable-next-line @typescript-eslint/no-unused-vars
const { id, content_key, content_md_key, private_user, ...bookmarkWithoutId } = res.bookmark
const { overview, key_takeaways } = this.parseOverviewRes(overviewResult.status === 'fulfilled' ? (overviewResult.value ?? null) : null)
const base = stripBookmarkInternals(res.bookmark, id => ctx.hashIds.encodeId(id))

return {
...bookmarkWithoutId,
bookmark_id: ctx.hashIds.encodeId(res.bookmark.id),
...base,
content: contentResult.status === 'fulfilled' ? contentResult.value : undefined,
archived: res.archive_status === 1 ? 'archive' : res.archive_status === 2 ? 'later' : 'inbox',
starred: res.is_starred ? 'star' : 'unstar',
Expand Down
Loading