Skip to content

Commit 42f5d7c

Browse files
tapashmajumdertapashmajumder
committed
Remove more methods from OfflineRequestProcessor.
1 parent 228a53e commit 42f5d7c

File tree

5 files changed

+53
-139
lines changed

5 files changed

+53
-139
lines changed

‎swift-sdk.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@
185185
ACC87766215C20B50097E29B /* UITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = ACC87765215C20B50097E29B /* UITests.swift */; };
186186
ACC8776D215C23CC0097E29B /* IterableSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AC2263DF20CF49B8009800EB /* IterableSDK.framework */; };
187187
ACC8776E215C23CC0097E29B /* IterableSDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = AC2263DF20CF49B8009800EB /* IterableSDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
188-
ACCF274C24F40C85004862D5 /* RequestProcessorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = ACCF274B24F40C85004862D5 /* RequestProcessorTests.swift */; };
188+
ACCF274C24F40C85004862D5 /* RequestHandlerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = ACCF274B24F40C85004862D5 /* RequestHandlerTests.swift */; };
189189
ACD6116C2107D004003E7F6B /* NetworkHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = ACD6116B2107D004003E7F6B /* NetworkHelper.swift */; };
190190
ACD6116E21080564003E7F6B /* IterableAPITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = ACD6116D21080564003E7F6B /* IterableAPITests.swift */; };
191191
ACDA975C23159C37004C412E /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = ACDA975B23159C37004C412E /* AppDelegate.swift */; };
@@ -520,7 +520,7 @@
520520
ACC87763215C20B50097E29B /* ui-tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "ui-tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
521521
ACC87765215C20B50097E29B /* UITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UITests.swift; sourceTree = "<group>"; };
522522
ACC87767215C20B50097E29B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
523-
ACCF274B24F40C85004862D5 /* RequestProcessorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RequestProcessorTests.swift; sourceTree = "<group>"; };
523+
ACCF274B24F40C85004862D5 /* RequestHandlerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RequestHandlerTests.swift; sourceTree = "<group>"; };
524524
ACD6116B2107D004003E7F6B /* NetworkHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkHelper.swift; sourceTree = "<group>"; };
525525
ACD6116D21080564003E7F6B /* IterableAPITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IterableAPITests.swift; sourceTree = "<group>"; };
526526
ACDA975923159C36004C412E /* inbox-ui-tests-app.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "inbox-ui-tests-app.app"; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -1187,7 +1187,7 @@
11871187
ACFD5AC524C8216A008E497A /* TasksCRUDTests.swift */,
11881188
ACC362C424D2C190002C67BA /* TaskProcessorTests.swift */,
11891189
AC2AED4124EBC60C000EE5F3 /* TaskRunnerTests.swift */,
1190-
ACCF274B24F40C85004862D5 /* RequestProcessorTests.swift */,
1190+
ACCF274B24F40C85004862D5 /* RequestHandlerTests.swift */,
11911191
AC67AF972507481200C1E974 /* NetworkConnectivityCheckerTests.swift */,
11921192
ACF406242507F90F005FD775 /* NetworkConnectivityManagerTests.swift */,
11931193
AC3EFFEF2510B8FB007F1330 /* TaskSchedulerTests.swift */,
@@ -1880,7 +1880,7 @@
18801880
ACFD5AC624C8216A008E497A /* TasksCRUDTests.swift in Sources */,
18811881
ACC362C624D2C334002C67BA /* CommonExtensions.swift in Sources */,
18821882
ACF406252507F90F005FD775 /* NetworkConnectivityManagerTests.swift in Sources */,
1883-
ACCF274C24F40C85004862D5 /* RequestProcessorTests.swift in Sources */,
1883+
ACCF274C24F40C85004862D5 /* RequestHandlerTests.swift in Sources */,
18841884
ACC362C724D2C647002C67BA /* CommonMocks.swift in Sources */,
18851885
ACC362C824D2C7C9002C67BA /* TestUtils.swift in Sources */,
18861886
AC241C2224F5757C00F8F9CC /* Mocks.swift in Sources */,

‎swift-sdk/Internal/OfflineRequestProcessor.swift‎

