upgrade

diegosm · Mar 15, 2020 · 24f402a · 24f402a
2 parents f09763e + c0ce92e
commit 24f402a
Show file tree

Hide file tree

Showing 9 changed files with 126 additions and 35 deletions.
diff --git a/phpcs.xml b/phpcs.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<ruleset name="PHP_CodeSniffer">
+    <description>The coding standard for our project.</description>
+    <rule ref="PSR2"/>
+
+    <file>src</file>
+    <file>tests</file>
+
+    <!-- Show progression -->
+    <arg value="p"/>
+</ruleset>
diff --git a/src/Factories/ReportBuilderFactory.php b/src/Factories/ReportBuilderFactory.php
@@ -4,27 +4,28 @@
 
 use Carbon\Carbon;
 use ReportBuilder\Processors\DailyProcessor;
+use ReportBuilder\Processors\DayProcessor;
 use ReportBuilder\Processors\MonthlyProcessor;
 use ReportBuilder\Processors\WeeklyProcessor;
 
 class ReportBuilderFactory
 {
-    public static function create(Carbon $startDate, Carbon $endDate, $firstDayWeek=0)
+    public static function create(Carbon $startDate, Carbon $endDate, $firstDayWeek = 0)
     {
         $days = $startDate->diffInDays($endDate);
 
-        switch ($days) {
-
-            case ($days > 30):
-                return new MonthlyProcessor($startDate, $endDate, $firstDayWeek);
-            break;
+        if ($days > 30) {
+            return new MonthlyProcessor($startDate, $endDate, $firstDayWeek);
+        }
 
-            case ($days > 13 && $days <= 30):
-                return new WeeklyProcessor($startDate, $endDate, $firstDayWeek);
-            break;
+        if ($days === 0) {
+            return new DayProcessor($startDate, $endDate, $firstDayWeek);
+        }
 
-            default:
-                return new DailyProcessor($startDate, $endDate, $firstDayWeek);
+        if ($days > 13 && $days <= 30) {
+            return new WeeklyProcessor($startDate, $endDate, $firstDayWeek);
         }
+
+        return new DailyProcessor($startDate, $endDate, $firstDayWeek);
     }
 }
diff --git a/src/Processors/DayProcessor.php b/src/Processors/DayProcessor.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace ReportBuilder\Processors;
+
+// use Carbon\CarbonPeriod;
+use ReportBuilder\Contracts\Processor;
+use ReportBuilder\Processors\Processor as Base;
+
+class DayProcessor extends Base implements Processor
+{
+    public function make(): array
+    {
+        return [
+            [
+                'startDate' => (clone $this->startDate)->startOfDay(),
+                'endDate'   => (clone $this->startDate)->endOfDay()
+            ]
+        ];
+    }
+}
diff --git a/src/Processors/Processor.php b/src/Processors/Processor.php
@@ -9,7 +9,7 @@ class Processor
     protected $startDate;
     protected $endDate;
 
-    public function __construct(Carbon $startDate = null, Carbon $endDate = null, $firstDayWeek=0)
+    public function __construct(Carbon $startDate = null, Carbon $endDate = null, $firstDayWeek = 0)
     {
         Carbon::setWeekStartsAt($firstDayWeek);
         $this->startDate = $startDate ?: Carbon::now();

diff --git a/src/ReportResults.php b/src/ReportResults.php
@@ -49,25 +49,36 @@ public function setDates(array $dates): self
      */
     public function results()
     {
-        return (isset($this->dates) && count($this->dates) > 0) ? $this->resultsWithDates() : $this->resultsWithoutDates();
+        return (isset($this->dates) && count($this->dates) > 0) ?
+            $this->resultsWithDates() :
+            $this->resultsWithoutDates();
     }
 
-
     /**
      *
      */
     private function resultsWithDates()
     {
         $data = [];
 
-        for ($x=0; $x < count($this->dates); $x++) {
-            foreach ($this->reportables->get() as $reportable  => $methods) {
+        for ($x = 0; $x < count($this->dates); $x++) {
+            foreach ($this->reportables->get() as $reportable => $methods) {
                 if (is_array($methods)) {
                     for ($y=0; $y<count($methods); $y++) {
-                        $data[$reportable][$methods[$y]][] = $this->getResult($reportable, $methods[$y], $this->dates[$x]['startDate'], $this->dates[$x]['endDate']);
+                        $data[$reportable][$methods[$y]][] = $this->getResult(
+                            $reportable,
+                            $methods[$y],
+                            $this->dates[$x]['startDate'],
+                            $this->dates[$x]['endDate']
+                        );
                     }
                 } else {
-                    $data[$reportable][] = $this->getResult($reportable, $methods, $this->dates[$x]['startDate'], $this->dates[$x]['endDate']);
+                    $data[$reportable][] = $this->getResult(
+                        $reportable,
+                        $methods,
+                        $this->dates[$x]['startDate'],
+                        $this->dates[$x]['endDate']
+                    );
                 }
             }
         }
@@ -80,7 +91,7 @@ private function resultsWithoutDates()
     {
         $data = [];
 
-        foreach ($this->reportables->get() as $reportable  => $methods) {
+        foreach ($this->reportables->get() as $reportable => $methods) {
             if (is_array($methods)) {
                 for ($y=0; $y<count($methods); $y++) {
                     $data[$reportable][$methods[$y]][] = $this->getResult($reportable, $methods[$y]);
@@ -98,13 +109,13 @@ private function resultsWithoutDates()
      *
      * @param $class
      * @param $method
-     * @param $startDate
-     * @param $endDate
+     * @param null $startDate
+     * @param null $endDate
      * @return mixed
+     * @throws \ReflectionException
      */
     private function getResult($class, $method, $startDate = null, $endDate = null)
     {
-
         // Get Parameters from class and method
         $rClass = (new \ReflectionClass(new $class));
         $rClassParameters = $rClass->getMethod($method)->getParameters();
@@ -127,10 +138,8 @@ private function getResult($class, $method, $startDate = null, $endDate = null)
         return (new $class)->$method(...$parameters2Method);
     }
 
-
     private function getParameters($startDate = null, $endDate = null)
     {
-
         // if is only parameters
         if (isset($this->parameters) && !isset($startDate, $endDate)) {
             $parameters = $this->parameters;

diff --git a/tests/Unit/DayProcessorTest.php b/tests/Unit/DayProcessorTest.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace Test\Unit;
+
+use Carbon\Carbon;
+use PHPUnit\Framework\TestCase;
+use ReportBuilder\Processors\DailyProcessor;
+
+class DayProcessorTest extends TestCase
+{
+    protected $processor;
+    protected $dates;
+
+    protected function setUp() : void
+    {
+        $this->processor = new DailyProcessor(
+            Carbon::createFromDate(2018, 8, 7)->startOfDay(),
+            Carbon::createFromDate(2018, 8, 7)->endOfDay(),
+            0
+        );
+        $this->dates = $this->processor->make();
+        parent::setUp();
+    }
+
+    public function testShouldHaveSameLastDay()
+    {
+        $lastDay = Carbon::createFromDate(2018, 8, 7)->endOfDay();
+        $this->assertEquals($lastDay, end($this->dates)['endDate']);
+    }
+
+    public function testShouldHaveOneDay()
+    {
+        $this->assertEquals(1, count($this->dates));
+    }
+}
diff --git a/tests/Unit/ReportBuilderFactoryTest.php b/tests/Unit/ReportBuilderFactoryTest.php
@@ -5,6 +5,7 @@
 use Carbon\Carbon;
 use PHPUnit\Framework\TestCase;
 use ReportBuilder\Processors\DailyProcessor;
+use ReportBuilder\Processors\DayProcessor;
 use ReportBuilder\Processors\MonthlyProcessor;
 use ReportBuilder\Processors\WeeklyProcessor;
 use ReportBuilder\Factories\ReportBuilderFactory;
@@ -16,7 +17,17 @@ protected function setUp() : void
         parent::setUp();
     }
 
-    public function testDefaultProcessorMustBeDaily()
+    public function testDefaultProcessorMustBeDay()
+    {
+        $obj = ReportBuilderFactory::create(
+            Carbon::createFromFormat('Y-m-d H:i:s', '2019-9-19 00:00:00')->startOfDay(),
+            Carbon::createFromFormat('Y-m-d H:i:s', '2019-9-19 00:00:00')->endOfDay()
+        );
+
+        $this->assertInstanceOf(DayProcessor::class, $obj);
+    }
+
+    public function tesProcessorMustBeDaily()
     {
         $obj = ReportBuilderFactory::create(Carbon::now(), Carbon::now()->addDays(13));
         $this->assertInstanceOf(DailyProcessor::class, $obj);

diff --git a/tests/Unit/ReportResultsFactoryTest.php b/tests/Unit/ReportResultsFactoryTest.php
@@ -19,7 +19,12 @@ class ReportResultsFactoryTest extends TestCase
     protected function setUp() : void
     {
         $this->reportables = (new ReportableCollection())->add(FakeRepository::class, 'popular');
-        $this->dates = (new DailyProcessor(Carbon::createFromDate(2018, 8, 7), Carbon::createFromDate(2018, 8, 17), 0))->make();
+        $this->dates = (new DailyProcessor(
+            Carbon::createFromDate(2018, 8, 7),
+            Carbon::createFromDate(2018, 8, 17),
+            0
+        ))->make();
+
         $this->parameters =  [
             'param' => 'val',
             'parameter' => 'value'

diff --git a/tests/Utilities/FakeRepository.php b/tests/Utilities/FakeRepository.php
@@ -4,21 +4,21 @@
 
 class FakeRepository
 {
-    public function between($startDate=null, $endDate=null)
+    public function between($startDate = null, $endDate = null)
     {
         return [
-                    'data' => 'FakeRepository > between',
-                    'startDate' => $startDate,
-                    'endDate' => $endDate
-               ];
+            'data'      => 'FakeRepository > between',
+            'startDate' => $startDate,
+            'endDate'   => $endDate
+        ];
     }
 
-    public function popular($startDate=null, $endDate=null, $param=null)
+    public function popular($startDate = null, $endDate = null, $param = null)
     {
         return [
-            'data' => 'FakeRepository > popular',
+            'data'      => 'FakeRepository > popular',
             'startDate' => isset($startDate) ? $startDate->format('d/m/Y 00:00:00') : $startDate,
-            'endDate' => isset($endDate) ? $endDate->format('d/m/Y 23:59:59') : $endDate,
+            'endDate'   => isset($endDate) ? $endDate->format('d/m/Y 23:59:59') : $endDate,
             'parameter' => 'Parameter value: ' . $param
         ];
     }
@@ -28,7 +28,6 @@ public function simpleWithParameterNoDate($param)
         return $param;
     }
 
-
     public function simple()
     {
         return 'simple';