6by6 · TheoKouzelis · May 8, 2019
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@
 vendor/
 composer.lock
 phpunit.xml
+tags
diff --git a/Entity/BankTransactionExplanation.php b/Entity/BankTransactionExplanation.php
@@ -19,15 +19,15 @@ class BankTransactionExplanation extends AbstractEntity
 
     /**
      * @var string
-     * @Group({"get", "update"})
+     * @Groups({"get", "update"})
      * @Type("string")
      */
     protected $url;
 
     /**
      * @var string
      * @Accessor(getter="getBankTransactionUrl", setter="setBankTransactionUrl")
-     * @Group({"get", "post", "update"})
+     * @Groups({"get", "post", "update"})
      * @Type("string")
      */
     protected $bankTransaction;
@@ -40,7 +40,7 @@ class BankTransactionExplanation extends AbstractEntity
     /**
      * @var string
      * @Accessor(getter="getBankAccountUrl", setter="setBankAccountUrl")
-     * @Group({"get", "post", "update"})
+     * @Groups({"get", "post", "update"})
      * @Type("string")
      */
     protected $bankAccount;
@@ -53,7 +53,7 @@ class BankTransactionExplanation extends AbstractEntity
     /**
      * @var string
      * @Accessor(getter="getCategoryUrl", setter="setCategoryUrl")
-     * @Group({"get", "post", "update"})
+     * @Groups({"get", "post", "update"})
      * @Type("string")
      */
     protected $category;
@@ -65,29 +65,29 @@ class BankTransactionExplanation extends AbstractEntity
 
     /**
      * @var \DateTime
-     * @Group({"get", "post", "update"})
+     * @Groups({"get", "post", "update"})
      * @Type("DateTime<'Y-m-d'>")
      */
     protected $datedOn;
 
     /**
      * @var string
-     * @Group({"get", "post", "update"})
+     * @Groups({"get", "post", "update"})
      * @Type("string")
      */
     protected $description;
 
     /**
      * @var float
-     * @Group({"get", "post", "update"})
+     * @Groups({"get", "post", "update"})
      * @Type("double")
      */
     protected $grossValue;
 
     /**
      * @var string
      * @Accessor(getter="getProjectUrl", setter="setProjectUrl")
-     * @Group({"get", "post", "update"})
+     * @Groups({"get", "post", "update"})
      * @Type("string")
      */
     protected $project;
@@ -99,43 +99,43 @@ class BankTransactionExplanation extends AbstractEntity
 
     /**
      * @var string
-     * @Group({"get", "post", "update"})
+     * @Groups({"get", "post", "update"})
      * @Type("string")
      */
     protected $rebillType;
 
     /**
      * @var float
-     * @Group({"get", "post", "update"})
+     * @Groups({"get", "post", "update"})
      * @Type("double")
      */
     protected $rebillFactor;
 
     /**
      * @var Attachment
-     * @Group({"get", "post", "update"})
+     * @Groups({"get", "post", "update"})
      * @Type("SixBySix\Freeagent\Entity\Attachment")
      */
     protected $attachment;
 
     /**
      * @var float
-     * @Group({"get", "post", "update"})
+     * @Groups({"get", "post", "update"})
      * @Type("double")
      */
     protected $manualSalesTaxAmount;
 
     /**
      * @var float
-     * @Group({"get", "post", "update"})
+     * @Groups({"get", "post", "update"})
      * @Type("double")
      */
     protected $foreignCurrencyValue;
 
     /**
      * @var string
      * @Accessor(getter="getPaidInvoiceUrl", setter="setPaidInvoiceUrl")
-     * @Group({"get", "post", "update"})
+     * @Groups({"get", "post", "update"})
      * @Type("string")
      */
     protected $paidInvoice;
@@ -148,7 +148,7 @@ class BankTransactionExplanation extends AbstractEntity
     /**
      * @var string
      * @Accessor(getter="getPaidBillUrl", setter="setPaidBillUrl")
-     * @Group({"get", "post", "update"})
+     * @Groups({"get", "post", "update"})
      * @Type("string")
      */
     protected $paidBill;
