Added new method under entries and Assets class

Author: Rohit Mishra

src/lib/helper.php

@@ -267,6 +267,22 @@ function contentstackAddBoolean($operator = '', $query = array()) {
     }
 }
 
+if (!function_exists('contentstackAddParam')) {
+    /*
+     * AddParam
+     * Set the locale on the Query
+     * @param
+     *      $operator - key of the query
+     *      $query - Query object
+     *      $value - value to be set against key
+     * @return $query
+     * */
+    function contentstackAddParam($key = '', $query = array(), $value = '') {
+        $query[$key] =  $value;
+        return $query;
+    }
+}
+
 if (!function_exists('contentstackExistence')) {
     /*
      * existence
@@ -284,5 +300,4 @@ function contentstackExistence($operator = '', $query = array(), $key = '', $val
         $query[$key] = array($operator => $value);
         return $query;
     }
-}
-
+}

src/lib/models/assets.php

@@ -4,20 +4,21 @@
  * */
 namespace Contentstack\Stack\Assets;
 
+require_once __DIR__ . "/../helper.php";
 
 use Contentstack\Stack\ContentType\Query\Query;
-// use Contentstack\Stack\ContentType\BaseQuery\BaseQuery;
+ use Contentstack\Stack\ContentType\BaseQuery\BaseQuery;
 use Contentstack\Utility;
 
 
 require_once __DIR__.'/query.php';
-// require_once __DIR__."/base_query.php";
+ require_once __DIR__."/base_query.php";
 
 
 /*
  * Class Assets
  * */
-class Assets {
+class Assets extends BaseQuery {
 
     var $operation;
     var $assetUid = '';
@@ -34,12 +35,13 @@ class Assets {
      * */
     public function __construct($asset_uid = '', $stack = '') { 
 
-         $this->stack = $stack;
          if($asset_uid == ''){
+            $this->stack = $stack;
             $this->type = 'assets';
         }else{
-            $this->type = 'asset';
-            $this->assetUid = $asset_uid;  
+            $stack->type = 'asset';
+            $this->assetUid = $asset_uid;
+            parent::__construct($stack, $this);
          }
     }
 
@@ -61,4 +63,7 @@ public function fetch() {
         $this->operation = __FUNCTION__;
        return \Contentstack\Utility\contentstackRequest($this, 'asset');
     }
-}
+
+
+}
+

src/lib/models/base_query.php

@@ -20,19 +20,16 @@ public function __construct($data = '', $parent = '') {
             $this->queryObject->_query = array();
             $this->subQuery = array();
         }elseif ($data->type === 'asset'){
-            $this->asset = $data;
-            $this->queryObject = $data;
+            $this->stack = $data;
+            $this->queryObject = $parent;
             $this->queryObject->_query = array();
-            $this->subQuery = array();        
-        }
-        else{
+            $this->subQuery = array();
+        }else{
             $this->contentType = $data;
             $this->queryObject = $parent;
             $this->queryObject->_query = array();
-            $this->subQuery = array();
-
+            $this->subQuery = array();          
         }
-
     }
 
     /*
@@ -63,7 +60,7 @@ public function except($level = 'BASE', $field_uids = array()) {
      * @return Query
      * */
     public function only($level = 'BASE', $field_uids = array()) {
-        $this->queryObject->_query = call_user_func('contentstackProjection', 'only', $this->queryObject->_query, $level, $field_uids);
+    $this->queryObject->_query = call_user_func('contentstackProjection', 'only', $this->queryObject->_query, $level, $field_uids);
         return $this->queryObject;
     }
 
@@ -233,6 +230,18 @@ public function includeOwner() {
         return $this->queryObject;
     }
 
+    /*
+     * addParam
+     * To sort the entries in addParam
+     * @param
+     *      field_uid - field uid to be sorted
+     * @return Query
+     * */
+    public function addParam($key = '', $value = '') {
+       $this->queryObject->_query  = call_user_func('contentstackAddParam', $key, $this->queryObject->_query, $value);
+        return $this->queryObject;
+    }
+
     /*
      * language
      * To set the language code in the query
@@ -403,7 +412,5 @@ public function getQuery() {
         } catch(\Exception $e) {
             echo $e->getMessage();
         }
-    }
-
-
+    }   
 }

src/lib/models/query.php

@@ -21,6 +21,7 @@ class Query extends BaseQuery {
      * @param
      * */
     public function __construct($data = '', $type = '') {
+
         $this->_query = array();
         $this->type = $type;
         parent::__construct($data, $this);

src/lib/utility.php

@@ -256,6 +256,7 @@ function wrapResult($result = '', $queryObject = '') {
     function contentstackRequest($queryObject = '', $type = ''){
         $server_output = '';
         if($queryObject) {
+            \Contentstack\Utility\debug(contentstackUrl($queryObject, $type));
             $http = curl_init(contentstackUrl($queryObject, $type));  
 
             // setting the GET request