fix: Saving ParseFiles occurs on the background queue (#230)

cbaker6 · web-flow · commit 85e8bd763b51 · 2021-09-11T23:25:03.000-04:00
* Save ParseFiles on background queue

* Fix test cases and allow to specify return queue on sync

* Add internal convenience initializer

* Test files in Playgrounds

* Test multiple files in playground

* Fix warnings in Playgrounds
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,12 @@
 [Full Changelog](https://github.com/parse-community/Parse-Swift/compare/1.9.8...main)
 * _Contributing to this repo? Add info about your change here to be included in the next release_
 
+### 1.9.8
+[Full Changelog](https://github.com/parse-community/Parse-Swift/compare/1.9.8...1.9.9)
+
+__Fixes__
+- Saving ParseObjects with ParseFile properties now saves files on background queue ([#230](https://github.com/parse-community/Parse-Swift/pull/230)), thanks to [Corey Baker](https://github.com/cbaker6).
+
 ### 1.9.8
 [Full Changelog](https://github.com/parse-community/Parse-Swift/compare/1.9.7...1.9.8)
 
diff --git a/ParseSwift.playground/Pages/10 - Cloud Code.xcplaygroundpage/Contents.swift b/ParseSwift.playground/Pages/10 - Cloud Code.xcplaygroundpage/Contents.swift
@@ -67,10 +67,16 @@ cloudError.runFunction { result in
             case 3000:
                 print("Received Cloud Code error: \(error)")
             default:
-                assertionFailure("Should have received code \"3000\"")
+                assertionFailure("""
+                    Should have received code \"3000\"
+                    Instead received \(error)
+                """)
             }
         default:
-            assertionFailure("Should have been case \"other\"")
+            assertionFailure("""
+                Should have received code \"other\"
+                Instead received \(error)
+            """)
         }
     }
 }
diff --git a/ParseSwift.playground/Pages/15 - Custom ObjectId.xcplaygroundpage/Contents.swift b/ParseSwift.playground/Pages/15 - Custom ObjectId.xcplaygroundpage/Contents.swift
@@ -70,7 +70,7 @@ score.save { result in
         changedScore.score = 200
         changedScore.save { result in
             switch result {
-            case .success(var savedChangedScore):
+            case .success(let savedChangedScore):
                 assert(savedChangedScore.score == 200)
                 assert(savedScore.objectId == savedChangedScore.objectId)
                 print("Updated score: \(savedChangedScore)")
diff --git a/ParseSwift.playground/Pages/17 - SwiftUI - Finding Objects.xcplaygroundpage/Contents.swift b/ParseSwift.playground/Pages/17 - SwiftUI - Finding Objects.xcplaygroundpage/Contents.swift
@@ -38,6 +38,7 @@ struct GameScore: ParseObject, Identifiable {
     var score: Int = 0
     var location: ParseGeoPoint?
     var name: String?
+    var myFiles: [ParseFile]?
 
     //: Custom initializer.
     init(name: String, score: Int) {
@@ -55,9 +56,43 @@ struct ContentView: View {
     @ObservedObject var viewModel = GameScore.query("score" > 2)
         .order([.descending("score")])
         .viewModel
+    @State var name = ""
+    @State var score = ""
+    @State var isShowingAction = false
+    @State var savedLabel = ""
 
     var body: some View {
         NavigationView {
+            VStack {
+                TextField("Name", text: $name)
+                TextField("Score", text: $score)
+                Button(action: {
+                    guard let scoreValue = Int(score),
+                          let linkToFile = URL(string: "https://parseplatform.org/img/logo.svg") else {
+                        return
+                    }
+                    var score = GameScore(name: name,
+                                          score: scoreValue)
+                    //: Create new `ParseFile` for saving.
+                    let file1 = ParseFile(name: "file1.svg",
+                                          cloudURL: linkToFile)
+                    let file2 = ParseFile(name: "file2.svg",
+                                          cloudURL: linkToFile)
+                    score.myFiles = [file1, file2]
+                    score.save { result in
+                        switch result {
+                        case .success:
+                            savedLabel = "Saved score"
+                            self.viewModel.find()
+                        case .failure(let error):
+                            savedLabel = "Error: \(error.message)"
+                        }
+                        isShowingAction = true
+                    }
+                }, label: {
+                    Text("Save score")
+                })
+            }
             if let error = viewModel.error {
                 Text(error.description)
             } else {
@@ -75,6 +110,11 @@ struct ContentView: View {
             Spacer()
         }.onAppear(perform: {
             viewModel.find()
+        }).alert(isPresented: $isShowingAction, content: {
+            Alert(title: Text("GameScore"),
+                  message: Text(savedLabel),
+                  dismissButton: .default(Text("Ok"), action: {
+            }))
         })
     }
 }
diff --git a/ParseSwift.playground/Pages/7 - GeoPoint.xcplaygroundpage/Contents.swift b/ParseSwift.playground/Pages/7 - GeoPoint.xcplaygroundpage/Contents.swift
@@ -77,7 +77,10 @@ do {
 
             assert(scores.count >= 1)
             scores.forEach { (score) in
-                print("Someone with objectId \"\(score.objectId!)\" has a score of \"\(score.score)\" near me")
+                print("""
+                    Someone with objectId \"\(score.objectId!)\"
+                    has a score of \"\(String(describing: score.score))\" near me
+                """)
             }
 
         case .failure(let error):
@@ -97,7 +100,10 @@ querySorted.find { results in
 
         assert(scores.count >= 1)
         scores.forEach { (score) in
-            print("Someone with objectId \"\(score.objectId!)\" has a score of \"\(score.score)\" near me")
+            print("""
+                Someone with objectId \"\(score.objectId!)\"
+                has a score of \"\(String(describing: score.score))\" near me
+            """)
         }
 
     case .failure(let error):
@@ -116,7 +122,7 @@ query2.find { results in
         scores.forEach { (score) in
             print("""
                 Someone with objectId \"\(score.objectId!)\" has a
-                score of \"\(score.score)\" near me which is greater than 9
+                score of \"\(String(describing: score.score))\" near me which is greater than 9
             """)
         }
 
@@ -133,7 +139,8 @@ query3.find { results in
 
         scores.forEach { (score) in
             print("""
-                Someone has a score of \"\(score.score)\" with no geopoint \(String(describing: score.location))
+                Someone has a score of \"\(String(describing: score.score))\"
+                with no geopoint \(String(describing: score.location))
             """)
         }
 
@@ -151,7 +158,8 @@ query4.find { results in
         assert(scores.count >= 1)
         scores.forEach { (score) in
             print("""
-                Someone has a score of \"\(score.score)\" with geopoint \(String(describing: score.location))
+                Someone has a score of \"\(String(describing: score.score))\"
+                with geopoint \(String(describing: score.location))
             """)
         }
 
@@ -170,7 +178,8 @@ query7.find { results in
 
         scores.forEach { (score) in
             print("""
-                Someone has a score of \"\(score.score)\" with geopoint using OR \(String(describing: score.location))
+                Someone has a score of \"\(String(describing: score.score))\"
+                with geopoint using OR \(String(describing: score.location))
             """)
         }
 
diff --git a/Sources/ParseSwift/API/URLSession+extensions.swift b/Sources/ParseSwift/API/URLSession+extensions.swift
@@ -135,7 +135,8 @@ extension URLSession {
             completion(self.makeResult(request: request,
                                        responseData: responseData,
                                        urlResponse: urlResponse,
-                                       responseError: responseError, mapper: mapper))
+                                       responseError: responseError,
+                                       mapper: mapper))
         }.resume()
     }
 }
diff --git a/Sources/ParseSwift/Objects/ParseObject.swift b/Sources/ParseSwift/Objects/ParseObject.swift
@@ -789,8 +789,7 @@ extension ParseObject {
                     }
 
                     try savableFiles.forEach {
-                        let file = $0
-                        filesFinishedSaving[file.localId] = try $0.save(options: options)
+                        filesFinishedSaving[$0.localId] = try $0.save(options: options, callbackQueue: queue)
                     }
                 }
                 completion(objectsFinishedSaving, filesFinishedSaving, nil)
diff --git a/Sources/ParseSwift/ParseConstants.swift b/Sources/ParseSwift/ParseConstants.swift
@@ -10,7 +10,7 @@ import Foundation
 
 enum ParseConstants {
     static let sdk = "swift"
-    static let version = "1.9.8"
+    static let version = "1.9.9"
     static let fileManagementDirectory = "parse/"
     static let fileManagementPrivateDocumentsDirectory = "Private Documents/"
     static let fileManagementLibraryDirectory = "Library/"
diff --git a/Sources/ParseSwift/Types/ParseError.swift b/Sources/ParseSwift/Types/ParseError.swift
@@ -18,11 +18,6 @@ public struct ParseError: ParseType, Decodable, Swift.Error {
     public let message: String
     /// An error value representing a custom error from the Parse Server.
     public let otherCode: Int?
-    init(code: Code, message: String) {
-        self.code = code
-        self.message = message
-        self.otherCode = nil
-    }
 
     enum CodingKeys: String, CodingKey {
         case code
@@ -369,6 +364,16 @@ extension ParseError {
     }
 }
 
+// MARK: Convenience Implementations
+extension ParseError {
+
+    init(code: Code, message: String) {
+        self.code = code
+        self.message = message
+        self.otherCode = nil
+    }
+}
+
 // MARK: Decodable
 extension ParseError {
 
diff --git a/Sources/ParseSwift/Types/ParseFile.swift b/Sources/ParseSwift/Types/ParseFile.swift
diff --git a/Tests/ParseSwiftTests/ParseObjectTests.swift b/Tests/ParseSwiftTests/ParseObjectTests.swift

Original file line number	Diff line number	Diff line change
`@@ -67,10 +67,16 @@ cloudError.runFunction { result in`
`67`	`67`	`case 3000:`
`68`	`68`	`print("Received Cloud Code error: \(error)")`
`69`	`69`	`default:`
`70`		`- assertionFailure("Should have received code \"3000\"")`
	`70`	`+ assertionFailure("""`
	`71`	`+ Should have received code \"3000\"`
	`72`	`+ Instead received \(error)`
	`73`	`+ """)`
`71`	`74`	`}`
`72`	`75`	`default:`
`73`		`- assertionFailure("Should have been case \"other\"")`
	`76`	`+ assertionFailure("""`
	`77`	`+ Should have received code \"other\"`
	`78`	`+ Instead received \(error)`
	`79`	`+ """)`
`74`	`80`	`}`
`75`	`81`	`}`
`76`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,8 @@ extension URLSession {`
`135`	`135`	`completion(self.makeResult(request: request,`
`136`	`136`	`responseData: responseData,`
`137`	`137`	`urlResponse: urlResponse,`
`138`		`- responseError: responseError, mapper: mapper))`
	`138`	`+ responseError: responseError,`
	`139`	`+ mapper: mapper))`
`139`	`140`	`}.resume()`
`140`	`141`	`}`
`141`	`142`	`}`
Original file line number	Diff line number	Diff line change
`@@ -789,8 +789,7 @@ extension ParseObject {`
`789`	`789`	`}`
`790`	`790`
`791`	`791`	`try savableFiles.forEach {`
`792`		`- let file = $0`
`793`		`- filesFinishedSaving[file.localId] = try $0.save(options: options)`
	`792`	`+ filesFinishedSaving[$0.localId] = try $0.save(options: options, callbackQueue: queue)`
`794`	`793`	`}`
`795`	`794`	`}`
`796`	`795`	`completion(objectsFinishedSaving, filesFinishedSaving, nil)`