Merge pull request #3 from vikramezhil/wellness-api-filter

Wellness api filter

README.md

@@ -1,4 +1,4 @@
-# cordova-plugin-humanapi v1.0.3
+# cordova-plugin-humanapi v1.0.4
 humanapi cordova plugin for android & ios
 
 <b><h2>Plugin installation</h2></b>
@@ -49,6 +49,12 @@ For a detailed documentation 📔, please have a look at the [Wiki](https://gith
         alert("Error = " + error)
     })
 
+    window.plugin.humanapi.executeByFilter("WELLNESS_NAME", "ACCESS_TOKEN", "FILTER_NAME", function(result) {
+        alert("Result = " + result)
+    }, function(error) {
+        alert("Error = " + error)
+    })
+
 <b>Sources Data</b>
 
     window.plugin.humanapi.execute("sources", "ACCESS_TOKEN", function(result) {
@@ -77,6 +83,12 @@ For a detailed documentation 📔, please have a look at the [Wiki](https://gith
       alert("Error = " + error)
     })
 
+    human.plugin.humanapi.executeByFilter("WELLNESS_NAME", "ACCESS_TOKEN", "FILTER_NAME", (result) => {
+      alert("Result = " + result)
+    }, (error) => {
+      alert("Error = " + error)
+    })
+
 <b>Sources Data</b>
 
     var human: any = window

package.json

@@ -1,6 +1,6 @@
 {
     "name": "cordova-plugin-humanapi",
-    "version": "1.0.3",
+    "version": "1.0.4",
     "description": "Human API Plugin for Android and IOS",
     "cordova": {
       "id": "cordova-plugin-humanapi",

plugin.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<plugin id="cordova-plugin-humanapi" version="1.0.3" xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android">
+<plugin id="cordova-plugin-humanapi" version="1.0.4" xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android">
     <name>Human API Plugin</name>
     <description>Human API Plugin for Android and IOS</description>
     <author>Vikram Ezhil</author>

src/android/HumanAPIPlugin.java

@@ -67,6 +67,10 @@ public boolean execute(String action, JSONArray args, CallbackContext callbackCo
         } else if (action.equals("execute")) {
             this.humanAPIService.execute(callbackContext, args.getString(0), args.getString(1));
 
+            return true;
+        } else if (action.equals("executeByFilter")) {
+            this.humanAPIService.executeByFilter(callbackContext, args.getString(0), args.getString(1), args.getString(2));
+
             return true;
         }
 

src/android/human/HumanAPIService.java

@@ -56,7 +56,7 @@ public void onServiceError(CallbackContext callbackContext, String passBackKey,
     }
 
     /**
-     * Executes the human API wellness services based on key
+     * Executes the human API services based on key
      *
      * @param callbackContext The callback context
      * @param key The human api service key
@@ -79,4 +79,30 @@ public void execute(CallbackContext callbackContext, String key, String accessTo
             }   
         }
     }
+
+    /**
+     * Executes the human API services based on key and filter
+     *
+     * @param callbackContext The callback context
+     * @param key The human api service key
+     * @param accessToken The access token
+     * @param filterName The filter name
+     */
+    public void executeByFilter(CallbackContext callbackContext, String key, String accessToken, String filterName) {
+        if(accessToken == null || accessToken.isEmpty()) {
+            humanAPIListener.onHumanAPIUpdate(callbackContext, false, humanAPIModel.getHumanAPIHybridData("", key, "Access token is empty"));
+        } else {
+            // Getting the data url
+            String url = this.humanAPIModel.getDataURL(key);
+
+            if(url == null || url.isEmpty()) {
+                humanAPIListener.onHumanAPIUpdate(callbackContext, false, humanAPIModel.getHumanAPIHybridData("", key, "Unknown data key, unable to generate url"));
+            } else {
+                // Saving the access token in the human api model
+                this.humanAPIModel.setAccessToken(accessToken);
+
+                service.get(callbackContext, key, url + ("?source=" + filterName), humanAPIModel.getDataHeader());
+            }   
+        }
+    }
 }

src/ios/HumanAPIPlugin.swift

@@ -66,7 +66,7 @@ import UIKit
     }
 
     ///
-    /// Executes the human API wellness services
+    /// Executes the human API services
     ///
     /// :param: command The cdv url command instance
     ///
@@ -77,6 +77,18 @@ import UIKit
         }
     }
 
+    ///
+    /// Executes the human API services based on filter
+    ///
+    /// :param: command The cdv url command instance
+    ///
+    @objc(executeByFilter:)
+    func executeByFilter(command: CDVInvokedUrlCommand) {
+        if let wellnessKey = command.arguments[0] as? String, let token = command.arguments[1] as? String, let filter = command.arguments[2] as? String {
+            humanAPIService?.executeByFilter(command: command, key: wellnessKey, accessToken: token, filterName: filter)
+        }
+    }
+
     // @Override HumanAPIVCDelegate Methods
 
     func onHumanAPIUpdate(command: CDVInvokedUrlCommand?, success: Bool, humanAPIData: String) {

src/ios/human/HumanAPIService.swift

@@ -24,7 +24,7 @@ class HumanAPIService: NSObject, ServiceDelegate {
     }
 
     ///
-    /// Executes the human API wellness services based on key
+    /// Executes the human API services based on key
     ///
     /// :param: command The callback context
     /// :param: key The human api service key
@@ -45,6 +45,30 @@ class HumanAPIService: NSObject, ServiceDelegate {
         }
     }
 
+    ///
+    /// Executes the human API services based on key & filter
+    ///
+    /// :param: command The callback context
+    /// :param: key The human api service key
+    /// :param: accessToken The access token
+    /// :param: filterName The filter name
+    ///
+    func executeByFilter(command: CDVInvokedUrlCommand, key: String, accessToken: String, filterName: String) {
+        if(accessToken.count == 0) {
+            humanAPIServiceDelegate?.onHumanAPIUpdate(command: command, success: false, humanAPIData: humanAPIModel.getHumanAPIHybridData(humanAPIData: "", key: key, pluginMsg: "Access token is empty"))
+        } else {
+            if let url = humanAPIModel.getDataURL(dataKey: key) {
+                // Saving the access token in the human api model
+                humanAPIModel.accessToken = accessToken
+
+                let filterUrl: String = "\(url)?source=\(filterName)"
+                service.get(command: command, passbackKey: key, requestLink: filterUrl, customHeaders: humanAPIModel.dataHeader)
+            } else {
+                humanAPIServiceDelegate?.onHumanAPIUpdate(command: command, success: false, humanAPIData: humanAPIModel.getHumanAPIHybridData(humanAPIData: "", key: key, pluginMsg: "Unknown data key, unable to generate url"))
+            }
+        }
+    }
+
     // @Override ServiceDelegate Methods
 
     func onServiceRunning(command: CDVInvokedUrlCommand?, passBackKey: String, serviceRunning: Bool) {

www/humanapi.js

@@ -14,6 +14,10 @@ HumanAPIPlugin.prototype.execute = function (type, accessToken, success, error)
     exec(success, error, pluginName, 'execute', [type, accessToken]);
 };
 
+HumanAPIPlugin.prototype.executeByFilter = function (type, accessToken, filterName, success, error) {
+    exec(success, error, pluginName, 'executeByFilter', [type, accessToken, filterName]);
+};
+
 // Installation constructor that binds HumanAPIPlugin to window
 HumanAPIPlugin.install = function() {
     if(!window.plugin) {