diff --git a/migration/20.10/2010.sql b/migration/20.10/2010.sql
index afbecb3fa91abdf5c35b579f1dd8fb66a5bbf3c2..d459bbd0ecde07807b78081d5d53b72260f8f0b5 100755
--- a/migration/20.10/2010.sql
+++ b/migration/20.10/2010.sql
@@ -194,7 +194,6 @@ CREATE TABLE IF NOT EXISTS issuing_sites (
site_label CHARACTER VARYING(256) NOT NULL,
post_office_label CHARACTER VARYING(256),
account_number CHARACTER VARYING(256),
- address_name CHARACTER VARYING(256),
address_number CHARACTER VARYING(256),
address_street CHARACTER VARYING(256),
address_additional1 CHARACTER VARYING(256),
diff --git a/phpunit.xml b/phpunit.xml
index d21378bcaf49a39079a908f00f7a8bce94531622..3dcac1768370ce8210a9d2c97f0e80d20b9d2b81 100755
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -48,7 +48,7 @@
<file>test/unitTests/app/signatureBook/SignatureBookControllerTest.php</file>
<file>test/unitTests/app/acknowledgementReceipt/AcknowledgementReceiptControllerTest.php</file>
<file>test/unitTests/app/notification/DiffusionTypesControllerTest.php</file>
- <file>test/unitTests/app/recommended/IssuingSiteControllerTest.php</file>
+ <file>test/unitTests/app/registeredMail/IssuingSiteControllerTest.php</file>
<!-- The last one should be history -->
<file>test/unitTests/app/history/HistoryControllerTest.php</file>
</testsuite>
diff --git a/rest/index.php b/rest/index.php
index 004a1202032733db147fe09a853941c5a64db689..7366a033467a8c288da6d6a99f244456334b49e5 100755
--- a/rest/index.php
+++ b/rest/index.php
@@ -614,12 +614,12 @@ $app->post('/collaboraOnline/file', \ContentManagement\controllers\CollaboraOnli
$app->delete('/collaboraOnline/file', \ContentManagement\controllers\CollaboraOnlineController::class . ':deleteTmpFile');
$app->post('/collaboraOnline/encodedFile', \ContentManagement\controllers\CollaboraOnlineController::class . ':saveTmpEncodedDocument');
-// Recommended
-$app->get('/recommended/sites', \Recommended\controllers\IssuingSiteController::class . ':get');
-$app->get('/recommended/sites/{id}', \Recommended\controllers\IssuingSiteController::class . ':getById');
-$app->post('/recommended/sites', \Recommended\controllers\IssuingSiteController::class . ':create');
-$app->put('/recommended/sites/{id}', \Recommended\controllers\IssuingSiteController::class . ':update');
-$app->delete('/recommended/sites/{id}', \Recommended\controllers\IssuingSiteController::class . ':delete');
+// Registered mail
+$app->get('/registeredMail/sites', \RegisteredMail\controllers\IssuingSiteController::class . ':get');
+$app->get('/registeredMail/sites/{id}', \RegisteredMail\controllers\IssuingSiteController::class . ':getById');
+$app->post('/registeredMail/sites', \RegisteredMail\controllers\IssuingSiteController::class . ':create');
+$app->put('/registeredMail/sites/{id}', \RegisteredMail\controllers\IssuingSiteController::class . ':update');
+$app->delete('/registeredMail/sites/{id}', \RegisteredMail\controllers\IssuingSiteController::class . ':delete');
$app->run();
diff --git a/sql/structure.sql b/sql/structure.sql
index 8d7b55546d8750886688229050002c937e1017f9..3a727e5ab0491a44bf47fd5e48f719d40a54120e 100755
--- a/sql/structure.sql
+++ b/sql/structure.sql
@@ -1413,7 +1413,6 @@ CREATE TABLE IF NOT EXISTS issuing_sites
site_label CHARACTER VARYING(256) NOT NULL,
post_office_label CHARACTER VARYING(256),
account_number CHARACTER VARYING(256),
- address_name CHARACTER VARYING(256),
address_number CHARACTER VARYING(256),
address_street CHARACTER VARYING(256),
address_additional1 CHARACTER VARYING(256),
diff --git a/src/app/entity/controllers/EntityController.php b/src/app/entity/controllers/EntityController.php
index dbbee52134936546968d4ed5ae29122fc56e0498..14d2ebe7dc0b63600e0c0a16dfe5c0aa9201a2f3 100755
--- a/src/app/entity/controllers/EntityController.php
+++ b/src/app/entity/controllers/EntityController.php
@@ -539,8 +539,7 @@ class EntityController
$fields = [
'id', 'entity_id', 'entity_label', 'short_label', 'entity_full_name', 'enabled', 'adrs_1', 'adrs_2', 'adrs_3', 'zipcode', 'city',
- 'country', 'email', 'parent_entity_id', 'entity_type', 'business_id', 'ldap_id', 'archival_agency', 'archival_agreement',
- 'folder_import', 'external_id',
+ 'country', 'email', 'parent_entity_id', 'entity_type', 'business_id', 'archival_agency', 'archival_agreement', 'folder_import'
];
$csvHead = array_merge($fields, [ 'diffusionList', 'visaCircuit', 'opinionCircuit', 'users', 'templates']);
diff --git a/src/app/registeredMail/controllers/IssuingSiteController.php b/src/app/registeredMail/controllers/IssuingSiteController.php
index c44f91081cc17f98c032b80664a49953229a650e..25ce446e6342dca9eeb9dea078f5e67d8652b926 100644
--- a/src/app/registeredMail/controllers/IssuingSiteController.php
+++ b/src/app/registeredMail/controllers/IssuingSiteController.php
@@ -37,7 +37,6 @@ class IssuingSiteController
'siteLabel' => $site['site_label'],
'postOfficeLabel' => $site['post_office_label'] ?? null,
'accountNumber' => $site['account_number'] ?? null,
- 'addressName' => $site['address_name'] ?? null,
'addressNumber' => $site['address_number'] ?? null,
'addressStreet' => $site['address_street'] ?? null,
'addressAdditional1' => $site['address_additional1'] ?? null,
@@ -68,7 +67,6 @@ class IssuingSiteController
'siteLabel' => $site['site_label'],
'postOfficeLabel' => $site['post_office_label'] ?? null,
'accountNumber' => $site['account_number'] ?? null,
- 'addressName' => $site['address_name'] ?? null,
'addressNumber' => $site['address_number'] ?? null,
'addressStreet' => $site['address_street'] ?? null,
'addressAdditional1' => $site['address_additional1'] ?? null,
@@ -115,8 +113,7 @@ class IssuingSiteController
$id = IssuingSiteModel::create([
'siteLabel' => $body['siteLabel'],
'postOfficeLabel' => $body['postOfficeLabel'] ?? null,
- 'accountNumber' => $body['accountNumber'] ?? null,
- 'addressName' => $body['addressName'] ?? null,
+ 'accountNumber' => $body['accountNumber'],
'addressNumber' => $body['addressNumber'] ?? null,
'addressStreet' => $body['addressStreet'] ?? null,
'addressAdditional1' => $body['addressAdditional1'] ?? null,
@@ -174,8 +171,7 @@ class IssuingSiteController
'set' => [
'site_label' => $body['siteLabel'],
'post_office_label' => $body['postOfficeLabel'] ?? null,
- 'account_number' => $body['accountNumber'] ?? null,
- 'address_name' => $body['addressName'] ?? null,
+ 'account_number' => $body['accountNumber'] ?? null, // TODO cannot be modified
'address_number' => $body['addressNumber'] ?? null,
'address_street' => $body['addressStreet'] ?? null,
'address_additional1' => $body['addressAdditional1'] ?? null,
diff --git a/src/app/registeredMail/models/IssuingSiteModel.php b/src/app/registeredMail/models/IssuingSiteModel.php
index 355bc966a67d9ab5c0caa48f165316a9dd98c9d2..94beaf2a59f20bddd7f08d0822816567a38e5f97 100644
--- a/src/app/registeredMail/models/IssuingSiteModel.php
+++ b/src/app/registeredMail/models/IssuingSiteModel.php
@@ -23,8 +23,8 @@ class IssuingSiteModel
ValidatorModel::arrayType($args, ['select']);
return DatabaseModel::select([
- 'select' => empty($args['select']) ? ['*'] : $args['select'],
- 'table' => ['issuing_sites'],
+ 'select' => empty($args['select']) ? ['*'] : $args['select'],
+ 'table' => ['issuing_sites']
]);
}
@@ -35,10 +35,10 @@ class IssuingSiteModel
ValidatorModel::arrayType($args, ['select']);
$site = DatabaseModel::select([
- 'select' => empty($args['select']) ? ['*'] : $args['select'],
- 'table' => ['issuing_sites'],
- 'where' => ['id = ?'],
- 'data' => [$args['id']]
+ 'select' => empty($args['select']) ? ['*'] : $args['select'],
+ 'table' => ['issuing_sites'],
+ 'where' => ['id = ?'],
+ 'data' => [$args['id']]
]);
if (empty($site[0])) {
@@ -62,7 +62,6 @@ class IssuingSiteModel
'site_label' => $args['siteLabel'],
'post_office_label' => $args['postOfficeLabel'] ?? null,
'account_number' => $args['accountNumber'] ?? null,
- 'address_name' => $args['addressName'] ?? null,
'address_number' => $args['addressNumber'] ?? null,
'address_street' => $args['addressStreet'] ?? null,
'address_additional1' => $args['addressAdditional1'] ?? null,
diff --git a/test/unitTests/app/registeredMail/IssuingSiteControllerTest.php b/test/unitTests/app/registeredMail/IssuingSiteControllerTest.php
index 5bacca433eebe6b97464b2f68ee55bb6d687ba7e..847a8c8c0a0a4755ca5c8c2e9adb9b1678ea8b57 100644
--- a/test/unitTests/app/registeredMail/IssuingSiteControllerTest.php
+++ b/test/unitTests/app/registeredMail/IssuingSiteControllerTest.php
@@ -15,7 +15,7 @@ class IssuingSiteControllerTest extends TestCase
public function testCreate()
{
- $issuingSiteController = new \Recommended\controllers\IssuingSiteController();
+ $issuingSiteController = new \RegisteredMail\controllers\IssuingSiteController();
// CREATE
$environment = \Slim\Http\Environment::mock(['REQUEST_METHOD' => 'POST']);
@@ -25,7 +25,6 @@ class IssuingSiteControllerTest extends TestCase
'siteLabel' => 'Scranton',
'postOfficeLabel' => 'Scranton Post Office',
'accountNumber' => 42,
- 'addressName' => 'Dunder Mifflin Scranton',
'addressStreet' => '1725',
'ddressAdditional1' => null,
'addressAdditional2' => null,
@@ -55,7 +54,6 @@ class IssuingSiteControllerTest extends TestCase
$this->assertSame('Scranton', $responseBody['site']['siteLabel']);
$this->assertSame('Scranton Post Office', $responseBody['site']['postOfficeLabel']);
$this->assertSame('42', $responseBody['site']['accountNumber']);
- $this->assertSame('Dunder Mifflin Scranton', $responseBody['site']['addressName']);
$this->assertSame('1725', $responseBody['site']['addressStreet']);
$this->assertEmpty($responseBody['site']['ddressAdditional1']);
$this->assertEmpty($responseBody['site']['ddressAdditional2']);
@@ -83,7 +81,6 @@ class IssuingSiteControllerTest extends TestCase
'siteLabel' => 'Scranton',
'postOfficeLabel' => 'Scranton Post Office',
'accountNumber' => 42,
- 'addressName' => 'Dunder Mifflin Scranton',
'addressStreet' => '1725',
'ddressAdditional1' => null,
'addressAdditional2' => null,
@@ -103,7 +100,6 @@ class IssuingSiteControllerTest extends TestCase
'siteLabel' => 'Scranton',
'postOfficeLabel' => 'Scranton Post Office',
'accountNumber' => 42,
- 'addressName' => 'Dunder Mifflin Scranton',
'addressStreet' => '1725',
'ddressAdditional1' => null,
'addressAdditional2' => null,
@@ -140,7 +136,7 @@ class IssuingSiteControllerTest extends TestCase
public function testGet()
{
- $issuingSiteController = new \Recommended\controllers\IssuingSiteController();
+ $issuingSiteController = new \RegisteredMail\controllers\IssuingSiteController();
// GET
$environment = \Slim\Http\Environment::mock(['REQUEST_METHOD' => 'GET']);
@@ -158,7 +154,6 @@ class IssuingSiteControllerTest extends TestCase
$this->assertSame('Scranton', $responseBody['sites'][0]['siteLabel']);
$this->assertSame('Scranton Post Office', $responseBody['sites'][0]['postOfficeLabel']);
$this->assertSame('42', $responseBody['sites'][0]['accountNumber']);
- $this->assertSame('Dunder Mifflin Scranton', $responseBody['sites'][0]['addressName']);
$this->assertSame('1725', $responseBody['sites'][0]['addressStreet']);
$this->assertEmpty($responseBody['sites'][0]['ddressAdditional1']);
$this->assertEmpty($responseBody['sites'][0]['ddressAdditional2']);
@@ -182,7 +177,7 @@ class IssuingSiteControllerTest extends TestCase
public function testGetById()
{
- $issuingSiteController = new \Recommended\controllers\IssuingSiteController();
+ $issuingSiteController = new \RegisteredMail\controllers\IssuingSiteController();
// GET
$environment = \Slim\Http\Environment::mock(['REQUEST_METHOD' => 'GET']);
@@ -197,7 +192,6 @@ class IssuingSiteControllerTest extends TestCase
$this->assertSame('Scranton', $responseBody['site']['siteLabel']);
$this->assertSame('Scranton Post Office', $responseBody['site']['postOfficeLabel']);
$this->assertSame('42', $responseBody['site']['accountNumber']);
- $this->assertSame('Dunder Mifflin Scranton', $responseBody['site']['addressName']);
$this->assertSame('1725', $responseBody['site']['addressStreet']);
$this->assertEmpty($responseBody['site']['ddressAdditional1']);
$this->assertEmpty($responseBody['site']['ddressAdditional2']);
@@ -224,7 +218,7 @@ class IssuingSiteControllerTest extends TestCase
public function testUpdate()
{
- $issuingSiteController = new \Recommended\controllers\IssuingSiteController();
+ $issuingSiteController = new \RegisteredMail\controllers\IssuingSiteController();
// UPDATE
$environment = \Slim\Http\Environment::mock(['REQUEST_METHOD' => 'PUT']);
@@ -259,7 +253,6 @@ class IssuingSiteControllerTest extends TestCase
$this->assertSame('Scranton - UP', $responseBody['site']['siteLabel']);
$this->assertSame('Scranton Post Office', $responseBody['site']['postOfficeLabel']);
$this->assertSame('42', $responseBody['site']['accountNumber']);
- $this->assertSame('Dunder Mifflin Scranton', $responseBody['site']['addressName']);
$this->assertSame('1725', $responseBody['site']['addressStreet']);
$this->assertEmpty($responseBody['site']['ddressAdditional1']);
$this->assertEmpty($responseBody['site']['ddressAdditional2']);
@@ -288,7 +281,6 @@ class IssuingSiteControllerTest extends TestCase
'siteLabel' => 'Scranton',
'postOfficeLabel' => 'Scranton Post Office',
'accountNumber' => 42,
- 'addressName' => 'Dunder Mifflin Scranton',
'addressStreet' => '1725',
'ddressAdditional1' => null,
'addressAdditional2' => null,
@@ -308,7 +300,6 @@ class IssuingSiteControllerTest extends TestCase
'siteLabel' => 'Scranton',
'postOfficeLabel' => 'Scranton Post Office',
'accountNumber' => 42,
- 'addressName' => 'Dunder Mifflin Scranton',
'addressStreet' => '1725',
'ddressAdditional1' => null,
'addressAdditional2' => null,
@@ -350,7 +341,7 @@ class IssuingSiteControllerTest extends TestCase
public function testDelete()
{
- $issuingSiteController = new \Recommended\controllers\IssuingSiteController();
+ $issuingSiteController = new \RegisteredMail\controllers\IssuingSiteController();
// DELETE
$environment = \Slim\Http\Environment::mock(['REQUEST_METHOD' => 'DELETE']);