extract logic and make functions available in swift

Author: nickolas-dimitrakas

mParticle-Google-Analytics-Firebase-GA4/MPKitFirebaseGA4Analytics.h

@@ -20,6 +20,15 @@
 + (void)setCustomNameStandardization:(NSString * _Nonnull (^_Nullable)(NSString * _Nonnull name))standardization;
 + (NSString * _Nonnull (^_Nullable)(NSString * _Nonnull name))customNameStandardization;
 
+- (nonnull NSDictionary<NSString *, NSString *> *)consentDictionaryForCurrentUser;
+- (NSNumber * _Nullable)resolvedConsentForPurpose:(NSString * _Nullable)purpose
+                                      gdprConsents:(NSDictionary<NSString *, MPGDPRConsent *> * _Nonnull)gdprConsents;
+- (NSNumber * _Nullable)resolvedConsentFromDefault:(NSString * _Nonnull)defaultKey;
+- (NSNumber * _Nullable)resolvedConsentForMappingKey:(NSString * _Nonnull)mappingKey
+                                          defaultKey:(NSString * _Nonnull)defaultKey
+                                        gdprConsents:(NSDictionary<NSString *, MPGDPRConsent *> * _Nonnull)gdprConsents
+                                             mapping:(NSDictionary<NSString *, NSString*> * _Nonnull)mapping;
+
 @end
 
 static NSString * _Nonnull const kMPFIRGA4ExternalUserIdentityType = @"externalUserIdentityType";

mParticle-Google-Analytics-Firebase-GA4/MPKitFirebaseGA4Analytics.m

@@ -387,36 +387,35 @@ - (MPKitExecStatus *)setConsentState:(nullable MPConsentState *)state {
     return [self execStatus:MPKitReturnCodeSuccess];
 }
 
-- (void)updateConsent {
-    NSArray<NSDictionary *> *mappings = [self mappingForKey: @"consentMappingSDK"];
+- (NSDictionary<NSString *, NSString *> *)consentDictionaryForCurrentUser {
+    NSArray<NSDictionary *> *mappings = [self mappingForKey:@"consentMappingSDK"];
     NSDictionary<NSString *, NSString *> *mappingsConfig;
     if (mappings != nil) {
-        mappingsConfig = [self convertToKeyValuePairs: mappings];
+        mappingsConfig = [self convertToKeyValuePairs:mappings];
     }
-    
-    
+
     MParticleUser *currentUser = [[[MParticle sharedInstance] identity] currentUser];
     NSDictionary<NSString *, MPGDPRConsent *> *gdprConsents = currentUser.consentState.gdprConsentState;
 
     NSNumber *adStorage = [self resolvedConsentForMappingKey:kMPFIRGA4AdStorageKey
                                                   defaultKey:kMPFIRGA4DefaultAdStorageKey
                                                 gdprConsents:gdprConsents
-                                              mapping:mappingsConfig];
+                                                     mapping:mappingsConfig];
 
     NSNumber *adUserData = [self resolvedConsentForMappingKey:kMPFIRGA4AdUserDataKey
                                                    defaultKey:kMPFIRGA4DefaultAdUserDataKey
                                                  gdprConsents:gdprConsents
-                                               mapping:mappingsConfig];
+                                                      mapping:mappingsConfig];
 
     NSNumber *analyticsStorage = [self resolvedConsentForMappingKey:kMPFIRGA4AnalyticsStorageKey
                                                          defaultKey:kMPFIRGA4DefaultAnalyticsStorageKey
                                                        gdprConsents:gdprConsents
-                                                     mapping:mappingsConfig];
+                                                            mapping:mappingsConfig];
 
     NSNumber *adPersonalization = [self resolvedConsentForMappingKey:kMPFIRGA4AdPersonalizationKey
                                                           defaultKey:kMPFIRGA4DefaultAdPersonalizationKey
                                                         gdprConsents:gdprConsents
-                                                      mapping:mappingsConfig];
+                                                             mapping:mappingsConfig];
 
     NSMutableDictionary *uploadDict = [NSMutableDictionary dictionary];
 
@@ -432,12 +431,16 @@ - (void)updateConsent {
     if (adPersonalization != nil) {
         uploadDict[FIRConsentTypeAdPersonalization] = adPersonalization.boolValue ? FIRConsentStatusGranted : FIRConsentStatusDenied;
     }
-    
-    
-    // Update consent state with FIRAnalytics
-    [FIRAnalytics setConsent:uploadDict];
+
+    return uploadDict;
 }
 
+- (void)updateConsent {
+    NSDictionary *consentDict = [self consentDictionaryForCurrentUser];
+    [FIRAnalytics setConsent:consentDict];
+}
+
+
 - (NSString *)getEventNameForCommerceEvent:(MPCommerceEvent *)commerceEvent parameters:(NSDictionary<NSString *, id> *)parameters {
     switch (commerceEvent.action) {
         case MPCommerceEventActionAddToCart:
@@ -673,16 +676,24 @@ - (NSNumber * _Nullable)resolvedConsentForMappingKey:(NSString *)mappingKey
                                         gdprConsents:(NSDictionary<NSString *, MPGDPRConsent *> *)gdprConsents
                                       mapping:(NSDictionary<NSString *, NSString*> *) mapping {
 
-    // Prefer mParticle Consent if available
     NSString *purpose = mapping[mappingKey];
-    if (purpose) {
-        MPGDPRConsent *consent = gdprConsents[purpose];
-        if (consent) {
-            return @(consent.consented);
-        }
+    NSNumber *consent = [self resolvedConsentForPurpose:purpose gdprConsents:gdprConsents];
+    if (consent) {
+        return consent;
     }
+    return [self resolvedConsentFromDefault:defaultKey];
+}
+
+- (NSNumber * _Nullable)resolvedConsentForPurpose:(NSString *)purpose
+                                      gdprConsents:(NSDictionary<NSString *, MPGDPRConsent *> *)gdprConsents {
+    MPGDPRConsent *consent = gdprConsents[purpose];
+    if (consent) {
+        return @(consent.consented);
+    }
+    return nil;
+}
 
-    // Fallback to configuration defaults
+- (NSNumber * _Nullable)resolvedConsentFromDefault:(NSString *)defaultKey {
     NSString *value = self->_configuration[defaultKey];
     if ([value isEqualToString:@"Granted"]) {
         return @(YES);