Append the product ID to each media item's parent_id in the multipart form data upload.

Author: jaclync

Networking/Networking/Network/Network.swift

@@ -4,7 +4,13 @@ import Alamofire
 /// Constructs `multipart/form-data` for uploads within an HTTP or HTTPS body.
 ///
 public protocol MultipartFormData {
+    /// Appends a file with file URL for a name to form data.
+    ///
     func append(_ fileURL: URL, withName name: String, fileName: String, mimeType: String)
+
+    /// Appends data for a name to form data.
+    ///
+    func append(_ data: Data, withName name: String)
 }
 
 /// Defines all of the Network Operations we'll be performing. This allows us to swap the actual Wrapper in our

Networking/Networking/Remote/MediaRemote.swift

@@ -40,19 +40,25 @@ public class MediaRemote: Remote {
     ///
     /// - Parameters:
     ///     - siteID: Site for which we'll upload the media to.
+    ///     - productID: Product for which the media items are first added to.
     ///     - context: Display or edit. Scope under which the request is made;
     ///                determines fields present in response. Default is Display.
     ///     - mediaItems: An array of uploadable media items.
     ///     - completion: Closure to be executed upon completion.
     ///
     public func uploadMedia(for siteID: Int64,
+                            productID: Int64,
                             context: String? = Default.context,
                             mediaItems: [UploadableMedia],
                             completion: @escaping ([Media]?, Error?) -> Void) {
         let parameters = [
             ParameterKey.contextKey: context ?? Default.context,
         ]
 
+        let formParameters: [String: String] = [Int](0..<mediaItems.count).reduce(into: [:]) { (parentIDsByKey, index) in
+            parentIDsByKey["attrs[\(index)][parent_id]"] = "\(productID)"
+        }
+
         let path = "sites/\(siteID)/media/new"
         let request = DotcomRequest(wordpressApiVersion: .mark1_1,
                                     method: .post,
@@ -61,6 +67,10 @@ public class MediaRemote: Remote {
         let mapper = MediaListMapper()
 
         enqueueMultipartFormDataUpload(request, mapper: mapper, multipartFormData: { multipartFormData in
+            formParameters.forEach { (key, value) in
+                multipartFormData.append(Data(value.utf8), withName: key)
+            }
+
             mediaItems.forEach { mediaItem in
                 multipartFormData.append(mediaItem.localURL,
                                          withName: "media[]",

WooCommerce/Classes/ViewRelated/Products/Media/ProductImageActionHandler.swift

@@ -9,6 +9,7 @@ final class ProductImageActionHandler {
     typealias OnAssetUpload = (PHAsset, ProductImage) -> Void
 
     private let siteID: Int64
+    private let productID: Int64
 
     var productImageStatuses: [ProductImageStatus] {
         return allStatuses.productImageStatuses
@@ -29,6 +30,7 @@ final class ProductImageActionHandler {
 
     init(siteID: Int64, product: Product) {
         self.siteID = siteID
+        self.productID = product.productID
         self.allStatuses = (productImageStatuses: product.imageStatuses, error: nil)
     }
 
@@ -98,6 +100,7 @@ final class ProductImageActionHandler {
         allStatuses = (productImageStatuses: imageStatuses, error: nil)
 
         let action = MediaAction.uploadMedia(siteID: siteID,
+                                             productID: productID,
                                              mediaAsset: asset) { [weak self] (media, error) in
                                                 guard let self = self else {
                                                     return

Yosemite/Yosemite/Actions/MediaAction.swift

@@ -18,5 +18,8 @@ public enum MediaAction: Action {
 
     /// Uploads an exportable media asset to the site's WP Media Library.
     ///
-    case uploadMedia(siteID: Int64, mediaAsset: ExportableAsset, onCompletion: (_ uploadedMedia: Media?, _ error: Error?) -> Void)
+    case uploadMedia(siteID: Int64,
+        productID: Int64,
+        mediaAsset: ExportableAsset,
+        onCompletion: (_ uploadedMedia: Media?, _ error: Error?) -> Void)
 }

Yosemite/Yosemite/Stores/MediaStore.swift

@@ -36,8 +36,8 @@ public final class MediaStore: Store {
         switch action {
         case .retrieveMediaLibrary(let siteID, let pageNumber, let pageSize, let onCompletion):
             retrieveMediaLibrary(siteID: siteID, pageNumber: pageNumber, pageSize: pageSize, onCompletion: onCompletion)
-        case .uploadMedia(let siteID, let mediaAsset, let onCompletion):
-            uploadMedia(siteID: siteID, mediaAsset: mediaAsset, onCompletion: onCompletion)
+        case .uploadMedia(let siteID, let productID, let mediaAsset, let onCompletion):
+            uploadMedia(siteID: siteID, productID: productID, mediaAsset: mediaAsset, onCompletion: onCompletion)
         }
     }
 }
@@ -60,6 +60,7 @@ private extension MediaStore {
     /// 2) Uploads the exported media file to the server
     ///
     func uploadMedia(siteID: Int64,
+                     productID: Int64,
                      mediaAsset: ExportableAsset,
                      onCompletion: @escaping (_ uploadedMedia: Media?, _ error: Error?) -> Void) {
         mediaExportService.export(mediaAsset,
@@ -69,16 +70,19 @@ private extension MediaStore {
                                         return
                                     }
                                     self?.uploadMedia(siteID: siteID,
+                                                      productID: productID,
                                                       uploadableMedia: uploadableMedia,
                                                       onCompletion: onCompletion)
         })
     }
 
     func uploadMedia(siteID: Int64,
+                     productID: Int64,
                      uploadableMedia media: UploadableMedia,
                      onCompletion: @escaping (_ uploadedMedia: Media?, _ error: Error?) -> Void) {
         let remote = MediaRemote(network: network)
         remote.uploadMedia(for: siteID,
+                           productID: productID,
                            mediaItems: [media]) { (uploadedMediaItems, error) in
                             // Removes local media after the upload API request.
                             do {