Skip to content

Commit e7d04d2

Browse files
evantk91evantk91
authored
Merge pull request #857 from Iterable/evan/MOB-10093-final-cleanup
[MOB-10093] final cleanup
2 parents 1d56e8a + 9e05993 commit e7d04d2

8 files changed

+98
-58
lines changed

‎swift-sdk/Internal/InternalIterableAPI.swift

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ final class InternalIterableAPI: NSObject, PushTrackerProtocol, AuthProvider {
153153
}
154154
let merge = identityResolution?.mergeOnAnonymousToKnown ?? config.identityResolution.mergeOnAnonymousToKnown
155155
let replay = identityResolution?.replayOnVisitorToKnown ?? config.identityResolution.replayOnVisitorToKnown
156-
if config.enableAnonTracking, let email = email {
156+
if config.enableAnonActivation, let email = email {
157157
self?.attemptAndProcessMerge(
158158
merge: merge ?? true,
159159
replay: replay ?? true,
@@ -192,7 +192,7 @@ final class InternalIterableAPI: NSObject, PushTrackerProtocol, AuthProvider {
192192
guard let config = self?.config else {
193193
return
194194
}
195-
if config.enableAnonTracking {
195+
if config.enableAnonActivation {
196196
if let userId = userId, userId != (self?.localStorage.userIdAnnon ?? "") {
197197
let merge = identityResolution?.mergeOnAnonymousToKnown ?? config.identityResolution.mergeOnAnonymousToKnown
198198
let replay = identityResolution?.replayOnVisitorToKnown ?? config.identityResolution.replayOnVisitorToKnown
@@ -242,7 +242,7 @@ final class InternalIterableAPI: NSObject, PushTrackerProtocol, AuthProvider {
242242
self.localStorage.anonymousUserUpdate = nil
243243
self.localStorage.userIdAnnon = nil
244244

245-
if isVisitorUsageTracked && config.enableAnonTracking {
245+
if isVisitorUsageTracked && config.enableAnonActivation {
246246
ITBInfo("CONSENT GIVEN and ANON TRACKING ENABLED - Criteria fetched")
247247
self.anonymousUserManager.getAnonCriteria()
248248
self.anonymousUserManager.updateAnonSession()
@@ -268,7 +268,7 @@ final class InternalIterableAPI: NSObject, PushTrackerProtocol, AuthProvider {
268268
}
269269

270270
if !isEitherUserIdOrEmailSet() && localStorage.userIdAnnon == nil {
271-
if config.enableAnonTracking {
271+
if config.enableAnonActivation {
272272
anonymousUserManager.trackAnonTokenRegistration(token: token.hexString())
273273
}
274274
onFailure?("Iterable SDK must be initialized with an API key and user email/userId before calling SDK methods", nil)
@@ -330,7 +330,7 @@ final class InternalIterableAPI: NSObject, PushTrackerProtocol, AuthProvider {
330330
onSuccess: OnSuccessHandler? = nil,
331331
onFailure: OnFailureHandler? = nil) -> Pending<SendRequestValue, SendRequestError> {
332332
if !isEitherUserIdOrEmailSet() && localStorage.userIdAnnon == nil {
333-
if config.enableAnonTracking {
333+
if config.enableAnonActivation {
334334
ITBInfo("AUT ENABLED - anon update user")
335335
anonymousUserManager.trackAnonUpdateUser(dataFields)
336336
}
@@ -362,7 +362,7 @@ final class InternalIterableAPI: NSObject, PushTrackerProtocol, AuthProvider {
362362
onSuccess: OnSuccessHandler? = nil,
363363
onFailure: OnFailureHandler? = nil) -> Pending<SendRequestValue, SendRequestError> {
364364
if !isEitherUserIdOrEmailSet() && localStorage.userIdAnnon == nil {
365-
if config.enableAnonTracking {
365+
if config.enableAnonActivation {
366366
ITBInfo("AUT ENABLED - anon update cart")
367367
anonymousUserManager.trackAnonUpdateCart(items: items)
368368
}
@@ -395,7 +395,7 @@ final class InternalIterableAPI: NSObject, PushTrackerProtocol, AuthProvider {
395395
onSuccess: OnSuccessHandler? = nil,
396396
onFailure: OnFailureHandler? = nil) -> Pending<SendRequestValue, SendRequestError> {
397397
if !isEitherUserIdOrEmailSet() {
398-
if config.enableAnonTracking {
398+
if config.enableAnonActivation {
399399
ITBInfo("AUT ENABLED - anon track purchase")
400400
anonymousUserManager.trackAnonPurchaseEvent(total: total, items: items, dataFields: dataFields)
401401
}
@@ -469,7 +469,7 @@ final class InternalIterableAPI: NSObject, PushTrackerProtocol, AuthProvider {
469469
onSuccess: OnSuccessHandler? = nil,
470470
onFailure: OnFailureHandler? = nil) -> Pending<SendRequestValue, SendRequestError> {
471471
if !isEitherUserIdOrEmailSet() && localStorage.userIdAnnon == nil {
472-
if config.enableAnonTracking {
472+
if config.enableAnonActivation {
473473
ITBInfo("AUT ENABLED - anon track custom event")
474474
anonymousUserManager.trackAnonEvent(name: eventName, dataFields: dataFields)
475475
}

‎swift-sdk/IterableAPI.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ import UIKit
126126
callback?(false)
127127
}
128128

129-
if let implementation, config.enableAnonTracking, !implementation.isSDKInitialized(), implementation.getVisitorUsageTracked() {
129+
if let implementation, config.enableAnonActivation, !implementation.isSDKInitialized(), implementation.getVisitorUsageTracked() {
130130
ITBInfo("AUT ENABLED AND CONSENT GIVEN - Criteria fetched")
131131
implementation.anonymousUserManager.getAnonCriteria()
132132
implementation.anonymousUserManager.updateAnonSession()

‎swift-sdk/IterableConfig.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ public class IterableConfig: NSObject {
141141
public var dataRegion: String = IterableDataRegion.US
142142

143143
/// When set to `true`, IterableSDK will track all events when users are not logged into the application.
144-
public var enableAnonTracking = true
144+
public var enableAnonActivation = true
145145
/// Allows for fetching embedded messages.
146146
public var enableEmbeddedMessaging = false
147147

‎tests/unit-tests/DataTypeComparatorSearchQueryCriteria.swift

Lines changed: 64 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,12 @@ final class DataTypeComparatorSearchQueryCriteria: XCTestCase {
8383
func testCompareDataEqualSuccess() {
8484

8585
let eventItems: [[AnyHashable: Any]] = [["dataType":"user",
86-
"dataFields":["savings": 19.99, "eventTimeStamp": 3,
87-
"likes_boba": true,
88-
"country":"Chaina"]]]
86+
"dataFields":[
87+
"savings": 19.99,
88+
"eventTimeStamp": 3,
89+
"likes_boba": true,
90+
"country":"Chaina"]
91+
]]
8992

9093
let expectedCriteriaId = "285"
9194

@@ -98,9 +101,12 @@ final class DataTypeComparatorSearchQueryCriteria: XCTestCase {
98101
//let eventItems: [[AnyHashable: Any]] = [["dataType":"user","savings": 10.1]]
99102

100103
let eventItems: [[AnyHashable: Any]] = [["dataType":"user",
101-
"dataFields":["savings": 10.99, "eventTimeStamp": 30,
102-
"likes_boba": false,
103-
"country":"Taiwan"]]]
104+
"dataFields":[
105+
"savings": 10.99,
106+
"eventTimeStamp": 30,
107+
"likes_boba": false,
108+
"country":"Taiwan"]
109+
]]
104110

105111
let matchedCriteriaId = CriteriaCompletionChecker(anonymousCriteria: data(from: mockDataEqual)!, anonymousEvents: eventItems).getMatchedCriteria()
106112
XCTAssertEqual(matchedCriteriaId, nil)
@@ -164,8 +170,10 @@ final class DataTypeComparatorSearchQueryCriteria: XCTestCase {
164170
func testCompareDataDoesNotEqualSuccess() {
165171

166172
let eventItems: [[AnyHashable: Any]] = [["dataType":"user",
167-
"dataFields":["savings": 11.2, "eventTimeStamp": 30,
168-
"likes_boba": false]
173+
"dataFields":[
174+
"savings": 11.2,
175+
"eventTimeStamp": 30,
176+
"likes_boba": false]
169177
]]
170178
let expectedCriteriaId = "285"
171179

@@ -176,8 +184,11 @@ final class DataTypeComparatorSearchQueryCriteria: XCTestCase {
176184
func testCompareDataDoesNotEqualFailed() {
177185

178186
let eventItems: [[AnyHashable: Any]] = [["dataType":"user",
179-
"dataFields":["savings": 19.99, "eventTimeStamp": 30,
180-
"likes_boba": true]]]
187+
"dataFields":[
188+
"savings": 19.99,
189+
"eventTimeStamp": 30,
190+
"likes_boba": true]
191+
]]
181192
let matchedCriteriaId = CriteriaCompletionChecker(anonymousCriteria: data(from: mockDataDoesNotEquals)!, anonymousEvents: eventItems).getMatchedCriteria()
182193
XCTAssertEqual(matchedCriteriaId, nil)
183194
}
@@ -271,7 +282,9 @@ final class DataTypeComparatorSearchQueryCriteria: XCTestCase {
271282
func testCompareDataLessThanSuccess() {
272283

273284
let eventItems: [[AnyHashable: Any]] = [["dataType":"user",
274-
"dataFields":["savings": 10, "eventTimeStamp": 14]
285+
"dataFields":[
286+
"savings": 10,
287+
"eventTimeStamp": 14]
275288
]]
276289
let expectedCriteriaId = "289"
277290

@@ -282,15 +295,21 @@ final class DataTypeComparatorSearchQueryCriteria: XCTestCase {
282295
func testCompareDataLessThanFailed() {
283296

284297
let eventItems: [[AnyHashable: Any]] = [["dataType":"user",
285-
"dataFields":["savings": 18, "eventTimeStamp": 18]]]
298+
"dataFields":[
299+
"savings": 18,
300+
"eventTimeStamp": 18]
301+
]]
286302
let matchedCriteriaId = CriteriaCompletionChecker(anonymousCriteria: data(from: mockDataLessThanOrEqual)!, anonymousEvents: eventItems).getMatchedCriteria()
287303
XCTAssertEqual(matchedCriteriaId, nil)
288304
}
289305

290306
func testCompareDataLessThanOrEqualSuccess() {
291307

292308
let eventItems: [[AnyHashable: Any]] = [["dataType":"user",
293-
"dataFields":["savings": 17, "eventTimeStamp": 14]]]
309+
"dataFields":[
310+
"savings": 17,
311+
"eventTimeStamp": 14]
312+
]]
294313
let expectedCriteriaId = "290"
295314

296315
let matchedCriteriaId = CriteriaCompletionChecker(anonymousCriteria: data(from: mockDataLessThanOrEqual)!, anonymousEvents: eventItems).getMatchedCriteria()
@@ -300,7 +319,10 @@ final class DataTypeComparatorSearchQueryCriteria: XCTestCase {
300319
func testCompareDataLessThanOrEqualFailed() {
301320

302321
let eventItems: [[AnyHashable: Any]] = [["dataType":"user",
303-
"dataFields":["savings": 18, "eventTimeStamp": 12]]]
322+
"dataFields":[
323+
"savings": 18,
324+
"eventTimeStamp": 12]
325+
]]
304326
let matchedCriteriaId = CriteriaCompletionChecker(anonymousCriteria: data(from: mockDataLessThanOrEqual)!, anonymousEvents: eventItems).getMatchedCriteria()
305327
XCTAssertEqual(matchedCriteriaId, nil)
306328
}
@@ -394,7 +416,10 @@ final class DataTypeComparatorSearchQueryCriteria: XCTestCase {
394416
func testCompareDataGreaterThanSuccess() {
395417

396418
let eventItems: [[AnyHashable: Any]] = [["dataType":"user",
397-
"dataFields":["savings": 56, "eventTimeStamp": 51]]]
419+
"dataFields":[
420+
"savings": 56,
421+
"eventTimeStamp": 51]
422+
]]
398423
let expectedCriteriaId = "290"
399424

400425
let matchedCriteriaId = CriteriaCompletionChecker(anonymousCriteria: data(from: mockDataGreaterThanOrEqual)!, anonymousEvents: eventItems).getMatchedCriteria()
@@ -404,23 +429,32 @@ final class DataTypeComparatorSearchQueryCriteria: XCTestCase {
404429
func testCompareDataGreaterThanFailed() {
405430

406431
let eventItems: [[AnyHashable: Any]] = [["dataType":"user",
407-
"dataFields":["savings": 5, "eventTimeStamp": 3]]]
432+
"dataFields":[
433+
"savings": 5,
434+
"eventTimeStamp": 3]
435+
]]
408436
let matchedCriteriaId = CriteriaCompletionChecker(anonymousCriteria: data(from: mockDataGreaterThanOrEqual)!, anonymousEvents: eventItems).getMatchedCriteria()
409437
XCTAssertEqual(matchedCriteriaId, nil)
410438
}
411439

412440
func testCompareDataGreaterThanOrEqualSuccess() {
413441

414442
let eventItems: [[AnyHashable: Any]] = [["dataType": "user",
415-
"dataFields":["savings": 20, "eventTimeStamp": 30]]]
443+
"dataFields":[
444+
"savings": 20,
445+
"eventTimeStamp": 30]
446+
]]
416447
let expectedCriteriaId = "291"
417448
let matchedCriteriaId = CriteriaCompletionChecker(anonymousCriteria: data(from: mockDataGreaterThanOrEqual)!, anonymousEvents: eventItems).getMatchedCriteria()
418449
XCTAssertEqual(matchedCriteriaId, expectedCriteriaId)
419450
}
420451

421452
func testCompareDataGreaterThanOrEqualFailed() {
422453
let eventItems: [[AnyHashable: Any]] = [["dataType":"user",
423-
"dataFields":["savings": 18, "eventTimeStamp":16]]]
454+
"dataFields":[
455+
"savings": 18,
456+
"eventTimeStamp":16]
457+
]]
424458
let matchedCriteriaId = CriteriaCompletionChecker(anonymousCriteria: data(from: mockDataGreaterThanOrEqual)!, anonymousEvents: eventItems).getMatchedCriteria()
425459
XCTAssertEqual(matchedCriteriaId, nil)
426460
}
@@ -489,19 +523,25 @@ final class DataTypeComparatorSearchQueryCriteria: XCTestCase {
489523

490524
func testCompareDataIsSetySuccess() {
491525
let eventItems: [[AnyHashable: Any]] = [["dataType":"user",
492-
"dataFields":["savings": 10, "eventTimeStamp":20,
493-
"saved_cars":"10",
494-
"country": "Taiwan"]]]
526+
"dataFields":[
527+
"savings": 10,
528+
"eventTimeStamp":20,
529+
"saved_cars":"10",
530+
"country": "Taiwan"]
531+
]]
495532
let expectedCriteriaId = "285"
496533
let matchedCriteriaId = CriteriaCompletionChecker(anonymousCriteria: data(from: mockDataIsSet)!, anonymousEvents: eventItems).getMatchedCriteria()
497534
XCTAssertEqual(matchedCriteriaId, expectedCriteriaId)
498535
}
499536

500537
func testCompareDataIsSetFailure() {
501538
let eventItems: [[AnyHashable: Any]] = [["dataType":"user",
502-
"dataFields":["savings": "", "eventTimeStamp":"",
503-
"saved_cars":"",
504-
"country": ""]]]
539+
"dataFields":[
540+
"savings": "",
541+
"eventTimeStamp":"",
542+
"saved_cars":"",
543+
"country": ""]
544+
]]
505545
let matchedCriteriaId = CriteriaCompletionChecker(anonymousCriteria: data(from: mockDataIsSet)!, anonymousEvents: eventItems).getMatchedCriteria()
506546
XCTAssertEqual(matchedCriteriaId, nil)
507547
}

0 commit comments

Comments
 (0)