Merge pull request #3485 from aws-amplify/5d/graphql-filter-on-option…

…al-field-v1

fix(datastore-v1): correct the filter predicate logic applied to optional fields

Amplify/Categories/DataStore/Model/Internal/Persistable.swift

@@ -65,6 +65,12 @@ struct PersistableHelper {
  return lhs == rhs
  case let (lhs, rhs) as (String, String):
  return lhs == rhs
+ case let (lhs, rhs) as (any EnumPersistable, String):
+ return lhs.rawValue == rhs
+ case let (lhs, rhs) as (String, any EnumPersistable):
+ return lhs == rhs.rawValue
+ case let (lhs, rhs) as (any EnumPersistable, any EnumPersistable):
+ return lhs.rawValue == rhs.rawValue
  default:
  return false
  }
@@ -95,6 +101,12 @@ struct PersistableHelper {
  return lhs == Double(rhs)
  case let (lhs, rhs) as (String, String):
  return lhs == rhs
+ case let (lhs, rhs) as (any EnumPersistable, String):
+ return lhs.rawValue == rhs
+ case let (lhs, rhs) as (String, any EnumPersistable):
+ return lhs == rhs.rawValue
+ case let (lhs, rhs) as (any EnumPersistable, any EnumPersistable):
+ return lhs.rawValue == rhs.rawValue
  default:
  return false
  }
@@ -123,6 +135,12 @@ struct PersistableHelper {
  return lhs <= Double(rhs)
  case let (lhs, rhs) as (String, String):
  return lhs <= rhs
+ case let (lhs, rhs) as (any EnumPersistable, String):
+ return lhs.rawValue <= rhs
+ case let (lhs, rhs) as (String, any EnumPersistable):
+ return lhs <= rhs.rawValue
+ case let (lhs, rhs) as (any EnumPersistable, any EnumPersistable):
+ return lhs.rawValue <= rhs.rawValue
  default:
  return false
  }
@@ -151,6 +169,12 @@ struct PersistableHelper {
  return lhs < Double(rhs)
  case let (lhs, rhs) as (String, String):
  return lhs < rhs
+ case let (lhs, rhs) as (any EnumPersistable, String):
+ return lhs.rawValue < rhs
+ case let (lhs, rhs) as (String, any EnumPersistable):
+ return lhs < rhs.rawValue
+ case let (lhs, rhs) as (any EnumPersistable, any EnumPersistable):
+ return lhs.rawValue < rhs.rawValue
  default:
  return false
  }
@@ -179,6 +203,12 @@ struct PersistableHelper {
  return lhs >= Double(rhs)
  case let (lhs, rhs) as (String, String):
  return lhs >= rhs
+ case let (lhs, rhs) as (any EnumPersistable, String):
+ return lhs.rawValue >= rhs
+ case let (lhs, rhs) as (String, any EnumPersistable):
+ return lhs >= rhs.rawValue
+ case let (lhs, rhs) as (any EnumPersistable, any EnumPersistable):
+ return lhs.rawValue >= rhs.rawValue
  default:
  return false
  }
@@ -207,6 +237,12 @@ struct PersistableHelper {
  return Double(lhs) > rhs
  case let (lhs, rhs) as (String, String):
  return lhs > rhs
+ case let (lhs, rhs) as (any EnumPersistable, String):
+ return lhs.rawValue > rhs
+ case let (lhs, rhs) as (String, any EnumPersistable):
+ return lhs > rhs.rawValue
+ case let (lhs, rhs) as (any EnumPersistable, any EnumPersistable):
+ return lhs.rawValue > rhs.rawValue
  default:
  return false
  }

Amplify/Categories/DataStore/Query/QueryOperator.swift

