Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(datastore): add required fields in selection set for hasOne-belongsTo relationship #3476

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions Amplify/Categories/API/Response/GraphQLError.swift
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,5 @@ extension GraphQLError {
public let column: Int
}
}

extension GraphQLError: Error { }
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ extension SelectionSet {
let schema = ModelRegistry.modelSchema(from: associatedModelName) {
if recursive {
var recursive = recursive
if field._isBelongsToOrHasOne {
if field._isBelongsToOrHasOne && !field.isRequired {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

even though it's a minor fix, is there a unit test that can be updated or added to cover this change?

recursive = false
}

Expand Down
31 changes: 31 additions & 0 deletions AmplifyPlugins/Core/AWSPluginsCore/Sync/PaginatedList.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,35 @@ public struct PaginatedList<ModelType: Model>: Decodable {
public let items: [MutationSync<ModelType>]
public let nextToken: String?
public let startedAt: Int64?

enum CodingKeys: CodingKey {
case items
case nextToken
case startedAt
}

public init(items: [MutationSync<ModelType>], nextToken: String?, startedAt: Int64?) {
self.items = items
self.nextToken = nextToken
self.startedAt = startedAt
}

public init(from decoder: Decoder) throws {
let values = try decoder.container(keyedBy: CodingKeys.self)
let optimisticDecodedResults = try values.decode([OptimisticDecoded<MutationSync<ModelType>>].self, forKey: .items)
items = optimisticDecodedResults.compactMap { try? $0.result.get() }
nextToken = try values.decode(String?.self, forKey: .nextToken)
startedAt = try values.decode(Int64?.self, forKey: .startedAt)
}
}


fileprivate struct OptimisticDecoded<T: Decodable>: Decodable {
let result: Result<T, Error>

init(from decoder: Decoder) throws {
result = Result(catching: {
try T(from: decoder)
})
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -216,11 +216,17 @@ final class InitialSyncOperation: AsynchronousOperation {

let syncQueryResult: SyncQueryResult
switch graphQLResult {
case .success(let queryResult):
syncQueryResult = queryResult

case .failure(.partial(let queryResult, let errors)):
syncQueryResult = queryResult
errors.map { DataStoreError.api(APIError(errorDescription: $0.message, error: $0)) }
.forEach { dataStoreConfiguration.errorHandler($0) }

case .failure(let graphQLResponseError):
finish(result: .failure(DataStoreError.api(graphQLResponseError)))
return
case .success(let queryResult):
syncQueryResult = queryResult
}

let items = syncQueryResult.items
Expand Down