simple request from the Client

castle · May 26, 2021 · dc1eb2e · dc1eb2e
1 parent 347cfe6
commit dc1eb2e
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 87 deletions.
diff --git a/lib/Castle.php b/lib/Castle.php
@@ -22,9 +22,6 @@ function lcfirst( $str ) {
 require(dirname(__FILE__) . '/RestModel/Model.php');
 require(dirname(__FILE__) . '/Castle/Models/Context.php');
 require(dirname(__FILE__) . '/Castle/Models/Authenticate.php');
-require(dirname(__FILE__) . '/Castle/Models/Filter.php');
-require(dirname(__FILE__) . '/Castle/Models/Log.php');
-require(dirname(__FILE__) . '/Castle/Models/Risk.php');
 require(dirname(__FILE__) . '/Castle/Models/Review.php');
 require(dirname(__FILE__) . '/Castle/CurlTransport.php');
 require(dirname(__FILE__) . '/Castle/RequestContext.php');

diff --git a/lib/Castle/Castle.php b/lib/Castle/Castle.php
@@ -165,37 +165,42 @@ public static function track(Array $attributes)
 
   /**
    * Filter an action
-   * @param  String $attributes 'name', and 'user' object with 'id' are required
+   * @param  String $attributes 'request_token', 'event', 'context' are required, 'user' with 'id' and 'properties' are optional
    * @return Castle_Log
    */
   public static function filter(Array $attributes)
   {
-    $filter = new Castle_Filter($attributes);
-    $filter->save();
-    return $filter;
+    $request = new Castle_Request();
+    list($response, $request) = $request->send('post', '/filter', $attributes);
+    if ($request->rStatus == 204) {
+      $response = array();
+    }
+    return $response;
   }
 
   /**
    * Log events
-   * @param  String $attributes 'name', 'status' and 'user' object with 'id' are required
+   * @param  String $attributes 'request_token', 'event', 'status' and 'user' object with 'id' are required
    * @return Castle_Log
    */
   public static function log(Array $attributes)
   {
-    $log = new Castle_Log($attributes);
-    $log->save();
-    return $log;
+    $request = new Castle_Request();
+    $request->send('post', '/log', $attributes);
   }
 
   /**
    * Risk
-   * @param  String $attributes 'name', 'status' and 'user' object with 'id' are required
+   * @param  String $attributes 'request_token', 'event', 'context', 'user' with 'id' are required, 'status', 'properties' are optional
    * @return Castle_Risk
    */
   public static function risk(Array $attributes)
   {
-    $risk = new Castle_Risk($attributes);
-    $risk->save();
-    return $risk;
+    $request = new Castle_Request();
+    list($response, $request) = $request->send('post', '/risk', $attributes);
+    if ($request->rStatus == 204) {
+      $response = array();
+    }
+    return $response;
   }
 }
diff --git a/lib/Castle/Models/Filter.php b/lib/Castle/Models/Filter.php
diff --git a/lib/Castle/Models/Log.php b/lib/Castle/Models/Log.php
diff --git a/lib/Castle/Models/Risk.php b/lib/Castle/Models/Risk.php
diff --git a/test/Castle.php b/test/Castle.php
@@ -28,9 +28,6 @@ public function assertRequest($method, $url, $headers=null)
 require(dirname(__FILE__) . '/../lib/RestModel/Resource.php');
 require(dirname(__FILE__) . '/../lib/RestModel/Model.php');
 require(dirname(__FILE__) . '/../lib/Castle/Models/Authenticate.php');
-require(dirname(__FILE__) . '/../lib/Castle/Models/Filter.php');
-require(dirname(__FILE__) . '/../lib/Castle/Models/Log.php');
-require(dirname(__FILE__) . '/../lib/Castle/Models/Risk.php');
 require(dirname(__FILE__) . '/../lib/Castle/Models/Review.php');
 require(dirname(__FILE__) . '/../lib/Castle/Models/Context.php');
 require(dirname(__FILE__) . '/TestTransport.php');

diff --git a/test/FilterTest.php b/test/FilterTest.php
diff --git a/test/LogTest.php b/test/LogTest.php
diff --git a/test/RiskTest.php b/test/RiskTest.php