Merge branch 'woomob-1210-relationship-based-mapping-and-saving-for-POS-entities' into woomob-1210-tests-for-saving-pos-models

Author: joshheald

Modules/Sources/Yosemite/Model/Storage/PersistedProduct+Conversions.swift

@@ -44,12 +44,12 @@ extension PersistedProduct {
     }
 
     func toPOSProduct(db: GRDBDatabaseConnection) throws -> POSProduct {
-        let images = try db.read { db in
-            return try request(for: PersistedProduct.images).fetchAll(db)
-        }
-        let attributes = try db.read { db in
-            return try request(for: PersistedProduct.attributes).fetchAll(db)
+        let (images, attributes) = try db.read { db in
+            let images = try request(for: PersistedProduct.images).fetchAll(db)
+            let attributes = try request(for: PersistedProduct.attributes).fetchAll(db)
+            return (images, attributes)
         }
+
         return toPOSProduct(
             images: images.map { $0.toProductImage() },
             attributes: attributes.map { $0.toProductAttribute(siteID: siteID) }
@@ -96,7 +96,7 @@ extension PersistedProductAttribute {
     func toProductAttribute(siteID: Int64) -> ProductAttribute {
         return ProductAttribute(
             siteID: siteID,
-            attributeID: 0,
+            attributeID: id ?? 0,
             name: name,
             position: Int(position),
             visible: visible,

Modules/Sources/Yosemite/Model/Storage/PersistedProductVariation+Conversions.swift

@@ -38,12 +38,12 @@ extension PersistedProductVariation {
     }
 
     func toPOSProductVariation(db: GRDBDatabaseConnection) throws -> POSProductVariation {
-        let image = try db.read { db in
-            return try request(for: PersistedProductVariation.image).fetchOne(db)
-        }
-        let attributes = try db.read { db in
-            return try request(for: PersistedProductVariation.attributes).fetchAll(db)
+        let (image, attributes) = try db.read { db in
+            let image = try request(for: PersistedProductVariation.image).fetchOne(db)
+            let attributes = try request(for: PersistedProductVariation.attributes).fetchAll(db)
+            return (image, attributes)
         }
+
         return toPOSProductVariation(
             attributes: attributes.map { $0.toProductVariationAttribute() },
             image: image?.toProductImage()