get it to build

firebase · aashishpatil-g · Mar 27, 2025 · Feb 27, 2025 · Feb 28, 2025 · Mar 3, 2025
commit 477e464ee6a26aafcb655b83efcc204d3a356571
diff --git a/Sources/DataConnectError.swift b/Sources/DataConnectError.swift
@@ -38,16 +38,16 @@ public enum DataConnectError: Error {
 
 // The data and errors sent to us from the backend in its response.
 @available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
-public struct OperationFailureResponse {
+public protocol OperationFailureResponse {
   // JSON string whose value is the "data" property provided by the backend in its response
   // payload; may be `nil` if the "data" property was not provided in the backend response and/or
   // was `null` in the backend response.
-  public let jsonData: String?
+  var jsonData: String? { get }
 
   // The list of errors in the "error" property provided by the backend in its response payload;
   // may be empty if the "errors" property was not provided in the backend response and/or was an
   // empty list in the backend response.
-  public let errorInfoList: [OperationFailureResponseErrorInfo]
+  var errorInfoList: [OperationFailureResponseErrorInfo] { get }
 
   // Returns `jsonData` string decoded into the given type, if decoding was successful when the
   // operation was executed. Returns `nil` if `jsonData` is `nil`, if `jsonData` was _not_ able to
@@ -56,7 +56,17 @@ public struct OperationFailureResponse {
   //
   // This function does _not_ do the decoding itself, but simply returns the decoded data, if any,
   // that was decoded at the time of the operation's execution.
-  public func decodedData<Data: Decodable>(asType: Data.Type = Data.self) -> Data?
+  func decodedData<Data: Decodable>(asType: Data.Type) -> Data?
+}
+
+struct OperationFailureResponseImpl : OperationFailureResponse {
+  public let jsonData: String?
+
+  public let errorInfoList: [OperationFailureResponseErrorInfo]
+
+  func decodedData<Data: Decodable>(asType: Data.Type = Data.self) -> Data? {
+    return nil;
+  }
 }
 
 // Information about an error provided by the backend in its response.

diff --git a/Sources/Internal/CodableHelpers.swift b/Sources/Internal/CodableHelpers.swift
@@ -40,7 +40,7 @@ class Int64CodableConverter: CodableConverter {
     }
 
     guard let int64Value = Int64(input) else {
-      throw DataConnectError.decodeFailed
+      throw DataConnectError.appNotConfigured
     }
     return int64Value
   }

diff --git a/Sources/Internal/GrpcClient.swift b/Sources/Internal/GrpcClient.swift
@@ -151,10 +151,16 @@ actor GrpcClient: CustomStringConvertible {
       DataConnectLogger
         .debug("executeQuery() receives response: \(resultsString, privacy: .private).")
 
+
       // Not doing error decoding here
       guard results.errors.isEmpty else {
-        throw DataConnectError
-          .operationExecutionFailed(messages: createErrorJson(errors: results.errors))
+        throw DataConnectError.operationExecutionFailed(
+          messages: createErrorJson(errors: results.errors),
+          response: OperationFailureResponseImpl(
+            jsonData: resultsString,
+            errorInfoList: []
+          )
+        )
       }
 
       if let decodedResults = try codec.decode(result: results.data, asType: resultType) {
@@ -163,7 +169,13 @@ actor GrpcClient: CustomStringConvertible {
         // In future, set this as error in OperationResult
         DataConnectLogger
           .debug("executeQuery() response: \(resultsString, privacy: .private) decode failed.")
-        throw DataConnectError.decodeFailed
+        throw DataConnectError.operationExecutionFailed(
+          messages: "decode failed",
+          response: OperationFailureResponseImpl(
+            jsonData: resultsString,
+            errorInfoList: []
+          )
+        )
       }
     } catch {
       DataConnectLogger.error(
@@ -201,16 +213,27 @@ actor GrpcClient: CustomStringConvertible {
         .debug("executeMutation() receives response: \(resultsString, privacy: .private).")
 
       guard results.errors.isEmpty else {
-        throw DataConnectError
-          .operationExecutionFailed(messages: createErrorJson(errors: results.errors))
+        throw DataConnectError.operationExecutionFailed(
+          messages: createErrorJson(errors: results.errors),
+          response: OperationFailureResponseImpl(
+            jsonData: resultsString,
+            errorInfoList: []
+          )
+        )
       }
 
       if let decodedResults = try codec.decode(result: results.data, asType: resultType) {
         return OperationResult(data: decodedResults)
       } else {
         DataConnectLogger
           .debug("executeMutation() response: \(resultsString, privacy: .private) decode failed.")
-        throw DataConnectError.decodeFailed
+        throw DataConnectError.operationExecutionFailed(
+          messages: "decode failed",
+          response: OperationFailureResponseImpl(
+            jsonData: resultsString,
+            errorInfoList: []
+          )
+        )
       }
     } catch {
       DataConnectLogger.error(