Merge branch 'hotline#72297_invisibilite_des_nouveautes_sur_le_site' into 'hotline'

hotline #72297 : fix  call notice from exemplaire without notice

See merge request !2536

VERSIONS_HOTLINE/72297

+ - ticket #72297 : Cosmogramme : correction du système de dédoublonnage
\ No newline at end of file

library/Class/Exemplaire.php

@@ -182,7 +182,9 @@ class Class_Exemplaire extends Storm_Model_Abstract {
 
 
   public function getTomeAlpha() {
-    return $this->getNotice()->getTomeAlpha();
+    return ($record = $this->getNotice())
+      ? $record->getTomeAlpha()
+      : '';
   }
 
 
@@ -225,32 +227,44 @@ class Class_Exemplaire extends Storm_Model_Abstract {
 
 
   public function getTitrePrincipal() {
-    return $this->getNotice()->getTitrePrincipal();
+    return ($record = $this->getNotice())
+      ? $record->getTitrePrincipal()
+      : '';
   }
 
 
   public function getTitreEtSousTitre() {
-    return $this->getNotice()->getTitreEtSousTitre();
+    return ($record = $this->getNotice())
+      ? $record->getTitreEtSousTitre()
+      : '';
   }
 
 
   public function getAuteurPrincipal() {
-    return $this->getNotice()->getAuteurPrincipal();
+    return ($record =$this->getNotice())
+      ? $record->getAuteurPrincipal()
+      : '';
   }
 
 
   public function getEditeur() {
-    return $this->getNotice()->getEditeur();
+    return ($record = $this->getNotice())
+      ? $record->getEditeur()
+      : '';
   }
 
 
   public function getCollectionPrincipale() {
-    return $this->getNotice()->getCollections(true);
+    return ($record = $this->getNotice())
+      ? $record->getCollections(true)
+      : '';
   }
 
 
   public function getTypeDoc() {
-    return $this->getNotice()->getTypeDoc();
+    return ($record = $this->getNotice())
+      ? $record->getTypeDoc()
+      : '';
   }
 
 
@@ -279,7 +293,7 @@ class Class_Exemplaire extends Storm_Model_Abstract {
 
 
   public function isDisponible($cache_only = false) {
-    if ($this->getNotice()->isRessourceNumerique())
+    if ($this->getNotice() && $this->getNotice()->isRessourceNumerique())
       return true;
 
     if ($cache_only)
@@ -334,7 +348,10 @@ class Class_Exemplaire extends Storm_Model_Abstract {
 
   public function toUnimarcIso2709() {
     $writer = new Class_NoticeUnimarc_Writer();
-    $writer->setNotice($this->getNotice()->getUnimarc());
+    $unimarc = ($record = $this->getNotice())
+      ? $record->getUnimarc()
+      : '';
+    $writer->setNotice($unimarc);
     $subfields = [];
     foreach ($this->zone995toArray() as $subfield)
       $subfields[] = [$this->get995Key($subfield), $subfield['valeur']];
@@ -420,7 +437,9 @@ class Class_Exemplaire extends Storm_Model_Abstract {
 
 
   public function isSigbLoanable() {
-    $record = $this->getNotice();
+    if(!$record = $this->getNotice())
+      return false;
+
     return $this->isLoanable() && (!$record->isDilicom());
   }
 }
\ No newline at end of file

tests/library/Class/Notice/DoubleFinderTest.php

@@ -93,6 +93,31 @@ abstract class DoubleFinderTestCase extends ModelTestCase {
 
 
 
+class DoubleFinderWithNoNoticeTest extends DoubleFinderTestCase {
+
+  protected $_data = ['type_doc' => Class_TypeDoc::DILICOM,
+                      'statut_exemplaires' => ['nb_ex' => 1],
+                      'exemplaires' => [ ['code_barres' => '302'] ]];
+
+
+  protected function _prepareFixtures() {
+    $this->fixture('Class_Exemplaire',
+                   ['id' => 30,
+                    'code_barres' => '302',
+                    'id_origine' => '789',
+                    'type_doc' => Class_TypeDoc::DILICOM,
+                    'id_int_bib' => 1]);
+  }
+
+
+  /** @test */
+  public function WithExemplaireWithoutNoticeShouldNotFound() {
+    $this->assertFalse($this->_found);
+  }
+}
+
+
+
 class DoubleFinderWithoutAnyRecordTest extends DoubleFinderTestCase {
   /** @test */
   public function shouldNotFindDouble() {