FIxed the test based on the changes of stats service.

tests/Integration/Service/StatsAnrServiceTest.php

@@ -8,6 +8,7 @@ use Doctrine\Common\Collections\ArrayCollection;
 use GuzzleHttp\Handler\MockHandler;
 use GuzzleHttp\Psr7\Response;
 use Laminas\ServiceManager\ServiceManager;
+use LogicException;
 use Monarc\Core\Service\ConnectedUserService;
 use Monarc\FrontOffice\Model\Entity\Anr;
 use Monarc\FrontOffice\Model\Entity\UserAnr;
@@ -177,6 +178,20 @@ class StatsAnrServiceTest extends AbstractIntegrationTestCase
         $user->expects($this->once())->method('hasRole')->with(UserRole::USER_ROLE_CEO)->willReturn(false);
         $user->method('getUserAnrs')->willReturn(new ArrayCollection());
 
+        $this->connectedUserService
+            ->expects($this->once())
+            ->method('getConnectedUser')
+            ->willReturn($user);
+
+        $this->statsAnrService->getStats(['type' => StatsDataObject::TYPE_CARTOGRAPHY]);
+    }
+
+    public function testItThrowsLogicExceptionIfTypeIsNotPassed()
+    {
+        $this->expectException(LogicException::class);
+        $this->expectExceptionMessage('Filter parameter \'type\' is mandatory to get the stats.');
+
+        $user = $this->createMock(User::class);
         $this->connectedUserService
             ->expects($this->once())
             ->method('getConnectedUser')
@@ -203,18 +218,21 @@ class StatsAnrServiceTest extends AbstractIntegrationTestCase
         $this->connectedUserService->expects($this->exactly(2))->method('getConnectedUser')->willReturn($user);
         $this->statsApiMockHandler->append(new Response(200, [], $this->getStatsResponse()));
 
-        $stats = $this->statsAnrService->getStats([]);
+        $stats = $this->statsAnrService->getStats(['type' => StatsDataObject::TYPE_COMPLIANCE]);
 
         $this->assertEmpty($stats);
 
         $defaultDates = [
-            'dateFrom' => (new DateTime())->modify('-' . StatsAnrService::DEFAULT_STATS_DATES_RANGE)->format('Y-m-d'),
+            'date_from' => (new DateTime())->modify('-' . StatsAnrService::DEFAULT_STATS_DATES_RANGE)->format('Y-m-d'),
-            'dateTo' => (new DateTime())->format('Y-m-d'),
+            'date_to' => (new DateTime())->format('Y-m-d'),
         ];
         $queryParams = [];
         parse_str($this->statsApiMockHandler->getLastRequest()->getUri()->getQuery(), $queryParams);
         $this->assertEquals(
-            array_merge(['anrs' => [$anr1->getUuid(), $anr2->getUuid(), $anr3->getUuid()]], $defaultDates),
+            array_merge([
+                'anrs' => [$anr1->getUuid(), $anr2->getUuid(), $anr3->getUuid()],
+                'type' => StatsDataObject::TYPE_COMPLIANCE,
+            ], $defaultDates),
             $queryParams
         );
 
@@ -245,13 +263,16 @@ class StatsAnrServiceTest extends AbstractIntegrationTestCase
         ]);
         $this->statsApiMockHandler->append(new Response(200, [], $statsResponse));
 
-        $stats = $this->statsAnrService->getStats(['anrs' => [1, 3, 7]]);
+        $stats = $this->statsAnrService->getStats(['type' => StatsDataObject::TYPE_RISK, 'anrs' => [1, 3, 7]]);
 
         $this->assertEquals($this->getStatsResponse($stats), $statsResponse);
 
         parse_str($this->statsApiMockHandler->getLastRequest()->getUri()->getQuery(), $queryParams);
         $this->assertEquals(
-            array_merge(['anrs' => [$anr1->getUuid(), $anr3->getUuid()]], $defaultDates),
+            array_merge([
+                'anrs' => [$anr1->getUuid(), $anr3->getUuid()],
+                'type' => StatsDataObject::TYPE_RISK,
+            ], $defaultDates),
             $queryParams
         );
     }
@@ -271,24 +292,28 @@ class StatsAnrServiceTest extends AbstractIntegrationTestCase
         }
 
         $defaultDates = [
-            'dateFrom' => (new DateTime())->modify('-' . StatsAnrService::DEFAULT_STATS_DATES_RANGE)->format('Y-m-d'),
+            'date_from' => (new DateTime())->modify('-' . StatsAnrService::DEFAULT_STATS_DATES_RANGE)->format('Y-m-d'),
-            'dateTo' => (new DateTime())->format('Y-m-d'),
+            'date_to' => (new DateTime())->format('Y-m-d'),
         ];
 
         $this->statsApiMockHandler->append(new Response(200, [], $this->getStatsResponse()));
         $this->statsApiMockHandler->append(new Response(200, [], $this->getStatsResponse()));
 
         $this->statsAnrService->getStats([
+            'type' => StatsDataObject::TYPE_RISK,
             'anrs' => [1, 2, 3, 99] // anr ID = 99 is not in thew db.
         ]);
 
         parse_str($this->statsApiMockHandler->getLastRequest()->getUri()->getQuery(), $queryParams);
