Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Fix User Settings Regression #1295

Merged
merged 2 commits into from
Sep 18, 2020
Merged

Fix User Settings Regression #1295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef206be
Fix user settings regression
justinswart Sep 18, 2020
586e6d1
Fix query
justinswart Sep 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
103 changes: 52 additions & 51 deletions KsApi/queries/UserQueries.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,66 +21,67 @@ public enum UserQueries: Queryable {
}

public func accountQueryFields() -> NonEmptySet<Query.User> {
return .chosenCurrency +|
[
.isAppleConnected,
.isEmailVerified,
.isEmailDeliverable,
.id,
.imageUrl(alias: "imageUrl", blur: false, width: Constants.imageWidth),
.name,
.hasPassword,
.email
]
return GraphUser.baseQueryProperties
.op(
.chosenCurrency +| [
.isAppleConnected,
.isEmailVerified,
.isEmailDeliverable,
.hasPassword,
.email
]
)
}

public func storedCardsQueryFields() -> NonEmptySet<Query.User> {
return .id +| [
.storedCards(
[],
.totalCount +| [
.nodes(
.id +| [
.expirationDate,
.lastFour,
.type
]
)
]
return GraphUser.baseQueryProperties
.op(
Query.User.storedCards(
[],
.totalCount +| [
.nodes(
.id +| [
.expirationDate,
.lastFour,
.type
]
)
]
) +| []
)
]
}

public func changeEmailQueryFields() -> NonEmptySet<Query.User> {
return .email +| [
.isEmailVerified,
.isEmailDeliverable,
.id,
.imageUrl(alias: "imageUrl", blur: false, width: Constants.imageWidth),
.name
]
return GraphUser.baseQueryProperties
.op(
.email +| [
.isEmailVerified,
.isEmailDeliverable
]
)
}

public func backingsQueryFields(status: String) -> NonEmptySet<Query.User> {
return .id +| [
.backings(
status: status,
[],
.totalCount +| [
.nodes(
.status +| [
.id,
.errorReason,
.project(
.pid +| [
.name,
.slug,
.finalCollectionDate
]
)
]
)
]
return GraphUser.baseQueryProperties
.op(
Query.User.backings(
status: status,
[],
.totalCount +| [
.nodes(
.status +| [
.id,
.errorReason,
.project(
.pid +| [
.name,
.slug,
.finalCollectionDate
]
)
]
)
]
) +| []
)
]
}
16 changes: 8 additions & 8 deletions KsApi/queries/UserQueriesTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ final class UserQueriesTests: XCTestCase {
let query = Query.user(accountQueryFields())

XCTAssertEqual(
"me { chosenCurrency email hasPassword id imageUrl: imageUrl(blur: false, width: 1024) isAppleConnected isDeliverable isEmailVerified name }",
"me { chosenCurrency email hasPassword id imageUrl: imageUrl(blur: false, width: 1024) isAppleConnected isDeliverable isEmailVerified name uid }",
query.description
)
XCTAssertEqual(
"{ me { chosenCurrency email hasPassword id imageUrl: imageUrl(blur: false, width: 1024) isAppleConnected isDeliverable isEmailVerified name } }",
"{ me { chosenCurrency email hasPassword id imageUrl: imageUrl(blur: false, width: 1024) isAppleConnected isDeliverable isEmailVerified name uid } }",
Query.build(NonEmptySet(query))
)
}
Expand All @@ -20,11 +20,11 @@ final class UserQueriesTests: XCTestCase {
let query = Query.user(changeEmailQueryFields())

XCTAssertEqual(
"me { email id imageUrl: imageUrl(blur: false, width: 1024) isDeliverable isEmailVerified name }",
"me { email id imageUrl: imageUrl(blur: false, width: 1024) isDeliverable isEmailVerified name uid }",
query.description
)
XCTAssertEqual(
"{ me { email id imageUrl: imageUrl(blur: false, width: 1024) isDeliverable isEmailVerified name } }",
"{ me { email id imageUrl: imageUrl(blur: false, width: 1024) isDeliverable isEmailVerified name uid } }",
Query.build(NonEmptySet(query))
)
}
Expand All @@ -33,23 +33,23 @@ final class UserQueriesTests: XCTestCase {
let query = Query.user(storedCardsQueryFields())

XCTAssertEqual(
"me { id storedCards { nodes { expirationDate id lastFour type } totalCount } }",
"me { id imageUrl: imageUrl(blur: false, width: 1024) name storedCards { nodes { expirationDate id lastFour type } totalCount } uid }",
query.description
)
XCTAssertEqual(
"{ me { id storedCards { nodes { expirationDate id lastFour type } totalCount } } }",
"{ me { id imageUrl: imageUrl(blur: false, width: 1024) name storedCards { nodes { expirationDate id lastFour type } totalCount } uid } }",
Query.build(NonEmptySet(query))
)
}

func testBackingsQuery() {
let query = Query.user(backingsQueryFields(status: BackingState.errored.rawValue))
XCTAssertEqual(
"me { backings(status: errored) { nodes { errorReason id project { finalCollectionDate name pid slug } status } totalCount } id }",
"me { backings(status: errored) { nodes { errorReason id project { finalCollectionDate name pid slug } status } totalCount } id imageUrl: imageUrl(blur: false, width: 1024) name uid }",
query.description
)
XCTAssertEqual(
"{ me { backings(status: errored) { nodes { errorReason id project { finalCollectionDate name pid slug } status } totalCount } id } }",
"{ me { backings(status: errored) { nodes { errorReason id project { finalCollectionDate name pid slug } status } totalCount } id imageUrl: imageUrl(blur: false, width: 1024) name uid } }",
Query.build(NonEmptySet(query))
)
}
Expand Down