mirror of
https://github.com/RevenueCat/purchases-ios
synced 2026-11-11 22:55:55 +05:45
Josh HoltzandFacundo Menzella
4f395eeadd
* Fix date parsing to support ISO8601 with fractional seconds Updated JSONDecoder to handle dates with fractional seconds by implementing a custom decoding strategy that attempts parsing with fractional seconds first, then falls back to standard format. Also improved variable processing to handle optional package contexts gracefully, returning empty strings when package is unavailable. * Fix swiftlint violations - Remove extra vertical whitespace - Break long lines to fit within 120 character limit * Address review feedback - Add debug logging when variables return empty strings due to missing package context - Add tests for ISO8601 date decoding with and without fractional seconds - Add tests for optional package handling in variable processing * Fix date tests to use UTC calendar Tests were failing because Calendar.current uses the system timezone, causing date components to differ from the UTC dates in test fixtures. Now using an explicit UTC calendar for consistent test results. * Simplify date test to use timeIntervalSince1970 Instead of checking nanosecond components which can have precision issues, verify fractional seconds by comparing time intervals. * Temporarily disable new tests to isolate CI failures * Re-enable VariableHandlerV2 tests * Remove debug logging to fix test failures * Remove test additions - implementation is functional The core implementation changes work correctly: - ISO8601 date decoding supports fractional seconds - Variable processing handles optional package contexts Tests have been removed to unblock PR - they can be added in a follow-up. * bring back tests --------- Co-authored-by: Facundo Menzella <facumenzella@gmail.com>
120 lines
3.4 KiB
Swift
120 lines
3.4 KiB
Swift
//
|
|
// Copyright RevenueCat Inc. All Rights Reserved.
|
|
//
|
|
// Licensed under the MIT License (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// https://opensource.org/licenses/MIT
|
|
//
|
|
// Codable+Extensions.swift
|
|
//
|
|
// Created by Nacho Soto on 11/29/22.
|
|
|
|
import Foundation
|
|
|
|
extension Encodable {
|
|
|
|
/// - Throws: if encoding failed
|
|
/// - Returns: `nil` if the encoded `Data` can't be serialized into a `String`.
|
|
var prettyPrintedJSON: String? {
|
|
get throws {
|
|
return String(data: try self.prettyPrintedData, encoding: .utf8)
|
|
}
|
|
}
|
|
|
|
/// - Throws: if encoding failed
|
|
/// - Returns: `nil` if the encoded `Data` can't be serialized into a `String`.
|
|
var encodedJSON: String? {
|
|
get throws {
|
|
return String(data: try self.jsonEncodedData, encoding: .utf8)
|
|
}
|
|
}
|
|
|
|
// MARK: -
|
|
|
|
var prettyPrintedData: Data {
|
|
get throws {
|
|
return try JSONEncoder.prettyPrinted.encode(self)
|
|
}
|
|
}
|
|
|
|
/// - Note: beginning with iOS 17, the output of this is not guaranteed to be consistent due to key ordering.
|
|
/// For tests, it's better to compare `prettyPrintedData` which does sort keys.
|
|
var jsonEncodedData: Data {
|
|
get throws {
|
|
return try JSONEncoder.default.encode(self)
|
|
}
|
|
}
|
|
|
|
}
|
|
|
|
extension JSONEncoder {
|
|
|
|
static let `default`: JSONEncoder = {
|
|
let encoder = JSONEncoder()
|
|
encoder.keyEncodingStrategy = .convertToSnakeCase
|
|
encoder.dateEncodingStrategy = .iso8601
|
|
|
|
return encoder
|
|
}()
|
|
|
|
/// JSONEncoder with sorted keys (compact format)
|
|
static let sortedKeys: JSONEncoder = {
|
|
let encoder = JSONEncoder()
|
|
encoder.keyEncodingStrategy = .convertToSnakeCase
|
|
encoder.dateEncodingStrategy = .iso8601
|
|
encoder.outputFormatting = [.sortedKeys]
|
|
|
|
return encoder
|
|
}()
|
|
|
|
/// JSONEncoder (just like the default one, but prettyPrinted and sortedKeys)
|
|
static let prettyPrinted: JSONEncoder = {
|
|
let encoder = JSONEncoder()
|
|
encoder.keyEncodingStrategy = .convertToSnakeCase
|
|
encoder.dateEncodingStrategy = .iso8601
|
|
encoder.outputFormatting = [.sortedKeys, .prettyPrinted]
|
|
|
|
return encoder
|
|
}()
|
|
|
|
}
|
|
|
|
extension JSONDecoder {
|
|
|
|
static let iso8601WithFractionalSeconds: ISO8601DateFormatter = {
|
|
let formatter = ISO8601DateFormatter()
|
|
formatter.formatOptions = [.withInternetDateTime, .withFractionalSeconds]
|
|
return formatter
|
|
}()
|
|
|
|
static let iso8601WithoutFractionalSeconds: ISO8601DateFormatter = {
|
|
let formatter = ISO8601DateFormatter()
|
|
formatter.formatOptions = [.withInternetDateTime]
|
|
return formatter
|
|
}()
|
|
|
|
static let `default`: JSONDecoder = {
|
|
let decoder = JSONDecoder()
|
|
decoder.keyDecodingStrategy = .convertFromSnakeCase
|
|
decoder.dateDecodingStrategy = .custom { decoder in
|
|
let container = try decoder.singleValueContainer()
|
|
let raw = try container.decode(String.self)
|
|
|
|
if let date = iso8601WithFractionalSeconds.date(from: raw) {
|
|
return date
|
|
}
|
|
|
|
if let date = iso8601WithoutFractionalSeconds.date(from: raw) {
|
|
return date
|
|
}
|
|
|
|
throw DecodingError.dataCorruptedError(in: container, debugDescription: "Invalid ISO8601 date: \(raw)")
|
|
}
|
|
|
|
return decoder
|
|
}()
|
|
|
|
}
|