From c13c63a9333b30df8038e68927cee51f7de4ca90 Mon Sep 17 00:00:00 2001
From: Dariusz Rybicki <dariusz@elixxir.io>
Date: Thu, 8 Sep 2022 22:58:21 +0200
Subject: [PATCH] Update GroupSendReport model
---
Sources/XXClient/Models/GroupSendReport.swift | 12 ++++++++----
.../XXClientTests/Models/GroupSendReportTests.swift | 13 ++++++++-----
2 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/Sources/XXClient/Models/GroupSendReport.swift b/Sources/XXClient/Models/GroupSendReport.swift
index c7b3b01d..9d450e46 100644
--- a/Sources/XXClient/Models/GroupSendReport.swift
+++ b/Sources/XXClient/Models/GroupSendReport.swift
@@ -2,23 +2,27 @@ import Foundation
public struct GroupSendReport: Equatable {
public init(
- roundId: UInt64,
+ rounds: [Int],
+ roundURL: String,
timestamp: Int64,
messageId: Data
) {
- self.roundId = roundId
+ self.rounds = rounds
+ self.roundURL = roundURL
self.timestamp = timestamp
self.messageId = messageId
}
- public var roundId: UInt64
+ public var rounds: [Int]
+ public var roundURL: String
public var timestamp: Int64
public var messageId: Data
}
extension GroupSendReport: Codable {
enum CodingKeys: String, CodingKey {
- case roundId = "RoundID"
+ case rounds = "Rounds"
+ case roundURL = "RoundURL"
case timestamp = "Timestamp"
case messageId = "MessageID"
}
diff --git a/Tests/XXClientTests/Models/GroupSendReportTests.swift b/Tests/XXClientTests/Models/GroupSendReportTests.swift
index b8addf78..552e315c 100644
--- a/Tests/XXClientTests/Models/GroupSendReportTests.swift
+++ b/Tests/XXClientTests/Models/GroupSendReportTests.swift
@@ -4,12 +4,14 @@ import XCTest
final class GroupSendReportTests: XCTestCase {
func testCoding() throws {
- let roundId: UInt64 = 123
- let timestamp: Int64 = 321
- let messageIdB64 = "EB/70R5HYEw5htZ4Hg9ondrn3+cAc/lH2G0mjQMja3w="
+ let rounds: [Int] = [25, 64]
+ let roundURL = "https://dashboard.xx.network/rounds/25?xxmessenger=true"
+ let timestamp: Int64 = 1_662_577_352_813_112_000
+ let messageIdB64 = "69ug6FA50UT2q6MWH3hne9PkHQ+H9DnEDsBhc0m0Aww="
let jsonString = """
{
- "RoundID": \(roundId),
+ "Rounds": [\(rounds.map { "\($0)" }.joined(separator: ", "))],
+ "RoundURL": "\(roundURL)",
"Timestamp": \(timestamp),
"MessageID": "\(messageIdB64)"
}
@@ -18,7 +20,8 @@ final class GroupSendReportTests: XCTestCase {
let model = try GroupSendReport.decode(jsonData)
XCTAssertNoDifference(model, GroupSendReport(
- roundId: roundId,
+ rounds: rounds,
+ roundURL: roundURL,
timestamp: timestamp,
messageId: Data(base64Encoded: messageIdB64)!
))
--
GitLab