Remove .custom

GetStream · Aug 12, 2021 · 2f6c0d8 · 2f6c0d8
1 parent 2c01fc6
commit 2f6c0d8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/Sources/StreamChat/APIClient/Endpoints/Payloads/CurrentUserPayloads_Tests.swift b/Sources/StreamChat/APIClient/Endpoints/Payloads/CurrentUserPayloads_Tests.swift
@@ -12,7 +12,7 @@ class CurrentUserPayload_Tests: XCTestCase {
     func test_currentUserJSON_customRoleIsDecodedCorrectly() throws {
         let json = XCTestCase.mockData(fromFile: "CurrentUserCustomRole")
         let payload = try JSONDecoder.default.decode(CurrentUserPayload.self, from: json)
-        XCTAssertEqual(payload.role, .custom("banana-master"))
+        XCTAssertEqual(payload.role, UserRole("banana-master"))
     }
 
     func test_currentUserJSON_isDecodedCorrectly() throws {

diff --git a/Sources/StreamChat/Database/DTOs/CurrentUserDTO_Tests.swift b/Sources/StreamChat/Database/DTOs/CurrentUserDTO_Tests.swift
@@ -21,7 +21,7 @@ class CurrentUserModelDTO_Tests: XCTestCase {
     }
 
     func test_currentUserPayload_customRolesEncoding() throws {
-        let payload: CurrentUserPayload = .dummy(userPayload: .dummy(userId: .unique, role: .custom("banana-master")))
+        let payload: CurrentUserPayload = .dummy(userPayload: .dummy(userId: .unique, role: UserRole("banana-master")))
 
         // Asynchronously save the payload to the db
         try database.writeSynchronously { session in
@@ -33,7 +33,7 @@ class CurrentUserModelDTO_Tests: XCTestCase {
             database.viewContext.currentUser?.asModel()
         )
 
-        XCTAssertEqual(.custom("banana-master"), loadedCurrentUser.userRole)
+        XCTAssertEqual(UserRole("banana-master"), loadedCurrentUser.userRole)
     }
 
     func test_currentUserPayload_isStoredAndLoadedFromDB() throws {

diff --git a/Sources/StreamChat/Models/User.swift b/Sources/StreamChat/Models/User.swift
@@ -103,10 +103,6 @@ public struct UserRole: RawRepresentable, Codable, Hashable, ExpressibleByString
     public init(stringLiteral value: String) {
         self.init(rawValue: value)
     }
-
-    static func custom(_ rawValue: String) -> UserRole {
-        .init(rawValue: rawValue)
-    }
 }
 
 public extension UserRole {