Merge pull request #268 from appwrite/dev

Add time between queries

Author: abnegate

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## 19.0.0
+
+* Rename `CreditCard` enum value `unionChinaPay` to `unionPay`
+* Add time between query support
+* Add spatial query support
+
 ## 18.0.0
 
 * Support for Appwrite 1.8

README.md

@@ -21,7 +21,7 @@ Add this to your package's `pubspec.yaml` file:
 
 ```yml
 dependencies:
-  appwrite: ^18.0.0
+  appwrite: ^19.0.0
 ```
 
 You can install packages from the command line:

docs/examples/account/update-prefs.md

@@ -7,5 +7,9 @@ Client client = Client()
 Account account = Account(client);
 
 User result = await account.updatePrefs(
-    prefs: {},
+    prefs: {
+        "language": "en",
+        "timezone": "UTC",
+        "darkTheme": true
+    },
 );

docs/examples/databases/create-document.md

@@ -10,6 +10,12 @@ Document result = await databases.createDocument(
     databaseId: '<DATABASE_ID>',
     collectionId: '<COLLECTION_ID>',
     documentId: '<DOCUMENT_ID>',
-    data: {},
+    data: {
+        "username": "walter.obrien",
+        "email": "walter.obrien@example.com",
+        "fullName": "Walter O'Brien",
+        "age": 30,
+        "isAdmin": false
+    },
     permissions: ["read("any")"], // optional
 );

docs/examples/tablesdb/create-row.md

@@ -10,6 +10,12 @@ Row result = await tablesDB.createRow(
     databaseId: '<DATABASE_ID>',
     tableId: '<TABLE_ID>',
     rowId: '<ROW_ID>',
-    data: {},
+    data: {
+        "username": "walter.obrien",
+        "email": "walter.obrien@example.com",
+        "fullName": "Walter O'Brien",
+        "age": 30,
+        "isAdmin": false
+    },
     permissions: ["read("any")"], // optional
 );

lib/query.dart

@@ -9,17 +9,19 @@ class Query {
   Query._(this.method, [this.attribute = null, this.values = null]);
 
   Map<String, dynamic> toJson() {
-    final map = <String, dynamic>{'method': method};
+    final result = <String, dynamic>{};
+
+    result['method'] = method;
 
     if (attribute != null) {
-      map['attribute'] = attribute;
+      result['attribute'] = attribute;
     }
 
     if (values != null) {
-      map['values'] = values is List ? values : [values];
+      result['values'] = values is List ? values : [values];
     }
 
-    return map;
+    return result;
   }
 
   @override
@@ -35,7 +37,7 @@ class Query {
 
   /// Filter resources where [attribute] is not equal to [value].
   static String notEqual(String attribute, dynamic value) =>
-      Query._('notEqual', attribute, [value]).toString();
+      Query._('notEqual', attribute, value).toString();
 
   /// Filter resources where [attribute] is less than [value].
   static String lessThan(String attribute, dynamic value) =>
@@ -111,6 +113,10 @@ class Query {
   static String createdAfter(String value) =>
       Query._('createdAfter', null, value).toString();
 
+  /// Filter resources where document was created between [start] and [end] (inclusive).
+  static String createdBetween(String start, String end) =>
+      Query._('createdBetween', null, [start, end]).toString();
+
   /// Filter resources where document was updated before [value].
   static String updatedBefore(String value) =>
       Query._('updatedBefore', null, value).toString();
@@ -119,6 +125,10 @@ class Query {
   static String updatedAfter(String value) =>
       Query._('updatedAfter', null, value).toString();
 
+  /// Filter resources where document was updated between [start] and [end] (inclusive).
+  static String updatedBetween(String start, String end) =>
+      Query._('updatedBetween', null, [start, end]).toString();
+
   static String or(List<String> queries) => Query._(
         'or',
         null,
@@ -166,4 +176,68 @@ class Query {
   /// docs for more information.
   static String offset(int offset) =>
       Query._('offset', null, offset).toString();
+
+  /// Filter resources where [attribute] is at a specific distance from the given coordinates.
+  static String distanceEqual(
+          String attribute, List<dynamic> values, num distance,
+          [bool meters = true]) =>
+      Query._('distanceEqual', attribute, [
+        [values, distance, meters]
+      ]).toString();
+
+  /// Filter resources where [attribute] is not at a specific distance from the given coordinates.
+  static String distanceNotEqual(
+          String attribute, List<dynamic> values, num distance,
+          [bool meters = true]) =>
+      Query._('distanceNotEqual', attribute, [
+        [values, distance, meters]
+      ]).toString();
+
+  /// Filter resources where [attribute] is at a distance greater than the specified value from the given coordinates.
+  static String distanceGreaterThan(
+          String attribute, List<dynamic> values, num distance,
+          [bool meters = true]) =>
+      Query._('distanceGreaterThan', attribute, [
+        [values, distance, meters]
+      ]).toString();
+
+  /// Filter resources where [attribute] is at a distance less than the specified value from the given coordinates.
+  static String distanceLessThan(
+          String attribute, List<dynamic> values, num distance,
+          [bool meters = true]) =>
+      Query._('distanceLessThan', attribute, [
+        [values, distance, meters]
+      ]).toString();
+
+  /// Filter resources where [attribute] intersects with the given geometry.
+  static String intersects(String attribute, List<dynamic> values) =>
+      Query._('intersects', attribute, [values]).toString();
+
+  /// Filter resources where [attribute] does not intersect with the given geometry.
+  static String notIntersects(String attribute, List<dynamic> values) =>
+      Query._('notIntersects', attribute, [values]).toString();
+
+  /// Filter resources where [attribute] crosses the given geometry.
+  static String crosses(String attribute, List<dynamic> values) =>
+      Query._('crosses', attribute, [values]).toString();
+
+  /// Filter resources where [attribute] does not cross the given geometry.
+  static String notCrosses(String attribute, List<dynamic> values) =>
+      Query._('notCrosses', attribute, [values]).toString();
+
+  /// Filter resources where [attribute] overlaps with the given geometry.
+  static String overlaps(String attribute, List<dynamic> values) =>
+      Query._('overlaps', attribute, [values]).toString();
+
+  /// Filter resources where [attribute] does not overlap with the given geometry.
+  static String notOverlaps(String attribute, List<dynamic> values) =>
+      Query._('notOverlaps', attribute, [values]).toString();
+
+  /// Filter resources where [attribute] touches the given geometry.
+  static String touches(String attribute, List<dynamic> values) =>
+      Query._('touches', attribute, [values]).toString();
+
+  /// Filter resources where [attribute] does not touch the given geometry.
+  static String notTouches(String attribute, List<dynamic> values) =>
+      Query._('notTouches', attribute, [values]).toString();
 }