SAO-1806: Fix hangs upon node updates for big folders.

meganz · Jul 18, 2024 · 615bd6b · 615bd6b
1 parent 35fa3b2
commit 615bd6b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 21 deletions.
diff --git a/MEGAUnitTests/Home/Search/HomeSearchResultsProviderTests.swift b/MEGAUnitTests/Home/Search/HomeSearchResultsProviderTests.swift
@@ -65,12 +65,12 @@ fileprivate extension Date {
 class HomeSearchResultsProviderTests: XCTestCase {
 
     class Harness {
+        static let parentNodeHandle: HandleEntity = 999
         let filesSearchUseCase: MockFilesSearchUseCase
         let nodeDetails: MockNodeDetailUseCase
         let nodeDataUseCase: MockNodeDataUseCase
         let mediaUseCase: MockMediaUseCase
         let nodesUpdateListenerRepo: MockSDKNodesUpdateListenerRepository
-        let nodeUpdateRepository: MockNodeUpdateRepository
         let downloadTransfersListener: MockDownloadTransfersListener
         let contentConsumptionUserAttributeUseCase: MockContentConsumptionUserAttributeUseCase
         let sut: HomeSearchResultsProvider
@@ -100,8 +100,6 @@ class HomeSearchResultsProviderTests: XCTestCase {
             mediaUseCase = MockMediaUseCase()
 
             nodesUpdateListenerRepo = MockSDKNodesUpdateListenerRepository.newRepo
-
-            nodeUpdateRepository = MockNodeUpdateRepository()
 
             downloadTransfersListener = MockDownloadTransfersListener()
 
@@ -110,15 +108,14 @@ class HomeSearchResultsProviderTests: XCTestCase {
             )
 
             sut = HomeSearchResultsProvider(
-                parentNodeProvider: { NodeEntity(handle: 123) },
+                parentNodeProvider: { NodeEntity(handle: Harness.parentNodeHandle) },
                 filesSearchUseCase: filesSearchUseCase,
                 nodeDetailUseCase: nodeDetails,
                 nodeUseCase: nodeDataUseCase,
                 mediaUseCase: mediaUseCase,
                 nodesUpdateListenerRepo: nodesUpdateListenerRepo,
                 downloadTransferListener: downloadTransfersListener,
                 nodeIconUsecase: MockNodeIconUsecase(stubbedIconData: Data()),
-                nodeUpdateRepository: nodeUpdateRepository,
                 contentConsumptionUserAttributeUseCase: contentConsumptionUserAttributeUseCase,
                 allChips: SearchChipEntity.allChips(
                     areChipsGroupEnabled: true,
@@ -678,9 +675,6 @@ class HomeSearchResultsProviderTests: XCTestCase {
             nodeUpdatesSignals.append($0)
         })
 
-        harness.nodeUpdateRepository.shouldProcessOnNodesUpdateValue = false
-        _ = await harness.sut.search(queryRequest: .initial, lastItemIndex: nil)
-
         // when
         harness.nodesUpdateListenerRepo.onNodesUpdateHandler?(nodes)
 
@@ -702,8 +696,6 @@ class HomeSearchResultsProviderTests: XCTestCase {
                 expectation.fulfill()
             }
         })
-
-        harness.nodeUpdateRepository.shouldProcessOnNodesUpdateValue = true
         _ = await harness.sut.search(queryRequest: .initial, lastItemIndex: nil)
 
         let task = Task {
@@ -712,7 +704,7 @@ class HomeSearchResultsProviderTests: XCTestCase {
 
         // when
 
-        harness.nodesUpdateListenerRepo.onNodesUpdateHandler?(nodes) // Trigger .generic signal
+        harness.nodesUpdateListenerRepo.onNodesUpdateHandler?([.init(parentHandle: Harness.parentNodeHandle)]) // Trigger .generic signal
         harness.downloadTransfersListener.simulateDownloadedNode(nodes[1]) // Trigger .specific signal
 
         await fulfillment(of: [expectation], timeout: 1.0)

diff --git a/iMEGA/Home/Scenes/HomeScreenFactory.swift b/iMEGA/Home/Scenes/HomeScreenFactory.swift
@@ -343,7 +343,6 @@ final class HomeScreenFactory: NSObject {
             nodesUpdateListenerRepo: makeNodesUpdateListenerRepo(),
             downloadTransferListener: makeDownloadTransfersListener(),
             nodeIconUsecase: makeNodeIconUsecase(),
-            nodeUpdateRepository: NodeUpdateRepository.newRepo,
             contentConsumptionUserAttributeUseCase: ContentConsumptionUserAttributeUseCase(repo: UserAttributeRepository.newRepo),
             allChips: Self.allChips(areChipsGroupEnabled: featureFlagProvider.isFeatureFlagEnabled(for: .chipsGroups)),
             sdk: sdk,

diff --git a/iMEGA/Home/Scenes/HomeSearch/Provider/HomeSearchResultsProvider.swift b/iMEGA/Home/Scenes/HomeSearch/Provider/HomeSearchResultsProvider.swift
@@ -42,7 +42,6 @@ final class HomeSearchResultsProvider: SearchResultsProviding {
     // root node can be nil in case when we start app in offline
     private let parentNodeProvider: () -> NodeEntity?
     private let mapper: SearchResultMapper
-    private let nodeUpdateRepository: any NodeUpdateRepositoryProtocol
     private let notificationCenter: NotificationCenter
     private var subscriptions = Set<AnyCancellable>()
 
@@ -55,7 +54,6 @@ final class HomeSearchResultsProvider: SearchResultsProviding {
         nodesUpdateListenerRepo: some NodesUpdateListenerProtocol,
         downloadTransferListener: some DownloadTransfersListening,
         nodeIconUsecase: some NodeIconUsecaseProtocol,
-        nodeUpdateRepository: some NodeUpdateRepositoryProtocol,
         contentConsumptionUserAttributeUseCase: some ContentConsumptionUserAttributeUseCaseProtocol,
         notificationCenter: NotificationCenter = .default,
         allChips: [SearchChipEntity],
@@ -71,7 +69,6 @@ final class HomeSearchResultsProvider: SearchResultsProviding {
         self.mediaUseCase = mediaUseCase
         self.nodesUpdateListenerRepo = nodesUpdateListenerRepo
         self.downloadTransferListener = downloadTransferListener
-        self.nodeUpdateRepository = nodeUpdateRepository
         self.contentConsumptionUserAttributeUseCase = contentConsumptionUserAttributeUseCase
         self.notificationCenter = notificationCenter
         self.availableChips = allChips
@@ -282,15 +279,16 @@ final class HomeSearchResultsProvider: SearchResultsProviding {
         mapper.map(node: node)
     }
 
+    // Need some improvements node update listening mechanism - [SAO-1821]
     private func addNodesUpdateHandler() {
         nodesUpdateListenerRepo.onNodesUpdateHandler = { [weak self] updatedNodes in
-            guard let self,
-                  let parentNode = self.parentNode,
-                  let childNodes = self.nodeList?.toNodeEntities(),
-                  self.nodeUpdateRepository.shouldProcessOnNodesUpdate(parentNode: parentNode, childNodes: childNodes, updatedNodes: updatedNodes) else {
-                return
+            guard let self else { return }
+            Task { [weak self] in
+                guard let self, let parentNodeHandle = self.parentNode?.handle,
+                      updatedNodes.contains(where: { $0.handle == parentNodeHandle })
+                        || updatedNodes.contains(where: { $0.parentHandle == parentNodeHandle }) else { return }
+                self.onSearchResultsUpdated(.generic)
             }
-            self.onSearchResultsUpdated(.generic)
         }
     }
 }