-        $this->assertEquals(array_merge(['anrs' => $anrUuids], $defaultDates), $queryParams);
+        $this->assertEquals(array_merge([
+            'anrs' => $anrUuids,
+            'type' => StatsDataObject::TYPE_RISK
+        ], $defaultDates), $queryParams);
 
-        $this->statsAnrService->getStats([]);
+        $this->statsAnrService->getStats(['type' => StatsDataObject::TYPE_VULNERABILITY]);
 
         parse_str($this->statsApiMockHandler->getLastRequest()->getUri()->getQuery(), $queryParams);
-        $this->assertEquals($defaultDates, $queryParams);
+        $this->assertEquals(array_merge(['type' => StatsDataObject::TYPE_VULNERABILITY], $defaultDates), $queryParams);
     }
 
     public function testItCanSendDifferentParamsToGetTheStats()
@@ -322,9 +347,12 @@ class StatsAnrServiceTest extends AbstractIntegrationTestCase
         parse_str($this->statsApiMockHandler->getLastRequest()->getUri()->getQuery(), $queryParams);
         $this->assertEquals(array_merge([
             'anrs' => $anrUuids,
-            'aggregationPeriod' => 'month',
+            'aggregation_period' => 'month',
             'type' => StatsDataObject::TYPE_COMPLIANCE
-        ], $datesRange), $queryParams);
+        ], [
+            'date_from' => $datesRange['dateFrom'],
+            'date_to' => $datesRange['dateTo'],
+        ]), $queryParams);
 
         $this->statsAnrService->getStats(array_merge([
             'aggregationPeriod' => 'week',
@@ -333,9 +361,12 @@ class StatsAnrServiceTest extends AbstractIntegrationTestCase
 
         parse_str($this->statsApiMockHandler->getLastRequest()->getUri()->getQuery(), $queryParams);
         $this->assertEquals(array_merge([
-            'aggregationPeriod' => 'week',
+            'aggregation_period' => 'week',
             'type' => StatsDataObject::TYPE_VULNERABILITY
-        ], $datesRange), $queryParams);
+        ], [
+            'date_from' => $datesRange['dateFrom'],
+            'date_to' => $datesRange['dateTo'],
+        ]), $queryParams);
     }
 
     public function testItFetchesStatsForDefaultPeriodIfFromAndToDatesAreNotPassed()
@@ -354,26 +385,35 @@ class StatsAnrServiceTest extends AbstractIntegrationTestCase
         $this->statsApiMockHandler->append(new Response(200, [], $this->getStatsResponse()));
         $this->statsApiMockHandler->append(new Response(200, [], $this->getStatsResponse()));
 
-        $this->statsAnrService->getStats([]);
+        $this->statsAnrService->getStats(['type' => StatsDataObject::TYPE_THREAT]);
-
-        parse_str($this->statsApiMockHandler->getLastRequest()->getUri()->getQuery(), $queryParams);
-        $this->assertEquals($defaultDates, $queryParams);
-
-        $this->statsAnrService->getStats(['dateFrom' => (new DateTime())->modify('-6 months')->format('Y-m-d')]);
 
         parse_str($this->statsApiMockHandler->getLastRequest()->getUri()->getQuery(), $queryParams);
         $this->assertEquals([
-            'dateFrom' => (new DateTime())->modify('-6 months')->format('Y-m-d'),
+            'date_from' => $defaultDates['dateFrom'],
-            'dateTo' => $defaultDates['dateTo']
+            'date_to' => $defaultDates['dateTo'],
+            'type' => StatsDataObject::TYPE_THREAT,
+        ], $queryParams);
+
+        $this->statsAnrService->getStats([
+            'type' => StatsDataObject::TYPE_THREAT,
+            'dateFrom' => (new DateTime())->modify('-6 months')->format('Y-m-d')
+        ]);
+
+        parse_str($this->statsApiMockHandler->getLastRequest()->getUri()->getQuery(), $queryParams);
+        $this->assertEquals([
+            'date_from' => (new DateTime())->modify('-6 months')->format('Y-m-d'),
+            'date_to' => $defaultDates['dateTo'],
+            'type' => StatsDataObject::TYPE_THREAT,
         ], $queryParams);
 
         $dateTo = (new DateTimeImmutable())->modify('-6 months');
