Redmine : avoid multiple connections on same account

library/Class/Bib.php

@@ -72,7 +72,13 @@ class BibLoader extends Storm_Model_Loader {
   public function findAllRedmineEnabled() {
     return (new Storm_Model_Collection(Class_Bib::findAllSortedByLabel()))
       ->select('isRedmineEnabled')
-      ->getArrayCopy();
+      ->injectInto([],
+                   function($distinct_library_accounts, $library) {
+                     $account = $library->getRedmineLoginOrKey();
+                     if (!isset($distinct_library_accounts[$account]))
+                       $distinct_library_accounts[$account] = $library;
+                     return $distinct_library_accounts;
+                   });
   }
 
 
@@ -851,7 +857,9 @@ class Class_Bib extends Storm_Model_Abstract {
 
 
   public function getRedmineLoginOrKey() {
-    return ($login = $this->getRedmineLogin()) ? $login : $this->getRedmineApiKey();
+    return ($login = trim($this->getRedmineLogin()))
+      ? $login
+      : trim($this->getRedmineApiKey());
   }
 
 

tests/application/modules/admin/controllers/RedmineControllerTest.php

@@ -389,7 +389,7 @@ class Admin_RedmineControllerWithMultipleAccountTest extends Admin_RedmineContro
   public function setUp() {
     parent::setUp();
 
-    $chambery = $this->fixture('Class_Bib',
+    $chambery = $this->fixture(Class_Bib::class,
                                ['id' => 2,
                                 'libelle' => 'Mediatheque de Chambéry',
                                 'redmine_api_key' => '987654321',
@@ -397,6 +397,14 @@ class Admin_RedmineControllerWithMultipleAccountTest extends Admin_RedmineContro
                                 'redmine_password' => 'late',
                                 'redmine_user_id' => 12]);
 
+    $la_motte_same_account = $this->fixture(Class_Bib::class,
+                                            ['id' => 3,
+                                             'libelle' => 'Mediathèque de La Motte',
+                                             'redmine_api_key' => '987654321',
+                                             'redmine_login' => 'chambery@customer',
+                                             'redmine_password' => 'late',
+                                             'redmine_user_id' => 12]);
+
     Class_Users::getIdentity()->setBib(null);
     Class_Users::getIdentity()->setRedmineLibrary(null);
 
@@ -417,6 +425,13 @@ class Admin_RedmineControllerWithMultipleAccountTest extends Admin_RedmineContro
   }
 
 
+  /** @test */
+  public function laMotteShouldNotBePresentInLibrarySelector() {
+    $this->assertNotXPathContentContains('//select[@name="library"]//option',
+                                         'Motte');
+  }
+
+
   /** @test */
   public function urserRedmineLibShouldBeNull() {
     $this->assertNull(Class_Users::getIdentity()->getRedmineLibrary());
@@ -943,4 +958,4 @@ class Admin_RedmineControllerTestActionDownloadEmptyAttachmentTest
   public function shouldRedirect() {
     $this->assertRedirect();
   }
-}
\ No newline at end of file
+}