resolve property 'config' in closure requires explicit use of 'self' to make capture semantics explicit

megha-iterable · megha-iterable · commit f3a0799ec30f · 2024-10-23T16:03:06.000+05:30
diff --git a/swift-sdk/Internal/InternalIterableAPI.swift b/swift-sdk/Internal/InternalIterableAPI.swift
@@ -147,21 +147,21 @@ final class InternalIterableAPI: NSObject, PushTrackerProtocol, AuthProvider {
         self._email = email
         self._userId = nil
 
-        self.onLogin(authToken) { [weak self]() -> Void in
-            guard let self = self else {
+        self.onLogin(authToken) { [weak self] in
+            guard let config = self?.config else {
                 return
             }
             let merge = identityResolution?.mergeOnAnonymousToKnown ?? config.identityResolution.mergeOnAnonymousToKnown
             let replay = identityResolution?.replayOnVisitorToKnown ?? config.identityResolution.replayOnVisitorToKnown
             if config.enableAnonTracking, let email = email {
-                attemptAndProcessMerge(
+                self?.attemptAndProcessMerge(
                     merge: merge ?? true,
                     replay: replay ?? true,
                     destinationUser: email,
                     isEmail: true,
                     failureHandler: failureHandler
                 )
-                self.localStorage.userIdAnnon = nil
+                self?.localStorage.userIdAnnon = nil
             }
         }
         
@@ -188,15 +188,15 @@ final class InternalIterableAPI: NSObject, PushTrackerProtocol, AuthProvider {
         self._email = nil
         self._userId = userId
         
-        self.onLogin(authToken) { [weak self]() -> Void in
-            guard let self = self else {
+        self.onLogin(authToken) { [weak self] in
+            guard let config = self?.config else {
                 return
             }
             if config.enableAnonTracking {
-                if let userId = userId, userId != localStorage.userIdAnnon {
+                if let userId = userId, userId != (self?.localStorage.userIdAnnon ?? "") {
                     let merge = identityResolution?.mergeOnAnonymousToKnown ?? config.identityResolution.mergeOnAnonymousToKnown
                     let replay = identityResolution?.replayOnVisitorToKnown ?? config.identityResolution.replayOnVisitorToKnown
-                    attemptAndProcessMerge(
+                    self?.attemptAndProcessMerge(
                         merge: merge ?? true,
                         replay: replay ?? true,
                         destinationUser: userId,
@@ -206,7 +206,7 @@ final class InternalIterableAPI: NSObject, PushTrackerProtocol, AuthProvider {
                 }
 
                 if !isAnon {
-                    localStorage.userIdAnnon = nil
+                    self?.localStorage.userIdAnnon = nil
                 }
             }
         }
diff --git a/tests/unit-tests/ComparatorTypeDoesNotEqualMatchTest.swift b/tests/unit-tests/ComparatorTypeDoesNotEqualMatchTest.swift
@@ -254,75 +254,5 @@ final class ComparatorTypeDoesNotEqualMatchTest: XCTestCase {
         XCTAssertEqual(matchedCriteriaId, nil)
     }
 
-
-    private let modeDataDoesNot467 = """
-       {
-         "count": 1,
-         "criteriaSets": [
-                {
-                    "criteriaId": "467",
-                    "name": "Custom event - single primitive",
-                    "createdAt": 1728166585122,
-                    "updatedAt": 1729581351423,
-                    "searchQuery": {
-                        "combinator": "And",
-                        "searchQueries": [
-                            {
-                                "combinator": "And",
-                                "searchQueries": [
-                                    {
-                                        "dataType": "customEvent",
-                                        "searchCombo": {
-                                            "combinator": "And",
-                                            "searchQueries": [
-                                                {
-                                                    "dataType": "customEvent",
-                                                    "field": "eventName",
-                                                    "comparatorType": "Equals",
-                                                    "value": "animal_found",
-                                                    "fieldType": "string"
-                                                },
-                                                {
-                                                    "dataType": "customEvent",
-                                                    "field": "animal_found.count",
-                                                    "comparatorType": "DoesNotEqual",
-                                                    "value": "4",
-                                                    "fieldType": "string"
-                                                }
-                                            ]
-                                        }
-                                    }
-                                ]
-                            }
-                        ]
-                    }
-                }
-            ]
-        }
-"""
-
-    func testCompareDataSuccess467ForLong() {
-
-        let eventItems: [[AnyHashable: Any]] = [[
-                                                 "dataType": "customEvent",
-                                                "eventName": "animal_found",
-                                                 "dataFields":["count": [5,8,9]
-                                                               ]]]
-        let expectedCriteriaId = "467"
-        let matchedCriteriaId = CriteriaCompletionChecker(anonymousCriteria: data(from: modeDataDoesNot467)!, anonymousEvents: eventItems).getMatchedCriteria()
-        XCTAssertEqual(matchedCriteriaId, expectedCriteriaId)
-    }
-
-    func testCompareDataFailed467ForLong() {
-
-        let eventItems: [[AnyHashable: Any]] = [[
-                                                 "dataType": "customEvent",
-                                                "eventName": "animal_found",
-                                                 "dataFields":["count": 4
-                                                               ]]]
-        let matchedCriteriaId = CriteriaCompletionChecker(anonymousCriteria: data(from: modeDataDoesNot467)!, anonymousEvents: eventItems).getMatchedCriteria()
-        XCTAssertEqual(matchedCriteriaId, nil)
-    }
-
 }
 

Original file line number	Diff line number	Diff line change
`@@ -147,21 +147,21 @@ final class InternalIterableAPI: NSObject, PushTrackerProtocol, AuthProvider {`
`147`	`147`	`self._email = email`
`148`	`148`	`self._userId = nil`
`149`	`149`
`150`		`- self.onLogin(authToken) { [weak self]() -> Void in`
`151`		`- guard let self = self else {`
	`150`	`+ self.onLogin(authToken) { [weak self] in`
	`151`	`+ guard let config = self?.config else {`
`152`	`152`	`return`
`153`	`153`	`}`
`154`	`154`	`let merge = identityResolution?.mergeOnAnonymousToKnown ?? config.identityResolution.mergeOnAnonymousToKnown`
`155`	`155`	`let replay = identityResolution?.replayOnVisitorToKnown ?? config.identityResolution.replayOnVisitorToKnown`
`156`	`156`	`if config.enableAnonTracking, let email = email {`
`157`		`- attemptAndProcessMerge(`
	`157`	`+ self?.attemptAndProcessMerge(`
`158`	`158`	`merge: merge ?? true,`
`159`	`159`	`replay: replay ?? true,`
`160`	`160`	`destinationUser: email,`
`161`	`161`	`isEmail: true,`
`162`	`162`	`failureHandler: failureHandler`
`163`	`163`	`)`
`164`		`- self.localStorage.userIdAnnon = nil`
	`164`	`+ self?.localStorage.userIdAnnon = nil`
`165`	`165`	`}`
`166`	`166`	`}`
`167`	`167`
`@@ -188,15 +188,15 @@ final class InternalIterableAPI: NSObject, PushTrackerProtocol, AuthProvider {`
`188`	`188`	`self._email = nil`
`189`	`189`	`self._userId = userId`
`190`	`190`
`191`		`- self.onLogin(authToken) { [weak self]() -> Void in`
`192`		`- guard let self = self else {`
	`191`	`+ self.onLogin(authToken) { [weak self] in`
	`192`	`+ guard let config = self?.config else {`
`193`	`193`	`return`
`194`	`194`	`}`
`195`	`195`	`if config.enableAnonTracking {`
`196`		`- if let userId = userId, userId != localStorage.userIdAnnon {`
	`196`	`+ if let userId = userId, userId != (self?.localStorage.userIdAnnon ?? "") {`
`197`	`197`	`let merge = identityResolution?.mergeOnAnonymousToKnown ?? config.identityResolution.mergeOnAnonymousToKnown`
`198`	`198`	`let replay = identityResolution?.replayOnVisitorToKnown ?? config.identityResolution.replayOnVisitorToKnown`
`199`		`- attemptAndProcessMerge(`
	`199`	`+ self?.attemptAndProcessMerge(`
`200`	`200`	`merge: merge ?? true,`
`201`	`201`	`replay: replay ?? true,`
`202`	`202`	`destinationUser: userId,`
`@@ -206,7 +206,7 @@ final class InternalIterableAPI: NSObject, PushTrackerProtocol, AuthProvider {`
`206`	`206`	`}`
`207`	`207`
`208`	`208`	`if !isAnon {`
`209`		`- localStorage.userIdAnnon = nil`
	`209`	`+ self?.localStorage.userIdAnnon = nil`
`210`	`210`	`}`
`211`	`211`	`}`
`212`	`212`	`}`