Merge pull request #50 from pbj-apps/Add-Product-External-Id

Add product externalId
pbj-apps · Jul 1, 2022 · 75ae75c · 75ae75c
2 parents 8b11d57 + 6e3ed09
commit 75ae75c
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 10 deletions.
diff --git a/Sources/Live/Data/Product/JSONProduct.swift b/Sources/Live/Data/Product/JSONProduct.swift
@@ -21,6 +21,7 @@ struct JSONProductHighlightedTiming: Decodable {
 }
 
 struct JSONProduct: Decodable {
+    let external_id: String?
 	let title: String
 	let description: String
 	let price: String
@@ -57,7 +58,8 @@ public extension String {
 extension JSONProductResult {
 	func toProduct() -> Product {
 		return Product(
-			id: id,
+            id: id,
+            externalId: product.external_id ?? "",
 			title: product.title,
 			price: product.price,
 			detail: product.description,

diff --git a/Sources/Live/Domain/Product/Product.swift b/Sources/Live/Domain/Product/Product.swift
@@ -9,6 +9,7 @@ import Foundation
 
 public struct Product: Equatable, Identifiable {
 	public let id: String
+    public let externalId: String
 	public let title: String
 	public let price: String
 	public let detail: String
@@ -18,14 +19,16 @@ public struct Product: Equatable, Identifiable {
 	public let highlightTimings: [ProductHighlightedTiming]?
 
 	public init(id: String,
-							title: String,
-							price: String,
-							detail: String,
-							image: URL?,
-							link: URL?,
-							isHighlighted: Bool,
-							highlightTimings: [ProductHighlightedTiming]?){
+                externalId: String,
+                title: String,
+                price: String,
+                detail: String,
+                image: URL?,
+                link: URL?,
+                isHighlighted: Bool,
+                highlightTimings: [ProductHighlightedTiming]?){
 		self.id = id
+        self.externalId = externalId
 		self.title = title
 		self.price = price
 		self.detail = detail

diff --git a/Sources/LiveUI/Products/ProductComponent.swift b/Sources/LiveUI/Products/ProductComponent.swift
@@ -28,7 +28,8 @@ struct ProductComponent: View {
 struct ProductComponent_Previews: PreviewProvider {
 	static var previews: some View {
 		let product = Product(
-			id: "123",
+            id: "123",
+            externalId: "456",
 			title: "Apple Airpods",
 			price: "$29.99",
 			detail: "Lorem ipsum dolor sit amet, consectetur adipiscing elit.`",

diff --git a/Sources/LiveUI/Products/ProductsCarrousel.swift b/Sources/LiveUI/Products/ProductsCarrousel.swift
@@ -45,7 +45,8 @@ public struct ProductsCarrousel<PVF: ProductCardViewFactory>: View {
 struct ProductsCarrousel_Previews: PreviewProvider {
 	static var previews: some View {
 		let product1 = Product(
-			id: "123",
+            id: "123",
+            externalId: "456",
 			title: "Apple Airpods",
 			price: "$29.99",
 			detail: "Lorem ipsum dolor sit amet, consectetur adipiscing elit.`",
@@ -55,6 +56,7 @@ struct ProductsCarrousel_Previews: PreviewProvider {
 			highlightTimings: nil)
 		let product2 = Product(
 			id: "123",
+            externalId: "456",
 			title: "Apple Airpods",
 			price: "$29.99",
 			detail: "Lorem ipsum dolor sit amet, consectetur adipiscing elit.`",
@@ -64,6 +66,7 @@ struct ProductsCarrousel_Previews: PreviewProvider {
 			highlightTimings: nil)
 		let product3 = Product(
 			id: "123",
+            externalId: "456",
 			title: "Apple Airpods",
 			price: "$29.99",
 			detail: "Lorem ipsum dolor sit amet, consectetur adipiscing elit.`",