Merge branch...

Merge branch 'hotline#140311_livres_pnb_affiches_en_double_dans_l_administration_du_site' into 'hotline'

hotline : #140311 : delete double album in dillicom

See merge request !4273

VERSIONS_HOTLINE/140311

+ - ticket #140311 : Administration : Correction de l'affichage de doublons dans le tableau de bord de PNB Dilicom
\ No newline at end of file

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);

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([]));
+  }
+}