-        $this->statsAnrService->getStats(['dateTo' => $dateTo->format('Y-m-d')]);
+        $this->statsAnrService->getStats(['type' => StatsDataObject::TYPE_THREAT, 'dateTo' => $dateTo->format('Y-m-d')]);
 
         parse_str($this->statsApiMockHandler->getLastRequest()->getUri()->getQuery(), $queryParams);
         $this->assertEquals([
-            'dateFrom' => $dateTo->modify('-' . StatsAnrService::DEFAULT_STATS_DATES_RANGE)->format('Y-m-d'),
+            'type' => StatsDataObject::TYPE_THREAT,
-            'dateTo' => $dateTo->format('Y-m-d')
+            'date_from' => $dateTo->modify('-' . StatsAnrService::DEFAULT_STATS_DATES_RANGE)->format('Y-m-d'),
+            'date_to' => $dateTo->format('Y-m-d')
         ], $queryParams);
     }
 
@@ -381,11 +421,9 @@ class StatsAnrServiceTest extends AbstractIntegrationTestCase
     {
         return json_encode([
             'metadata' => [
-                'resultset' => [
+                'count' => \count($results),
-                    'count' => \count($results),
+                'offset' => 0,
-                    'offset' => 0,
+                'limit' => 0,
-                    'limit' => 0,
-                ],
             ],
             'data' => $results,
         ]);

tests/Integration/Service/StatsApiServiceTest.php

@@ -1,230 +0,0 @@
-<?php
-
-namespace MonarcAppFo\Tests\Integration\Service;
-
-use DateTime;
-use GuzzleHttp\Handler\MockHandler;
-use GuzzleHttp\Psr7\Response;
-use Laminas\ServiceManager\ServiceManager;
-use Monarc\FrontOffice\Model\Table\AnrTable;
-use Monarc\FrontOffice\Model\Table\SettingTable;
-use Monarc\FrontOffice\Stats\DataObject\StatsDataObject;
-use Monarc\FrontOffice\Stats\Exception\StatsAlreadyCollectedException;
-use Monarc\FrontOffice\Stats\Provider\StatsApiProvider;
-use Monarc\FrontOffice\Stats\Service\StatsAnrService;
-use MonarcAppFo\Tests\Integration\AbstractIntegrationTestCase;
-
-class StatsApiServiceTest extends AbstractIntegrationTestCase
-{
-    /** @var MockHandler */
-    private $mockHandler;
-
-    /** @var array */
-    private $currentDateParams;
-
-    public static function setUpBeforeClass(): void
-    {
-        parent::setUpBeforeClass();
-
-        static::createMyPrintTestData();
-    }
-
-    public function setUp(): void
-    {
-        parent::setUp();
-
-        $this->currentDateParams = $this->getCurrentDateParams();
-    }
-
-    protected function configureServiceManager(ServiceManager $serviceManager)
-    {
-        $serviceManager->setAllowOverride(true);
-
-        $this->mockHandler = new MockHandler();
-        $statsApiProvider = new StatsApiProvider(
-            $serviceManager->get(SettingTable::class),
-            [],
-            $this->mockHandler
-        );
-        $serviceManager->setService(StatsApiProvider::class, $statsApiProvider);
-
-        $serviceManager->setAllowOverride(false);
-    }
-
-    public function testItThrowsTheErrorWhenTheTheStatsAlreadyGeneratedForToday()
-    {
-        $this->expectException(StatsAlreadyCollectedException::class);
-        $this->expectExceptionMessage('The stats is already collected for today.');
-
-        $this->mockHandler->append(new Response(200, [], $this->getStatsResponse([
-            [
-                'type' => StatsDataObject::TYPE_RISK,
-                'data' => [
-                    'category' => 'ANR 1',
-                    'series' => [
-                        [
-                            'label' => 'Low risks',
-                            'value' => 50,
-
-                        ],
-                        [
-                            'label' => 'Medium risks',
-                            'value' => 30,
-
-                        ],
-                        [
-                            'label' => 'High risks',
-                            'value' => 10,
-
-                        ],
-                    ],
-                ],
-            ],
-        ])));
-
-        /** @var StatsAnrService $statsAnrService */
-        $statsAnrService = $this->getApplicationServiceLocator()->get(StatsAnrService::class);
-        $statsAnrService->collectStats();
-    }
-
-    public function testItDoesNotSendTheStatsWhenTheDataIsEmpty()
-    {
-        $this->mockHandler->append(new Response(200, [], $this->getStatsResponse()));
-
-        /** @var StatsAnrService $statsAnrService */
-        $statsAnrService = $this->getApplicationServiceLocator()->get(StatsAnrService::class);
-        $statsAnrService->collectStats([99, 78]);
-
-        $this->assertEquals('GET', $this->mockHandler->getLastRequest()->getMethod());
-    }
-
-    public function testItCanGenerateTheStatsForAllTheAnrs()
-    {
-        /** @var AnrTable $anrTable */
-        $anrTable = $this->getApplicationServiceLocator()->get(AnrTable::class);
-        $anrs = $anrTable->findAll();
-        $anrUuids = [];
-        foreach ($anrs as $anr) {
-            $anrUuids[] = $anr->getUuid();
-        }
-
-        $this->mockHandler->append(new Response(200, [], $this->getStatsResponse()));
-        $this->mockHandler->append(new Response(201, [], '{"status": "ok"}'));
-
-        /** @var StatsAnrService $statsAnrService */
-        $statsAnrService = $this->getApplicationServiceLocator()->get(StatsAnrService::class);
-        $statsAnrService->collectStats();
-
-        $this->assertJsonStringEqualsJsonString(
-            $this->getExpectedStatsDataJson($anrUuids),
-            $this->mockHandler->getLastRequest()->getBody()->getContents()
-        );
-    }
-
-    public function testItGenerateTheStatsOnlyForPassedAnrs()
-    {
-        $anrIdsToGenerateTheStats = [1, 2, 3];
-
-        /** @var AnrTable $anrTable */
-        $anrTable = $this->getApplicationServiceLocator()->get(AnrTable::class);
-        $anrs = $anrTable->findByIds($anrIdsToGenerateTheStats);
-        $anrUuids = [];
-        foreach ($anrs as $num => $anr) {
-            $anrUuids[] = $anr->getUuid();
-        }
-
-        $this->assertCount(\count($anrIdsToGenerateTheStats), $anrUuids);
-
-        $this->mockHandler->append(new Response(200, [], $this->getStatsResponse()));
-        $this->mockHandler->append(new Response(201, [], '{"status": "ok"}'));
-
-        /** @var StatsAnrService $statsAnrService */
-        $statsAnrService = $this->getApplicationServiceLocator()->get(StatsAnrService::class);
-        $statsAnrService->collectStats($anrIdsToGenerateTheStats);
-
-        $this->assertJsonStringEqualsJsonString(
-            $this->getExpectedStatsDataJson($anrUuids),
-            $this->mockHandler->getLastRequest()->getBody()->getContents()
-        );
-    }
-/*
-    public function testItThrowsTheExceptionIfUserIsNotLoggedIn()
-    {
-
-    }
-
-    public function testItThrowsTheExceptionIfUserDeosNotHaveTheRightsToGetTheStats()
-    {
-
-    }
-
-    public function testItAddsToTheFilterAlloedForTheUserAnrUuids()
-    {
-
-    }
-
-    public function testItAllowsToFilterBySpecificAnrsForCeoRole()
-    {
-
-    }
-
-    public function testItAllowsToGetStatsWithoutAnrsLimitationForCeoRole()
-    {
-
-    }
-
-    public function testItCanSendDifferentAgregationParamsToGetTheStats()
-    {
-
-    }
-*/
-    private function getStatsResponse(array $results = []): string
-    {
-        return json_encode([
-            'metadata' => [
-                'resultset' => [
-                    'count' => \count($results),
-                    'offset' => 0,
-                    'limit' => 0,
-                ],
-            ],
-            'data' => $results,
-        ]);
-    }
-
-    private function getExpectedStatsDataJson(array $anrUuids): string
-    {
-        $statsData = json_decode(
-            file_get_contents($this->testPath . '/data/expected_stats_data_for_my_print.json'),
-            true
-        );
-
-        $expectedStats = [];
-        foreach ($anrUuids as $num => $anrUuid) {
-            foreach ($statsData as $data) {
-                $data['anr'] = $anrUuid;
-                $data['day'] = $this->currentDateParams['day'];
-                $data['week'] = $this->currentDateParams['week'];
-                $data['month'] = $this->currentDateParams['month'];
-                $data['quarter'] = $this->currentDateParams['quarter'];
-                $data['year'] = $this->currentDateParams['year'];
-                $expectedStats[] = $data;
-            }
-        }
-
-        return json_encode($expectedStats);
-    }
-
-    private function getCurrentDateParams(): array
-    {
-        $dateTime = new DateTime();
-
-        return [
-            'day' => (int)$dateTime->format('z') + 1,
-            'week' => (int)$dateTime->format('W'),
-            'month' => (int)$dateTime->format('m'),
-            'quarter' => (int)ceil($dateTime->format('m') / 3),
-            'year' => (int)$dateTime->format('Y'),
-        ];
-    }
-}