Room Member is now an interface SDK update (#711)

* migrated to the usage of a Protocol for the RoomMember * removed unused file * code improvement * sliding sync new states * sdk bump * fix for tests * fixing tests * package resolved rollback * rollback package.resolved * fixed a mistakenly removed dependency * Revert "fixed a mistakenly removed dependency" This reverts commit 096d9da6142d8117bc1dfa6d5bbbd797b43b31ad. * removing unnecessary Identifiable conformance * pr suggestions * pr comment
2026-11-03 06:55:59 +00:00 · 2023-03-22 13:36:08 +01:00
parent 8c89b06f3b
commit fe72d34d11
24 changed files with 241 additions and 126 deletions
@@ -50,6 +50,36 @@ class BugReportServiceMock: BugReportServiceProtocol {
        }
    }
 }
+class RoomMemberProxyMock: RoomMemberProxyProtocol {
+    var userID: String {
+        get { return underlyingUserID }
+        set(value) { underlyingUserID = value }
+    }
+    var underlyingUserID: String!
+    var displayName: String?
+    var avatarURL: URL?
+    var membership: MembershipState {
+        get { return underlyingMembership }
+        set(value) { underlyingMembership = value }
+    }
+    var underlyingMembership: MembershipState!
+    var isNameAmbiguous: Bool {
+        get { return underlyingIsNameAmbiguous }
+        set(value) { underlyingIsNameAmbiguous = value }
+    }
+    var underlyingIsNameAmbiguous: Bool!
+    var powerLevel: Int {
+        get { return underlyingPowerLevel }
+        set(value) { underlyingPowerLevel = value }
+    }
+    var underlyingPowerLevel: Int!
+    var normalizedPowerLevel: Int {
+        get { return underlyingNormalizedPowerLevel }
+        set(value) { underlyingNormalizedPowerLevel = value }
+    }
+    var underlyingNormalizedPowerLevel: Int!
+
+}
 class RoomProxyMock: RoomProxyProtocol {
    var id: String {
        get { return underlyingId }
@@ -321,10 +351,10 @@ class RoomProxyMock: RoomProxyProtocol {
    var membersCalled: Bool {
        return membersCallsCount > 0
    }
-    var membersReturnValue: Result<[RoomMemberProxy], RoomProxyError>!
-    var membersClosure: (() async -> Result<[RoomMemberProxy], RoomProxyError>)?
+    var membersReturnValue: Result<[RoomMemberProxyProtocol], RoomProxyError>!
+    var membersClosure: (() async -> Result<[RoomMemberProxyProtocol], RoomProxyError>)?

-    func members() async -> Result<[RoomMemberProxy], RoomProxyError> {
+    func members() async -> Result<[RoomMemberProxyProtocol], RoomProxyError> {
        membersCallsCount += 1
        if let membersClosure = membersClosure {
            return await membersClosure()
@@ -0,0 +1,74 @@
+//
+// Copyright 2023 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import Foundation
+import MatrixRustSDK
+
+struct RoomMemberProxyMockConfiguration {
+    var userID: String
+    var displayName: String
+    var avatarURL: String?
+    var membership: MembershipState
+    var isNameAmbiguous: Bool
+    var powerLevel: Int
+    var normalizedPowerLevel: Int
+}
+
+extension RoomMemberProxyMock {
+    convenience init(with configuration: RoomMemberProxyMockConfiguration) {
+        self.init()
+        userID = configuration.userID
+        displayName = configuration.displayName
+        if let avatarURL = configuration.avatarURL {
+            self.avatarURL = URL(string: avatarURL)
+        }
+        membership = configuration.membership
+        isNameAmbiguous = configuration.isNameAmbiguous
+        powerLevel = configuration.powerLevel
+        normalizedPowerLevel = configuration.normalizedPowerLevel
+    }
+
+    // Mocks
+    static var mockAlice: RoomMemberProxyMock {
+        RoomMemberProxyMock(with: .init(userID: "alice@matrix.org",
+                                        displayName: "Alice",
+                                        avatarURL: nil,
+                                        membership: .join,
+                                        isNameAmbiguous: false,
+                                        powerLevel: 50,
+                                        normalizedPowerLevel: 50))
+    }
+
+    static var mockBob: RoomMemberProxyMock {
+        RoomMemberProxyMock(with: .init(userID: "bob@matrix.org",
+                                        displayName: "Bob",
+                                        avatarURL: nil,
+                                        membership: .join,
+                                        isNameAmbiguous: false,
+                                        powerLevel: 50,
+                                        normalizedPowerLevel: 50))
+    }
+
+    static var mockCharlie: RoomMemberProxyMock {
+        RoomMemberProxyMock(with: .init(userID: "charlie@matrix.org",
+                                        displayName: "Charlie",
+                                        avatarURL: nil,
+                                        membership: .join,
+                                        isNameAmbiguous: false,
+                                        powerLevel: 50,
+                                        normalizedPowerLevel: 50))
+    }
+}
@@ -30,7 +30,7 @@ struct RoomProxyMockConfiguration {
    var canonicalAlias: String?
    var alternativeAliases: [String] = []
    var hasUnreadNotifications = Bool.random()
-    var members: [RoomMemberProxy]?
+    var members: [RoomMemberProxyProtocol]?
 }

 extension RoomProxyMock {