From 2be9a21c751d1852488db561f59f8129a48c74a8 Mon Sep 17 00:00:00 2001
From: Guillaume Heurtier <guillaume.heurtier@maarch.org>
Date: Fri, 18 Sep 2020 16:22:04 +0200
Subject: [PATCH] FEAT #13271 TIME 0:30 fix tu
---
sql/structure.sql | 2 +-
.../ConfigurationControllerTest.php | 38 +++----
.../RegisteredNumberRangeControllerTest.php | 101 +-----------------
3 files changed, 22 insertions(+), 119 deletions(-)
diff --git a/sql/structure.sql b/sql/structure.sql
index 8ac5b62836f..e6f4f0602bf 100755
--- a/sql/structure.sql
+++ b/sql/structure.sql
@@ -1270,7 +1270,7 @@ id serial NOT NULL,
privilege character varying(64) NOT NULL,
value json DEFAULT '{}' NOT NULL,
CONSTRAINT configuration_pkey PRIMARY KEY (id),
-CONSTRAINT configuration_unique_key UNIQUE (service)
+CONSTRAINT configuration_unique_key UNIQUE (privilege)
)
WITH (OIDS=FALSE);
diff --git a/test/unitTests/app/configuration/ConfigurationControllerTest.php b/test/unitTests/app/configuration/ConfigurationControllerTest.php
index 2ff1285acfc..a927e42d922 100755
--- a/test/unitTests/app/configuration/ConfigurationControllerTest.php
+++ b/test/unitTests/app/configuration/ConfigurationControllerTest.php
@@ -32,7 +32,7 @@ class ConfigurationControllerTest extends TestCase
];
$fullRequest = \httpRequestCustom::addContentInBody($aArgs, $request);
- $response = $configurationController->update($fullRequest, new \Slim\Http\Response(), ['service' => 'admin_email_server']);
+ $response = $configurationController->update($fullRequest, new \Slim\Http\Response(), ['privilege' => 'admin_email_server']);
$responseBody = json_decode((string)$response->getBody());
$this->assertSame('success', $responseBody->success);
@@ -40,12 +40,12 @@ class ConfigurationControllerTest extends TestCase
// READ
$environment = \Slim\Http\Environment::mock(['REQUEST_METHOD' => 'GET']);
$request = \Slim\Http\Request::createFromEnvironment($environment);
- $response = $configurationController->getByService($request, new \Slim\Http\Response(), ['service' => 'admin_email_server']);
+ $response = $configurationController->getByPrivilege($request, new \Slim\Http\Response(), ['privilege' => 'admin_email_server']);
$responseBody = json_decode((string)$response->getBody());
$this->assertNotNull($responseBody->configuration);
$this->assertIsInt($responseBody->configuration->id);
- $this->assertSame('admin_email_server', $responseBody->configuration->service);
+ $this->assertSame('admin_email_server', $responseBody->configuration->privilege);
$this->assertNotNull($responseBody->configuration->value);
$jsonTest = json_encode(
@@ -82,19 +82,19 @@ class ConfigurationControllerTest extends TestCase
];
$fullRequest = \httpRequestCustom::addContentInBody($aArgs, $request);
- $response = $configurationController->update($fullRequest, new \Slim\Http\Response(), ['service' => 'admin_email_server']);
+ $response = $configurationController->update($fullRequest, new \Slim\Http\Response(), ['privilege' => 'admin_email_server']);
$responseBody = json_decode((string)$response->getBody());
$this->assertSame('success', $responseBody->success);
$environment = \Slim\Http\Environment::mock(['REQUEST_METHOD' => 'GET']);
$request = \Slim\Http\Request::createFromEnvironment($environment);
- $response = $configurationController->getByService($request, new \Slim\Http\Response(), ['service' => 'admin_email_server']);
+ $response = $configurationController->getByPrivilege($request, new \Slim\Http\Response(), ['privilege' => 'admin_email_server']);
$responseBody = json_decode((string)$response->getBody());
$this->assertNotNull($responseBody->configuration);
$this->assertIsInt($responseBody->configuration->id);
- $this->assertSame('admin_email_server', $responseBody->configuration->service);
+ $this->assertSame('admin_email_server', $responseBody->configuration->privilege);
$this->assertNotNull($responseBody->configuration->value);
$jsonTest = json_encode(
@@ -125,19 +125,19 @@ class ConfigurationControllerTest extends TestCase
];
$fullRequest = \httpRequestCustom::addContentInBody($aArgs, $request);
- $response = $configurationController->update($fullRequest, new \Slim\Http\Response(), ['service' => 'admin_email_server']);
+ $response = $configurationController->update($fullRequest, new \Slim\Http\Response(), ['privilege' => 'admin_email_server']);
$responseBody = json_decode((string)$response->getBody());
$this->assertSame('success', $responseBody->success);
$environment = \Slim\Http\Environment::mock(['REQUEST_METHOD' => 'GET']);
$request = \Slim\Http\Request::createFromEnvironment($environment);
- $response = $configurationController->getByService($request, new \Slim\Http\Response(), ['service' => 'admin_email_server']);
+ $response = $configurationController->getByPrivilege($request, new \Slim\Http\Response(), ['privilege' => 'admin_email_server']);
$responseBody = json_decode((string)$response->getBody());
$this->assertNotNull($responseBody->configuration);
$this->assertIsInt($responseBody->configuration->id);
- $this->assertSame('admin_email_server', $responseBody->configuration->service);
+ $this->assertSame('admin_email_server', $responseBody->configuration->privilege);
$this->assertNotNull($responseBody->configuration->value);
$jsonTest = json_encode(
@@ -160,10 +160,10 @@ class ConfigurationControllerTest extends TestCase
];
$fullRequest = \httpRequestCustom::addContentInBody($aArgs, $request);
- $response = $configurationController->update($fullRequest, new \Slim\Http\Response(), ['service' => 'admin_email_server_fail']);
+ $response = $configurationController->update($fullRequest, new \Slim\Http\Response(), ['privilege' => 'admin_email_server_fail']);
$responseBody = json_decode((string)$response->getBody());
- $this->assertSame('Service configuration does not exist', $responseBody->errors);
+ $this->assertSame('Privilege configuration does not exist', $responseBody->errors);
// UPDATE ERROR
$environment = \Slim\Http\Environment::mock(['REQUEST_METHOD' => 'PUT']);
@@ -173,7 +173,7 @@ class ConfigurationControllerTest extends TestCase
];
$fullRequest = \httpRequestCustom::addContentInBody($aArgs, $request);
- $response = $configurationController->update($fullRequest, new \Slim\Http\Response(), ['service' => 'admin_email_server']);
+ $response = $configurationController->update($fullRequest, new \Slim\Http\Response(), ['privilege' => 'admin_email_server']);
$responseBody = json_decode((string)$response->getBody());
$this->assertSame('Configuration type is missing', $responseBody->errors);
@@ -194,7 +194,7 @@ class ConfigurationControllerTest extends TestCase
];
$fullRequest = \httpRequestCustom::addContentInBody($aArgs, $request);
- $response = $configurationController->update($fullRequest, new \Slim\Http\Response(), ['service' => 'admin_email_server']);
+ $response = $configurationController->update($fullRequest, new \Slim\Http\Response(), ['privilege' => 'admin_email_server']);
$responseBody = json_decode((string)$response->getBody());
$this->assertSame('Configuration data is missing or not well formatted', $responseBody->errors);
@@ -221,7 +221,7 @@ class ConfigurationControllerTest extends TestCase
];
$fullRequest = \httpRequestCustom::addContentInBody($aArgs, $request);
- $response = $configurationController->update($fullRequest, new \Slim\Http\Response(), ['service' => 'admin_email_server']);
+ $response = $configurationController->update($fullRequest, new \Slim\Http\Response(), ['privilege' => 'admin_email_server']);
$responseBody = json_decode((string)$response->getBody());
$this->assertSame('success', $responseBody->success);
@@ -229,12 +229,12 @@ class ConfigurationControllerTest extends TestCase
// READ
$environment = \Slim\Http\Environment::mock(['REQUEST_METHOD' => 'GET']);
$request = \Slim\Http\Request::createFromEnvironment($environment);
- $response = $configurationController->getByService($request, new \Slim\Http\Response(), ['service' => 'admin_email_server']);
+ $response = $configurationController->getByPrivilege($request, new \Slim\Http\Response(), ['privilege' => 'admin_email_server']);
$responseBody = json_decode((string)$response->getBody());
$this->assertNotNull($responseBody->configuration);
$this->assertIsInt($responseBody->configuration->id);
- $this->assertSame('admin_email_server', $responseBody->configuration->service);
+ $this->assertSame('admin_email_server', $responseBody->configuration->privilege);
$this->assertNotNull($responseBody->configuration->value);
$jsonTest = json_encode(
@@ -271,7 +271,7 @@ class ConfigurationControllerTest extends TestCase
];
$fullRequest = \httpRequestCustom::addContentInBody($aArgs, $request);
- $response = $configurationController->update($fullRequest, new \Slim\Http\Response(), ['service' => 'admin_email_server']);
+ $response = $configurationController->update($fullRequest, new \Slim\Http\Response(), ['privilege' => 'admin_email_server']);
$responseBody = json_decode((string)$response->getBody());
$this->assertSame('success', $responseBody->success);
@@ -279,12 +279,12 @@ class ConfigurationControllerTest extends TestCase
// READ
$environment = \Slim\Http\Environment::mock(['REQUEST_METHOD' => 'GET']);
$request = \Slim\Http\Request::createFromEnvironment($environment);
- $response = $configurationController->getByService($request, new \Slim\Http\Response(), ['service' => 'admin_email_server']);
+ $response = $configurationController->getByPrivilege($request, new \Slim\Http\Response(), ['privilege' => 'admin_email_server']);
$responseBody = json_decode((string)$response->getBody());
$this->assertNotNull($responseBody->configuration);
$this->assertIsInt($responseBody->configuration->id);
- $this->assertSame('admin_email_server', $responseBody->configuration->service);
+ $this->assertSame('admin_email_server', $responseBody->configuration->privilege);
$this->assertNotNull($responseBody->configuration->value);
$jsonTest = json_encode(
diff --git a/test/unitTests/app/registeredMail/RegisteredNumberRangeControllerTest.php b/test/unitTests/app/registeredMail/RegisteredNumberRangeControllerTest.php
index b818cd5a523..8f9e4d1f2af 100644
--- a/test/unitTests/app/registeredMail/RegisteredNumberRangeControllerTest.php
+++ b/test/unitTests/app/registeredMail/RegisteredNumberRangeControllerTest.php
@@ -13,45 +13,20 @@ class RegisteredNumberRangeControllerTest extends TestCase
{
private static $id = null;
private static $id2 = null;
- private static $siteId = null;
public function testCreate()
{
$registeredNumberRangeController = new \RegisteredMail\controllers\RegisteredNumberRangeController();
- $issuingSiteController = new \RegisteredMail\controllers\IssuingSiteController();
// CREATE
$environment = \Slim\Http\Environment::mock(['REQUEST_METHOD' => 'POST']);
$request = \Slim\Http\Request::createFromEnvironment($environment);
- $body = [
- 'label' => 'Scranton',
- 'postOfficeLabel' => 'Scranton Post Office',
- 'accountNumber' => 42,
- 'addressNumber' => '1725',
- 'addressStreet' => 'Slough Avenue',
- 'addressAdditional1' => null,
- 'addressAdditional2' => null,
- 'addressPostcode' => '18505',
- 'addressTown' => 'Scranton',
- 'addressCountry' => 'USA',
- 'entities' => [6]
- ];
- $fullRequest = \httpRequestCustom::addContentInBody($body, $request);
-
- $response = $issuingSiteController->create($fullRequest, new \Slim\Http\Response());
- $this->assertSame(200, $response->getStatusCode());
- $responseBody = json_decode((string)$response->getBody(), true);
- $this->assertIsInt($responseBody['id']);
-
- self::$siteId = $responseBody['id'];
-
$body = [
'registeredMailType' => '2D',
'trackerNumber' => 'AZPOKF30KDZP',
'rangeStart' => 11,
'rangeEnd' => 1000,
- 'siteId' => self::$siteId
];
$fullRequest = \httpRequestCustom::addContentInBody($body, $request);
@@ -67,7 +42,6 @@ class RegisteredNumberRangeControllerTest extends TestCase
'trackerNumber' => 'AZPOKF30KDZP2',
'rangeStart' => 1001,
'rangeEnd' => 2000,
- 'siteId' => self::$siteId,
'status' => 'OK'
];
$fullRequest = \httpRequestCustom::addContentInBody($body, $request);
@@ -92,7 +66,6 @@ class RegisteredNumberRangeControllerTest extends TestCase
$this->assertSame('AZPOKF30KDZP', $responseBody['range']['trackerNumber']);
$this->assertSame(11, $responseBody['range']['rangeStart']);
$this->assertSame(1000, $responseBody['range']['rangeEnd']);
- $this->assertSame(self::$siteId, $responseBody['range']['siteId']);
$this->assertSame($GLOBALS['id'], $responseBody['range']['creator']);
$this->assertNull($responseBody['range']['currentNumber']);
$this->assertSame(0, $responseBody['range']['fullness']);
@@ -143,39 +116,11 @@ class RegisteredNumberRangeControllerTest extends TestCase
$responseBody = json_decode((string)$response->getBody(), true);
$this->assertSame('Body rangeEnd is empty or not an integer', $responseBody['errors']);
- $body = [
- 'registeredMailType' => '2D',
- 'trackerNumber' => 'AZPOKF30KDZP',
- 'rangeStart' => 1,
- 'rangeEnd' => 1000,
- ];
- $fullRequest = \httpRequestCustom::addContentInBody($body, $request);
-
- $response = $registeredNumberRangeController->create($fullRequest, new \Slim\Http\Response());
- $this->assertSame(400, $response->getStatusCode());
- $responseBody = json_decode((string)$response->getBody(), true);
- $this->assertSame('Body siteId is empty or not an integer', $responseBody['errors']);
-
- $body = [
- 'registeredMailType' => '2D',
- 'trackerNumber' => 'AZPOKF30KDZP',
- 'rangeStart' => 1,
- 'rangeEnd' => 1000,
- 'siteId' => self::$siteId * 1000
- ];
- $fullRequest = \httpRequestCustom::addContentInBody($body, $request);
-
- $response = $registeredNumberRangeController->create($fullRequest, new \Slim\Http\Response());
- $this->assertSame(400, $response->getStatusCode());
- $responseBody = json_decode((string)$response->getBody(), true);
- $this->assertSame('Body siteId does not exist', $responseBody['errors']);
-
$body = [
'registeredMailType' => '2D',
'trackerNumber' => 'AZPOKF30KDZP3',
'rangeStart' => 500,
- 'rangeEnd' => 1500,
- 'siteId' => self::$siteId
+ 'rangeEnd' => 1500
];
$fullRequest = \httpRequestCustom::addContentInBody($body, $request);
@@ -188,8 +133,7 @@ class RegisteredNumberRangeControllerTest extends TestCase
'registeredMailType' => '2D',
'trackerNumber' => 'AZPOKF30KDZP',
'rangeStart' => 500,
- 'rangeEnd' => 1500,
- 'siteId' => self::$siteId
+ 'rangeEnd' => 1500
];
$fullRequest = \httpRequestCustom::addContentInBody($body, $request);
@@ -300,7 +244,6 @@ class RegisteredNumberRangeControllerTest extends TestCase
'trackerNumber' => 'AZPOKF30KDZP',
'rangeStart' => 11,
'rangeEnd' => 900,
- 'siteId' => self::$siteId,
'status' => 'OK'
];
$fullRequest = \httpRequestCustom::addContentInBody($body, $request);
@@ -320,7 +263,6 @@ class RegisteredNumberRangeControllerTest extends TestCase
$this->assertSame('AZPOKF30KDZP', $responseBody['range']['trackerNumber']);
$this->assertSame(11, $responseBody['range']['rangeStart']);
$this->assertSame(900, $responseBody['range']['rangeEnd']);
- $this->assertSame(self::$siteId, $responseBody['range']['siteId']);
$this->assertSame($GLOBALS['id'], $responseBody['range']['creator']);
$this->assertSame(11, $responseBody['range']['currentNumber']);
$this->assertSame(0, $responseBody['range']['fullness']);
@@ -339,7 +281,6 @@ class RegisteredNumberRangeControllerTest extends TestCase
'trackerNumber' => 'AZPOKF30KDZP2',
'rangeStart' => 1001,
'rangeEnd' => 2000,
- 'siteId' => self::$siteId,
'status' => 'OK'
];
$fullRequest = \httpRequestCustom::addContentInBody($body, $request);
@@ -359,7 +300,6 @@ class RegisteredNumberRangeControllerTest extends TestCase
$this->assertSame('AZPOKF30KDZP2', $responseBody['range']['trackerNumber']);
$this->assertSame(1001, $responseBody['range']['rangeStart']);
$this->assertSame(2000, $responseBody['range']['rangeEnd']);
- $this->assertSame(self::$siteId, $responseBody['range']['siteId']);
$this->assertSame($GLOBALS['id'], $responseBody['range']['creator']);
$this->assertSame(1001, $responseBody['range']['currentNumber']);
$this->assertSame(0, $responseBody['range']['fullness']);
@@ -384,7 +324,6 @@ class RegisteredNumberRangeControllerTest extends TestCase
'trackerNumber' => 'AZPOKF30KDZP',
'rangeStart' => 11,
'rangeEnd' => 900,
- 'siteId' => self::$siteId,
'status' => 'END'
];
$fullRequest = \httpRequestCustom::addContentInBody($body, $request);
@@ -403,7 +342,6 @@ class RegisteredNumberRangeControllerTest extends TestCase
'trackerNumber' => 'AZPOKF30KDZP2',
'rangeStart' => 1001,
'rangeEnd' => 2000,
- 'siteId' => self::$siteId,
'status' => 'SPD'
];
$fullRequest = \httpRequestCustom::addContentInBody($body, $request);
@@ -416,7 +354,6 @@ class RegisteredNumberRangeControllerTest extends TestCase
'trackerNumber' => 'AZPOKF30KDZP2',
'rangeStart' => 1001,
'rangeEnd' => 2000,
- 'siteId' => self::$siteId,
'status' => 'OK'
];
$fullRequest = \httpRequestCustom::addContentInBody($body, $request);
@@ -470,33 +407,6 @@ class RegisteredNumberRangeControllerTest extends TestCase
$responseBody = json_decode((string)$response->getBody(), true);
$this->assertSame('Body rangeEnd is empty or not an integer', $responseBody['errors']);
- $body = [
- 'registeredMailType' => '2D',
- 'trackerNumber' => 'AZPOKF30KDZP',
- 'rangeStart' => 11,
- 'rangeEnd' => 1000,
- ];
- $fullRequest = \httpRequestCustom::addContentInBody($body, $request);
-
- $response = $registeredNumberRangeController->update($fullRequest, new \Slim\Http\Response(), ['id' => self::$id]);
- $this->assertSame(400, $response->getStatusCode());
- $responseBody = json_decode((string)$response->getBody(), true);
- $this->assertSame('Body siteId is empty or not an integer', $responseBody['errors']);
-
- $body = [
- 'registeredMailType' => '2D',
- 'trackerNumber' => 'AZPOKF30KDZP',
- 'rangeStart' => 11,
- 'rangeEnd' => 1000,
- 'siteId' => self::$siteId * 1000
- ];
- $fullRequest = \httpRequestCustom::addContentInBody($body, $request);
-
- $response = $registeredNumberRangeController->update($fullRequest, new \Slim\Http\Response(), ['id' => self::$id]);
- $this->assertSame(400, $response->getStatusCode());
- $responseBody = json_decode((string)$response->getBody(), true);
- $this->assertSame('Body siteId does not exist', $responseBody['errors']);
-
$response = $registeredNumberRangeController->update($fullRequest, new \Slim\Http\Response(), ['id' => self::$id * 1000]);
$this->assertSame(400, $response->getStatusCode());
$responseBody = json_decode((string)$response->getBody(), true);
@@ -507,7 +417,6 @@ class RegisteredNumberRangeControllerTest extends TestCase
'trackerNumber' => 'AZPOKF30KDZP',
'rangeStart' => 500,
'rangeEnd' => 1500,
- 'siteId' => self::$siteId
];
$fullRequest = \httpRequestCustom::addContentInBody($body, $request);
@@ -521,7 +430,6 @@ class RegisteredNumberRangeControllerTest extends TestCase
'trackerNumber' => 'AZPOKF30KDZP2',
'rangeStart' => 1001,
'rangeEnd' => 2000,
- 'siteId' => self::$siteId,
'status' => 'OK'
];
$fullRequest = \httpRequestCustom::addContentInBody($body, $request);
@@ -536,7 +444,6 @@ class RegisteredNumberRangeControllerTest extends TestCase
'trackerNumber' => 'AZPOKF30KDZP',
'rangeStart' => 1001,
'rangeEnd' => 2000,
- 'siteId' => self::$siteId,
'status' => 'OK'
];
$fullRequest = \httpRequestCustom::addContentInBody($body, $request);
@@ -600,7 +507,6 @@ class RegisteredNumberRangeControllerTest extends TestCase
public function testDelete()
{
$registeredNumberRangeController = new \RegisteredMail\controllers\RegisteredNumberRangeController();
- $issuingSiteController = new \RegisteredMail\controllers\IssuingSiteController();
// DELETE
$environment = \Slim\Http\Environment::mock(['REQUEST_METHOD' => 'DELETE']);
@@ -657,8 +563,5 @@ class RegisteredNumberRangeControllerTest extends TestCase
$GLOBALS['login'] = 'superadmin';
$userInfo = \User\models\UserModel::getByLogin(['login' => $GLOBALS['login'], 'select' => ['id']]);
$GLOBALS['id'] = $userInfo['id'];
-
- $response = $issuingSiteController->delete($request, new \Slim\Http\Response(), ['id' => self::$siteId]);
- $this->assertSame(204, $response->getStatusCode());
}
}
--
GitLab