adjust metered billing and three d secure endpoints and added test

lib/RebillyMeteredBilling.php

@@ -5,8 +5,12 @@
  */
 class RebillyMeteredBilling extends RebillyRequest
 {
-    const URL = 'meteredBilling/';
+    const TYPE_DEBIT = 'debit';
+    const TYPE_CREDIT = 'credit';
 
+    /**
+     * @var string $itemId the id assigned to the item by the Merchant
+     */
     public $itemId;
     /**
      * @var string $type Can be 'DEBIT' or 'CREDIT'
@@ -39,13 +43,6 @@ public function __construct($attributes)
         }
     }
 
-    public function retrieve()
-    {
-        $this->setApiController(self::URL . $this->itemId);
-
-        return $this->sendGetRequest();
-    }
-
     /**
      * Return all the property of this class
      * @param $class

lib/RebillySubscription.php

@@ -6,6 +6,8 @@
  */
 class RebillySubscription extends RebillyRequest
 {
+
+    const SUBSCRIPTION_URL = 'subscriptions/';
     /**
      * @var string $websiteId unique id for each website
      */
@@ -83,27 +85,13 @@ public function __construct($id = null)
     }
 
     /**
-     * Send POST request to Rebilly
-     * @return RebillyResponse response from Rebilly
-     */
-    public function createThreeDSecure()
-    {
-        $this->setApiController(RebillyThreeDSecure::THREE_D_SECURE_URL);
-
-        $data = $this->buildRequest($this);
-
-        return $this->sendPostRequest($data, get_class());
-    }
-
-    /**
-     * Create Metered Billing
-     * @return RebillyResponse
+     * Sends the request to Rebilly's endpoint and returns the prepared response.
+     * @return array the api prepared response
      */
-    public function createMeteredBilling()
+    public function create()
     {
-        $this->setApiController(RebillyMeteredBilling::URL);
+        $this->setApiController(self::SUBSCRIPTION_URL);
         $data = $this->buildRequest($this);
-
         return $this->sendPostRequest($data);
     }
 

lib/RebillyThreeDSecure.php

@@ -5,8 +5,6 @@
  */
 class RebillyThreeDSecure
 {
-
-    const THREE_D_SECURE_URL = 'threeDSecure/';
     /**
      * @var string
      */

tests/unit/RebillyMeteredBillingTest.php

@@ -0,0 +1,21 @@
+<?php
+
+class RebillyMeteredBilling extends \Codeception\TestCase\Test
+{
+    public function testMeteredBillingPost()
+    {
+        $subscription = new RebillySubscription('subscriptionId123');
+        $subscription->setApiKey('apiKey');
+        $meteredBilling = new RebillyMeteredBilling();
+        $meteredBilling->itemId = 'abc1';
+        $meteredBilling->type = 'debit';
+        $meteredBilling->amount = '9.99';
+        $meteredBilling->quantity = 1;
+        $meteredBilling->description = 'Test widget';
+
+        $subscription->meteredBilling = array($meteredBilling);
+
+        expect($subscription->buildRequest($subscription))
+            ->equals('{"lookupSubscriptionId":"subscriptionId123","meteredBilling":[{"itemId":"abc1","type":"debit","amount":"9.99","quantity":1,"description":"Test widget"}]}');
+    }
+}

tests/unit/RebillyThreeDSecureTest.php

@@ -4,7 +4,6 @@ class RebillyThreeDSecureTest extends \Codeception\TestCase\Test
     public function testCreateThreeDSecure()
     {
         $subscription = new RebillySubscription('subscriptionId');
-        $subscription->setEnvironment(RebillyRequest::ENV_STAGING);
         $subscription->setApiKey('apiKey');
         $threeDSecure = new RebillyThreeDSecure();
         $threeDSecure->amount = '10.00';