Add date range to custom report

Author: mihai8804858

Sources/Core/Models/Codable/CustomReport.swift

@@ -44,6 +44,10 @@ public struct CustomReport: Codable, Hashable, Sendable, CodingKeysContaining, I
     public let startTime: Date?
     /// The end time of the report. The format is YYYY-MM-DD, such as 2024-06-30.
     public let endTime: Date?
+    /// The date range of the report.
+    ///
+    /// A date range is required only when using `WEEKLY` granularity in Impression Share Report.
+    public let dateRange: CustomReportDateRange?
     /// The timestamp for the creation of the report.
     public let creationTime: Date?
     /// The most recent timestamp of report modifications
@@ -75,6 +79,7 @@ public struct CustomReport: Codable, Hashable, Sendable, CodingKeysContaining, I
         state: State? = nil,
         startTime: Date? = nil,
         endTime: Date? = nil,
+        dateRange: CustomReportDateRange? = nil,
         creationTime: Date? = nil,
         modificationTime: Date? = nil,
         granularity: CustomReportGranularity? = nil,
@@ -88,6 +93,7 @@ public struct CustomReport: Codable, Hashable, Sendable, CodingKeysContaining, I
         self.state = state
         self.startTime = startTime
         self.endTime = endTime
+        self.dateRange = dateRange
         self.creationTime = creationTime
         self.modificationTime = modificationTime
         self.granularity = granularity
@@ -103,6 +109,7 @@ public struct CustomReport: Codable, Hashable, Sendable, CodingKeysContaining, I
         case state
         case startTime
         case endTime
+        case dateRange
         case creationTime
         case modificationTime
         case granularity
@@ -122,6 +129,7 @@ public struct CustomReport: Codable, Hashable, Sendable, CodingKeysContaining, I
         state = try container.decodeIfPresent(CustomReport.State.self, forKey: .state)
         startTime = try container.decodeIfPresent(String.self, forKey: .startTime).flatMap(formatter.date(from:))
         endTime = try container.decodeIfPresent(String.self, forKey: .endTime).flatMap(formatter.date(from:))
+        dateRange = try container.decodeIfPresent(CustomReportDateRange.self, forKey: .dateRange)
         creationTime = try container.decodeIfPresent(Date.self, forKey: .creationTime)
         modificationTime = try container.decodeIfPresent(Date.self, forKey: .modificationTime)
         granularity = try container.decodeIfPresent(CustomReportGranularity.self, forKey: .granularity)
@@ -137,6 +145,7 @@ public struct CustomReport: Codable, Hashable, Sendable, CodingKeysContaining, I
         try container.encodeIfPresent(id, forKey: .id)
         try container.encodeIfPresent(name, forKey: .name)
         try container.encodeIfPresent(state, forKey: .state)
+        try container.encodeIfPresent(dateRange, forKey: .dateRange)
         try container.encodeIfPresent(creationTime, forKey: .creationTime)
         try container.encodeIfPresent(modificationTime, forKey: .modificationTime)
         try container.encodeIfPresent(granularity, forKey: .granularity)

Sources/Core/Models/Codable/CustomReportDateRange.swift

@@ -0,0 +1,6 @@
+/// The date range of the report request.
+public enum CustomReportDateRange: String, Codable, Hashable, Sendable {
+    case lastWeek = "LAST_WEEK"
+    case last2Weeks = "LAST_2_WEEKS"
+    case last4Weeks = "LAST_4_WEEKS"
+}

Sources/Core/Models/Codable/CustomReportRequest.swift

@@ -2,13 +2,6 @@ import Foundation
 
 /// The Impression Share report request body.
 public struct CustomReportRequest: Codable, Hashable, Sendable {
-    /// The date range of the report request.
-    public enum DateRange: String, Codable, Hashable, Sendable {
-        case lastWeek = "LAST_WEEK"
-        case last2Weeks = "LAST_2_WEEKS"
-        case last4Weeks = "LAST_4_WEEKS"
-    }
-
     /// A free-text field. The maximum length is 50 characters.
     public let name: String
     /// The start time of the report. The format is YYYY-MM-DD, such as 2024-06-01.
@@ -18,7 +11,7 @@ public struct CustomReportRequest: Codable, Hashable, Sendable {
     /// The date range of the report request.
     ///
     /// A date range is required only when using `WEEKLY` granularity in Impression Share Report.
-    public let dateRange: DateRange?
+    public let dateRange: CustomReportDateRange?
     /// The report data organized by day or week.
     ///
     /// Impression Share reports with a `WEEKLY` granularity value can’t have
@@ -35,7 +28,7 @@ public struct CustomReportRequest: Codable, Hashable, Sendable {
         name: String,
         startTime: Date? = nil,
         endTime: Date? = nil,
-        dateRange: DateRange? = nil,
+        dateRange: CustomReportDateRange? = nil,
         granularity: CustomReportGranularity? = nil,
         selector: CustomReportSelector? = nil
     ) {
@@ -62,7 +55,7 @@ public struct CustomReportRequest: Codable, Hashable, Sendable {
         name = try container.decode(String.self, forKey: .name)
         startTime = try container.decodeIfPresent(String.self, forKey: .startTime).flatMap(formatter.date(from:))
         endTime = try container.decodeIfPresent(String.self, forKey: .endTime).flatMap(formatter.date(from:))
-        dateRange = try container.decodeIfPresent(CustomReportRequest.DateRange.self, forKey: .dateRange)
+        dateRange = try container.decodeIfPresent(CustomReportDateRange.self, forKey: .dateRange)
         granularity = try container.decodeIfPresent(CustomReportGranularity.self, forKey: .granularity)
         selector = try container.decodeIfPresent(CustomReportSelector.self, forKey: .selector)
     }