From 88f25954ac6333a9e526d0d95ca6ed2f0d080419 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karol=20S=C3=B3jko?= <karolsojko@gmail.com>
Date: Tue, 21 Nov 2023 13:28:55 +0100
Subject: [PATCH] fix(syncing-server): front load themes and user prefs as high
 priority load items

---
 .../UseCase/Syncing/SyncItems/SyncItems.ts      | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/packages/syncing-server/src/Domain/UseCase/Syncing/SyncItems/SyncItems.ts b/packages/syncing-server/src/Domain/UseCase/Syncing/SyncItems/SyncItems.ts
index 292a07f59..725d282f4 100644
--- a/packages/syncing-server/src/Domain/UseCase/Syncing/SyncItems/SyncItems.ts
+++ b/packages/syncing-server/src/Domain/UseCase/Syncing/SyncItems/SyncItems.ts
@@ -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({
@@ -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)
       }
     })