0.6.0 (#22)

Enhanced Pagination for User Retrieval and Dialog Synchronization

Implemented pagination across user selection, member management, and dialog synchronization to improve performance and scrolling experience.

Key Changes:
- User Selection: Added pagination to CreateDialogViewModel, ensuring efficient user retrieval and seamless infinite scrolling.
- Member Management: Introduced paginated user fetching in RemoveMembersView and MembersDialogViewModel to reduce redundant API calls.
- Data Synchronization: Improved SyncDialog to handle paginated user synchronization, ensuring batch processing and efficient retrieval.
- Performance Optimizations: Centralized pagination settings, refined API integration, and enhanced async handling to avoid redundant requests and ensure smooth UI updates.

Author: IlliaChemolosov

Sources/QuickBloxData/Pagination/Pagination.swift

@@ -9,7 +9,16 @@
 import Foundation
 import QuickBloxDomain
 
+public class PaginationSettings {
+    public var limit: Int = 100
+}
+
 public struct Pagination: PaginationProtocol {
+    
+    public static var limit: Int {
+        return QuickBloxData.settings.pagination.limit
+    }
+    
     public var skip: Int
     public let limit: Int
     public let total: Int
@@ -22,15 +31,15 @@ public struct Pagination: PaginationProtocol {
         return (total + limit - 1) / limit
     }
 
-    public var hasNextPage: Bool = false
+    public var hasNext: Bool = false
 
-    public init(skip: Int, limit: Int, total: Int) {
+    public init(skip: Int, limit: Int = Pagination.limit, total: Int = 0) {
         self.skip = skip
         self.limit = limit
         self.total = total
     }
 
-    public init(page: Int = 1, perPage: Int = 10, total: Int = 0) {
+    public init(page: Int = 1, perPage: Int = Pagination.limit, total: Int = 0) {
         self.skip = (page - 1) * perPage
         self.limit = perPage
         self.total = total

Sources/QuickBloxData/QuickBloxData.swift

@@ -0,0 +1,15 @@
+//
+//  QuickBloxData.swift
+//  QuickBloxUIKit
+//
+//  Created by Injoit on 24.02.2025.
+//  Copyright © 2025 QuickBlox. All rights reserved.
+//
+
+import Foundation
+
+public class DataSettings {
+    public let pagination = PaginationSettings()
+}
+
+public var settings: DataSettings = .init()

Sources/QuickBloxData/Repository/DialogsRepository.swift

@@ -24,6 +24,10 @@ public class DialogsRepository {
 }
 
 extension DialogsRepository: DialogsRepositoryProtocol {
+    public var initialPagination: Pagination {
+        Pagination()
+    }
+    
     public var remoteEventPublisher: AnyPublisher<RemoteDialogEvent<Message>, Never> {
         get async {
             await remote.eventPublisher

Sources/QuickBloxData/Repository/MessagesRepository.swift

@@ -168,6 +168,10 @@ extension Message {
 }
 
 extension MessagesRepository {
+    public var initialPagination: Pagination {
+        Pagination()
+    }
+    
     public func send(messageToRemote entity: Message) async throws {
         do {
             _ = try await remote.send(message: RemoteMessageDTO(entity))

Sources/QuickBloxData/Repository/UsersRepository.swift

@@ -63,6 +63,10 @@ extension LocalUserDTO {
 }
 
 extension UsersRepository: UsersRepositoryProtocol {
+    public var initialPagination: Pagination {
+        Pagination()
+    }
+    
     public func save(userToLocal entity: User) async throws {
         do {
             try await local.save(user: LocalUserDTO(entity))
@@ -99,27 +103,24 @@ extension UsersRepository: UsersRepositoryProtocol {
         }
     }
 
-    public func get(usersFromRemote usersIds: [String]) async throws -> [User] {
-        var pagination = Pagination(skip: 0, limit: usersIds.count)
-        if usersIds.isEmpty {
-            pagination = Pagination(skip: 0, limit: 30)
-        } 
+    public func get(usersFromRemote usersIds: [String], pagination: Pagination? = nil) async throws -> (users: [User], pagination: Pagination) {
+        let pagination = pagination ?? Pagination(skip: 0)
         do {
             let withIds = RemoteUsersDTO(ids: usersIds,
                                          pagination: pagination)
             let data = try await remote.get(users: withIds)
-            return data.users.map { User($0) }
+            return (users: data.users.map { User($0) }, pagination: data.pagination)
         } catch {
             throw try error.repositoryException
         }
     }
 
-    public func get(usersFromRemote fullName: String) async throws -> [User] {
+    public func get(usersFromRemote fullName: String, pagination: Pagination? = nil) async throws -> (users: [User], pagination: Pagination) {
         do {
-            let pagination = Pagination(skip: 0, limit: 100)
+            let pagination = pagination ?? Pagination(skip: 0)
             let withFullName = RemoteUsersDTO(name:fullName, pagination: pagination)
             let data = try await remote.get(users: withFullName)
-            return data.users.map { User($0) }
+            return (users: data.users.map { User($0) }, pagination: data.pagination)
         } catch {
             throw try error.repositoryException
         }

Sources/QuickBloxData/Source/Local/PermissionsDataSourceProtocol.swift

@@ -2,8 +2,8 @@
 //  PermissionsDataSourceProtocol.swift
 //  QuickBloxUIKit
 //
-//  Created by Injoit on Illia Chemolosov on 28.01.2025.
-//  Copyright © 2023 QuickBlox. All rights reserved.
+//  Created by Injoit on 28.01.2025.
+//  Copyright © 2025 QuickBlox. All rights reserved.
 //
 
 import QuickBloxDomain

Sources/QuickBloxData/Source/Remote/API/API.swift

@@ -21,6 +21,7 @@ extension Pagination {
         self.init(page: Int(page.currentPage),
                   perPage: Int(page.perPage),
                   total: Int(page.totalEntries))
+        self.hasNext = self.total > self.skip + self.limit
     }
 }
 
@@ -29,13 +30,15 @@ extension Pagination {
         self.init(skip: page.skip,
                   limit: page.limit,
                   total: Int(page.totalEntries))
+        self.hasNext = self.total > self.skip + self.limit
     }
 }
 
 extension QBGeneralResponsePage {
     convenience init(_ pagination: Pagination) {
         self.init(currentPage: UInt(pagination.currentPage + 1),
-                  perPage: UInt(pagination.limit))
+                  perPage: UInt(pagination.limit),
+                  totalEntries: 0)
     }
 }
 

Sources/QuickBloxData/Source/Remote/API/APIUsers.swift

@@ -43,6 +43,7 @@ public struct APIUsers {
 
         return try await withCheckedThrowingContinuation { continuation in
             let page = QBGeneralResponsePage(page)
+            
             QBRequest.users(withExtendedRequest: extendedRequest, page: page) {
                 _, page, users in
                 continuation.resume(returning: (users, Pagination(page)))

Sources/QuickBloxData/Source/Remote/Chat.swift

@@ -119,7 +119,7 @@ private actor Chat {
 private extension QBChatDialog {
     func joinAsync() async throws {
         return try await withCheckedThrowingContinuation { continuation in
-            if type == .private || isJoined() == true {
+            if type == .private || type == .publicGroup || isJoined() == true {
                 continuation.resume()
             } else {
                 join { error in

Sources/QuickBloxData/Source/Remote/RemoteDataSource.swift

@@ -394,9 +394,7 @@ open class RemoteDataSource: NSObject, RemoteDataSourceProtocol, QBChatDelegate
             }
             let dialogs = result.dialogs.map { RemoteDialogDTO($0) }
             let usersIds = result.usersIds.map { $0.stringValue }
-            let pagination = Pagination(skip: result.page.skip,
-                                        limit: result.page.limit,
-                                        total: Int(result.page.totalEntries))
+            let pagination = Pagination(result.page)
             let dialogsDTO = RemoteDialogsDTO(dialogs: dialogs,
                                               usersIds: usersIds,
                                               pagination: pagination)
@@ -551,8 +549,18 @@ open class RemoteDataSource: NSObject, RemoteDataSourceProtocol, QBChatDelegate
         do {
             var tuple: (users: [QBUUser], pagination: Pagination)
             if dto.ids.isEmpty == false {
-                tuple = try await api.users.get(with: dto.ids,
-                                                page: dto.pagination)
+                let limit = 100
+                let requestPage = Pagination(skip: 0, limit: limit)
+                let offset = dto.pagination.skip
+                let count = dto.ids.count
+                let requestIds = Array(dto.ids[offset..<min(offset + limit, count)])
+                tuple = try await api.users.get(with: requestIds,
+                                                page: requestPage)
+                var responsePage = Pagination(skip: dto.pagination.skip,
+                                              limit: limit,
+                                              total: dto.ids.count)
+                responsePage.hasNext = responsePage.total > (responsePage.skip + responsePage.limit)
+                tuple.pagination = responsePage
             } else if dto.name.isEmpty == false {
                 tuple = try await api.users.get(with: dto.name,
                                                 page: dto.pagination)