fix(datastore): fix invalid model id field name implication (#1600)

* chore(datastore): convert source file from CRLF to LF

* fix(datastore): fix invalid model id field name implication

* chore(datastore): convert query_sort.dart to LF mode

* fix(datastore): fix bad model id naming and ensure backwards compatibility

* fix(datastore): remove redundant logic from native implementation

Author: HuiSF

packages/amplify_core/lib/src/types/query/query_predicate.dart

@@ -79,7 +79,7 @@ class QueryPredicateOperation extends QueryPredicate {
   Map<String, dynamic> serializeAsMap() {
     return <String, dynamic>{
       'queryPredicateOperation': <String, dynamic>{
-        'field': field,
+        'field': getFieldName(field),
         'fieldOperator': queryFieldOperator.serializeAsMap(),
       },
     };

packages/amplify_core/lib/src/types/query/query_sort.dart

@@ -1,64 +1,67 @@
-/*
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *  http://aws.amazon.com/apache2.0
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-part of 'query_field.dart';
-
-enum QuerySortOrder { ascending, descending }
-
-extension QuerySortOrderExtension on QuerySortOrder {
-  String toShortString() {
-    return toString().split('.').last; // toString returns the enumName.value
-  }
-}
-
-/// Represents a model field and an order to sort by (ascending or descending),
-/// used to specify the order of results from a query operation
-class QuerySortBy {
-  final QuerySortOrder order;
-  final String field;
-
-  const QuerySortBy({required this.order, required this.field});
-
-  int compare<T extends Model>(T a, T b) {
-    String fieldName = getFieldName(field);
-    dynamic valueA = a.toJson()[fieldName];
-    dynamic valueB = b.toJson()[fieldName];
-    int orderMultiplier = order == QuerySortOrder.ascending ? 1 : -1;
-    if (valueA == null || valueB == null) {
-      return orderMultiplier * _compareNull(valueA, valueB);
-    } else if (valueA is bool && valueB is bool) {
-      return orderMultiplier * _compareBool(valueA, valueB);
-    } else if (valueA is Comparable && valueB is Comparable) {
-      return orderMultiplier * valueA.compareTo(valueB);
-    }
-    throw const AmplifyException(
-      'A non-comparable field was used as a QuerySortBy',
-    );
-  }
-
-  int _compareBool(bool a, bool b) {
-    if (a == b) return 0;
-    return a ? 1 : -1;
-  }
-
-  int _compareNull(Object? a, Object? b) {
-    if (a == b) return 0;
-    return a != null ? 1 : -1;
-  }
-
-  Map<String, dynamic> serializeAsMap() {
-    return <String, dynamic>{'field': field, 'order': order.toShortString()};
-  }
-}
+/*
+ * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+part of 'query_field.dart';
+
+enum QuerySortOrder { ascending, descending }
+
+extension QuerySortOrderExtension on QuerySortOrder {
+  String toShortString() {
+    return toString().split('.').last; // toString returns the enumName.value
+  }
+}
+
+/// Represents a model field and an order to sort by (ascending or descending),
+/// used to specify the order of results from a query operation
+class QuerySortBy {
+  final QuerySortOrder order;
+  final String field;
+
+  const QuerySortBy({required this.order, required this.field});
+
+  int compare<T extends Model>(T a, T b) {
+    String fieldName = getFieldName(field);
+    dynamic valueA = a.toJson()[fieldName];
+    dynamic valueB = b.toJson()[fieldName];
+    int orderMultiplier = order == QuerySortOrder.ascending ? 1 : -1;
+    if (valueA == null || valueB == null) {
+      return orderMultiplier * _compareNull(valueA, valueB);
+    } else if (valueA is bool && valueB is bool) {
+      return orderMultiplier * _compareBool(valueA, valueB);
+    } else if (valueA is Comparable && valueB is Comparable) {
+      return orderMultiplier * valueA.compareTo(valueB);
+    }
+    throw const AmplifyException(
+      'A non-comparable field was used as a QuerySortBy',
+    );
+  }
+
+  int _compareBool(bool a, bool b) {
+    if (a == b) return 0;
+    return a ? 1 : -1;
+  }
+
+  int _compareNull(Object? a, Object? b) {
+    if (a == b) return 0;
+    return a != null ? 1 : -1;
+  }
+
+  Map<String, dynamic> serializeAsMap() {
+    return <String, dynamic>{
+      'field': getFieldName(field),
+      'order': order.toShortString(),
+    };
+  }
+}

packages/amplify_datastore/android/src/test/kotlin/com/amazonaws/amplify/amplify_datastore/AmplifyDataStorePluginTest.kt

@@ -306,7 +306,7 @@ class AmplifyDataStorePluginTest {
     fun test_query_with_predicates_success_zero_result() {
         val queryOptions =
             Where.matches(
-                field("post.id").eq("123").or(
+                field("id").eq("123").or(
                     field("rating").ge(4).and(
                         not(
                             field("created").eq("2020-02-20T20:20:20-08:00")
@@ -315,7 +315,7 @@ class AmplifyDataStorePluginTest {
                 )
             )
                 .paginated(Page.startingAt(2).withLimit(8))
-                .sorted(field("post.id").ascending(), field("created").descending())
+                .sorted(field("id").ascending(), field("created").descending())
 
         doAnswer { invocation: InvocationOnMock ->
             assertEquals("Post", invocation.arguments[0])

packages/amplify_datastore/android/src/test/kotlin/com/amazonaws/amplify/amplify_datastore/types/query/QueryPredicateBuilderTest.kt

@@ -25,7 +25,7 @@ import org.junit.Assert
 import org.junit.Test
 
 class QueryPredicateBuilderTest {
-    private val id: QueryField = QueryField.field("post.id")
+    private val id: QueryField = QueryField.field("id")
     private val title: QueryField = QueryField.field("title")
     private val rating: QueryField = QueryField.field("rating")
     private val created: QueryField = QueryField.field("created")

packages/amplify_datastore/android/src/test/kotlin/com/amazonaws/amplify/amplify_datastore/types/query/QuerySortBuilderTest.kt

@@ -22,7 +22,7 @@ import org.junit.Assert
 import org.junit.Test
 
 class QuerySortBuilderTest {
-    private val id: QueryField = QueryField.field("post.id")
+    private val id: QueryField = QueryField.field("id")
     private val rating: QueryField = QueryField.field("rating")
 
     @Test

packages/amplify_datastore/ios/Classes/types/query/QueryPredicateBuilder.swift

@@ -18,26 +18,13 @@ import Foundation
 import Amplify
 
 public class QueryPredicateBuilder {
-    
-    // Remove model name if queryPredicate is on id 
-    private static func extractFieldName( field : String? ) -> String? {
-        
-        if let queryField = field, queryField.hasSuffix(".id"){
-            return "id"
-        }
-        return field;
-    }
-    
     static func fromSerializedMap(_ serializedMap: [String: Any]?) throws -> QueryPredicate {
-        
         guard let data = serializedMap else {
             return QueryPredicateConstant.all
         }
-        
-        
-        
+
         if let queryPredicateOperationMap = data["queryPredicateOperation"] as? [String: Any] {
-            if let fieldValue = extractFieldName(field: queryPredicateOperationMap["field"] as? String),
+            if let fieldValue = queryPredicateOperationMap["field"] as? String,
                let queryFieldOperatorMap = queryPredicateOperationMap["fieldOperator"] as? [String: Any],
                let operatorName = queryFieldOperatorMap["operatorName"] as? String {
                 let operand = convertToAmplifyPersistable(operand: queryFieldOperatorMap["value"])