ALFMOB-149: Bag & Wishlist - Redirect to PDP

In the **Bag** and **Wishlist** screens, tapping on a product cell now redirects the user to the **PDP** of the selected item, ensuring a smooth transition while preserving selected attributes like size and color.

**Changes & Improvements:**
- Made product cells tappable, including a tap effect for better user feedback.
- Renamed `SelectionProduct` to `SelectedProduct` for better clarity.
- Updated `SelectedProduct` to include `Product` and `Product.Variant` properties.
- Implemented a mechanism to open **PDP** with a `SelectedProduct`.
- Fixed an issue in `buildColorAndSizingSelectionConfigurations` where the `Product.Variant` parameter was not being properly used.

Author: JoaoPinhoMinder

…ensions/SelectionProduct+Extension.swift …tensions/SelectedProduct+Extension.swiftAlfie/Alfie/Extensions/SelectionProduct+Extension.swift renamed to Alfie/Alfie/Extensions/SelectedProduct+Extension.swift Alfie/Alfie/Extensions/SelectionProduct+Extension.swift renamed to Alfie/Alfie/Extensions/SelectedProduct+Extension.swift

@@ -1,7 +1,7 @@
 import Foundation
 import Models
 
-extension SelectionProduct {
+extension SelectedProduct {
     var sizeText: String {
         var sizeValue: String = ""
         if let size {

Alfie/Alfie/Navigation/Coordinator.swift

@@ -143,6 +143,10 @@ final class Coordinator: ObservableObject, CoordinatorProtocol {
         navigationAdapter.push(.productDetails(.product(product)))
     }
 
+    public func openDetails(for selectedProduct: SelectedProduct) {
+        navigationAdapter.push(.productDetails(.selectedProduct(selectedProduct)))
+    }
+
     // MARK: - Brands
 
     public func openBrands() {

Alfie/Alfie/Navigation/Screen.swift

@@ -43,6 +43,7 @@ enum HomeTabConfig: Equatable, Hashable {
 enum ThemedProductDetailsScreen: Equatable, Hashable {
     case id(_ id: String)
     case product(_ product: Product)
+    case selectedProduct(_ selectedProduct: SelectedProduct)
 }
 
 struct ProductListingScreenConfiguration: Equatable, Hashable {

Alfie/Alfie/Navigation/TabCoordinator.swift

@@ -112,6 +112,9 @@ final class TabCoordinator: TabCoordinatorProtocol, ObservableObject {
 
             case .product(let product):
                 coordinator.openDetails(for: product)
+
+            case .selectedProduct(let selectedProduct):
+                coordinator.openDetails(for: selectedProduct)
             }
 
         case .categoryList(let categories, let title):

Alfie/Alfie/Navigation/ViewFactory.swift

@@ -157,6 +157,23 @@ final class ViewFactory: ViewFactoryProtocol {
                         )
                     )
                 )
+
+            case .selectedProduct(let selectedProduct):
+                ProductDetailsView(
+                    viewModel: ProductDetailsViewModel(
+                        productId: selectedProduct.product.id,
+                        product: selectedProduct.product,
+                        selectedProduct: selectedProduct,
+                        dependencies: ProductDetailsDependencyContainer(
+                            productService: serviceProvider.productService,
+                            webUrlProvider: serviceProvider.webUrlProvider,
+                            bagService: serviceProvider.bagService,
+                            wishlistService: serviceProvider.wishlistService,
+                            configurationService: serviceProvider.configurationService,
+                            analytics: serviceProvider.analytics
+                        )
+                    )
+                )
             }
 
         case .recentSearches:

Alfie/Alfie/Views/BagView/BagView.swift

@@ -6,6 +6,7 @@ import Mocks
 #endif
 
 struct BagView<ViewModel: BagViewModelProtocol>: View {
+    @EnvironmentObject var coordinador: Coordinator
     @StateObject private var viewModel: ViewModel
 
     init(viewModel: ViewModel) {
@@ -15,7 +16,14 @@ struct BagView<ViewModel: BagViewModelProtocol>: View {
     var body: some View {
         List {
             ForEach(viewModel.products) { product in
-                HorizontalProductCard(viewModel: viewModel.productCardViewModel(for: product))
+                Button(
+                    action: { coordinador.openDetails(for: product) },
+                    label: {
+                        HorizontalProductCard(viewModel: viewModel.productCardViewModel(for: product))
+                            .contentShape(Rectangle())
+                    }
+                )
+                .buttonStyle(.plain)
                 .listRowInsets(EdgeInsets())
             }
             .onDelete { offsets in

Alfie/Alfie/Views/BagView/BagViewModel.swift

@@ -2,7 +2,7 @@ import Foundation
 import Models
 
 final class BagViewModel: BagViewModelProtocol {
-    @Published private(set) var products: [SelectionProduct]
+    @Published private(set) var products: [SelectedProduct]
 
     private let dependencies: BagDependencyContainer
 
@@ -17,22 +17,22 @@ final class BagViewModel: BagViewModelProtocol {
         products = dependencies.bagService.getBagContent()
     }
 
-    func didSelectDelete(for product: SelectionProduct) {
-        dependencies.bagService.removeProduct(product)
+    func didSelectDelete(for selectedProduct: SelectedProduct) {
+        dependencies.bagService.removeProduct(selectedProduct)
         products = dependencies.bagService.getBagContent()
-        dependencies.analytics.trackRemoveFromBag(productID: product.id)
+        dependencies.analytics.trackRemoveFromBag(productID: selectedProduct.product.id)
     }
 
-    func productCardViewModel(for product: SelectionProduct) -> HorizontalProductCardViewModel {
+    func productCardViewModel(for selectedProduct: SelectedProduct) -> HorizontalProductCardViewModel {
         .init(
-            image: product.media.first?.asImage?.url,
-            designer: product.brand.name,
-            name: product.name,
+            image: selectedProduct.media.first?.asImage?.url,
+            designer: selectedProduct.brand.name,
+            name: selectedProduct.name,
             colorTitle: L10n.Product.Color.title + ":",
-            color: product.colour?.name ?? "",
+            color: selectedProduct.colour?.name ?? "",
             sizeTitle: L10n.Product.Size.title + ":",
-            size: product.size == nil ? L10n.Product.OneSize.title : product.sizeText,
-            priceType: product.priceType
+            size: selectedProduct.size == nil ? L10n.Product.OneSize.title : selectedProduct.sizeText,
+            priceType: selectedProduct.priceType
         )
     }
 }

Alfie/Alfie/Views/ProductDetails/ProductDetailsViewModel.swift

@@ -15,6 +15,7 @@ final class ProductDetailsViewModel: ProductDetailsViewModelProtocol {
     private(set) var colorSelectionConfiguration: ColorAndSizingSelectorConfiguration<ColorSwatch> = .init(items: [])
     private(set) var sizingSelectionConfiguration: ColorAndSizingSelectorConfiguration<SizingSwatch> = .init(items: [])
     public let productId: String
+    private let initialSelectedProduct: SelectedProduct?
 
     private var product: Product? {
         guard case .success(let model) = state else {
@@ -26,7 +27,7 @@ final class ProductDetailsViewModel: ProductDetailsViewModelProtocol {
 
     private var selectedVariant: Product.Variant? {
         guard case .success(let model) = state else {
-            return baseProduct?.defaultVariant
+            return initialSelectedProduct?.selectedVariant ?? baseProduct?.defaultVariant
         }
 
         return model.selectedVariant
@@ -87,16 +88,32 @@ final class ProductDetailsViewModel: ProductDetailsViewModelProtocol {
         product?.priceType
     }
 
-    init(productId: String, product: Product?, dependencies: ProductDetailsDependencyContainer) {
+    init(
+        productId: String,
+        product: Product?,
+        selectedProduct: SelectedProduct? = nil,
+        dependencies: ProductDetailsDependencyContainer
+    ) {
         self.productId = productId
+        self.initialSelectedProduct = selectedProduct
         baseProduct = product
         self.dependencies = dependencies
 
-        if let baseProduct {
+        switch (product, selectedProduct) {
+        case (.some(let product), .none):
             buildColorAndSizingSelectionConfigurations(
-                product: baseProduct,
-                selectedVariant: baseProduct.defaultVariant
+                product: product,
+                selectedVariant: product.defaultVariant
             )
+
+        case (_, .some(let selectedProduct)):
+            buildColorAndSizingSelectionConfigurations(
+                product: selectedProduct.product,
+                selectedVariant: selectedProduct.selectedVariant
+            )
+
+        default:
+            break
         }
     }
 
@@ -204,13 +221,14 @@ final class ProductDetailsViewModel: ProductDetailsViewModelProtocol {
             return
         }
 
-        buildColorAndSizingSelectionConfigurations(product: product, selectedVariant: product.defaultVariant)
-        state = .success(.init(product: product, selectedVariant: product.defaultVariant))
+        let selectedVariant = initialSelectedProduct?.selectedVariant ?? product.defaultVariant
+        buildColorAndSizingSelectionConfigurations(product: product, selectedVariant: selectedVariant)
+        state = .success(.init(product: product, selectedVariant: selectedVariant))
     }
 
-    private func buildColorAndSizingSelectionConfigurations(product: Product, selectedVariant: Product.Variant?) {
-        buildColorSelectionConfiguration(product: product, selectedVariant: product.defaultVariant)
-        buildSizingSelectionConfiguration(product: product, selectedVariant: product.defaultVariant)
+    private func buildColorAndSizingSelectionConfigurations(product: Product, selectedVariant: Product.Variant) {
+        buildColorSelectionConfiguration(product: product, selectedVariant: selectedVariant)
+        buildSizingSelectionConfiguration(product: product, selectedVariant: selectedVariant)
     }
 
     private func buildColorSelectionConfiguration(product: Product, selectedVariant: Product.Variant?) {
@@ -363,14 +381,14 @@ final class ProductDetailsViewModel: ProductDetailsViewModelProtocol {
         state = .success(.init(product: product, selectedVariant: variant))
     }
 
-    private var selectedProduct: SelectionProduct? {
+    private var selectedProduct: SelectedProduct? {
         guard
             let product,
             let selectedVariant
         else {
-            return nil
+            return initialSelectedProduct
         }
 
-        return SelectionProduct(product: product, selectedVariant: selectedVariant)
+        return SelectedProduct(product: product, selectedVariant: selectedVariant)
     }
 }

Alfie/Alfie/Views/ProductListing/ProductListingViewModel.swift

@@ -14,7 +14,7 @@ final class ProductListingViewModel: ProductListingViewModelProtocol {
     @Published var style: ProductListingListStyle
     @Published var showRefine = false
     @Published var sortOption: String?
-    @Published private(set) var wishlistContent: [SelectionProduct]
+    @Published private(set) var wishlistContent: [SelectedProduct]
     @Published private(set) var state: PaginatedViewState<ProductListingViewStateModel, ProductListingViewErrorType>
 
     private enum Constants {
@@ -79,16 +79,17 @@ final class ProductListingViewModel: ProductListingViewModelProtocol {
     func didSelect(_: Product) {}
 
     func isFavoriteState(for product: Product) -> Bool {
-        wishlistContent.contains { $0.id == product.defaultVariant.sku }
+        wishlistContent.contains { $0.product.defaultVariant.sku == product.defaultVariant.sku }
     }
 
     func didTapAddToWishlist(for product: Product, isFavorite: Bool) {
         if !isFavorite {
-            let selectedProduct = SelectionProduct(product: product)
+            let selectedProduct = SelectedProduct(product: product)
             dependencies.wishlistService.addProduct(selectedProduct)
-            dependencies.analytics.trackAddToWishlist(productID: selectedProduct.id)
+            dependencies.analytics.trackAddToWishlist(productID: product.id)
         } else {
-            dependencies.wishlistService.removeProduct(product.defaultVariant.sku)
+            let selectedProduct = SelectedProduct(product: product)
+            dependencies.wishlistService.removeProduct(selectedProduct)
             dependencies.analytics.trackRemoveFromWishlist(productID: product.id)
         }
         wishlistContent = dependencies.wishlistService.getWishlistContent()

Alfie/Alfie/Views/WishlistView/WishlistView.swift

@@ -6,6 +6,7 @@ import Mocks
 #endif
 
 struct WishlistView<ViewModel: WishlistViewModelProtocol>: View {
+    @EnvironmentObject var coordinador: Coordinator
     @StateObject private var viewModel: ViewModel
 
     init(viewModel: ViewModel) {
@@ -22,11 +23,18 @@ struct WishlistView<ViewModel: WishlistViewModelProtocol>: View {
                 spacing: Spacing.space200
             ) {
                 ForEach(viewModel.products) { product in
-                    VerticalProductCard(
-                        viewModel: viewModel.productCardViewModel(for: product)
-                    ) { _, type in
-                        handleUserAction(forProduct: product, actionType: type)
-                    }
+                    Button(
+                        action: { coordinador.openDetails(for: product) },
+                        label: {
+                            VerticalProductCard(
+                                viewModel: viewModel.productCardViewModel(for: product)
+                            ) { _, type in
+                                handleUserAction(forProduct: product, actionType: type)
+                            }
+                        }
+                    )
+                    .buttonStyle(.plain)
+                    .listRowInsets(EdgeInsets())
                 }
             }
             .padding(.horizontal, Spacing.space200)
@@ -42,7 +50,7 @@ struct WishlistView<ViewModel: WishlistViewModelProtocol>: View {
 // MARK: - Private Methods
 
 private extension WishlistView {
-    func handleUserAction(forProduct product: SelectionProduct, actionType: VerticalProductCard.ProductUserActionType) {
+    func handleUserAction(forProduct product: SelectedProduct, actionType: VerticalProductCard.ProductUserActionType) {
         // swiftlint:disable vertical_whitespace_between_cases
         switch actionType {
         case .remove: