Merge pull request #41 from phillwiggins/develop

Develop

Author: phillwiggins

.idea/workspace.xml

@@ -1,3 +1,6 @@
+## 1.0.8
+Fixed some queries
+
 ## 1.0.7
 
 Some items now return a response rather than a ParseObject

CHANGELOG.md

@@ -13,7 +13,7 @@ Want to get involved? Join our Slack channel and help out! (http://flutter-parse
 To install, either add to your pubspec.yaml
 ```
 dependencies:  
-    parse_server_sdk: ^1.0.7
+    parse_server_sdk: ^1.0.8
 ```
 or clone this repository and add to your project. As this is an early development with multiple contributors, it is probably best to download/clone and keep updating as an when a new feature is added.
 

README.md

@@ -51,13 +51,13 @@ class _MyAppState extends State<MyApp> {
   }
 
   runTestQueries() {
-    createItem();
-    getAllItems();
-    getAllItemsByName();
-    getSingleItem();
+    //createItem();
+    //getAllItems();
+    //getAllItemsByName();
+    //getSingleItem();
     query();
-    function();
-    initUser();
+    //function();
+    //initUser();
   }
 
   void createItem() async {
@@ -112,7 +112,6 @@ class _MyAppState extends State<MyApp> {
 
       // shows example of retrieving a pin
       var newDietPlanFromPin = DietPlan().fromPin('R5EonpUDWy');
-
       if (newDietPlanFromPin != null) print('Retreiving from pin worked!');
 
     } else {
@@ -122,7 +121,8 @@ class _MyAppState extends State<MyApp> {
 
   void query() async {
     var queryBuilder = QueryBuilder<DietPlan>(DietPlan())
-      ..whereContains(DietPlan.keyName, "eto");
+      ..whereContains(DietPlan.keyName, "iet")
+      ..keysToReturn([DietPlan.keyName]);
 
     var apiResponse = await queryBuilder.query();
 

example/lib/main.dart

@@ -49,12 +49,12 @@ class QueryBuilder<T extends ParseObject> {
   /// [String] keys will only return the columns of a result you want the data for,
   /// this is useful for large objects
   void keysToReturn(List<String> keys){
-    limiters["keys"] = keys.toString();
+    limiters["keys"] = concatArray(keys);
   }
 
   /// Includes other ParseObjects stored as a Pointer
-  void includeObject(String objectType){
-    limiters["include"] = objectType;
+  void includeObject(List<String> objectTypes){
+    limiters["include"] = concatArray(objectTypes);
   }
 
   /// Returns an object where the [String] column starts with [value]
@@ -148,15 +148,15 @@ class QueryBuilder<T extends ParseObject> {
   /// Performs a search to see if [String] contains other string
   void whereContains(String column, String value, {bool caseSensitive: false}) {
     if (caseSensitive) {
-      queries.add(MapEntry(_SINGLE_QUERY, '\"$column\":{\"\$regex\": \"$query\"}'));
+      queries.add(MapEntry(_SINGLE_QUERY, '\"$column\":{\"\$regex\": \"$value\"}'));
         } else {
-      queries.add(MapEntry(_SINGLE_QUERY, '\"$column\":{\"\$regex\": \"$query\", \"\$options\": \"i\"}'));
+      queries.add(MapEntry(_SINGLE_QUERY, '\"$column\":{\"\$regex\": \"$value\", \"\$options\": \"i\"}'));
     }
   }
 
   /// Powerful search for containing whole words. This search is much quicker than regex and can search for whole words including wether they are case sensitive or not.
   /// This search can also order by the score of the search
-  void textContainsWholeWord(String column, String query, {bool caseSensitive: false, bool orderByScore: true}){
+  void whereContainsWholeWord(String column, String query, {bool caseSensitive: false, bool orderByScore: true}){
     queries.add(MapEntry(_SINGLE_QUERY, '\"$column\":{\"\$text\":{\"\$search\":{\"\$term\": \"$query\", \"\$caseSensitive\": $caseSensitive }}}'));
     if (orderByScore) orderByDescending('score');
   }
@@ -177,7 +177,6 @@ class QueryBuilder<T extends ParseObject> {
 
   /// Runs through all queries and adds them to a query string
   String buildQueries(List<MapEntry> queries) {
-
     String queryBuilder = "";
 
     for (var item in queries) {
@@ -191,6 +190,20 @@ class QueryBuilder<T extends ParseObject> {
     return queryBuilder;
   }
 
+  String concatArray(List<String> queries) {
+    String queryBuilder = "";
+
+    for (var item in queries) {
+      if (item == queries.first) {
+        queryBuilder += item;
+      } else {
+        queryBuilder += ",$item";
+      }
+    }
+
+    return queryBuilder;
+  }
+
   /// Creates a query param using the column, the value and the queryOperator
   /// that the column and value are being queried against
   MapEntry _buildQueryWithColumnValueAndOperator(MapEntry columnAndValue, String queryOperator) {

lib/src/network/parse_query.dart

@@ -170,8 +170,16 @@ class ParseObject extends ParseBase implements ParseCloneable {
   /// Can be used to create custom queries
   Future<ParseResponse> query(String query) async {
     try {
-      var uri = "${ParseCoreData().serverUrl}$_path?$query";
-      var result = await _client.get(uri);
+
+      Uri tempUri = Uri.parse(ParseCoreData().serverUrl);
+
+      Uri url = Uri(
+          scheme: tempUri.scheme,
+          host: tempUri.host,
+          path: "${tempUri.path}$_path",
+          query: query);
+
+      var result = await _client.get(url);
       return handleResponse(result, ParseApiRQ.query);
     } on Exception catch (e) {
       return handleException(e, ParseApiRQ.query);

lib/src/objects/parse_object.dart

@@ -74,8 +74,7 @@ class ParseUser extends ParseObject implements ParseCloneable {
           host: tempUri.host,
           path: "${tempUri.path}$keyEndPointUserName");
 
-      final response = await _client
-          .get(uri, headers: {keyHeaderSessionToken: _client.data.sessionId});
+      final response = await _client.get(uri, headers: {keyHeaderSessionToken: _client.data.sessionId});
       return _handleResponse(response, ParseApiRQ.currentUser);
     } on Exception catch (e) {
       return _handleException(e, ParseApiRQ.currentUser);

lib/src/objects/parse_user.dart

@@ -1,6 +1,6 @@
 name: parse_server_sdk
 description: Flutter plugin for Parse Server, (https://parseplatform.org), (https://back4app.com)
-version: 1.0.7
+version: 1.0.8
 homepage: https://github.com/phillwiggins/flutter_parse_sdk
 author: PhillWiggins <phill.wiggins@gmail.com>