Skip to content

Commit 7b13c02

Browse files
itsmeichigoitsmeichigo
committed
Rename model ShippingLabelPackageInfo into ShippingLabelPackageAttributes
1 parent 6709773 commit 7b13c02

File tree

8 files changed

+18
-18
lines changed

8 files changed

+18
-18
lines changed

WooCommerce/Classes/Model/ShippingLabelPackageInfo.swift renamed to WooCommerce/Classes/Model/ShippingLabelPackageAttributes.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import Foundation
22

33
/// A structure to hold the basic details for a selected package on Package Details screen of Shipping Label purchase flow.
44
///
5-
struct ShippingLabelPackageInfo: Hashable, Equatable {
5+
struct ShippingLabelPackageAttributes: Hashable, Equatable {
66

77
/// ID of the selected package.
88
let packageID: String

‎WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/Create Shipping Label Form/Package Details/ShippingLabelPackageDetails.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ struct ShippingLabelPackageDetails: View {
88

99
/// Completion callback
1010
///
11-
typealias Completion = (_ selectedPackages: [ShippingLabelPackageInfo]) -> Void
11+
typealias Completion = (_ selectedPackages: [ShippingLabelPackageAttributes]) -> Void
1212
private let onCompletion: Completion
1313

1414
init(viewModel: ShippingLabelPackageDetailsViewModel, completion: @escaping Completion) {

‎WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/Create Shipping Label Form/Package Details/ShippingLabelPackageDetailsViewModel.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,11 @@ final class ShippingLabelPackageDetailsViewModel: ObservableObject {
5959
/// List of selected package with basic info.
6060
/// TODO-4599: update this to properly support multi-package.
6161
///
62-
var selectedPackagesDetails: [ShippingLabelPackageInfo] {
62+
var selectedPackagesDetails: [ShippingLabelPackageAttributes] {
6363
guard let id = selectedPackageID, totalWeight.isNotEmpty else {
6464
return []
6565
}
66-
return [ShippingLabelPackageInfo(packageID: id, totalWeight: totalWeight, productIDs: orderItems.map { $0.productOrVariationID })]
66+
return [ShippingLabelPackageAttributes(packageID: id, totalWeight: totalWeight, productIDs: orderItems.map { $0.productOrVariationID })]
6767
}
6868

6969
/// The title of the selected package, if any.
@@ -95,7 +95,7 @@ final class ShippingLabelPackageDetailsViewModel: ObservableObject {
9595

9696
init(order: Order,
9797
packagesResponse: ShippingLabelPackagesResponse?,
98-
selectedPackages: [ShippingLabelPackageInfo],
98+
selectedPackages: [ShippingLabelPackageAttributes],
9999
formatter: CurrencyFormatter = CurrencyFormatter(currencySettings: ServiceLocator.currencySettings),
100100
stores: StoresManager = ServiceLocator.stores,
101101
storageManager: StorageManagerType = ServiceLocator.storageManager,

‎WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/Create Shipping Label Form/ShippingLabelFormViewController.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@ private extension ShippingLabelFormViewController {
416416
navigationController?.pushViewController(vc, animated: true)
417417
}
418418

419-
func displayPackageDetailsVC(inputPackages: [ShippingLabelPackageInfo]) {
419+
func displayPackageDetailsVC(inputPackages: [ShippingLabelPackageAttributes]) {
420420
let vm = ShippingLabelPackageDetailsViewModel(order: viewModel.order,
421421
packagesResponse: viewModel.packagesResponse,
422422
selectedPackages: inputPackages)

‎WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/Create Shipping Label Form/ShippingLabelFormViewModel.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ final class ShippingLabelFormViewModel {
3535

3636
/// Selected packages configured from Package Details form.
3737
///
38-
private(set) var selectedPackagesDetails: [ShippingLabelPackageInfo] = []
38+
private(set) var selectedPackagesDetails: [ShippingLabelPackageAttributes] = []
3939

4040
/// Customs forms
4141
///
@@ -200,7 +200,7 @@ final class ShippingLabelFormViewModel {
200200
}
201201
}
202202

203-
func handlePackageDetailsValueChanges(details: [ShippingLabelPackageInfo]) {
203+
func handlePackageDetailsValueChanges(details: [ShippingLabelPackageAttributes]) {
204204
self.selectedPackagesDetails = details
205205

206206
guard details.isNotEmpty else {

‎WooCommerce/WooCommerce.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1282,7 +1282,7 @@
12821282
DEC2962526C122DF005A056B /* ShippingLabelCustomsFormInputViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEC2962426C122DF005A056B /* ShippingLabelCustomsFormInputViewModel.swift */; };
12831283
DEC2962726C17AD8005A056B /* ShippingLabelCustomsForm+Localization.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEC2962626C17AD8005A056B /* ShippingLabelCustomsForm+Localization.swift */; };
12841284
DEC2962926C20ECB005A056B /* CollapsibleView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEC2962826C20ECB005A056B /* CollapsibleView.swift */; };
1285-
DEDB886B26E8531E00981595 /* ShippingLabelPackageInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEDB886A26E8531E00981595 /* ShippingLabelPackageInfo.swift */; };
1285+
DEDB886B26E8531E00981595 /* ShippingLabelPackageAttributes.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEDB886A26E8531E00981595 /* ShippingLabelPackageAttributes.swift */; };
12861286
DEE6437626D87C4100888A75 /* PrintCustomsFormsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEE6437526D87C4100888A75 /* PrintCustomsFormsView.swift */; };
12871287
DEE6437826D8DAD900888A75 /* InProgressView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEE6437726D8DAD900888A75 /* InProgressView.swift */; };
12881288
DEFD6E61264990FB00E51E0D /* SitePluginListViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEFD6E60264990FB00E51E0D /* SitePluginListViewModelTests.swift */; };
@@ -2694,7 +2694,7 @@
26942694
DEC2962426C122DF005A056B /* ShippingLabelCustomsFormInputViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShippingLabelCustomsFormInputViewModel.swift; sourceTree = "<group>"; };
26952695
DEC2962626C17AD8005A056B /* ShippingLabelCustomsForm+Localization.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ShippingLabelCustomsForm+Localization.swift"; sourceTree = "<group>"; };
26962696
DEC2962826C20ECB005A056B /* CollapsibleView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CollapsibleView.swift; sourceTree = "<group>"; };
2697-
DEDB886A26E8531E00981595 /* ShippingLabelPackageInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShippingLabelPackageInfo.swift; sourceTree = "<group>"; };
2697+
DEDB886A26E8531E00981595 /* ShippingLabelPackageAttributes.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShippingLabelPackageAttributes.swift; sourceTree = "<group>"; };
26982698
DEE6437526D87C4100888A75 /* PrintCustomsFormsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrintCustomsFormsView.swift; sourceTree = "<group>"; };
26992699
DEE6437726D8DAD900888A75 /* InProgressView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InProgressView.swift; sourceTree = "<group>"; };
27002700
DEFD6E60264990FB00E51E0D /* SitePluginListViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SitePluginListViewModelTests.swift; sourceTree = "<group>"; };
@@ -5120,7 +5120,7 @@
51205120
D8EF1E552605121C00380EA4 /* OrderPaymentMethod.swift */,
51215121
FEDD70AE26A7223500194C3A /* StorageEligibilityErrorInfo+Woo.swift */,
51225122
E1C5E78326C2B8E8008D4C47 /* Site+Woo.swift */,
5123-
DEDB886A26E8531E00981595 /* ShippingLabelPackageInfo.swift */,
5123+
DEDB886A26E8531E00981595 /* ShippingLabelPackageAttributes.swift */,
51245124
);
51255125
path = Model;
51265126
sourceTree = "<group>";
@@ -7361,7 +7361,7 @@
73617361
02AAD54525023A8300BA1E26 /* ProductFormRemoteActionUseCase.swift in Sources */,
73627362
D83F5933225B2EB900626E75 /* ManualTrackingViewController.swift in Sources */,
73637363
3142663F2645E2AB00500598 /* CardReaderSettingsViewModelPresenter.swift in Sources */,
7364-
DEDB886B26E8531E00981595 /* ShippingLabelPackageInfo.swift in Sources */,
7364+
DEDB886B26E8531E00981595 /* ShippingLabelPackageAttributes.swift in Sources */,
73657365
B57C744A20F5649300EEFC87 /* EmptyStoresTableViewCell.swift in Sources */,
73667366
45DB70602614C7E80064A6CF /* ShippingLabelPackageDetailsResultsControllers.swift in Sources */,
73677367
027D67D1245ADDF40036B8DB /* FilterTypeViewModel+Helpers.swift in Sources */,

‎WooCommerce/WooCommerceTests/ViewRelated/Shipping Label/Create Shipping Label/ShippingLabelFormViewModelTests.swift‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ final class ShippingLabelFormViewModelTests: XCTestCase {
171171
destinationAddress: nil)
172172
let expectedPackageID = "my-package-id"
173173
let expectedPackageWeight = "55"
174-
let selectedPackage = ShippingLabelPackageInfo(packageID: expectedPackageID, totalWeight: expectedPackageWeight, productIDs: [])
174+
let selectedPackage = ShippingLabelPackageAttributes(packageID: expectedPackageID, totalWeight: expectedPackageWeight, productIDs: [])
175175

176176
// When
177177
shippingLabelFormViewModel.handlePackageDetailsValueChanges(details: [selectedPackage])
@@ -187,7 +187,7 @@ final class ShippingLabelFormViewModelTests: XCTestCase {
187187
destinationAddress: nil)
188188
let expectedPackageID = "my-package-id"
189189
let expectedPackageWeight = "55"
190-
let selectedPackage = ShippingLabelPackageInfo(packageID: expectedPackageID, totalWeight: expectedPackageWeight, productIDs: [])
190+
let selectedPackage = ShippingLabelPackageAttributes(packageID: expectedPackageID, totalWeight: expectedPackageWeight, productIDs: [])
191191

192192
shippingLabelFormViewModel.handleOriginAddressValueChanges(address: MockShippingLabelAddress.sampleAddress(), validated: true)
193193
shippingLabelFormViewModel.handleDestinationAddressValueChanges(address: MockShippingLabelAddress.sampleAddress(), validated: true)
@@ -216,7 +216,7 @@ final class ShippingLabelFormViewModelTests: XCTestCase {
216216
destinationAddress: nil)
217217
let expectedPackageID = "my-package-id"
218218
let expectedPackageWeight = "55"
219-
let selectedPackage = ShippingLabelPackageInfo(packageID: expectedPackageID, totalWeight: expectedPackageWeight, productIDs: [])
219+
let selectedPackage = ShippingLabelPackageAttributes(packageID: expectedPackageID, totalWeight: expectedPackageWeight, productIDs: [])
220220

221221
shippingLabelFormViewModel.handleOriginAddressValueChanges(address: MockShippingLabelAddress.sampleAddress(phone: "0123456789", country: "US"),
222222
validated: true)
@@ -867,7 +867,7 @@ final class ShippingLabelFormViewModelTests: XCTestCase {
867867
// When
868868
viewModel.handleOriginAddressValueChanges(address: MockShippingLabelAddress.sampleAddress(phone: "0123456789", country: "US"), validated: true)
869869
viewModel.handleDestinationAddressValueChanges(address: MockShippingLabelAddress.sampleAddress(country: "VN"), validated: true)
870-
let selectedPackage = ShippingLabelPackageInfo(packageID: expectedPackageID, totalWeight: "55", productIDs: [expectedProductID])
870+
let selectedPackage = ShippingLabelPackageAttributes(packageID: expectedPackageID, totalWeight: "55", productIDs: [expectedProductID])
871871
viewModel.handlePackageDetailsValueChanges(details: [selectedPackage])
872872

873873
// Then

‎WooCommerce/WooCommerceTests/ViewRelated/Shipping Label/Create Shipping Label/ShippingLabelPackageDetailsViewModelTests.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ final class ShippingLabelPackageDetailsViewModelTests: XCTestCase {
311311
productVariationID: 49,
312312
attributes: [ProductVariationAttribute(id: 1, name: "Color", option: "Blue")]))
313313

314-
let selectedPackages = [ShippingLabelPackageInfo(packageID: "Box", totalWeight: "30", productIDs: [1, 33, 23, 49])]
314+
let selectedPackages = [ShippingLabelPackageAttributes(packageID: "Box", totalWeight: "30", productIDs: [1, 33, 23, 49])]
315315
let viewModel = ShippingLabelPackageDetailsViewModel(order: order,
316316
packagesResponse: mockPackageResponse(),
317317
selectedPackages: selectedPackages,
@@ -364,7 +364,7 @@ final class ShippingLabelPackageDetailsViewModelTests: XCTestCase {
364364

365365
// When
366366
insert(Product.fake().copy(siteID: sampleSiteID, productID: 1, virtual: false, weight: "120"))
367-
let selectedPackages = [ShippingLabelPackageInfo(packageID: "Package", totalWeight: "500", productIDs: [1])]
367+
let selectedPackages = [ShippingLabelPackageAttributes(packageID: "Package", totalWeight: "500", productIDs: [1])]
368368
let viewModel = ShippingLabelPackageDetailsViewModel(order: order,
369369
packagesResponse: mockPackageResponse(),
370370
selectedPackages: selectedPackages,

0 commit comments

Comments
 (0)