Fix associations for images and attributes

joshheald · joshheald · commit 43c7bf62d627 · 2025-09-12T08:30:47.000+01:00
diff --git a/Modules/Sources/Storage/GRDB/Model/PersistedProduct.swift b/Modules/Sources/Storage/GRDB/Model/PersistedProduct.swift
@@ -73,7 +73,8 @@ extension PersistedProduct: FetchableRecord, PersistableRecord {
     }
 
     public static let images = hasMany(PersistedProductImage.self,
-                                       using: ForeignKey(PersistedProductImage.primaryKey,
+                                       using: ForeignKey([PersistedProductImage.CodingKeys.siteID.stringValue,
+                                                          PersistedProductImage.CodingKeys.productID.stringValue],
                                                          to: primaryKey))
     public static let attributes = hasMany(PersistedProductAttribute.self,
                                            using: ForeignKey([PersistedProductAttribute.CodingKeys.siteID.stringValue,
diff --git a/Modules/Sources/Storage/GRDB/Model/PersistedProductAttribute.swift b/Modules/Sources/Storage/GRDB/Model/PersistedProductAttribute.swift
@@ -35,6 +35,8 @@ public struct PersistedProductAttribute: Codable {
 extension PersistedProductAttribute: FetchableRecord, MutablePersistableRecord {
     public static var databaseTableName: String { "productAttribute" }
 
+    public static var primaryKey: [String] { [CodingKeys.id.stringValue] }
+
     public enum Columns {
         public static let id = Column(CodingKeys.id)
         public static let siteID = Column(CodingKeys.siteID)
@@ -49,6 +51,8 @@ extension PersistedProductAttribute: FetchableRecord, MutablePersistableRecord {
     public mutating func didInsert(_ inserted: InsertionSuccess) {
         id = inserted.rowID
     }
+
+    public static let product = belongsTo(PersistedProduct.self)
 }
 
 
diff --git a/Modules/Sources/Storage/GRDB/Model/PersistedProductImage.swift b/Modules/Sources/Storage/GRDB/Model/PersistedProductImage.swift
@@ -51,7 +51,7 @@ extension PersistedProductImage: FetchableRecord, PersistableRecord {
 
 
 // periphery:ignore - TODO: remove ignore when populating database
-private extension PersistedProductImage {
+extension PersistedProductImage {
     enum CodingKeys: String, CodingKey {
         case siteID
         case id
diff --git a/Modules/Sources/Storage/GRDB/Model/PersistedProductVariation.swift b/Modules/Sources/Storage/GRDB/Model/PersistedProductVariation.swift
@@ -61,11 +61,14 @@ extension PersistedProductVariation: FetchableRecord, PersistableRecord {
     }
 
     public static let attributes = hasMany(PersistedProductVariationAttribute.self,
+                                           key: "attributes",
                                            using: ForeignKey([PersistedProductVariationAttribute.CodingKeys.siteID.stringValue,
                                                               PersistedProductVariationAttribute.CodingKeys.productVariationID.stringValue],
                                                              to: primaryKey))
     public static let image = hasOne(PersistedProductVariationImage.self,
-                                     using: ForeignKey(PersistedProductVariationImage.primaryKey,
+                                     key: "image",
+                                     using: ForeignKey([PersistedProductVariationImage.CodingKeys.siteID.stringValue,
+                                                        PersistedProductVariationImage.CodingKeys.productVariationID.stringValue],
                                                        to: primaryKey))
 }
 
diff --git a/Modules/Sources/Storage/GRDB/Model/PersistedProductVariationAttribute.swift b/Modules/Sources/Storage/GRDB/Model/PersistedProductVariationAttribute.swift
@@ -27,6 +27,8 @@ public struct PersistedProductVariationAttribute: Codable {
 extension PersistedProductVariationAttribute: FetchableRecord, MutablePersistableRecord {
     public static var databaseTableName: String { "productVariationAttribute" }
 
+    public static var primaryKey: [String] { [CodingKeys.id.stringValue] }
+
     public enum Columns {
         public static let id = Column(CodingKeys.id)
         public static let siteID = Column(CodingKeys.siteID)
@@ -38,6 +40,8 @@ extension PersistedProductVariationAttribute: FetchableRecord, MutablePersistabl
     public mutating func didInsert(_ inserted: InsertionSuccess) {
         id = inserted.rowID
     }
+
+    public static let variation = belongsTo(PersistedProductVariation.self)
 }
 
 
diff --git a/Modules/Sources/Storage/GRDB/Model/PersistedProductVariationImage.swift b/Modules/Sources/Storage/GRDB/Model/PersistedProductVariationImage.swift
@@ -51,7 +51,7 @@ extension PersistedProductVariationImage: FetchableRecord, PersistableRecord {
 
 
 // periphery:ignore - TODO: remove ignore when populating database
-private extension PersistedProductVariationImage {
+extension PersistedProductVariationImage {
     enum CodingKeys: String, CodingKey {
         case siteID
         case id
diff --git a/Modules/Tests/YosemiteTests/Storage/PersistedProductTests.swift b/Modules/Tests/YosemiteTests/Storage/PersistedProductTests.swift
@@ -386,7 +386,7 @@ struct PersistedProductTests {
         try posProduct.save(to: db)
 
         let fetchedProduct = try db.read { db in
-            try PersistedProduct.filter(PersistedProduct.Columns.id == 123).fetchOne(db)
+            try PersistedProduct.filter { $0.siteID == 1 && $0.id == 123 }.fetchOne(db)
         }
         let product = try #require(fetchedProduct)
         let loadedPOSProduct = try product.toPOSProduct(db: db)

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,8 @@ extension PersistedProduct: FetchableRecord, PersistableRecord {`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`public static let images = hasMany(PersistedProductImage.self,`
`76`		`- using: ForeignKey(PersistedProductImage.primaryKey,`
	`76`	`+ using: ForeignKey([PersistedProductImage.CodingKeys.siteID.stringValue,`
	`77`	`+ PersistedProductImage.CodingKeys.productID.stringValue],`
`77`	`78`	`to: primaryKey))`
`78`	`79`	`public static let attributes = hasMany(PersistedProductAttribute.self,`
`79`	`80`	`using: ForeignKey([PersistedProductAttribute.CodingKeys.siteID.stringValue,`
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,8 @@ public struct PersistedProductAttribute: Codable {`
`35`	`35`	`extension PersistedProductAttribute: FetchableRecord, MutablePersistableRecord {`
`36`	`36`	`public static var databaseTableName: String { "productAttribute" }`
`37`	`37`
	`38`	`+ public static var primaryKey: [String] { [CodingKeys.id.stringValue] }`
	`39`	`+`
`38`	`40`	`public enum Columns {`
`39`	`41`	`public static let id = Column(CodingKeys.id)`
`40`	`42`	`public static let siteID = Column(CodingKeys.siteID)`
`@@ -49,6 +51,8 @@ extension PersistedProductAttribute: FetchableRecord, MutablePersistableRecord {`
`49`	`51`	`public mutating func didInsert(_ inserted: InsertionSuccess) {`
`50`	`52`	`id = inserted.rowID`
`51`	`53`	`}`
	`54`	`+`
	`55`	`+ public static let product = belongsTo(PersistedProduct.self)`
`52`	`56`	`}`
`53`	`57`
`54`	`58`
Original file line number	Diff line number	Diff line change
`@@ -61,11 +61,14 @@ extension PersistedProductVariation: FetchableRecord, PersistableRecord {`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`public static let attributes = hasMany(PersistedProductVariationAttribute.self,`
	`64`	`+ key: "attributes",`
`64`	`65`	`using: ForeignKey([PersistedProductVariationAttribute.CodingKeys.siteID.stringValue,`
`65`	`66`	`PersistedProductVariationAttribute.CodingKeys.productVariationID.stringValue],`
`66`	`67`	`to: primaryKey))`
`67`	`68`	`public static let image = hasOne(PersistedProductVariationImage.self,`
`68`		`- using: ForeignKey(PersistedProductVariationImage.primaryKey,`
	`69`	`+ key: "image",`
	`70`	`+ using: ForeignKey([PersistedProductVariationImage.CodingKeys.siteID.stringValue,`
	`71`	`+ PersistedProductVariationImage.CodingKeys.productVariationID.stringValue],`
`69`	`72`	`to: primaryKey))`
`70`	`73`	`}`
`71`	`74`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,8 @@ public struct PersistedProductVariationAttribute: Codable {`
`27`	`27`	`extension PersistedProductVariationAttribute: FetchableRecord, MutablePersistableRecord {`
`28`	`28`	`public static var databaseTableName: String { "productVariationAttribute" }`
`29`	`29`
	`30`	`+ public static var primaryKey: [String] { [CodingKeys.id.stringValue] }`
	`31`	`+`
`30`	`32`	`public enum Columns {`
`31`	`33`	`public static let id = Column(CodingKeys.id)`
`32`	`34`	`public static let siteID = Column(CodingKeys.siteID)`
`@@ -38,6 +40,8 @@ extension PersistedProductVariationAttribute: FetchableRecord, MutablePersistabl`
`38`	`40`	`public mutating func didInsert(_ inserted: InsertionSuccess) {`
`39`	`41`	`id = inserted.rowID`
`40`	`42`	`}`
	`43`	`+`
	`44`	`+ public static let variation = belongsTo(PersistedProductVariation.self)`
`41`	`45`	`}`
`42`	`46`
`43`	`47`
Original file line number	Diff line number	Diff line change
`@@ -386,7 +386,7 @@ struct PersistedProductTests {`
`386`	`386`	`try posProduct.save(to: db)`
`387`	`387`
`388`	`388`	`let fetchedProduct = try db.read { db in`
`389`		`- try PersistedProduct.filter(PersistedProduct.Columns.id == 123).fetchOne(db)`
	`389`	`+ try PersistedProduct.filter { $0.siteID == 1 && $0.id == 123 }.fetchOne(db)`
`390`	`390`	`}`
`391`	`391`	`let product = try #require(fetchedProduct)`
`392`	`392`	`let loadedPOSProduct = try product.toPOSProduct(db: db)`