@@ -161,7 +161,7 @@ class BankTransactionExplanation extends AbstractEntity
     /**
      * @var string
      * @Accessor(getter="getPaidUserUrl", setter="setPaidUserUrl")
-     * @Group({"get", "post", "update"})
+     * @Groups({"get", "post", "update"})
      * @Type("string")
      */
     protected $paidUser;
@@ -174,7 +174,7 @@ class BankTransactionExplanation extends AbstractEntity
     /**
      * @var string
      * @Accessor(getter="getTransferBankAccountUrl", setter="setTransferBankAccountUrl")
-     * @Group({"get", "post", "update"})
+     * @Groups({"get", "post", "update"})
      * @Type("string")
      */
     protected $transferBankAccount;
@@ -187,7 +187,7 @@ class BankTransactionExplanation extends AbstractEntity
     /**
      * @var string
      * @Accessor(getter="getStockItemUrl", setter="setStockItemUrl")
-     * @Group({"get", "post", "update"})
+     * @Groups({"get", "post", "update"})
      * @Type("string")
      */
     protected $stockItem;
@@ -199,22 +199,22 @@ class BankTransactionExplanation extends AbstractEntity
 
     /**
      * @var integer
-     * @Group({"get", "post", "update"})
+     * @Groups({"get", "post", "update"})
      * @Type("integer")
      */
     protected $stockAlteringQuantity;
 
     /**
      * @var integer
-     * @Group({"get", "post", "update"})
+     * @Groups({"get", "post", "update"})
      * @Type("integer")
      */
     protected $assetLifeYears;
 
     /**
      * @var string
      * @Accessor(getter="getDisposedAssetUrl", setter="setDisposedAssetUrl")
-     * @Group({"get", "post", "update"})
+     * @Groups({"get", "post", "update"})
      * @Type("string")
      */
     protected $disposedAsset;
@@ -226,18 +226,25 @@ class BankTransactionExplanation extends AbstractEntity
 
     /**
      * @var string
-     * @Group({"get", "post", "update"})
+     * @Groups({"get", "post", "update"})
      * @Type("string")
      */
     protected $ecStatus;
 
     /**
      * @var string
-     * @Group({"get", "post", "update"})
+     * @Groups({"get", "post", "update"})
      * @Type("string")
      */
     protected $placeOfSupply;
 
+    /**
+     * @var string
+     * @Groups({"get"})
+     * @Type("string")
+     */
+    protected $type;
+
     /**
      * @return mixed
      */
@@ -336,6 +343,24 @@ public function setDescription($description)
         return $this;
     }
 
+    /**
+     * @return mixed
+     */
+    public function getDisposedAssetUrl()
+    {
+        return $this->disposedAsset;
+    }
+
+    /**
+     * @param $disposedAsset
+     * @return $this
+     */
+    public function setDisposedAssetUrl($disposedAsset)
+    {
+        $this->disposedAsset = $disposedAsset;
+        return $this;
+    }
+
     /**
      * @return mixed
      */
@@ -815,4 +840,12 @@ public function setPaidUser(User $paidUserEntity)
     {
         $this->paidUserEntity = $paidUserEntity;
     }
+
+    /**
+     * @return string
+     */
+    public function getType()
+    {
+        return $this->type;
+    }
 }
