Skip to content

Commit 1038041

Browse files
amy-at-kickstarteramy-at-kickstarter
authored
MBL-2837: Rename 'pledgeRedemption' push payload to 'order' (#2662)
* Delete unused lens file PushEnvelopeLenses * MBL-2837: Rename 'pledgeRedemption' push payload to 'order' This matches the payload that is sent for all pledge manager related pushes. * Fix failing test in AppDelegateViewModelTests * Make 'id' a valid identifier name for swiftlint
1 parent 0cba012 commit 1038041

File tree

7 files changed

+18
-244
lines changed

7 files changed

+18
-244
lines changed

‎.swiftlint.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,5 @@ identifier_name:
2525
excluded:
2626
- ^vm$
2727
- ^vc$
28+
- ^id$
2829

‎Kickstarter-iOS/AppDelegateViewModel.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1089,10 +1089,10 @@ private func navigation(fromPushEnvelope envelope: PushEnvelope) -> Navigation?
10891089
}
10901090
}
10911091

1092-
if let pledgeRedemption = envelope.pledgeRedemption {
1093-
let path = pledgeRedemption.pledgeManagerPath
1092+
if let order = envelope.order {
1093+
let path = order.pledgeManagerPath
10941094
let url = AppEnvironment.current.apiService.serverConfig.webBaseUrl.absoluteString + path
1095-
return .project(.id(pledgeRedemption.projectId), .pledgeManagerWebview(url), refInfo: RefInfo(.push))
1095+
return .project(.id(order.projectId), .pledgeManagerWebview(url), refInfo: RefInfo(.push))
10961096
}
10971097

10981098
if let project = envelope.project {

‎Kickstarter-iOS/AppDelegateViewModelTests.swift‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1075,15 +1075,15 @@ final class AppDelegateViewModelTests: TestCase {
10751075
self.vm.inputs.didReceive(remoteNotification: badPushData)
10761076
}
10771077

1078-
func testOpenNotification_PledgeRedemption() {
1079-
self.vm.inputs.didReceive(remoteNotification: pledgeRedemptionPushData)
1078+
func testOpenNotification_Order() {
1079+
self.vm.inputs.didReceive(remoteNotification: orderPushData)
10801080

10811081
self.presentViewController.assertValueCount(1)
10821082
}
10831083

1084-
func testOpenNotification_PledgeRedemption_BadData() {
1085-
var badPushData = pledgeRedemptionPushData
1086-
badPushData["pledgeRedemption"]?["id"] = nil
1084+
func testOpenNotification_Order_BadData() {
1085+
var badPushData = orderPushData
1086+
badPushData["order"]?["id"] = nil
10871087

10881088
self.vm.inputs.didReceive(remoteNotification: badPushData)
10891089

@@ -2731,11 +2731,11 @@ private let projectCommentPushData = [
27312731
]
27322732
]
27332733

2734-
private let pledgeRedemptionPushData = [
2734+
private let orderPushData = [
27352735
"aps": [
27362736
"alert": "Response needed! Get your reward for backing some project."
27372737
],
2738-
"pledgeRedemption": [
2738+
"order": [
27392739
"id": 1,
27402740
"project_id": 1,
27412741
"pledge_manager_path": "/projects/fakeCreatorId/1/backing/redeem"

‎Kickstarter.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1301,7 +1301,6 @@
13011301
D01588BD1EEB2ED7006E7684 /* ProjectStatsEnvelope.RewardDistributionLenses.swift in Sources */ = {isa = PBXBuildFile; fileRef = D01587B71EEB2ED7006E7684 /* ProjectStatsEnvelope.RewardDistributionLenses.swift */; };
13021302
D01588BF1EEB2ED7006E7684 /* ProjectStatsEnvelope.VideoStatsLenses.swift in Sources */ = {isa = PBXBuildFile; fileRef = D01587B81EEB2ED7006E7684 /* ProjectStatsEnvelope.VideoStatsLenses.swift */; };
13031303
D01588C11EEB2ED7006E7684 /* ProjectStatsEnvelopeLenses.swift in Sources */ = {isa = PBXBuildFile; fileRef = D01587B91EEB2ED7006E7684 /* ProjectStatsEnvelopeLenses.swift */; };
1304-
D01588C31EEB2ED7006E7684 /* PushEnvelopeLenses.swift in Sources */ = {isa = PBXBuildFile; fileRef = D01587BA1EEB2ED7006E7684 /* PushEnvelopeLenses.swift */; };
13051304
D01588C51EEB2ED7006E7684 /* Reward.ShippingLenses.swift in Sources */ = {isa = PBXBuildFile; fileRef = D01587BB1EEB2ED7006E7684 /* Reward.ShippingLenses.swift */; };
13061305
D01588C71EEB2ED7006E7684 /* RewardItemLenses.swift in Sources */ = {isa = PBXBuildFile; fileRef = D01587BC1EEB2ED7006E7684 /* RewardItemLenses.swift */; };
13071306
D01588C91EEB2ED7006E7684 /* RewardLenses.swift in Sources */ = {isa = PBXBuildFile; fileRef = D01587BD1EEB2ED7006E7684 /* RewardLenses.swift */; };
@@ -3076,7 +3075,6 @@
30763075
D01587B71EEB2ED7006E7684 /* ProjectStatsEnvelope.RewardDistributionLenses.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ProjectStatsEnvelope.RewardDistributionLenses.swift; sourceTree = "<group>"; };
30773076
D01587B81EEB2ED7006E7684 /* ProjectStatsEnvelope.VideoStatsLenses.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ProjectStatsEnvelope.VideoStatsLenses.swift; sourceTree = "<group>"; };
30783077
D01587B91EEB2ED7006E7684 /* ProjectStatsEnvelopeLenses.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ProjectStatsEnvelopeLenses.swift; sourceTree = "<group>"; };
3079-
D01587BA1EEB2ED7006E7684 /* PushEnvelopeLenses.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PushEnvelopeLenses.swift; sourceTree = "<group>"; };
30803078
D01587BB1EEB2ED7006E7684 /* Reward.ShippingLenses.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Reward.ShippingLenses.swift; sourceTree = "<group>"; };
30813079
D01587BC1EEB2ED7006E7684 /* RewardItemLenses.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RewardItemLenses.swift; sourceTree = "<group>"; };
30823080
D01587BD1EEB2ED7006E7684 /* RewardLenses.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RewardLenses.swift; sourceTree = "<group>"; };
@@ -7475,7 +7473,6 @@
74757473
D01587B71EEB2ED7006E7684 /* ProjectStatsEnvelope.RewardDistributionLenses.swift */,
74767474
D01587B81EEB2ED7006E7684 /* ProjectStatsEnvelope.VideoStatsLenses.swift */,
74777475
D01587B91EEB2ED7006E7684 /* ProjectStatsEnvelopeLenses.swift */,
7478-
D01587BA1EEB2ED7006E7684 /* PushEnvelopeLenses.swift */,
74797476
D01587BB1EEB2ED7006E7684 /* Reward.ShippingLenses.swift */,
74807477
D01587BC1EEB2ED7006E7684 /* RewardItemLenses.swift */,
74817478
D01587BD1EEB2ED7006E7684 /* RewardLenses.swift */,
@@ -9605,7 +9602,6 @@
96059602
D775EC3020812C6500885634 /* ProjectStatsEnvelope.ReferralAggregateStatsTemplate.swift in Sources */,
96069603
8AE3F72E24DA27BE002B03C3 /* ProjectAndBackingEnvelope.swift in Sources */,
96079604
D0158A321EEB30A2006E7684 /* User.StatsTemplates.swift in Sources */,
9608-
D01588C31EEB2ED7006E7684 /* PushEnvelopeLenses.swift in Sources */,
96099605
D015887B1EEB2ED7006E7684 /* Item.swift in Sources */,
96109606
D0158A231EEB30A2006E7684 /* ProjectTemplates.swift in Sources */,
96119607
D6B9DF3F1F72E25A0064A4D8 /* Category.swift in Sources */,

‎KsApi/models/PushEnvelope.swift‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ public struct PushEnvelope {
66
public let erroredPledge: ErroredPledge?
77
public let forCreator: Bool?
88
public let message: Message?
9-
public let pledgeRedemption: PledgeRedemption?
9+
public let order: Order?
1010
public let project: Project?
1111
public let survey: Survey?
1212
public let update: Update?
@@ -35,7 +35,7 @@ public struct PushEnvelope {
3535
public let projectId: Int
3636
}
3737

38-
public struct PledgeRedemption {
38+
public struct Order {
3939
public let id: Int
4040
public let projectId: Int
4141
public let pledgeManagerPath: String
@@ -75,7 +75,7 @@ extension PushEnvelope: Decodable {
7575
case erroredPledge = "errored_pledge"
7676
case forCreator = "for_creator"
7777
case message
78-
case pledgeRedemption
78+
case order
7979
case project
8080
case survey
8181
case update
@@ -90,7 +90,7 @@ extension PushEnvelope: Decodable {
9090
self.forCreator = try values.decodeIfPresent(Bool.self, forKey: .forCreator)
9191
self.message = try values.decodeIfPresent(Message.self, forKey: .message)
9292
self.project = try values.decodeIfPresent(Project.self, forKey: .project)
93-
self.pledgeRedemption = try values.decodeIfPresent(PledgeRedemption.self, forKey: .pledgeRedemption)
93+
self.order = try values.decodeIfPresent(Order.self, forKey: .order)
9494
self.survey = try values.decodeIfPresent(Survey.self, forKey: .survey)
9595
if values.contains(.update) {
9696
self.update = try values.decodeIfPresent(Update.self, forKey: .update)
@@ -132,7 +132,7 @@ extension PushEnvelope.Message: Decodable {
132132
}
133133
}
134134

135-
extension PushEnvelope.PledgeRedemption: Decodable {
135+
extension PushEnvelope.Order: Decodable {
136136
enum CodingKeys: String, CodingKey {
137137
case id
138138
case projectId = "project_id"

‎KsApi/models/lenses/PushEnvelopeLenses.swift‎

Lines changed: 0 additions & 223 deletions
This file was deleted.

‎bin/send_pm_push.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ read -r -d '' APNS_DATA << EOF
77
"aps": {
88
"alert": "This is a pledge manager push notification.",
99
},
10-
"pledgeRedemption": {
10+
"order": {
1111
"id": 123456,
1212
"project_id": 123456,
1313
"pledge_manager_path": "$PM_PATH"
@@ -16,4 +16,4 @@ read -r -d '' APNS_DATA << EOF
1616
EOF
1717

1818
echo $APNS_DATA
19-
xcrun simctl push booted com.kickstarter.kickstarter.debug - <<< $APNS_DATA
19+
xcrun simctl push booted com.kickstarter.kickstarter.debug - <<< $APNS_DATA

0 commit comments

Comments
 (0)