FEAT #14213 TIME 0:30 Root mode refactoring + unit tests

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') {

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']])) {

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);