diff --git a/Tests/Entity/BankTransactionExplanationTest.php b/Tests/Entity/BankTransactionExplanationTest.php
@@ -0,0 +1,126 @@
+<?php
+
+namespace SixBySix\Freeagent\Tests\Entity;
+
+use DateTime;
+use SixBySix\Freeagent\Entity\Company;
+use SixBySix\Freeagent\Entity\InvoiceItem;
+use SixBySix\Freeagent\Tests\TestCase;
+
+class BankTransactionExplanationTest extends AbstractEntityTest
+{
+    protected static $currentUrl;
+
+    public function getClassName()
+    {
+        return 'SixBySix\Freeagent\Entity\BankTransactionExplanation';
+    }
+
+    public function getApiMethodName()
+    {
+        return 'bankTransactionExplanation';
+    }
+
+    public function deserializeProvider()
+    {
+        return [
+            [
+                [
+                    "bank_transaction" => "https://api.freeagent.com/v2/bank_transactions/8",
+                    "bank_account"     => "https://api.freeagent.com/v2/bank_accounts/1",
+                    "dated_on"         => "2010-05-01",
+                    "description"      => "harness end-to-end e-business",
+                    "ec_status"        => "EC Goods",
+                    "gross_value"      => "-730.0",
+                    "place_of_supply"  => "Greece",
+                    "project"          => "https://api.freeagent.com/v2/projects/1",
+                    "rebill_type"      => "markup",
+                    "rebill_factor"    => "0.25",
+                    "type"             => "Payment",
+                ],
+                [
+                    "getBankTransactionUrl" => "https://api.freeagent.com/v2/bank_transactions/8",
+                    "getBankAccountUrl"     => "https://api.freeagent.com/v2/bank_accounts/1",
+                    "getDatedOn"            => new DateTime("2010-05-01"),
+                    "getDescription"        => "harness end-to-end e-business",
+                    "getEcStatus"           => "EC Goods",
+                    "getGrossValue"         => "-730.0",
+                    "getPlaceOfSupply"      => "Greece",
+                    "getProjectUrl"         => "https://api.freeagent.com/v2/projects/1",
+                    "getRebillType"         => "markup",
+                    "getRebillFactor"       => "0.25",
+                    "getType"               => "Payment",
+                ]
+            ]
+        ];
+    }
+
+    public function createOneProvider()
+    {
+        return [
+            [
+                [
+                    'setGrossValue'  => 123.45,
+                    'setDatedOn'     => new DateTime(),
+                    'setDescription' => 'Test description.',
+                ]
+            ]
+        ];
+    }
+
+    /**
+     * @test
+     * @depends createOne
+     */
+    public function getOne()
+    {
+        $explanation = $this->api->bankTransactionExplanation()
+            ->getByUrl(self::$currentUrl);
+
+        $this->assertEquals($explanation->getUrl(), self::$currentUrl);
+    }
+
+    /**
+     * @test
+     * @dataProvider createOneProvider
+     * @param $json
+     */
+    public function createOne($json)
+    {
+        $bankAccount = $this->api->bankAccount()
+            ->query()
+            ->getFirst();
+
+        $contact = $this->api->contact()
+            ->setOrganisationName('Totally Cool Ltd.')
+            ->save();
+
+        $invoiceItem = (new InvoiceItem())
+                    ->setDescription('Services')
+                    ->setItemType(InvoiceItem::ITEM_TYPE_SERVICES)
+                    ->setPrice(123.45)
+                    ->setQuantity(1);
+
+        $invoice = $this->api->invoice()
+            ->setInvoiceItems([$invoiceItem])
+            ->setDatedOn(new \DateTime('now'))
+            ->setPaymentTermsInDays(30)
+            ->setContact($contact)
+            ->save();
+
+        /** @var BankTransactionExplanation $explanation */
+        $explanation = $this->api->bankTransactionExplanation()
+                            ->setBankAccountUrl($bankAccount->getUrl())
+                            ->setPaidInvoiceUrl($invoice->getUrl());
+
+        foreach ($json as $methodName => $value) {
+            $explanation->{$methodName}($value);
+        }
+
+        $explanation->save();
+
+        self::$currentUrl = $explanation->getUrl();
+
+        $this->assertNotEmpty($explanation->getUrl());
+    }
+}
diff --git a/Tests/Entity/CompanyTest.php b/Tests/Entity/CompanyTest.php
@@ -126,4 +126,4 @@ public function getOne()
 
         $this->assertInstanceOf($this->getClassName(), $entity);
     }
-}
+}
diff --git a/Tests/Entity/InvoiceTest.php b/Tests/Entity/InvoiceTest.php
@@ -273,4 +273,4 @@ protected function getCurrentInvoice()
     {
         return $this->api->invoice()->getByUrl(self::$currentUrl);
     }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,3 +2,4 @@ @@
     vendor/
     composer.lock
     phpunit.xml
+    tags