Write up ported class

firebase · Dec 3, 2024 · e6822a5 · e6822a5
1 parent 97cfe7e
commit e6822a5
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 26 deletions.
diff --git a/FirebaseABTesting/Sources/ABTExperimentPayload.m b/FirebaseABTesting/Sources/ABTExperimentPayload.m
@@ -14,6 +14,8 @@
 
 #import "FirebaseABTesting/Sources/Private/ABTExperimentPayload.h"
 
+#import "FirebaseABTesting/Sources/Public/FirebaseABTesting/FIRExperimentController.h"
+
 static NSString *const kExperimentPayloadKeyExperimentID = @"experimentId";
 static NSString *const kExperimentPayloadKeyVariantID = @"variantId";
 

diff --git a/FirebaseABTesting/Sources/Private/ABTExperimentPayload.h b/FirebaseABTesting/Sources/Private/ABTExperimentPayload.h
@@ -14,16 +14,9 @@
 
 #import <Foundation/Foundation.h>
 
-NS_ASSUME_NONNULL_BEGIN
+#import "FirebaseABTesting/Sources/Public/FirebaseABTesting/FIRExperimentController.h"
 
-/// Policy for handling the case where there's an overflow of experiments for an installation
-/// instance.
-typedef NS_ENUM(int32_t, ABTExperimentPayloadExperimentOverflowPolicy) {
-  ABTExperimentPayloadExperimentOverflowPolicyUnrecognizedValue = 999,
-  ABTExperimentPayloadExperimentOverflowPolicyUnspecified = 0,
-  ABTExperimentPayloadExperimentOverflowPolicyDiscardOldest = 1,
-  ABTExperimentPayloadExperimentOverflowPolicyIgnoreNewest = 2,
-};
+NS_ASSUME_NONNULL_BEGIN
 
 @interface ABTExperimentLite : NSObject
 @property(nonatomic, readonly, copy) NSString *experimentId;

diff --git a/FirebaseABTesting/Sources/Public/FirebaseABTesting/FIRExperimentController.h b/FirebaseABTesting/Sources/Public/FirebaseABTesting/FIRExperimentController.h
@@ -14,15 +14,21 @@
 
 #import <Foundation/Foundation.h>
 
+#import "FIRLifecycleEvents.h"
+
 @class ABTExperimentPayload;
 
-// Forward declaration to avoid importing into the module header
-typedef NS_ENUM(int32_t, ABTExperimentPayloadExperimentOverflowPolicy);
+/// Policy for handling the case where there's an overflow of experiments for an installation
+/// instance.
+typedef NS_ENUM(int32_t, ABTExperimentPayloadExperimentOverflowPolicy) {
+  ABTExperimentPayloadExperimentOverflowPolicyUnrecognizedValue = 999,
+  ABTExperimentPayloadExperimentOverflowPolicyUnspecified = 0,
+  ABTExperimentPayloadExperimentOverflowPolicyDiscardOldest = 1,
+  ABTExperimentPayloadExperimentOverflowPolicyIgnoreNewest = 2,
+};
 
 NS_ASSUME_NONNULL_BEGIN
 
-@class FIRLifecycleEvents;
-
 /// The default experiment overflow policy, that is to discard the experiment with the oldest start
 /// time when users start the experiment on the web console.
 extern const ABTExperimentPayloadExperimentOverflowPolicy FIRDefaultExperimentOverflowPolicy;

diff --git a/FirebaseRemoteConfig/Sources/FIRRemoteConfig.m b/FirebaseRemoteConfig/Sources/FIRRemoteConfig.m
@@ -23,7 +23,6 @@
 #import "FirebaseRemoteConfig/Sources/Private/RCNConfigFetch.h"
 #import "FirebaseRemoteConfig/Sources/Private/RCNConfigSettings.h"
 #import "FirebaseRemoteConfig/Sources/RCNConfigConstants.h"
-#import "FirebaseRemoteConfig/Sources/RCNConfigExperiment.h"
 #import "FirebaseRemoteConfig/Sources/RCNConfigRealtime.h"
 #import "FirebaseRemoteConfig/Sources/RCNConfigValue_Internal.h"
 #import "FirebaseRemoteConfig/Sources/RCNPersonalization.h"

diff --git a/FirebaseRemoteConfig/Sources/RCNConfigFetch.m b/FirebaseRemoteConfig/Sources/RCNConfigFetch.m
@@ -22,7 +22,6 @@
 #import "FirebaseInstallations/Source/Library/Private/FirebaseInstallationsInternal.h"
 #import "FirebaseRemoteConfig/Sources/Private/RCNConfigSettings.h"
 #import "FirebaseRemoteConfig/Sources/RCNConfigConstants.h"
-#import "FirebaseRemoteConfig/Sources/RCNConfigExperiment.h"
 
 #import "FirebaseRemoteConfig/FirebaseRemoteConfig-Swift.h"
 

