CC-3240: Refactor UserAlbumRepository SetEntity size retrieval

Author: mauritz-mega

MEGAData/Repository/Album/UserAlbumRepository.swift

@@ -18,9 +18,8 @@ struct UserAlbumRepository: UserAlbumRepositoryProtocol {
         var results: [SetEntity] = []
 
         for megaSet in megaSets {
-            let size = await albumContent(by: megaSet.handle).count
             var setEntity = megaSet.toSetEntity()
-            setEntity.size = size
+            setEntity.size = sdk.megaSetElementCount(megaSet.handle)
 
             results.append(setEntity)
         }

MEGADataTests/Repos/UserAlbumRepositoryTests.swift

@@ -5,16 +5,19 @@ import MEGADomain
 final class UserAlbumRepositoryTests: XCTestCase {
     func testLoadingAlbums_onRetrieved_shouldReturnAlbums() async throws {
         let megaSets = sampleSets()
+        let megaSetCounts: [MEGAHandle: UInt] = Dictionary(uniqueKeysWithValues: megaSets.map {
+            ($0.handle, UInt.random(in: 0...100))
+        })
         let megaSetElements = sampleSetElements()
-        let sdk = MockSdk(megaSets:megaSets,megaSetElements: megaSetElements)
+        let sdk = MockSdk(megaSets:megaSets, megaSetElementCounts: megaSetCounts)
         let repo = UserAlbumRepository(sdk: sdk)
 
         let sets = await repo.albums()
 
         XCTAssertEqual(sets.count, megaSets.count)
 
         for set in sets {
-            XCTAssertEqual(set.size, megaSetElements.count)
+            XCTAssertEqual(set.size, megaSetCounts[set.handle])
         }
     }
 

MEGAUnitTests/Mocks/Sdk/MockMEGASet.swift

@@ -10,7 +10,7 @@ final class MockMEGASet: MEGASet {
     private let setChangeType: MEGASetChangeType
 
     private var setModificationTime: Date?
-    
+    override var handle: UInt64 { setHandle }
     override var name: String? { setName }
     override var timestamp: Date { setModificationTime ?? Date() }
 

MEGAUnitTests/Mocks/Sdk/MockSdk.swift

@@ -11,6 +11,7 @@ final class MockSdk: MEGASdk {
     private var statsEventType: Int?
     private var statsEventMessage: String?
     private let megaRootNode: MEGANode?
+    private let megaSetElementCounts: [MEGAHandle: UInt]
 
     let sets: [MEGASet]
     let setElements: [MEGASetElement]
@@ -24,7 +25,9 @@ final class MockSdk: MEGASdk {
          myEmail: String? = nil,
          megaSets: [MEGASet] = [],
          megaSetElements: [MEGASetElement] = [],
-         megaRootNode: MEGANode? = nil) {
+         megaRootNode: MEGANode? = nil,
+         megaSetElementCounts: [MEGAHandle: UInt] = [:]
+    ) {
         self.nodes = nodes
         self.rubbishNodes = rubbishNodes
         self.myContacts = myContacts
@@ -33,7 +36,7 @@ final class MockSdk: MEGASdk {
         sets = megaSets
         setElements = megaSetElements
         self.megaRootNode = megaRootNode
-        
+        self.megaSetElementCounts = megaSetElementCounts
         super.init()
     }
 
@@ -89,4 +92,8 @@ final class MockSdk: MEGASdk {
     override func nodeListSearch(for node: MEGANode, search searchString: String?, cancelToken: MEGACancelToken, recursive: Bool, orderType: MEGASortOrderType, nodeFormatType: MEGANodeFormatType, folderTargetType: MEGAFolderTargetType) -> MEGANodeList {
         MockNodeList(nodes: nodes)
     }
+    
+    override func megaSetElementCount(_ sid: MEGAHandle) -> UInt {
+        megaSetElementCounts[sid] ?? 0
+    }
 }

Modules/MEGADomain/Sources/MEGADomain/Entity/Album/AlbumEntity.swift

@@ -11,10 +11,10 @@ public struct AlbumEntity: Identifiable, Hashable {
     public let id: HandleEntity
     public let name: String
     public let coverNode: NodeEntity?
-    public let count: Int
+    public let count: UInt
     public let type: AlbumEntityType
 
-    public init(id: HandleEntity, name: String, coverNode: NodeEntity?, count: Int, type: AlbumEntityType) {
+    public init(id: HandleEntity, name: String, coverNode: NodeEntity?, count: UInt, type: AlbumEntityType) {
         self.id = id
         self.name = name
         self.coverNode = coverNode

Modules/MEGADomain/Sources/MEGADomain/Entity/Set/SetEntity.swift

@@ -6,7 +6,7 @@ public struct SetEntity {
     public let coverId: HandleEntity
     public let modificationTime: Date
     public let name: String
-    public var size: Int = 0
+    public var size: UInt = 0
 
     public init(handle: HandleEntity, userId: HandleEntity, coverId: HandleEntity, modificationTime: Date, name: String) {
         self.handle = handle

Modules/MEGADomain/Sources/MEGADomain/UseCase/Album/AlbumListUseCase.swift

@@ -76,9 +76,9 @@ public final class AlbumListUseCase<T: AlbumRepositoryProtocol, U: FileSearchRep
         var coverOfFavouritePhoto: NodeEntity?
         var coverOfGifPhoto: NodeEntity?
         var coverOfRawPhoto: NodeEntity?
-        var numOfFavouritePhotos = 0
-        var numOfGifPhotos = 0
-        var numOfRawPhotos = 0
+        var numOfFavouritePhotos: UInt = 0
+        var numOfGifPhotos: UInt = 0
+        var numOfRawPhotos: UInt = 0
 
         photos.forEach { photo in
             if photo.isFavourite {

Modules/MEGADomain/Tests/MEGADomainTests/AlbumListUseCaseTests.swift

@@ -73,7 +73,7 @@ final class AlbumListUseCaseTests: XCTestCase {
         let albums = await sut.loadAlbums()
         XCTAssertTrue(albums.count == 2)
         XCTAssertEqual(albums.first, AlbumEntity(id: AlbumIdEntity.favourite.rawValue, name: "",
-                                                 coverNode: favouriteRawPhotos.last, count: favouriteRawPhotos.count, type: .favourite))
+                                                 coverNode: favouriteRawPhotos.last, count: UInt(favouriteRawPhotos.count), type: .favourite))
         XCTAssertEqual(albums.last?.type, AlbumEntityType.raw)
     }
 
@@ -87,7 +87,7 @@ final class AlbumListUseCaseTests: XCTestCase {
             NodeEntity(name: "b.mp4", handle: 3, hasThumbnail: true, isFavourite: true, modificationTime: try "2022-08-19T20:01:04Z".date),
             expectedCoverNode
         ]
-        let expectedFavouritesCount = (favouritePhotos + favouriteVideos).filter { $0.hasThumbnail && $0.isFavourite }.count
+        let expectedFavouritesCount = UInt((favouritePhotos + favouriteVideos).filter { $0.hasThumbnail && $0.isFavourite }.count)
         let sut = AlbumListUseCase(
             albumRepository: MockAlbumRepository.newRepo,
             userAlbumRepository: MockUserAlbumRepository.newRepo,

iMEGA/Media Consumption/Album Library/Cell/AlbumCellViewModel.swift

@@ -4,7 +4,7 @@ import MEGASwiftUI
 import MEGADomain
 
 final class AlbumCellViewModel: ObservableObject {
-    @Published var numberOfNodes = 0
+    @Published var numberOfNodes: UInt = 0
     @Published var thumbnailContainer: any ImageContaining
     @Published var isLoading: Bool = false
     @Published var title: String = ""