Lines changed: 0 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -37,51 +37,6 @@ struct OfflineRequestProcessor: RequestProcessorProtocol {
3737
taskRunner.stop()
3838
}
3939

40-
@discardableResult
41-
func register(registerTokenInfo: RegisterTokenInfo,
42-
notificationStateProvider: NotificationStateProviderProtocol,
43-
onSuccess: OnSuccessHandler? = nil,
44-
onFailure: OnFailureHandler? = nil) -> Future<SendRequestValue, SendRequestError> {
45-
let requestGenerator = { (requestCreator: RequestCreator) in
46-
requestCreator.createRegisterTokenRequest(registerTokenInfo: registerTokenInfo,
47-
notificationsEnabled: true)
48-
}
49-
50-
return sendIterableRequest(requestGenerator: requestGenerator,
51-
successHandler: onSuccess,
52-
failureHandler: onFailure,
53-
identifier: #function)
54-
}
55-
56-
@discardableResult
57-
func updateUser(_ dataFields: [AnyHashable: Any],
58-
mergeNestedObjects: Bool,
59-
onSuccess: OnSuccessHandler?,
60-
onFailure: OnFailureHandler?) -> Future<SendRequestValue, SendRequestError> {
61-
let requestGenerator = { (requestCreator: RequestCreator) in
62-
requestCreator.createUpdateUserRequest(dataFields: dataFields, mergeNestedObjects: mergeNestedObjects)
63-
}
64-
65-
return sendIterableRequest(requestGenerator: requestGenerator,
66-
successHandler: onSuccess,
67-
failureHandler: onFailure,
68-
identifier: #function)
69-
}
70-
71-
@discardableResult
72-
func updateEmail(_ newEmail: String,
73-
onSuccess: OnSuccessHandler?,
74-
onFailure: OnFailureHandler?) -> Future<SendRequestValue, SendRequestError> {
75-
let requestGenerator = { (requestCreator: RequestCreator) in
76-
requestCreator.createUpdateEmailRequest(newEmail: newEmail)
77-
}
78-
79-
return sendIterableRequest(requestGenerator: requestGenerator,
80-
successHandler: onSuccess,
81-
failureHandler: onFailure,
82-
identifier: #function)
83-
}
84-
8540
@discardableResult
8641
func trackPurchase(_ total: NSNumber,
8742
items: [CommerceItem],
@@ -139,25 +94,6 @@ struct OfflineRequestProcessor: RequestProcessorProtocol {
13994
identifier: #function)
14095
}
14196

142-
@discardableResult
143-
func updateSubscriptions(info: UpdateSubscriptionsInfo,
144-
onSuccess: OnSuccessHandler?,
145-
onFailure: OnFailureHandler?) -> Future<SendRequestValue, SendRequestError> {
146-
let requestGenerator = { (requestCreator: RequestCreator) in
147-
requestCreator.createUpdateSubscriptionsRequest(info.emailListIds,
148-
unsubscribedChannelIds: info.unsubscribedChannelIds,
149-
unsubscribedMessageTypeIds: info.unsubscribedMessageTypeIds,
150-
subscribedMessageTypeIds: info.subscribedMessageTypeIds,
151-
campaignId: info.campaignId,
152-
templateId: info.templateId)
153-
}
154-
155-
return sendIterableRequest(requestGenerator: requestGenerator,
156-
successHandler: onSuccess,
157-
failureHandler: onFailure,
158-
identifier: #function)
159-
}
160-
16197
@discardableResult
16298
func trackInAppOpen(_ message: IterableInAppMessage,
16399
location: InAppLocation,

‎swift-sdk/Internal/RequestHandler.swift‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@ class RequestHandler: RequestHandlerProtocol {
5151
notificationStateProvider: NotificationStateProviderProtocol,
5252
onSuccess: OnSuccessHandler?,
5353
onFailure: OnFailureHandler?) -> Future<SendRequestValue, SendRequestError> {
54-
chooseRequestProcessor().register(registerTokenInfo: registerTokenInfo,
55-
notificationStateProvider: notificationStateProvider,
56-
onSuccess: onSuccess,
57-
onFailure: onFailure)
54+
onlineProcessor.register(registerTokenInfo: registerTokenInfo,
55+
notificationStateProvider: notificationStateProvider,
56+
onSuccess: onSuccess,
57+
onFailure: onFailure)
5858
}
5959

6060
@discardableResult
@@ -80,19 +80,19 @@ class RequestHandler: RequestHandlerProtocol {
8080
mergeNestedObjects: Bool,
8181
onSuccess: OnSuccessHandler?,
8282
onFailure: OnFailureHandler?) -> Future<SendRequestValue, SendRequestError> {
83-
chooseRequestProcessor().updateUser(dataFields,
84-
mergeNestedObjects: mergeNestedObjects,
85-
onSuccess: onSuccess,
86-
onFailure: onFailure)
83+
onlineProcessor.updateUser(dataFields,
84+
mergeNestedObjects: mergeNestedObjects,
85+
onSuccess: onSuccess,
86+
onFailure: onFailure)
8787
}
8888

8989
@discardableResult
9090
func updateEmail(_ newEmail: String,
9191
onSuccess: OnSuccessHandler?,
9292
onFailure: OnFailureHandler?) -> Future<SendRequestValue, SendRequestError> {
93-
chooseRequestProcessor().updateEmail(newEmail,
94-
onSuccess: onSuccess,
95-
onFailure: onFailure)
93+
onlineProcessor.updateEmail(newEmail,
94+
onSuccess: onSuccess,
95+
onFailure: onFailure)
9696
}
9797

9898
@discardableResult
@@ -140,9 +140,9 @@ class RequestHandler: RequestHandlerProtocol {
140140
func updateSubscriptions(info: UpdateSubscriptionsInfo,
141141
onSuccess: OnSuccessHandler?,
142142
onFailure: OnFailureHandler?) -> Future<SendRequestValue, SendRequestError> {
143-
chooseRequestProcessor().updateSubscriptions(info: info,
144-
onSuccess: onSuccess,
145-
onFailure: onFailure)
143+
onlineProcessor.updateSubscriptions(info: info,
144+
onSuccess: onSuccess,
145+
onFailure: onFailure)
146146
}
147147

148148
@discardableResult

‎swift-sdk/Internal/RequestProcessorProtocol.swift‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -26,23 +26,6 @@ struct UpdateSubscriptionsInfo {
2626

2727
/// `RequestHandler` will delegate network related calls to this protocol.
2828
protocol RequestProcessorProtocol {
29-
@discardableResult
30-
func register(registerTokenInfo: RegisterTokenInfo,
31-
notificationStateProvider: NotificationStateProviderProtocol,
32-
onSuccess: OnSuccessHandler?,
33-
onFailure: OnFailureHandler?) -> Future<SendRequestValue, SendRequestError>
34-
35-
@discardableResult
36-
func updateUser(_ dataFields: [AnyHashable: Any],
37-
mergeNestedObjects: Bool,
38-
onSuccess: OnSuccessHandler?,
39-
onFailure: OnFailureHandler?) -> Future<SendRequestValue, SendRequestError>
40-
41-
@discardableResult
42-
func updateEmail(_ newEmail: String,
43-
onSuccess: OnSuccessHandler?,
44-
onFailure: OnFailureHandler?) -> Future<SendRequestValue, SendRequestError>
45-
4629
@discardableResult
4730
func trackPurchase(_ total: NSNumber,
4831
items: [CommerceItem],
@@ -65,11 +48,6 @@ protocol RequestProcessorProtocol {
6548
onSuccess: OnSuccessHandler?,
6649
onFailure: OnFailureHandler?) -> Future<SendRequestValue, SendRequestError>
6750

68-
@discardableResult
69-
func updateSubscriptions(info: UpdateSubscriptionsInfo,
70-
onSuccess: OnSuccessHandler?,
71-
onFailure: OnFailureHandler?) -> Future<SendRequestValue, SendRequestError>
72-
7351
@discardableResult
7452
func trackInAppOpen(_ message: IterableInAppMessage,
7553
location: InAppLocation,

0 commit comments

Comments
 (0)