Merge pull request #1192 from appwrite/spatial-type-queries

updated query and tests for the contains and equal

Author: abnegate

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

@@ -313,7 +313,7 @@ class Query(
          * @param meters Whether the distance is in meters.
          * @returns The query string.
          */
-        fun distanceEqual(attribute: String, values: List<Any>, distance: Number, meters: Boolean = true) = Query("distanceEqual", attribute, listOf(values, distance, meters)).toJson()
+        fun distanceEqual(attribute: String, values: List<Any>, distance: Number, meters: Boolean = true) = Query("distanceEqual", attribute, listOf(listOf(values, distance, meters))).toJson()
 
         /**
          * Filter resources where attribute is not at a specific distance from the given coordinates.
@@ -324,7 +324,7 @@ class Query(
          * @param meters Whether the distance is in meters.
          * @returns The query string.
          */
-        fun distanceNotEqual(attribute: String, values: List<Any>, distance: Number, meters: Boolean = true) = Query("distanceNotEqual", attribute, listOf(values, distance, meters)).toJson()
+        fun distanceNotEqual(attribute: String, values: List<Any>, distance: Number, meters: Boolean = true) = Query("distanceNotEqual", attribute, listOf(listOf(values, distance, meters))).toJson()
 
         /**
          * Filter resources where attribute is at a distance greater than the specified value from the given coordinates.
@@ -335,7 +335,7 @@ class Query(
          * @param meters Whether the distance is in meters.
          * @returns The query string.
          */
-        fun distanceGreaterThan(attribute: String, values: List<Any>, distance: Number, meters: Boolean = true) = Query("distanceGreaterThan", attribute, listOf(values, distance, meters)).toJson()
+        fun distanceGreaterThan(attribute: String, values: List<Any>, distance: Number, meters: Boolean = true) = Query("distanceGreaterThan", attribute, listOf(listOf(values, distance, meters))).toJson()
 
         /**
          * Filter resources where attribute is at a distance less than the specified value from the given coordinates.
@@ -346,7 +346,7 @@ class Query(
          * @param meters Whether the distance is in meters.
          * @returns The query string.
          */
-        fun distanceLessThan(attribute: String, values: List<Any>, distance: Number, meters: Boolean = true) = Query("distanceLessThan", attribute, listOf(values, distance, meters)).toJson()
+        fun distanceLessThan(attribute: String, values: List<Any>, distance: Number, meters: Boolean = true) = Query("distanceLessThan", attribute, listOf(listOf(values, distance, meters))).toJson()
 
         /**
          * Filter resources where attribute intersects with the given geometry.
@@ -355,7 +355,7 @@ class Query(
          * @param values The coordinate values.
          * @returns The query string.
          */
-        fun intersects(attribute: String, values: List<Any>) = Query("intersects", attribute, values).toJson()
+        fun intersects(attribute: String, values: List<Any>) = Query("intersects", attribute, listOf(values)).toJson()
 
         /**
          * Filter resources where attribute does not intersect with the given geometry.
@@ -364,7 +364,7 @@ class Query(
          * @param values The coordinate values.
          * @returns The query string.
          */
-        fun notIntersects(attribute: String, values: List<Any>) = Query("notIntersects", attribute, values).toJson()
+        fun notIntersects(attribute: String, values: List<Any>) = Query("notIntersects", attribute, listOf(values)).toJson()
 
         /**
          * Filter resources where attribute crosses the given geometry.
@@ -373,7 +373,7 @@ class Query(
          * @param values The coordinate values.
          * @returns The query string.
          */
-        fun crosses(attribute: String, values: List<Any>) = Query("crosses", attribute, values).toJson()
+        fun crosses(attribute: String, values: List<Any>) = Query("crosses", attribute, listOf(values)).toJson()
 
         /**
          * Filter resources where attribute does not cross the given geometry.
@@ -382,7 +382,7 @@ class Query(
          * @param values The coordinate values.
          * @returns The query string.
          */
-        fun notCrosses(attribute: String, values: List<Any>) = Query("notCrosses", attribute, values).toJson()
+        fun notCrosses(attribute: String, values: List<Any>) = Query("notCrosses", attribute, listOf(values)).toJson()
 
         /**
          * Filter resources where attribute overlaps with the given geometry.
@@ -391,7 +391,7 @@ class Query(
          * @param values The coordinate values.
          * @returns The query string.
          */
-        fun overlaps(attribute: String, values: List<Any>) = Query("overlaps", attribute, values).toJson()
+        fun overlaps(attribute: String, values: List<Any>) = Query("overlaps", attribute, listOf(values)).toJson()
 
         /**
          * Filter resources where attribute does not overlap with the given geometry.
@@ -400,7 +400,7 @@ class Query(
          * @param values The coordinate values.
          * @returns The query string.
          */
-        fun notOverlaps(attribute: String, values: List<Any>) = Query("notOverlaps", attribute, values).toJson()
+        fun notOverlaps(attribute: String, values: List<Any>) = Query("notOverlaps", attribute, listOf(values)).toJson()
 
         /**
          * Filter resources where attribute touches the given geometry.
@@ -409,7 +409,7 @@ class Query(
          * @param values The coordinate values.
          * @returns The query string.
          */
-        fun touches(attribute: String, values: List<Any>) = Query("touches", attribute, values).toJson()
+        fun touches(attribute: String, values: List<Any>) = Query("touches", attribute, listOf(values)).toJson()
 
         /**
          * Filter resources where attribute does not touch the given geometry.
@@ -418,7 +418,7 @@ class Query(
          * @param values The coordinate values.
          * @returns The query string.
          */
-        fun notTouches(attribute: String, values: List<Any>) = Query("notTouches", attribute, values).toJson()
+        fun notTouches(attribute: String, values: List<Any>) = Query("notTouches", attribute, listOf(values)).toJson()
 
         /**
          * Parse the value to a list of values.

templates/dart/lib/query.dart.twig

@@ -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) =>
@@ -176,50 +178,50 @@ class Query {
       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, double distance, [bool meters = true]) =>
-      Query._('distanceEqual', attribute, [values, distance, meters]).toString();
+  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, double distance, [bool meters = true]) =>
-      Query._('distanceNotEqual', attribute, [values, distance, meters]).toString();
+  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, double distance, [bool meters = true]) =>
-      Query._('distanceGreaterThan', attribute, [values, distance, meters]).toString();
+  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, double distance, [bool meters = true]) =>
-      Query._('distanceLessThan', attribute, [values, distance, meters]).toString();
+  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();
+      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();
+      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();
+      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();
+      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();
+      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();
+      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();
+      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();
+      Query._('notTouches', attribute, [values]).toString();
 }

templates/deno/src/query.ts.twig

@@ -1,5 +1,5 @@
 type QueryTypesSingle = string | number | boolean;
-export type QueryTypesList = string[] | number[] | boolean[] | Query[];
+export type QueryTypesList = string[] | number[] | boolean[] | Query[] | any[];
 export type QueryTypes = QueryTypesSingle | QueryTypesList;
 type AttributesTypes = string | string[];
 
@@ -33,10 +33,10 @@ export class Query {
     });
   }
 
-  static equal = (attribute: string, value: QueryTypes): string =>
+  static equal = (attribute: string, value: QueryTypes | any[]): string =>
     new Query("equal", attribute, value).toString();
 
-  static notEqual = (attribute: string, value: QueryTypes): string =>
+  static notEqual = (attribute: string, value: QueryTypes | any[]): string =>
     new Query("notEqual", attribute, value).toString();
 
   static lessThan = (attribute: string, value: QueryTypes): string =>
@@ -100,7 +100,7 @@ export class Query {
    * @param {string | string[]} value
    * @returns {string}
    */
-  static contains = (attribute: string, value: string | string[]): string =>
+  static contains = (attribute: string, value: string | any[]): string =>
     new Query("contains", attribute, value).toString();
 
   /**
@@ -110,7 +110,7 @@ export class Query {
    * @param {string | string[]} value
    * @returns {string}
    */
-  static notContains = (attribute: string, value: string | string[]): string =>
+  static notContains = (attribute: string, value: string | any[]): string =>
     new Query("notContains", attribute, value).toString();
 
   /**
@@ -227,7 +227,7 @@ export class Query {
    * @returns {string}
    */
   static distanceEqual = (attribute: string, values: any[], distance: number, meters: boolean = true): string =>
-    new Query("distanceEqual", attribute, [values, distance, meters] as QueryTypesList).toString();
+    new Query("distanceEqual", attribute, [[values, distance, meters]]).toString();
 
   /**
    * Filter resources where attribute is not at a specific distance from the given coordinates.
@@ -239,7 +239,7 @@ export class Query {
    * @returns {string}
    */
   static distanceNotEqual = (attribute: string, values: any[], distance: number, meters: boolean = true): string =>
-    new Query("distanceNotEqual", attribute, [values, distance, meters] as QueryTypesList).toString();
+    new Query("distanceNotEqual", attribute, [[values, distance, meters]]).toString();
 
   /**
    * Filter resources where attribute is at a distance greater than the specified value from the given coordinates.
@@ -251,7 +251,7 @@ export class Query {
    * @returns {string}
    */
   static distanceGreaterThan = (attribute: string, values: any[], distance: number, meters: boolean = true): string =>
-    new Query("distanceGreaterThan", attribute, [values, distance, meters] as QueryTypesList).toString();
+    new Query("distanceGreaterThan", attribute, [[values, distance, meters]]).toString();
 
   /**
    * Filter resources where attribute is at a distance less than the specified value from the given coordinates.
@@ -263,7 +263,7 @@ export class Query {
    * @returns {string}
    */
   static distanceLessThan = (attribute: string, values: any[], distance: number, meters: boolean = true): string =>
-    new Query("distanceLessThan", attribute, [values, distance, meters] as QueryTypesList).toString();
+    new Query("distanceLessThan", attribute, [[values, distance, meters]]).toString();
 
   /**
    * Filter resources where attribute intersects with the given geometry.
@@ -273,7 +273,7 @@ export class Query {
    * @returns {string}
    */
   static intersects = (attribute: string, values: any[]): string =>
-    new Query("intersects", attribute, values).toString();
+    new Query("intersects", attribute, [values]).toString();
 
   /**
    * Filter resources where attribute does not intersect with the given geometry.
@@ -283,7 +283,7 @@ export class Query {
    * @returns {string}
    */
   static notIntersects = (attribute: string, values: any[]): string =>
-    new Query("notIntersects", attribute, values).toString();
+    new Query("notIntersects", attribute, [values]).toString();
 
   /**
    * Filter resources where attribute crosses the given geometry.
@@ -293,7 +293,7 @@ export class Query {
    * @returns {string}
    */
   static crosses = (attribute: string, values: any[]): string =>
-    new Query("crosses", attribute, values).toString();
+    new Query("crosses", attribute, [values]).toString();
 
   /**
    * Filter resources where attribute does not cross the given geometry.
@@ -303,7 +303,7 @@ export class Query {
    * @returns {string}
    */
   static notCrosses = (attribute: string, values: any[]): string =>
-    new Query("notCrosses", attribute, values).toString();
+    new Query("notCrosses", attribute, [values]).toString();
 
   /**
    * Filter resources where attribute overlaps with the given geometry.
@@ -313,7 +313,7 @@ export class Query {
    * @returns {string}
    */
   static overlaps = (attribute: string, values: any[]): string =>
-    new Query("overlaps", attribute, values).toString();
+    new Query("overlaps", attribute, [values]).toString();
 
   /**
    * Filter resources where attribute does not overlap with the given geometry.
@@ -323,7 +323,7 @@ export class Query {
    * @returns {string}
    */
   static notOverlaps = (attribute: string, values: any[]): string =>
-    new Query("notOverlaps", attribute, values).toString();
+    new Query("notOverlaps", attribute, [values]).toString();
 
   /**
    * Filter resources where attribute touches the given geometry.
@@ -333,7 +333,7 @@ export class Query {
    * @returns {string}
    */
   static touches = (attribute: string, values: any[]): string =>
-    new Query("touches", attribute, values).toString();
+    new Query("touches", attribute, [values]).toString();
 
   /**
    * Filter resources where attribute does not touch the given geometry.
@@ -343,5 +343,5 @@ export class Query {
    * @returns {string}
    */
   static notTouches = (attribute: string, values: any[]): string =>
-    new Query("notTouches", attribute, values).toString();
+    new Query("notTouches", attribute, [values]).toString();
 }