Skip to content

Commit

Permalink
fix(syncing-server): front load themes and user prefs as high priorit…
Browse files Browse the repository at this point in the history
…y load items
  • Loading branch information
karolsojko committed Nov 21, 2023
1 parent d41dd3b commit 88f2595
Showing 1 changed file with 10 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ export class SyncItems implements UseCaseInterface<SyncItemsResponse> {
)
const isSharedVaultExclusiveSync = dto.sharedVaultUuids && dto.sharedVaultUuids.length > 0
if (this.isFirstSync(dto) && !isSharedVaultExclusiveSync) {
retrievedItems = await this.frontLoadKeysItemsToTop(dto.userUuid, retrievedItems)
retrievedItems = await this.frontLoadHighLoadingPriorityItemsToTop(dto.userUuid, retrievedItems)
}

const sharedVaultsOrError = await this.getSharedVaultsUseCase.execute({
Expand Down Expand Up @@ -139,19 +139,22 @@ export class SyncItems implements UseCaseInterface<SyncItemsResponse> {
return retrievedItems.filter((item: Item) => syncConflictIds.indexOf(item.id.toString()) === -1)
}

private async frontLoadKeysItemsToTop(userUuid: string, retrievedItems: Array<Item>): Promise<Array<Item>> {
const itemsKeys = await this.itemRepository.findAll({
private async frontLoadHighLoadingPriorityItemsToTop(
userUuid: string,
retrievedItems: Array<Item>,
): Promise<Array<Item>> {
const highPriorityItems = await this.itemRepository.findAll({
userUuid,
contentType: ContentType.TYPES.ItemsKey,
contentType: [ContentType.TYPES.ItemsKey, ContentType.TYPES.UserPrefs, ContentType.TYPES.Theme],
sortBy: 'updated_at_timestamp',
sortOrder: 'ASC',
})

const retrievedItemsIds: Array<string> = retrievedItems.map((item: Item) => item.id.toString())

itemsKeys.forEach((itemKey: Item) => {
if (retrievedItemsIds.indexOf(itemKey.id.toString()) === -1) {
retrievedItems.unshift(itemKey)
highPriorityItems.forEach((highPriorityItem: Item) => {
if (retrievedItemsIds.indexOf(highPriorityItem.id.toString()) === -1) {
retrievedItems.unshift(highPriorityItem)
}
})

Expand Down

0 comments on commit 88f2595

Please sign in to comment.