diff --git a/FirebaseRemoteConfig/SwiftNew/ConfigExperiment.swift b/FirebaseRemoteConfig/SwiftNew/ConfigExperiment.swift
@@ -16,7 +16,7 @@ import FirebaseABTesting
 import Foundation
 
 /// Handles experiment information update and persistence.
-/*@objc(RCNConfigExperiment)*/ open class ConfigExperiment: NSObject {
+@objc(RCNConfigExperiment) public class ConfigExperiment: NSObject {
   private static let experimentMetadataKeyLastStartTime = "last_experiment_start_time"
   private static let serviceOrigin = "frc"
 
@@ -28,19 +28,17 @@ import Foundation
   private let experimentStartTimeDateFormatter: DateFormatter
 
   /// Designated initializer;
-  public init(DBManager: ConfigDBManager?,
-              experimentController controller: ExperimentController?) {
+  @objc public init(DBManager: ConfigDBManager?,
+                    experimentController controller: ExperimentController?) {
     experimentPayloads = []
     experimentMetadata = [:]
     activeExperimentPayloads = []
     experimentStartTimeDateFormatter = {
       let dateFormatter = DateFormatter()
       dateFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"
-      dateFormatter.timeZone = TimeZone(secondsFromGMT: 0)
       // Locale needs to be hardcoded. See
       // https://developer.apple.com/library/ios/#qa/qa1480/_index.html for more details.
       dateFormatter.locale = Locale(identifier: "en_US_POSIX")
-      // TODO(ncooke3): Trace back and see why timeZone is set twice.
       dateFormatter.timeZone = TimeZone(abbreviation: "UTC")
       return dateFormatter
     }()
@@ -98,7 +96,7 @@ import Foundation
   }
 
   /// Update/Persist experiment information from config fetch response.
-  open func updateExperiments(withResponse response: [[String: Any]]?) {
+  @objc public func updateExperiments(withResponse response: [[String: Any]]?) {
     // Cache fetched experiment payloads.
     experimentPayloads.removeAll()
     dbManager?.deleteExperimentTable(forKey: ConfigConstants.experimentTableKeyPayload)
@@ -121,7 +119,7 @@ import Foundation
   }
 
   /// Update experiments to Firebase Analytics when `activateWithCompletion:` happens.
-  open func updateExperiments(handler: (((any Error)?) -> Void)? = nil) {
+  @objc public func updateExperiments(handler: (((any Error)?) -> Void)? = nil) {
     let lifecycleEvent = LifecycleEvents()
 
     // Get the last experiment start time prior to the latest payload.
@@ -134,7 +132,7 @@ import Foundation
         withServiceOrigin: Self.serviceOrigin,
         events: lifecycleEvent,
         policy: .discardOldest,
-        lastStartTime: lastStartTime,
+        lastStartTime: lastStartTime ?? 0,
         payloads: experimentPayloads,
         completionHandler: handler
       )

diff --git a/FirebaseRemoteConfig/Tests/Unit/RCNConfigExperimentTest.m b/FirebaseRemoteConfig/Tests/Unit/RCNConfigExperimentTest.m
@@ -19,8 +19,6 @@
 
 @import FirebaseRemoteConfig;
 
-#import "FirebaseRemoteConfig/Sources/RCNConfigExperiment.h"
-
 #import "FirebaseRemoteConfig/Sources/Private/RCNConfigSettings.h"
 #import "FirebaseRemoteConfig/Sources/Public/FirebaseRemoteConfig/FIRRemoteConfig.h"
 #import "FirebaseRemoteConfig/Sources/RCNConfigDefines.h"
@@ -31,6 +29,8 @@
 
 #import "Interop/Analytics/Public/FIRAnalyticsInterop.h"
 
+#import "FirebaseRemoteConfig/FirebaseRemoteConfig-Swift.h"
+
 // Surface the internal FIRExperimentController initializer.
 @interface FIRExperimentController ()
 - (instancetype)initWithAnalytics:(nullable id<FIRAnalyticsInterop>)analytics;

diff --git a/FirebaseRemoteConfig/Tests/Unit/RCNRemoteConfigTest.m b/FirebaseRemoteConfig/Tests/Unit/RCNRemoteConfigTest.m
@@ -25,7 +25,6 @@
 #import "FirebaseRemoteConfig/Sources/Private/RCNConfigFetch.h"
 #import "FirebaseRemoteConfig/Sources/Public/FirebaseRemoteConfig/FIRRemoteConfig.h"
 #import "FirebaseRemoteConfig/Sources/RCNConfigConstants.h"
-#import "FirebaseRemoteConfig/Sources/RCNConfigExperiment.h"
 #import "FirebaseRemoteConfig/Sources/RCNConfigRealtime.h"
 
 #import "FirebaseRemoteConfig/Tests/Unit/RCNTestUtilities.h"