Merge pull request #1182 from appwrite/feat-time-between

Add time between queries

Author: abnegate

composer.lock

@@ -39,7 +39,7 @@ function getSSLPage($url) {
 
     // Leave the platform you want uncommented
     // $platform = 'client';
-    $platform = 'console';
+    $platform = 'server';
     // $platform = 'server';
 
     $version = '1.8.x';

example.php

@@ -254,6 +254,15 @@ class Query(
          */
         fun createdAfter(value: String) = Query("createdAfter", null, listOf(value)).toJson()
 
+        /**
+         * Filter resources where document was created between start and end dates (inclusive).
+         *
+         * @param start The start date value.
+         * @param end The end date value.
+         * @returns The query string.
+         */
+        fun createdBetween(start: String, end: String) = Query("createdBetween", null, listOf(start, end)).toJson()
+
         /**
          * Filter resources where document was updated before date.
          *
@@ -270,6 +279,15 @@ class Query(
          */
         fun updatedAfter(value: String) = Query("updatedAfter", null, listOf(value)).toJson()
 
+        /**
+         * Filter resources where document was updated between start and end dates (inclusive).
+         *
+         * @param start The start date value.
+         * @param end The end date value.
+         * @returns The query string.
+         */
+        fun updatedBetween(start: String, end: String) = Query("updatedBetween", null, listOf(start, end)).toJson()
+
         /**
          * Combine multiple queries using logical OR operator.
          *

templates/android/library/src/main/java/io/package/Query.kt.twig

@@ -111,6 +111,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 +123,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,

templates/dart/lib/query.dart.twig

@@ -283,6 +283,13 @@ void main() {
     expect(query['method'], 'createdAfter');
   });
 
+  test('returns createdBetween', () {
+    final query = jsonDecode(Query.createdBetween('2023-01-01', '2023-12-31'));
+    expect(query['attribute'], null);
+    expect(query['values'], ['2023-01-01', '2023-12-31']);
+    expect(query['method'], 'createdBetween');
+  });
+
   test('returns updatedBefore', () {
     final query = jsonDecode(Query.updatedBefore('2023-01-01'));
     expect(query['attribute'], null);
@@ -296,5 +303,12 @@ void main() {
     expect(query['values'], ['2023-01-01']);
     expect(query['method'], 'updatedAfter');
   });
+
+  test('returns updatedBetween', () {
+    final query = jsonDecode(Query.updatedBetween('2023-01-01', '2023-12-31'));
+    expect(query['attribute'], null);
+    expect(query['values'], ['2023-01-01', '2023-12-31']);
+    expect(query['method'], 'updatedBetween');
+  });
 }
 

templates/dart/test/query_test.dart.twig

@@ -173,6 +173,16 @@ export class Query {
   static createdAfter = (value: string): string =>
     new Query("createdAfter", undefined, value).toString();
 
+  /**
+   * Filter resources where document was created between dates.
+   *
+   * @param {string} start
+   * @param {string} end
+   * @returns {string}
+   */
+  static createdBetween = (start: string, end: string): string =>
+    new Query("createdBetween", undefined, [start, end] as QueryTypesList).toString();
+
   /**
    * Filter resources where document was updated before date.
    *
@@ -191,6 +201,16 @@ export class Query {
   static updatedAfter = (value: string): string =>
     new Query("updatedAfter", undefined, value).toString();
 
+  /**
+   * Filter resources where document was updated between dates.
+   *
+   * @param {string} start
+   * @param {string} end
+   * @returns {string}
+   */
+  static updatedBetween = (start: string, end: string): string =>
+    new Query("updatedBetween", undefined, [start, end] as QueryTypesList).toString();
+
   static or = (queries: string[]) =>
       new Query("or", undefined, queries.map((query) => JSON.parse(query))).toString();
 

templates/deno/src/query.ts.twig

@@ -218,6 +218,11 @@ describe('Query', () => {
         `{"method":"createdAfter","values":["2023-01-01"]}`,
     ));
 
+    test('createdBetween', () => assertEquals(
+        Query.createdBetween('2023-01-01', '2023-12-31').toString(),
+        `{"method":"createdBetween","values":["2023-01-01","2023-12-31"]}`,
+    ));
+
     test('updatedBefore', () => assertEquals(
         Query.updatedBefore('2023-01-01').toString(),
         `{"method":"updatedBefore","values":["2023-01-01"]}`,
@@ -227,4 +232,9 @@ describe('Query', () => {
         Query.updatedAfter('2023-01-01').toString(),
         `{"method":"updatedAfter","values":["2023-01-01"]}`,
     ));
+
+    test('updatedBetween', () => assertEquals(
+        Query.updatedBetween('2023-01-01', '2023-12-31').toString(),
+        `{"method":"updatedBetween","values":["2023-01-01","2023-12-31"]}`,
+    ));
 })

templates/deno/test/query.test.ts.twig

@@ -186,6 +186,10 @@ namespace {{ spec.title | caseUcfirst }}
             return new Query("createdAfter", null, value).ToString();
         }
 
+        public static string CreatedBetween(string start, string end) {
+            return new Query("createdBetween", null, new List<string> { start, end }).ToString();
+        }
+
         public static string UpdatedBefore(string value) {
             return new Query("updatedBefore", null, value).ToString();
         }
@@ -194,6 +198,10 @@ namespace {{ spec.title | caseUcfirst }}
             return new Query("updatedAfter", null, value).ToString();
         }
 
+        public static string UpdatedBetween(string start, string end) {
+            return new Query("updatedBetween", null, new List<string> { start, end }).ToString();
+        }
+
         public static string Or(List<string> queries) {
             return new Query("or", null, queries.Select(q => JsonSerializer.Deserialize<Query>(q, Client.DeserializerOptions)).ToList()).ToString();
         }

templates/dotnet/Package/Query.cs.twig

@@ -217,6 +217,14 @@ func CreatedAfter(value interface{}) string {
 	})
 }
 
+func CreatedBetween(start, end interface{}) string {
+	values := []interface{}{start, end}
+	return parseQuery(queryOptions{
+		Method: "createdBetween",
+		Values: &values,
+	})
+}
+
 func UpdatedBefore(value interface{}) string {
 	values := toArray(value)
 	return parseQuery(queryOptions{
@@ -233,6 +241,14 @@ func UpdatedAfter(value interface{}) string {
 	})
 }
 
+func UpdatedBetween(start, end interface{}) string {
+	values := []interface{}{start, end}
+	return parseQuery(queryOptions{
+		Method: "updatedBetween",
+		Values: &values,
+	})
+}
+
 func Select(attributes interface{}) string {
 	values := toArray(attributes)
 	return parseQuery(queryOptions{

templates/go/query.go.twig

@@ -65,10 +65,14 @@ class Query(
 
         fun createdAfter(value: String) = Query("createdAfter", null, listOf(value)).toJson()
 
+        fun createdBetween(start: String, end: String) = Query("createdBetween", null, listOf(start, end)).toJson()
+
         fun updatedBefore(value: String) = Query("updatedBefore", null, listOf(value)).toJson()
 
         fun updatedAfter(value: String) = Query("updatedAfter", null, listOf(value)).toJson()
 
+        fun updatedBetween(start: String, end: String) = Query("updatedBetween", null, listOf(start, end)).toJson()
+
         fun or(queries: List<String>) = Query("or", null, queries.map { it.fromJson<Query>() }).toJson()
 
         fun and(queries: List<String>) = Query("and", null, queries.map { it.fromJson<Query>() }).toJson()