@@ -19,7 +19,7 @@ public enum QueryOperator {
  case beginsWith(_ value: String)
 
  // swiftlint:disable:next cyclomatic_complexity
- public func evaluate(target: Any) -> Bool {
+ public func evaluate(target: Any?) -> Bool {
  switch self {
  case .notEqual(let predicateValue):
  return !PersistableHelper.isEqual(target, predicateValue)
@@ -34,14 +34,14 @@ public enum QueryOperator {
  case .greaterThan(let predicateValue):
  return PersistableHelper.isGreaterThan(target, predicateValue)
  case .contains(let predicateString):
- if let targetString = target as? String {
+ if let targetString = target.flatMap({ $0 as? String }) {
  return targetString.contains(predicateString)
  }
  return false
  case .between(let start, let end):
  return PersistableHelper.isBetween(start, end, target)
  case .beginsWith(let predicateValue):
- if let targetString = target as? String {
+ if let targetString = target.flatMap({ $0 as? String }) {
  return targetString.starts(with: predicateValue)
  }
  }

Amplify/Categories/DataStore/Query/QueryPredicate.swift

@@ -127,34 +127,6 @@ public class QueryPredicateOperation: QueryPredicate {
  }
 
  public func evaluate(target: Model) -> Bool {
- guard let fieldValue = target[field] else {
- return false
- }
-
- guard let value = fieldValue else {
- return false
- }
-
- if let booleanValue = value as? Bool {
- return self.operator.evaluate(target: booleanValue)
- }
-
- if let doubleValue = value as? Double {
- return self.operator.evaluate(target: doubleValue)
- }
-
- if let intValue = value as? Int {
- return self.operator.evaluate(target: intValue)
- }
-
- if let timeValue = value as? Temporal.Time {
- return self.operator.evaluate(target: timeValue)
- }
-
- if let enumValue = value as? EnumPersistable {
- return self.operator.evaluate(target: enumValue.rawValue)
- }
-
- return self.operator.evaluate(target: value)
+ return self.operator.evaluate(target: target[field]?.flatMap { $0 })
  }
 }

AmplifyPlugins/Auth/AWSCognitoAuthPluginTests/AuthenticationProviderTests/AuthenticationProviderConfirmSignupTests.swift

@@ -26,7 +26,7 @@ class AuthenticationProviderConfirmSignupTests: BaseAuthenticationProviderTest {
  ///
  func testSuccessfulConfirmSignUp() {
 
- let mockSignupResult = SignUpResult(signUpState: .confirmed, codeDeliveryDetails: nil)
+ let mockSignupResult = SignUpResult(signUpState: .confirmed, codeDeliveryDetails: nil, userSub: nil)
  mockAWSMobileClient?.confirmSignUpMockResult = .success(mockSignupResult)
 
  let resultExpectation = expectation(description: "Should receive a result")
@@ -60,7 +60,7 @@ class AuthenticationProviderConfirmSignupTests: BaseAuthenticationProviderTest {
  ///
  func testConfirmSignUpWithEmptyUserName() {
 
- let mockSignupResult = SignUpResult(signUpState: .confirmed, codeDeliveryDetails: nil)
+ let mockSignupResult = SignUpResult(signUpState: .confirmed, codeDeliveryDetails: nil, userSub: nil)
  mockAWSMobileClient?.confirmSignUpMockResult = .success(mockSignupResult)
 
  let resultExpectation = expectation(description: "Should receive a result")

AmplifyPlugins/Auth/AWSCognitoAuthPluginTests/AuthenticationProviderTests/AuthenticationProviderResendSignupCodeTests.swift

@@ -31,7 +31,7 @@ class AuthenticationProviderResendSignupCodeTests: BaseAuthenticationProviderTes
  destination: nil,
  attributeName: nil)
  let mockResendSignUpCodeResult = SignUpResult(signUpState: .confirmed,
- codeDeliveryDetails: codeDelieveryDetails)
+ codeDeliveryDetails: codeDelieveryDetails, userSub: nil)
  mockAWSMobileClient?.resendSignUpCodeMockResult = .success(mockResendSignUpCodeResult)
  let resultExpectation = expectation(description: "Should receive a result")
  _ = plugin.resendSignUpCode(for: "username") { result in
@@ -66,7 +66,8 @@ class AuthenticationProviderResendSignupCodeTests: BaseAuthenticationProviderTes
  destination: nil,
  attributeName: nil)
  let mockResendSignUpCodeResult = SignUpResult(signUpState: .confirmed,
- codeDeliveryDetails: codeDelieveryDetails)
+ codeDeliveryDetails: codeDelieveryDetails,
+ userSub: nil)
  mockAWSMobileClient?.resendSignUpCodeMockResult = .success(mockResendSignUpCodeResult)
  let resultExpectation = expectation(description: "Should receive a result")
  _ = plugin.resendSignUpCode(for: "") { result in

AmplifyPlugins/Auth/AWSCognitoAuthPluginTests/AuthenticationProviderTests/AuthenticationProviderSignupTests.swift

@@ -26,7 +26,7 @@ class AuthenticationProviderSignupTests: BaseAuthenticationProviderTest {
  ///
  func testSignupWithSuccess() {
 
- let mockSignupResult = SignUpResult(signUpState: .confirmed, codeDeliveryDetails: nil)
+ let mockSignupResult = SignUpResult(signUpState: .confirmed, codeDeliveryDetails: nil, userSub: nil)
  mockAWSMobileClient?.signupMockResult = .success(mockSignupResult)
 
  let emailAttribute = AuthUserAttribute(.email, value: "email")
@@ -61,7 +61,7 @@ class AuthenticationProviderSignupTests: BaseAuthenticationProviderTest {
  ///
  func testSignupWithEmptyUserName() {
 
- let mockSignupResult = SignUpResult(signUpState: .confirmed, codeDeliveryDetails: nil)
+ let mockSignupResult = SignUpResult(signUpState: .confirmed, codeDeliveryDetails: nil, userSub: nil)
  mockAWSMobileClient?.signupMockResult = .success(mockSignupResult)
 
  let emailAttribute = AuthUserAttribute(.email, value: "email")
@@ -96,7 +96,7 @@ class AuthenticationProviderSignupTests: BaseAuthenticationProviderTest {
  ///
  func testSignupWithEmptyPassword() {
 
- let mockSignupResult = SignUpResult(signUpState: .confirmed, codeDeliveryDetails: nil)
+ let mockSignupResult = SignUpResult(signUpState: .confirmed, codeDeliveryDetails: nil, userSub: nil)
  mockAWSMobileClient?.signupMockResult = .success(mockSignupResult)
 
  let emailAttribute = AuthUserAttribute(.email, value: "email")
@@ -138,7 +138,11 @@ class AuthenticationProviderSignupTests: BaseAuthenticationProviderTest {
  let mockCodeDelivery = UserCodeDeliveryDetails(deliveryMedium: .email,
  destination: mockEmail,
  attributeName: "email")
- let mockSignupResult = SignUpResult(signUpState: .unconfirmed, codeDeliveryDetails: mockCodeDelivery)
+ let mockSignupResult = SignUpResult(
+ signUpState: .unconfirmed,
+ codeDeliveryDetails: mockCodeDelivery,
+ userSub: nil
+ )
  mockAWSMobileClient?.signupMockResult = .success(mockSignupResult)
 
  let resultExpectation = expectation(description: "Should receive a result")

AmplifyPlugins/Auth/Podfile.lock

@@ -99,4 +99,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 371cf67fe35ebb5167d0880bad12b01618a0fb0e
 
-COCOAPODS: 1.11.3
+COCOAPODS: 1.14.3

AmplifyPlugins/Core/AWSPluginsCoreTests/Query/QueryPredicateEvaluateGeneratedBoolTests.swift

@@ -41,7 +41,7 @@ class QueryPredicateEvaluateGeneratedBoolTests: XCTestCase {
 
  let evaluation = try predicate.evaluate(target: instance.eraseToAnyModel().instance)
 
- XCTAssertFalse(evaluation)
+ XCTAssertTrue(evaluation)
  }
 
  func testBoolfalsenotEqualBooltrue() throws {
@@ -70,7 +70,7 @@ class QueryPredicateEvaluateGeneratedBoolTests: XCTestCase {
 
  let evaluation = try predicate.evaluate(target: instance.eraseToAnyModel().instance)
 
- XCTAssertFalse(evaluation)
+ XCTAssertTrue(evaluation)
  }
 
  func testBooltrueequalsBooltrue() throws {

AmplifyPlugins/Core/AWSPluginsCoreTests/Query/QueryPredicateEvaluateGeneratedDateTests.swift

@@ -60,7 +60,7 @@ class QueryPredicateEvaluateGeneratedDateTests: XCTestCase {
 
  let evaluation = try predicate.evaluate(target: instance.eraseToAnyModel().instance)
 
- XCTAssertFalse(evaluation)
+ XCTAssertTrue(evaluation)
  }
 
  func testTemporalDateTemporal_Date_now_addvalue1to_daynotEqualTemporalDateTemporal_Date_now() throws {
@@ -109,7 +109,7 @@ class QueryPredicateEvaluateGeneratedDateTests: XCTestCase {
 
  let evaluation = try predicate.evaluate(target: instance.eraseToAnyModel().instance)
 
- XCTAssertFalse(evaluation)
+ XCTAssertTrue(evaluation)
  }
 
  func testTemporalDateTemporal_Date_now_addvalue2to_daynotEqualTemporalDateTemporal_Date_now() throws {
@@ -158,7 +158,7 @@ class QueryPredicateEvaluateGeneratedDateTests: XCTestCase {
 
  let evaluation = try predicate.evaluate(target: instance.eraseToAnyModel().instance)
 
- XCTAssertFalse(evaluation)
+ XCTAssertTrue(evaluation)
  }
 
  func testTemporalDateTemporal_Date_now_addvalue3to_daynotEqualTemporalDateTemporal_Date_now() throws {
@@ -207,7 +207,7 @@ class QueryPredicateEvaluateGeneratedDateTests: XCTestCase {
 
  let evaluation = try predicate.evaluate(target: instance.eraseToAnyModel().instance)
 
- XCTAssertFalse(evaluation)
+ XCTAssertTrue(evaluation)
  }
 
  func testTemporalDateTemporal_Date_nowequalsTemporalDateTemporal_Date_now() throws {

AmplifyPlugins/Core/AWSPluginsCoreTests/Query/QueryPredicateEvaluateGeneratedDateTimeTests.swift

@@ -66,7 +66,7 @@ class QueryPredicateEvaluateGeneratedDateTimeTests: XCTestCase {
 
  let evaluation = try predicate.evaluate(target: instance.eraseToAnyModel().instance)
 
- XCTAssertFalse(evaluation)
+ XCTAssertTrue(evaluation)
  }
 
  func testTemporalDateTimeTemporal_DateTime_now_addvalue1to_hournotEqualTemporalDateTimeTemporal_DateTime_now() throws {
@@ -120,7 +120,7 @@ class QueryPredicateEvaluateGeneratedDateTimeTests: XCTestCase {
 
  let evaluation = try predicate.evaluate(target: instance.eraseToAnyModel().instance)
 
- XCTAssertFalse(evaluation)
+ XCTAssertTrue(evaluation)
  }
 
  func testTemporalDateTimeTemporal_DateTime_now_addvalue2to_hournotEqualTemporalDateTimeTemporal_DateTime_now() throws {
@@ -174,7 +174,7 @@ class QueryPredicateEvaluateGeneratedDateTimeTests: XCTestCase {
 
  let evaluation = try predicate.evaluate(target: instance.eraseToAnyModel().instance)
 
- XCTAssertFalse(evaluation)
+ XCTAssertTrue(evaluation)
  }
 
  func testTemporalDateTimeTemporal_DateTime_now_addvalue3to_hournotEqualTemporalDateTimeTemporal_DateTime_now() throws {
@@ -228,7 +228,7 @@ class QueryPredicateEvaluateGeneratedDateTimeTests: XCTestCase {
 
  let evaluation = try predicate.evaluate(target: instance.eraseToAnyModel().instance)
 
- XCTAssertFalse(evaluation)
+ XCTAssertTrue(evaluation)
  }
 
  func testTemporalDateTimeTemporal_DateTime_nowequalsTemporalDateTimeTemporal_DateTime_now() throws {

AmplifyPlugins/Core/AWSPluginsCoreTests/Query/QueryPredicateEvaluateGeneratedDoubleIntTests.swift

@@ -50,7 +50,7 @@ class QueryPredicateEvaluateGeneratedDoubleIntTests: XCTestCase {
 
  let evaluation = try predicate.evaluate(target: instance.eraseToAnyModel().instance)
 
- XCTAssertFalse(evaluation)
+ XCTAssertTrue(evaluation)
  }
 
  func testDouble2_1notEqualInt1() throws {
@@ -89,7 +89,7 @@ class QueryPredicateEvaluateGeneratedDoubleIntTests: XCTestCase {
 
  let evaluation = try predicate.evaluate(target: instance.eraseToAnyModel().instance)
 
- XCTAssertFalse(evaluation)
+ XCTAssertTrue(evaluation)
  }
 
  func testDouble3_1notEqualInt1() throws {
@@ -128,7 +128,7 @@ class QueryPredicateEvaluateGeneratedDoubleIntTests: XCTestCase {
 
  let evaluation = try predicate.evaluate(target: instance.eraseToAnyModel().instance)
 
- XCTAssertFalse(evaluation)
+ XCTAssertTrue(evaluation)
  }
 
  func testDouble1notEqualInt1() throws {
@@ -167,7 +167,7 @@ class QueryPredicateEvaluateGeneratedDoubleIntTests: XCTestCase {
 
  let evaluation = try predicate.evaluate(target: instance.eraseToAnyModel().instance)
 
- XCTAssertFalse(evaluation)
+ XCTAssertTrue(evaluation)
  }
 
  func testDouble2notEqualInt1() throws {
@@ -206,7 +206,7 @@ class QueryPredicateEvaluateGeneratedDoubleIntTests: XCTestCase {
 
  let evaluation = try predicate.evaluate(target: instance.eraseToAnyModel().instance)
 
- XCTAssertFalse(evaluation)
+ XCTAssertTrue(evaluation)
  }
 
  func testDouble3notEqualInt1() throws {
@@ -245,7 +245,7 @@ class QueryPredicateEvaluateGeneratedDoubleIntTests: XCTestCase {
 
  let evaluation = try predicate.evaluate(target: instance.eraseToAnyModel().instance)
 
- XCTAssertFalse(evaluation)
+ XCTAssertTrue(evaluation)
  }
 
  func testDouble1_1equalsInt1() throws {