Skip to content

Commit d81986e

Browse files
iamgabrielmaiamgabrielma
committed
rename to use POS prefix
mimics 5eafca4 , for some reason the merge conflicts from this rename in the base branch aren’t being resolved correctly, so redoing the same commit here.
1 parent 2c86939 commit d81986e

File tree

5 files changed

+26
-26
lines changed

5 files changed

+26
-26
lines changed

‎WooCommerce/Classes/POS/PointOfSaleNotificationScheduler.swift‎ renamed to ‎WooCommerce/Classes/POS/POSNotificationScheduler.swift‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ import Yosemite
44
import Experiments
55

66
// periphery: ignore - work in progress
7-
protocol PointOfSaleNotificationScheduling {
8-
func scheduleLocalNotificationIfEligible(for merchantType: PointOfSaleNotificationScheduler.MerchantType) async
7+
protocol POSNotificationScheduling {
8+
func scheduleLocalNotificationIfEligible(for merchantType: POSNotificationScheduler.MerchantType) async
99
}
1010

1111
// periphery: ignore - work in progress
12-
final class PointOfSaleNotificationScheduler: PointOfSaleNotificationScheduling {
12+
final class POSNotificationScheduler: POSNotificationScheduling {
1313
enum MerchantType {
1414
case potentialMerchant
1515
case currentMerchant
@@ -61,7 +61,7 @@ final class PointOfSaleNotificationScheduler: PointOfSaleNotificationScheduling
6161
self.pushNotificationsManager = pushNotificationsManager
6262
}
6363

64-
func scheduleLocalNotificationIfEligible(for merchantType: PointOfSaleNotificationScheduler.MerchantType) async {
64+
func scheduleLocalNotificationIfEligible(for merchantType: POSNotificationScheduler.MerchantType) async {
6565
guard featureFlagService.isFeatureFlagEnabled(.pointOfSaleSurveys) else { return }
6666

6767
let isScheduled = await isNotificationScheduled(for: merchantType)
@@ -116,7 +116,7 @@ final class PointOfSaleNotificationScheduler: PointOfSaleNotificationScheduling
116116
}
117117
}
118118

119-
private func scheduleLocalNotification(for merchantType: PointOfSaleNotificationScheduler.MerchantType) async {
119+
private func scheduleLocalNotification(for merchantType: POSNotificationScheduler.MerchantType) async {
120120

121121
let payload: [AnyHashable: Any] = [
122122
LocalNotification.UserInfoKey.surveyURL: merchantType.surveyURL

‎WooCommerce/Classes/POS/TabBar/POSTabCoordinator.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ final class POSTabCoordinator {
124124
private extension POSTabCoordinator {
125125
func schedulePOSSurveyNotificationIfNeeded() {
126126
Task { @MainActor in
127-
await PointOfSaleNotificationScheduler().scheduleLocalNotificationIfEligible(for: .currentMerchant)
127+
await POSNotificationScheduler().scheduleLocalNotificationIfEligible(for: .currentMerchant)
128128

129129
let action = AppSettingsAction.setHasPOSBeenOpenedAtLeastOnce { _ in }
130130
storesManager.dispatch(action)

‎WooCommerce/Classes/ViewRelated/Orders/Order Creation/EditableOrderViewModel.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1026,7 +1026,7 @@ final class EditableOrderViewModel: ObservableObject {
10261026
self.onFinished(order)
10271027
self.trackCreateOrderSuccess(usesGiftCard: usesGiftCard)
10281028
Task {
1029-
await PointOfSaleNotificationScheduler().scheduleLocalNotificationIfEligible(for: .potentialMerchant)
1029+
await POSNotificationScheduler().scheduleLocalNotificationIfEligible(for: .potentialMerchant)
10301030
}
10311031
} onFailure: { [weak self] error, usesGiftCard in
10321032
guard let self else { return }

‎WooCommerce/WooCommerce.xcodeproj/project.pbxproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1340,7 +1340,7 @@
13401340
57CFCD2A2488496F003F51EC /* PrimarySectionHeaderView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 57CFCD292488496F003F51EC /* PrimarySectionHeaderView.xib */; };
13411341
57F2C6CD246DECC10074063B /* SummaryTableViewCellViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57F2C6CC246DECC10074063B /* SummaryTableViewCellViewModelTests.swift */; };
13421342
57F42E40253768D600EA87F7 /* TitleAndEditableValueTableViewCellViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57F42E3F253768D600EA87F7 /* TitleAndEditableValueTableViewCellViewModelTests.swift */; };
1343-
68051E1E2E9DFE5500228196 /* PointOfSaleNotificationSchedulerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 68051E1D2E9DFE5100228196 /* PointOfSaleNotificationSchedulerTests.swift */; };
1343+
68051E1E2E9DFE5500228196 /* POSNotificationSchedulerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 68051E1D2E9DFE5100228196 /* POSNotificationSchedulerTests.swift */; };
13441344
680BA59A2A4C377900F5559D /* UpgradeViewState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 680BA5992A4C377900F5559D /* UpgradeViewState.swift */; };
13451345
680E36B52BD8B9B900E8BCEA /* OrderSubscriptionTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 680E36B42BD8B9B900E8BCEA /* OrderSubscriptionTableViewCell.xib */; };
13461346
680E36B72BD8C49F00E8BCEA /* OrderSubscriptionTableViewCellViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 680E36B62BD8C49F00E8BCEA /* OrderSubscriptionTableViewCellViewModel.swift */; };
@@ -1351,7 +1351,7 @@
13511351
6832C7CC26DA5FDF00BA4088 /* LabeledTextViewTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6832C7CB26DA5FDE00BA4088 /* LabeledTextViewTableViewCell.xib */; };
13521352
683421642ACE9391009021D7 /* ProductDiscountView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 683421632ACE9391009021D7 /* ProductDiscountView.swift */; };
13531353
683AA9D62A303CB70099F7BA /* UpgradesViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 683AA9D52A303CB70099F7BA /* UpgradesViewModelTests.swift */; };
1354-
683F18662E9CC839007BC608 /* PointOfSaleNotificationScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 683F18652E9CC838007BC608 /* PointOfSaleNotificationScheduler.swift */; };
1354+
683F18662E9CC839007BC608 /* POSNotificationScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 683F18652E9CC838007BC608 /* POSNotificationScheduler.swift */; };
13551355
684AB83A2870677F003DFDD1 /* CardReaderManualsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 684AB8392870677F003DFDD1 /* CardReaderManualsView.swift */; };
13561356
684AB83C2873DF04003DFDD1 /* CardReaderManualsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 684AB83B2873DF04003DFDD1 /* CardReaderManualsViewModel.swift */; };
13571357
6850C5EE2B69E6580026A93B /* ReceiptViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6850C5ED2B69E6580026A93B /* ReceiptViewModel.swift */; };
@@ -4248,7 +4248,7 @@
42484248
57CFCD292488496F003F51EC /* PrimarySectionHeaderView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = PrimarySectionHeaderView.xib; sourceTree = "<group>"; };
42494249
57F2C6CC246DECC10074063B /* SummaryTableViewCellViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SummaryTableViewCellViewModelTests.swift; sourceTree = "<group>"; };
42504250
57F42E3F253768D600EA87F7 /* TitleAndEditableValueTableViewCellViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TitleAndEditableValueTableViewCellViewModelTests.swift; sourceTree = "<group>"; };
4251-
68051E1D2E9DFE5100228196 /* PointOfSaleNotificationSchedulerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PointOfSaleNotificationSchedulerTests.swift; sourceTree = "<group>"; };
4251+
68051E1D2E9DFE5100228196 /* POSNotificationSchedulerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = POSNotificationSchedulerTests.swift; sourceTree = "<group>"; };
42524252
680BA5992A4C377900F5559D /* UpgradeViewState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UpgradeViewState.swift; sourceTree = "<group>"; };
42534253
680E36B42BD8B9B900E8BCEA /* OrderSubscriptionTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = OrderSubscriptionTableViewCell.xib; sourceTree = "<group>"; };
42544254
680E36B62BD8C49F00E8BCEA /* OrderSubscriptionTableViewCellViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OrderSubscriptionTableViewCellViewModel.swift; sourceTree = "<group>"; };
@@ -4259,7 +4259,7 @@
42594259
6832C7CB26DA5FDE00BA4088 /* LabeledTextViewTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = LabeledTextViewTableViewCell.xib; sourceTree = "<group>"; };
42604260
683421632ACE9391009021D7 /* ProductDiscountView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProductDiscountView.swift; sourceTree = "<group>"; };
42614261
683AA9D52A303CB70099F7BA /* UpgradesViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UpgradesViewModelTests.swift; sourceTree = "<group>"; };
4262-
683F18652E9CC838007BC608 /* PointOfSaleNotificationScheduler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PointOfSaleNotificationScheduler.swift; sourceTree = "<group>"; };
4262+
683F18652E9CC838007BC608 /* POSNotificationScheduler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = POSNotificationScheduler.swift; sourceTree = "<group>"; };
42634263
684AB8392870677F003DFDD1 /* CardReaderManualsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardReaderManualsView.swift; sourceTree = "<group>"; };
42644264
684AB83B2873DF04003DFDD1 /* CardReaderManualsViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardReaderManualsViewModel.swift; sourceTree = "<group>"; };
42654265
6850C5ED2B69E6580026A93B /* ReceiptViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReceiptViewModel.swift; sourceTree = "<group>"; };
@@ -6787,7 +6787,7 @@
67876787
029327662BF59D2D00D703E7 /* POS */ = {
67886788
isa = PBXGroup;
67896789
children = (
6790-
683F18652E9CC838007BC608 /* PointOfSaleNotificationScheduler.swift */,
6790+
683F18652E9CC838007BC608 /* POSNotificationScheduler.swift */,
67916791
01654EB02E786223001DBB6F /* Adaptors */,
67926792
02ABF9B92DF7F8E200348186 /* TabBar */,
67936793
);
@@ -12037,7 +12037,7 @@
1203712037
DABF35242C11B40C006AF826 /* POS */ = {
1203812038
isa = PBXGroup;
1203912039
children = (
12040-
68051E1D2E9DFE5100228196 /* PointOfSaleNotificationSchedulerTests.swift */,
12040+
68051E1D2E9DFE5100228196 /* POSNotificationSchedulerTests.swift */,
1204112041
687C006C2D63469F00F832FC /* Analytics */,
1204212042
02CD3BFC2C35D01600E575C4 /* Mocks */,
1204312043
);
@@ -15136,7 +15136,7 @@
1513615136
B946880E29B627EB000646B0 /* SearchableActivityConvertable.swift in Sources */,
1513715137
010F7D8B2E79B763002B02EA /* POSCouponCreationSheetAdaptor.swift in Sources */,
1513815138
EE09DE0B2C2D6E5100A32680 /* SelectPackageImageCoordinator.swift in Sources */,
15139-
683F18662E9CC839007BC608 /* PointOfSaleNotificationScheduler.swift in Sources */,
15139+
683F18662E9CC839007BC608 /* POSNotificationScheduler.swift in Sources */,
1514015140
DE621F6A29D67E1B000DE3BD /* WooAnalyticsEvent+JetpackSetup.swift in Sources */,
1514115141
DE78DE422B2813E4002E58DE /* ThemesCarouselViewModel.swift in Sources */,
1514215142
DEE183F1292E0ED0008818AB /* JetpackSetupInterruptedView.swift in Sources */,
@@ -15764,7 +15764,7 @@
1576415764
EE3E9E8C2B05B7D600985B2C /* SubscriptionTrialViewModelTests.swift in Sources */,
1576515765
B958A7D328B52A2300823EEF /* MockRoute.swift in Sources */,
1576615766
02153211242376B5003F2BBD /* ProductPriceSettingsViewModelTests.swift in Sources */,
15767-
68051E1E2E9DFE5500228196 /* PointOfSaleNotificationSchedulerTests.swift in Sources */,
15767+
68051E1E2E9DFE5500228196 /* POSNotificationSchedulerTests.swift in Sources */,
1576815768
45C8B25D231529410002FA77 /* CustomerInfoTableViewCellTests.swift in Sources */,
1576915769
035BA3A8291000E90056F0AD /* JustInTimeMessageViewModelTests.swift in Sources */,
1577015770
DE6627EB2DCCC3850068E12E /* ShippingLabelHelpersTests.swift in Sources */,

‎WooCommerce/WooCommerceTests/POS/PointOfSaleNotificationSchedulerTests.swift‎ renamed to ‎WooCommerce/WooCommerceTests/POS/POSNotificationSchedulerTests.swift‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import UserNotifications
44
@testable import Yosemite
55

66
@MainActor
7-
struct PointOfSaleNotificationSchedulerTests {
7+
struct POSNotificationSchedulerTests {
88
private let mockFeatureFlagService: MockFeatureFlagService
99
private let mockPushNotesManager: MockPushNotificationsManager
1010
private let mockStores: MockStoresManager
@@ -21,7 +21,7 @@ struct PointOfSaleNotificationSchedulerTests {
2121
mockFeatureFlagService.isFeatureFlagEnabledReturnValue[.pointOfSaleSurveys] = false
2222
setupMockStores()
2323

24-
let scheduler = PointOfSaleNotificationScheduler(
24+
let scheduler = POSNotificationScheduler(
2525
stores: mockStores,
2626
siteSettings: siteSettings,
2727
featureFlagService: mockFeatureFlagService,
@@ -41,7 +41,7 @@ struct PointOfSaleNotificationSchedulerTests {
4141
mockFeatureFlagService.isFeatureFlagEnabledReturnValue[.pointOfSaleSurveys] = true
4242
setupMockStores()
4343

44-
let scheduler = PointOfSaleNotificationScheduler(
44+
let scheduler = POSNotificationScheduler(
4545
stores: mockStores,
4646
siteSettings: siteSettings,
4747
featureFlagService: mockFeatureFlagService,
@@ -65,7 +65,7 @@ struct PointOfSaleNotificationSchedulerTests {
6565
mockFeatureFlagService.isFeatureFlagEnabledReturnValue[.pointOfSaleSurveys] = true
6666
setupMockStores()
6767

68-
let scheduler = PointOfSaleNotificationScheduler(
68+
let scheduler = POSNotificationScheduler(
6969
stores: mockStores,
7070
siteSettings: siteSettings,
7171
featureFlagService: mockFeatureFlagService,
@@ -89,7 +89,7 @@ struct PointOfSaleNotificationSchedulerTests {
8989
mockFeatureFlagService.isFeatureFlagEnabledReturnValue[.pointOfSaleSurveys] = true
9090
setupMockStores()
9191

92-
let scheduler = PointOfSaleNotificationScheduler(
92+
let scheduler = POSNotificationScheduler(
9393
stores: mockStores,
9494
siteSettings: siteSettings,
9595
featureFlagService: mockFeatureFlagService,
@@ -109,7 +109,7 @@ struct PointOfSaleNotificationSchedulerTests {
109109
mockFeatureFlagService.isFeatureFlagEnabledReturnValue[.pointOfSaleSurveys] = true
110110
setupMockStores()
111111

112-
let scheduler = PointOfSaleNotificationScheduler(
112+
let scheduler = POSNotificationScheduler(
113113
stores: mockStores,
114114
siteSettings: siteSettings,
115115
featureFlagService: mockFeatureFlagService,
@@ -140,7 +140,7 @@ struct PointOfSaleNotificationSchedulerTests {
140140
mockFeatureFlagService.isFeatureFlagEnabledReturnValue[.pointOfSaleSurveys] = true
141141
setupMockStores(hasPOSBeenOpened: true) // Current merchant requires POS to have been opened
142142

143-
let scheduler = PointOfSaleNotificationScheduler(
143+
let scheduler = POSNotificationScheduler(
144144
stores: mockStores,
145145
siteSettings: siteSettings,
146146
featureFlagService: mockFeatureFlagService,
@@ -171,7 +171,7 @@ struct PointOfSaleNotificationSchedulerTests {
171171
mockFeatureFlagService.isFeatureFlagEnabledReturnValue[.pointOfSaleSurveys] = true
172172
setupMockStores()
173173

174-
let scheduler = PointOfSaleNotificationScheduler(
174+
let scheduler = POSNotificationScheduler(
175175
stores: mockStores,
176176
siteSettings: siteSettings,
177177
featureFlagService: mockFeatureFlagService,
@@ -200,7 +200,7 @@ struct PointOfSaleNotificationSchedulerTests {
200200
mockFeatureFlagService.isFeatureFlagEnabledReturnValue[.pointOfSaleSurveys] = true
201201
setupMockStores(isPotentialMerchantScheduled: true, hasPOSBeenOpened: true)
202202

203-
let scheduler = PointOfSaleNotificationScheduler(
203+
let scheduler = POSNotificationScheduler(
204204
stores: mockStores,
205205
siteSettings: siteSettings,
206206
featureFlagService: mockFeatureFlagService,
@@ -226,7 +226,7 @@ struct PointOfSaleNotificationSchedulerTests {
226226
mockFeatureFlagService.isFeatureFlagEnabledReturnValue[.pointOfSaleSurveys] = true
227227
setupMockStores(isCurrentMerchantScheduled: true, hasPOSBeenOpened: true)
228228

229-
let scheduler = PointOfSaleNotificationScheduler(
229+
let scheduler = POSNotificationScheduler(
230230
stores: mockStores,
231231
siteSettings: siteSettings,
232232
featureFlagService: mockFeatureFlagService,
@@ -246,7 +246,7 @@ struct PointOfSaleNotificationSchedulerTests {
246246
mockFeatureFlagService.isFeatureFlagEnabledReturnValue[.pointOfSaleSurveys] = true
247247
setupMockStores(hasPOSBeenOpened: false)
248248

249-
let scheduler = PointOfSaleNotificationScheduler(
249+
let scheduler = POSNotificationScheduler(
250250
stores: mockStores,
251251
siteSettings: siteSettings,
252252
featureFlagService: mockFeatureFlagService,

0 commit comments

Comments
 (0)