rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: fix ContentType usage (#2353)

Browse Source 
* chore: fix ContentType usage

* chore: fix specs
This commit is contained in:
Karol Sójko
2023-07-12 13:53:29 +02:00
committed by GitHub
parent d057cdff84
commit 325737bfbd
247 changed files with 1092 additions and 1060 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/services/src/Domain/Device/DatabaseLoadOptions.ts
View File

@@ -1,4 +1,3 @@
import { ContentType } from '@standardnotes/common'
import { FullyFormedTransferPayload } from '@standardnotes/models'
export type DatabaseKeysLoadChunk = {
@@ -42,7 +41,7 @@ export function isFullEntryLoadChunkResponse(
}
export type DatabaseLoadOptions = {
contentTypePriority: ContentType[]
contentTypePriority: string[]
uuidPriority: string[]
batchSize: number
}

56
packages/services/src/Domain/Device/DatabaseLoadSorter.spec.ts
View File

@@ -1,28 +1,28 @@
import { ContentType } from '@standardnotes/common'
import { ContentType } from '@standardnotes/domain-core'
import { FullyFormedPayloadInterface } from '@standardnotes/models'
import { GetSortedPayloadsByPriority } from './DatabaseLoadSorter'
describe('GetSortedPayloadsByPriority', () => {
let payloads: FullyFormedPayloadInterface[] = []
const contentTypePriority = [ContentType.ItemsKey, ContentType.UserPrefs, ContentType.Component, ContentType.Theme]
const contentTypePriority = [ContentType.TYPES.ItemsKey, ContentType.TYPES.UserPrefs, ContentType.TYPES.Component, ContentType.TYPES.Theme]
let launchPriorityUuids: string[] = []
it('should sort payloads based on content type priority', () => {
payloads = [
{
content_type: ContentType.Theme,
content_type: ContentType.TYPES.Theme,
} as FullyFormedPayloadInterface,
{
content_type: ContentType.UserPrefs,
content_type: ContentType.TYPES.UserPrefs,
} as FullyFormedPayloadInterface,
{
content_type: ContentType.Component,
content_type: ContentType.TYPES.Component,
} as FullyFormedPayloadInterface,
{
content_type: ContentType.ItemsKey,
content_type: ContentType.TYPES.ItemsKey,
} as FullyFormedPayloadInterface,
{
content_type: ContentType.Note,
content_type: ContentType.TYPES.Note,
} as FullyFormedPayloadInterface,
]
@@ -33,15 +33,15 @@ describe('GetSortedPayloadsByPriority', () => {
})
expect(itemsKeyPayloads.length).toBe(1)
expect(itemsKeyPayloads[0].content_type).toBe(ContentType.ItemsKey)
expect(itemsKeyPayloads[0].content_type).toBe(ContentType.TYPES.ItemsKey)
expect(contentTypePriorityPayloads.length).toBe(3)
expect(contentTypePriorityPayloads[0].content_type).toBe(ContentType.UserPrefs)
expect(contentTypePriorityPayloads[1].content_type).toBe(ContentType.Component)
expect(contentTypePriorityPayloads[2].content_type).toBe(ContentType.Theme)
expect(contentTypePriorityPayloads[0].content_type).toBe(ContentType.TYPES.UserPrefs)
expect(contentTypePriorityPayloads[1].content_type).toBe(ContentType.TYPES.Component)
expect(contentTypePriorityPayloads[2].content_type).toBe(ContentType.TYPES.Theme)
expect(remainingPayloads.length).toBe(1)
expect(remainingPayloads[0].content_type).toBe(ContentType.Note)
expect(remainingPayloads[0].content_type).toBe(ContentType.TYPES.Note)
})
it('should sort payloads based on launch priority uuids', () => {
@@ -53,31 +53,31 @@ describe('GetSortedPayloadsByPriority', () => {
payloads = [
{
content_type: ContentType.Theme,
content_type: ContentType.TYPES.Theme,
} as FullyFormedPayloadInterface,
{
content_type: ContentType.UserPrefs,
content_type: ContentType.TYPES.UserPrefs,
} as FullyFormedPayloadInterface,
{
content_type: ContentType.Component,
content_type: ContentType.TYPES.Component,
} as FullyFormedPayloadInterface,
{
content_type: ContentType.ItemsKey,
content_type: ContentType.TYPES.ItemsKey,
} as FullyFormedPayloadInterface,
{
content_type: ContentType.Note,
content_type: ContentType.TYPES.Note,
uuid: unprioritizedNoteUuid,
} as FullyFormedPayloadInterface,
{
content_type: ContentType.Tag,
content_type: ContentType.TYPES.Tag,
uuid: unprioritizedTagUuid,
} as FullyFormedPayloadInterface,
{
content_type: ContentType.Note,
content_type: ContentType.TYPES.Note,
uuid: prioritizedNoteUuid,
} as FullyFormedPayloadInterface,
{
content_type: ContentType.Tag,
content_type: ContentType.TYPES.Tag,
uuid: prioritizedTagUuid,
} as FullyFormedPayloadInterface,
]
@@ -91,12 +91,12 @@ describe('GetSortedPayloadsByPriority', () => {
})
expect(itemsKeyPayloads.length).toBe(1)
expect(itemsKeyPayloads[0].content_type).toBe(ContentType.ItemsKey)
expect(itemsKeyPayloads[0].content_type).toBe(ContentType.TYPES.ItemsKey)
expect(contentTypePriorityPayloads.length).toBe(3)
expect(contentTypePriorityPayloads[0].content_type).toBe(ContentType.UserPrefs)
expect(contentTypePriorityPayloads[1].content_type).toBe(ContentType.Component)
expect(contentTypePriorityPayloads[2].content_type).toBe(ContentType.Theme)
expect(contentTypePriorityPayloads[0].content_type).toBe(ContentType.TYPES.UserPrefs)
expect(contentTypePriorityPayloads[1].content_type).toBe(ContentType.TYPES.Component)
expect(contentTypePriorityPayloads[2].content_type).toBe(ContentType.TYPES.Theme)
expect(remainingPayloads.length).toBe(4)
expect(remainingPayloads[0].uuid).toBe(prioritizedNoteUuid)
@@ -114,21 +114,21 @@ describe('GetSortedPayloadsByPriority', () => {
payloads = [
{
content_type: ContentType.Note,
content_type: ContentType.TYPES.Note,
uuid: unprioritizedNoteUuid,
updated_at: new Date(1),
} as FullyFormedPayloadInterface,
{
content_type: ContentType.Tag,
content_type: ContentType.TYPES.Tag,
uuid: unprioritizedTagUuid,
updated_at: new Date(2),
} as FullyFormedPayloadInterface,
{
content_type: ContentType.Note,
content_type: ContentType.TYPES.Note,
uuid: prioritizedNoteUuid,
} as FullyFormedPayloadInterface,
{
content_type: ContentType.Tag,
content_type: ContentType.TYPES.Tag,
uuid: prioritizedTagUuid,
} as FullyFormedPayloadInterface,
]

11
packages/services/src/Domain/Device/DatabaseLoadSorter.ts
View File

@@ -1,6 +1,7 @@
import { ContentType } from '@standardnotes/domain-core'
import { DatabaseItemMetadata } from './DatabaseItemMetadata'
import { DatabaseLoadOptions } from './DatabaseLoadOptions'
import { ContentType } from '@standardnotes/common'
/**
* Sorts payloads according by most recently modified first, according to the priority,
@@ -9,7 +10,7 @@ import { ContentType } from '@standardnotes/common'
*/
function SortPayloadsByRecentAndContentPriority<T extends DatabaseItemMetadata = DatabaseItemMetadata>(
payloads: T[],
contentTypePriorityList: ContentType[],
contentTypePriorityList: string[],
): T[] {
return payloads.sort((a, b) => {
const dateResult = new Date(b.updated_at).getTime() - new Date(a.updated_at).getTime()
@@ -97,11 +98,11 @@ export function GetSortedPayloadsByPriority<T extends DatabaseItemMetadata = Dat
for (let index = 0; index < payloads.length; index++) {
const payload = payloads[index]
if (payload.content_type === ContentType.KeySystemRootKey) {
if (payload.content_type === ContentType.TYPES.KeySystemRootKey) {
keySystemRootKeyPayloads.push(payload)
} else if (payload.content_type === ContentType.KeySystemItemsKey) {
} else if (payload.content_type === ContentType.TYPES.KeySystemItemsKey) {
keySystemItemsKeyPayloads.push(payload)
} else if (payload.content_type === ContentType.ItemsKey) {
} else if (payload.content_type === ContentType.TYPES.ItemsKey) {
itemsKeyPayloads.push(payload)
} else if (options.contentTypePriority.includes(payload.content_type)) {
contentTypePriorityPayloads.push(payload)