From 585ad014d2ad87c4efd7c3d0863e92972204ba2d Mon Sep 17 00:00:00 2001
From: llaffont <llaffont@git-test.afi-sa.fr>
Date: Tue, 2 Apr 2013 12:07:26 +0000
Subject: [PATCH] =?UTF-8?q?Correction=20cr=C3=A9ation=20automatique=20des?=
=?UTF-8?q?=20abonn=C3=A9s=20Nanook?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
library/Class/Users.php | 1 +
.../Class/WebService/SIGB/AbstractRESTService.php | 2 +-
library/Class/WebService/SIGB/Emprunteur.php | 2 +-
library/Class/WebService/SIGB/Nanook/Service.php | 13 +------------
tests/library/Class/WebService/SIGB/NanookTest.php | 6 +++---
5 files changed, 7 insertions(+), 17 deletions(-)
diff --git a/library/Class/Users.php b/library/Class/Users.php
index 84c0f3ce8c1..56a238280a4 100644
--- a/library/Class/Users.php
+++ b/library/Class/Users.php
@@ -197,6 +197,7 @@ class Class_Users extends Storm_Model_Abstract {
'zone' => array('through' => 'bib'));
protected $_default_attribute_values = array('id_site' => 0,
+ 'login' => '',
'role' => 'invite',
'role_level' => 0,
'idabon' => '',
diff --git a/library/Class/WebService/SIGB/AbstractRESTService.php b/library/Class/WebService/SIGB/AbstractRESTService.php
index 4cb92c291b7..1bbd86e0c46 100644
--- a/library/Class/WebService/SIGB/AbstractRESTService.php
+++ b/library/Class/WebService/SIGB/AbstractRESTService.php
@@ -156,7 +156,7 @@ abstract class Class_WebService_SIGB_AbstractRESTService extends Class_WebServic
*/
public function ilsdiAuthenticatePatron($user) {
$params = ['service' => 'AuthenticatePatron',
- 'username' => $user->getIdabon(),
+ 'username' => $user->getLogin(),
'password' => $user->getPassword()];
$xml = $this->httpGet($params);
diff --git a/library/Class/WebService/SIGB/Emprunteur.php b/library/Class/WebService/SIGB/Emprunteur.php
index 5d7c0b677c7..63ed02d1027 100644
--- a/library/Class/WebService/SIGB/Emprunteur.php
+++ b/library/Class/WebService/SIGB/Emprunteur.php
@@ -25,7 +25,7 @@ class Class_WebService_SIGB_Emprunteur {
$_name,
$_emprunts,
$_reservations,
- $_email,
+ $_email = '',
$_nom = null,
$_prenom = null,
$_password = null,
diff --git a/library/Class/WebService/SIGB/Nanook/Service.php b/library/Class/WebService/SIGB/Nanook/Service.php
index d4c2e891065..2439f5f16b0 100644
--- a/library/Class/WebService/SIGB/Nanook/Service.php
+++ b/library/Class/WebService/SIGB/Nanook/Service.php
@@ -36,7 +36,7 @@ class Class_Webservice_SIGB_Nanook_Service extends Class_WebService_SIGB_Abstrac
*/
public function getEmprunteur($user) {
return $this
- ->_authenticate($user)
+ ->ilsdiAuthenticatePatron($user)
->ilsdiGetPatronInfo(array('patronId' => $user->getIdSigb()),
Class_WebService_SIGB_Nanook_PatronInfoReader::newInstance());
}
@@ -111,16 +111,5 @@ class Class_Webservice_SIGB_Nanook_Service extends Class_WebService_SIGB_Abstrac
return $this->getServerRoot() . implode('/', $parts);
}
-
-
- /**
- * @param $user Class_Users
- */
- protected function _authenticate($user) {
- if (null != $user->getIdSigb())
- return $this;
-
- return $this->ilsdiAuthenticatePatron($user);
- }
}
?>
\ No newline at end of file
diff --git a/tests/library/Class/WebService/SIGB/NanookTest.php b/tests/library/Class/WebService/SIGB/NanookTest.php
index f50bd455ac2..969d6af0019 100644
--- a/tests/library/Class/WebService/SIGB/NanookTest.php
+++ b/tests/library/Class/WebService/SIGB/NanookTest.php
@@ -689,7 +689,7 @@ class NanookGetEmprunteurWithoutIdSigbTest extends NanookTestCase {
->answers(NanookFixtures::xmlGetPatronError());
$emprunteur = $this->_service->getEmprunteur($user = Class_Users::newInstance()
- ->setIdabon('90175000410218')
+ ->setLogin('90175000410218')
->setPassword('1989'));
$this->assertNotNull($emprunteur);
@@ -730,8 +730,8 @@ class NanookGetEmprunteurPBTest extends NanookTestCase {
/** @test */
- public function mailShouldBeNull() {
- $this->assertNull($this->_emprunteur->getEmail());
+ public function mailShouldBeEmpty() {
+ $this->assertEmpty($this->_emprunteur->getEmail());
}
}
--
GitLab