diff --git a/VERSIONS_HOTLINE/140311 b/VERSIONS_HOTLINE/140311 new file mode 100644 index 0000000000000000000000000000000000000000..df79b8162ad5bb3a268526322fda144090915152 --- /dev/null +++ b/VERSIONS_HOTLINE/140311 @@ -0,0 +1 @@ + - ticket #140311 : Administration : Correction de l'affichage de doublons dans le tableau de bord de PNB Dilicom \ No newline at end of file diff --git a/library/Class/Batch/DilicomJobGenerateUsageReport.php b/library/Class/Batch/DilicomJobGenerateUsageReport.php index 6b45601fef05e25424dd0cea83921c96e417949a..da6d27895a241fb846e879a87d7a262362e0ebe9 100644 --- a/library/Class/Batch/DilicomJobGenerateUsageReport.php +++ b/library/Class/Batch/DilicomJobGenerateUsageReport.php @@ -42,7 +42,7 @@ class Class_Batch_DilicomJobGenerateUsageReport extends Class_Batch_Job { Class_Album_UsageReport::basicDeleteBy([]); - $page=0; + $page = 1; while ($items = Class_Album_Item::findAllBy(['order' => 'id', 'limitPage' => [$page, 100]])) { $this->_generateReportTableForItems($items); diff --git a/tests/scenarios/PnbDilicom/PnbDilicomBatchTest.php b/tests/scenarios/PnbDilicom/PnbDilicomBatchTest.php index 7feb4cc659289db398268ea17db5e8aedba6f698..89b4c08d11b75d67d9bce18eb20ac23a499bfde6 100644 --- a/tests/scenarios/PnbDilicom/PnbDilicomBatchTest.php +++ b/tests/scenarios/PnbDilicom/PnbDilicomBatchTest.php @@ -903,3 +903,42 @@ class PnbDilicomBatchJobGenerateUsageReportTest extends PnbDilicomBatchTestCase $this->assertEquals('1', $this->_report->getDuration()); } } + + + + +/* hotline : #140311 */ +class PnbDilicomJobGenerateUsageReportTest extends ModelTestCase { + + protected $_storm_default_to_volatile = true; + + public function setUp() { + parent::setUp(); + + RessourcesNumeriquesFixtures::activateDilicom(); + + $this->fixture(Class_Album::class, + ['id' => 1, + 'titre' => 'Album 1']); + $this->fixture(Class_Album::class, + ['id' => 2, + 'titre' => 'Album 2']); + $this->fixture(Class_Album_Item::class, + ['id' => 3, + 'album_id' => 1, + 'quantity' => 10]); + $this->fixture(Class_Album_Item::class, + ['id' => 4, + 'album_id' => 2, + 'quantity' => 10]); + + (new Class_Batch_DilicomJobGenerateUsageReport(new Class_Batch_Dilicom)) + ->run(); + } + + + /** @test */ + public function albumUsageReportCountsShouldBe2() { + $this->assertEquals(2, Class_Album_UsageReport::countBy([])); + } +}