Merge 458da1d into 78c45a7

leroy-merlin-br · Jul 16, 2018 · 51dedb6 · 51dedb6
2 parents 78c45a7 + 458da1d
commit 51dedb6
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 18 deletions.
diff --git a/src/AbstractFeed.php b/src/AbstractFeed.php
@@ -35,10 +35,7 @@ public function useProduction(): self
 
     public function newFeed(string $name, bool $incremental = false): FeedElementInterface
     {
-        $feedElement = new FeedElement($name, $incremental);
-        $feedElement->setNamespace($this->getNamespace());
-
-        return $feedElement;
+        return new FeedElement($name, $incremental);
     }
 
     public function printFeed(FeedElementInterface $feed): string

diff --git a/src/Elements/FeedElement.php b/src/Elements/FeedElement.php
@@ -116,15 +116,8 @@ public function addCategories(array $categories): FeedElementInterface
 
     public function generateXMLArray(): array
     {
-        $xmlNamespace = 'http://www.bazaarvoice.com/xs/PRR/'.$this->namespace.'/'.self::$apiVersion;
-
         $element = [
-            '#attributes' => [
-                'xmlns' => $xmlNamespace,
-                'name' => $this->name,
-                'incremental' => $this->incremental ? 'true' : 'false',
-                'extractDate' => date('Y-m-d\TH:i:s'),
-            ],
+            '#attributes' => $this->getBasicXmlAttributes(),
         ];
 
         if ($brands = $this->generateBrandsXMLArray()) {
@@ -188,6 +181,21 @@ public function generateProductsXMLArray(): array
         return $element;
     }
 
+    public function getBasicXmlAttributes(): array
+    {
+        return [
+            'xmlns' => $this->getNamespace(),
+            'name' => $this->name,
+            'incremental' => $this->incremental ? 'true' : 'false',
+            'extractDate' => date('Y-m-d\TH:i:s'),
+        ];
+    }
+
+    public function getNamespace(): string
+    {
+        return 'http://www.bazaarvoice.com/xs/PRR/ProductFeed/'.self::$apiVersion;
+    }
+
     private function generateInteractionsXMLArray(): array
     {
         if (!count($this->interactions)) {

diff --git a/src/Elements/FeedElementInterface.php b/src/Elements/FeedElementInterface.php
@@ -18,4 +18,8 @@ public function addCategories(array $categories): FeedElementInterface;
     public function addInteraction(InteractionElement $interaction): FeedElementInterface;
 
     public function addBrands(array $brands): FeedElementInterface;
+
+    public function getBasicXmlAttributes(): array;
+
+    public function getNamespace(): string;
 }
diff --git a/src/Elements/InteractionFeedElement.php b/src/Elements/InteractionFeedElement.php
@@ -0,0 +1,15 @@
+<?php
+namespace BazaarVoice\Elements;
+
+class InteractionFeedElement extends FeedElement implements FeedElementInterface
+{
+    public function getBasicXmlAttributes(): array
+    {
+        return ['xmlns' => $this->getNamespace()];
+    }
+
+    public function getNamespace(): string
+    {
+        return 'http://www.bazaarvoice.com/xs/PRR/PostPurchaseFeed/'.self::$apiVersion;
+    }
+}
diff --git a/src/FeedInterface.php b/src/FeedInterface.php
@@ -7,8 +7,6 @@ interface FeedInterface
 {
     public function newFeed(string $name, bool $incremental = false): FeedElementInterface;
 
-    public function getNamespace(): string;
-
     public function printFeed(FeedElementInterface $feed): string;
 
     public function saveFeed(FeedElementInterface $feed, string $fileLocation, string $fileName);

diff --git a/src/Interaction/Feed.php b/src/Interaction/Feed.php
@@ -3,6 +3,8 @@
 
 use BazaarVoice\AbstractFeed;
 use BazaarVoice\Elements\InteractionElement;
+use BazaarVoice\Elements\FeedElementInterface;
+use BazaarVoice\Elements\InteractionFeedElement;
 use BazaarVoice\FeedInterface;
 
 class Feed extends AbstractFeed implements FeedInterface
@@ -25,8 +27,8 @@ public function newInteraction(
         );
     }
 
-    public function getNamespace(): string
+    public function newFeed(string $name, bool $incremental = false): FeedElementInterface
     {
-        return 'PostPurchaseFeed';
+        return new InteractionFeedElement($name, $incremental);
     }
 }
diff --git a/tests/Feature/FeedTest.php b/tests/Feature/FeedTest.php
@@ -41,7 +41,7 @@ public function it_generates_an_interaction_feed()
         $result = $feed->printFeed($element);
 
         // Assertions
-        $this->assertFeedXmlWasGeneratedCorrectly($expectedFeed, $result);
+        $this->assertXmlStringEqualsXmlString($expectedFeed, $result);
     }
 
     /** @test */

diff --git a/tests/fixtures/interaction-feed.xml b/tests/fixtures/interaction-feed.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Feed xmlns="http://www.bazaarvoice.com/xs/PRR/PostPurchaseFeed/5.6" name="InteractionFeed" incremental="false" extractDate="2018-07-12T14:28:52">
+<Feed xmlns="http://www.bazaarvoice.com/xs/PRR/PostPurchaseFeed/5.6">
     <Interaction>
         <TransactionDate>22/03/1987</TransactionDate>
         <EmailAddress>john@doe.com</EmailAddress>