From 8eb433dace8c56c809167dd18b6307e7086e8c3a Mon Sep 17 00:00:00 2001
From: Damien <damien.burel@maarch.org>
Date: Tue, 21 Jul 2020 18:17:51 +0200
Subject: [PATCH] FEAT #14213 TIME 0:30 Root mode refactoring + unit tests
---
bin/notification/stack_letterbox_alerts.php | 3 ++-
src/app/user/controllers/UserController.php | 2 +-
test/unitTests/app/template/TemplateControllerTest.php | 8 +++-----
3 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/bin/notification/stack_letterbox_alerts.php b/bin/notification/stack_letterbox_alerts.php
index bd0e914c138..372949e0605 100644
--- a/bin/notification/stack_letterbox_alerts.php
+++ b/bin/notification/stack_letterbox_alerts.php
@@ -71,7 +71,8 @@ while ($state <> 'END') {
continue;
}
Bt_writeLog(['level' => 'INFO', 'message' => "Document type id is #" . $myDoc['type_id']]);
- $user = \User\models\UserModel::getByLogin(['login' => 'superadmin', 'select' => ['id']]);
+ $users = \User\models\UserModel::get(['select' => ['id'], 'orderBy' => ["user_id='superadmin' desc"], 'limit' => 1]);
+ $user = $users[0];
// Alert 1 = limit - n days
if ($myDoc['flag_alarm1'] != 'Y' && $myDoc['flag_alarm2'] != 'Y') {
diff --git a/src/app/user/controllers/UserController.php b/src/app/user/controllers/UserController.php
index aac2f4c78e0..fb3f26378b4 100755
--- a/src/app/user/controllers/UserController.php
+++ b/src/app/user/controllers/UserController.php
@@ -114,7 +114,7 @@ class UserController
return $response->withStatus($error['status'])->withJson(['errors' => $error['error']]);
}
- $user = UserModel::getById(['id' => $aArgs['id'], 'select' => ['id', 'user_id', 'firstname', 'lastname', 'status', 'phone', 'mail', 'initials', 'loginmode', 'external_id']]);
+ $user = UserModel::getById(['id' => $aArgs['id'], 'select' => ['id', 'user_id', 'firstname', 'lastname', 'status', 'phone', 'mail', 'initials', 'loginmode', 'mode', 'external_id']]);
$user['external_id'] = json_decode($user['external_id'], true);
if ($GLOBALS['id'] == $aArgs['id'] || PrivilegeController::hasPrivilege(['privilegeId' => 'view_personal_data', 'userId' => $GLOBALS['id']])) {
diff --git a/test/unitTests/app/template/TemplateControllerTest.php b/test/unitTests/app/template/TemplateControllerTest.php
index 0bb01ac8059..96efe68249e 100755
--- a/test/unitTests/app/template/TemplateControllerTest.php
+++ b/test/unitTests/app/template/TemplateControllerTest.php
@@ -824,11 +824,9 @@ class TemplateControllerTest extends TestCase
$this->assertSame("success", $responseBody->success);
//Delete entity
- \SrcCore\models\DatabaseModel::delete([
- 'table' => 'users_entities',
- 'where' => ['user_id = ?', 'entity_id = ?'],
- 'data' => [19, 'TST_AR']
- ]);
+ \User\models\UserEntityModel::deleteUserEntity(['id' => $GLOBALS['id'], 'entityId' => 'TST_AR']);
+ \User\models\UserEntityModel::deleteUserEntity(['id' => 19, 'entityId' => 'TST_AR']);
+
$entityController = new \Entity\controllers\EntityController();
$environment = \Slim\Http\Environment::mock(['REQUEST_METHOD' => 'DELETE']);
$request = \Slim\Http\Request::createFromEnvironment($environment);
--
GitLab