From 9fd9b0f46299f51cff096fb0a4ff2a09f4a98b91 Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nnes.com@googlemail.com>
Date: Sat, 6 May 2023 11:42:06 +0000
Subject: [PATCH] make id public, organigram impl. media password/encryption,
 settings bug fix, Money->FloatInt change, ...

---
 Application/Timerecording/Application.php | 6 ++++--
 Controller/ApiController.php              | 4 ++--
 Controller/BackendController.php          | 6 +++---
 Models/Session.php                        | 4 ++--
 Models/SessionElement.php                 | 4 ++--
 Theme/Backend/private-dashboard.tpl.php   | 4 ++--
 tests/Controller/ApiControllerTest.php    | 4 ++--
 tests/Models/NullSessionElementTest.php   | 2 +-
 tests/Models/NullSessionTest.php          | 2 +-
 tests/Models/SessionElementMapperTest.php | 8 ++++----
 tests/Models/SessionElementTest.php       | 4 ++--
 tests/Models/SessionMapperTest.php        | 8 ++++----
 tests/Models/SessionTest.php              | 2 +-
 13 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/Application/Timerecording/Application.php b/Application/Timerecording/Application.php
index 88d2710..854af7d 100755
--- a/Application/Timerecording/Application.php
+++ b/Application/Timerecording/Application.php
@@ -176,7 +176,7 @@ final class Application
 
         $account = $this->loadAccount($request);
 
-        if (!($account instanceof NullAccount)) {
+        if ($account->id > 0) {
             $response->header->l11n = $account->l11n;
         } elseif ($this->app->sessionManager->get('language') !== null
             && $response->header->l11n->getLanguage() !== $this->app->sessionManager->get('language')
@@ -186,6 +186,8 @@ final class Application
                     $this->app->sessionManager->get('language'),
                     $this->app->sessionManager->get('country') ?? '*'
                 );
+        } else {
+            $this->app->setResponseLanguage($request, $response, $this->config);
         }
 
         UriFactory::setQuery('/lang', $response->getLanguage());
@@ -201,7 +203,7 @@ final class Application
         $this->initResponseHead($head, $request, $response);
 
         /* Handle not logged in */
-        if ($account->getId() < 1) {
+        if ($account->id < 1) {
             $this->createLoggedOutResponse($response, $head, $pageView);
 
             return;
diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index 5bed01d..1c8289c 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -100,7 +100,7 @@ final class ApiController extends Controller
         $type   = $request->getDataInt('type') ?? ClockingType::OFFICE;
         $status = $request->getDataInt('status') ?? ClockingStatus::START;
 
-        if ($employee instanceof NullEmployee) {
+        if ($employee->id === 0) {
             return null;
         }
 
@@ -219,7 +219,7 @@ final class ApiController extends Controller
         $session = SessionMapper::get()->where('id', (int) $request->getData('session'))->execute();
 
         // cannot create session element for none existing session
-        if ($session === null || $session instanceof NullSession) {
+        if ($session->id === 0) {
             return null;
         }
 
diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index e56346e..a307876 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -78,7 +78,7 @@ final class BackendController extends Controller implements DashboardElementInte
             ->execute();
 
         /** @var \Modules\HumanResourceTimeRecording\Models\Session $lastOpenSession */
-        $lastOpenSession = SessionMapper::getMostPlausibleOpenSessionForEmployee($employee->getId());
+        $lastOpenSession = SessionMapper::getMostPlausibleOpenSessionForEmployee($employee->id);
 
         $start = new SmartDateTime('now');
         $start = $start->getEndOfDay();
@@ -86,7 +86,7 @@ final class BackendController extends Controller implements DashboardElementInte
         $limit->smartModify(0, -2, 0);
 
         $list = SessionMapper::getAll()
-            ->where('employee', $employee->getId())
+            ->where('employee', $employee->id)
             ->where('createdAt', $start->format('Y-m-d H:i:s'), '<=')
             ->sort('id', OrderType::DESC)
             ->execute();
@@ -126,7 +126,7 @@ final class BackendController extends Controller implements DashboardElementInte
             ->where('profile/account', $request->header->account)
             ->execute();
 
-        if ($session->employee->getId() !== $employee->getId()) {
+        if ($session->employee->id !== $employee->id) {
             $view->addData('session', new NullSession());
         } else {
             $view->addData('session', $session);
diff --git a/Models/Session.php b/Models/Session.php
index e47f1fa..c18849c 100755
--- a/Models/Session.php
+++ b/Models/Session.php
@@ -33,7 +33,7 @@ class Session implements \JsonSerializable
      * @var int
      * @since 1.0.0
      */
-    protected int $id = 0;
+    public int $id = 0;
 
     /**
      * Session start
@@ -65,7 +65,7 @@ class Session implements \JsonSerializable
      * @var int
      * @since 1.0.0
      */
-    private int $type = ClockingType::OFFICE;
+    public int $type = ClockingType::OFFICE;
 
     /**
      * Session elements.
diff --git a/Models/SessionElement.php b/Models/SessionElement.php
index 44ab266..2a3946c 100755
--- a/Models/SessionElement.php
+++ b/Models/SessionElement.php
@@ -30,7 +30,7 @@ class SessionElement implements \JsonSerializable
      * @var int
      * @since 1.0.0
      */
-    protected int $id = 0;
+    public int $id = 0;
 
     /**
      * Session element status.
@@ -38,7 +38,7 @@ class SessionElement implements \JsonSerializable
      * @var int
      * @since 1.0.0
      */
-    private int $status = ClockingStatus::START;
+    public int $status = ClockingStatus::START;
 
     /**
      * DateTime
diff --git a/Theme/Backend/private-dashboard.tpl.php b/Theme/Backend/private-dashboard.tpl.php
index f64676c..7b3a078 100755
--- a/Theme/Backend/private-dashboard.tpl.php
+++ b/Theme/Backend/private-dashboard.tpl.php
@@ -68,7 +68,7 @@ echo $this->getData('nav')->render(); ?>
                                 <option value="<?= ClockingStatus::END; ?>"<?= $status === ClockingStatus::CONTINUE ? ' selected' : ''; ?>><?= $this->getHtml('CS4'); ?>
                             </select>
                         <tr><td>
-                            <input type="hidden" name="session" value="<?= $lastOpenSession !== null ? $lastOpenSession->getId() : ''; ?>">
+                            <input type="hidden" name="session" value="<?= $lastOpenSession !== null ? $lastOpenSession->id : ''; ?>">
                             <input type="submit" id="iclockingButton" name="clockingButton" value="<?= $this->getHtml('Submit', '0', '0'); ?>" data-action='[
                                     {
                                         "key": 1, "listener": "click", "action": [
@@ -204,7 +204,7 @@ echo $this->getData('nav')->render(); ?>
                 <?php
                     $count = 0;
                     foreach ($sessions as $session) : ++$count;
-                    $url   = UriFactory::build('{/base}/private/timerecording/session?{?}&id=' . $session->getId());
+                    $url   = UriFactory::build('{/base}/private/timerecording/session?{?}&id=' . $session->id);
                 ?>
                 <tr data-href="<?= $url; ?>">
                     <td><a href="<?= $url; ?>">
diff --git a/tests/Controller/ApiControllerTest.php b/tests/Controller/ApiControllerTest.php
index 75f7e33..ca0463c 100755
--- a/tests/Controller/ApiControllerTest.php
+++ b/tests/Controller/ApiControllerTest.php
@@ -105,7 +105,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase
         $request->header->account = 1;
 
         $this->module->apiSessionCreate($request, $response);
-        self::assertGreaterThan(0, $sId = $response->get('')['response']->getId());
+        self::assertGreaterThan(0, $sId = $response->get('')['response']->id);
 
         $response = new HttpResponse();
         $request  = new HttpRequest(new HttpUri(''));
@@ -115,7 +115,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase
         $request->setData('status', ClockingStatus::END);
 
         $this->module->apiSessionElementCreate($request, $response);
-        self::assertGreaterThan(0, $response->get('')['response']->getId());
+        self::assertGreaterThan(0, $response->get('')['response']->id);
     }
 
     /**
diff --git a/tests/Models/NullSessionElementTest.php b/tests/Models/NullSessionElementTest.php
index bf8593f..ace3779 100755
--- a/tests/Models/NullSessionElementTest.php
+++ b/tests/Models/NullSessionElementTest.php
@@ -37,6 +37,6 @@ final class NullSessionElementTest extends \PHPUnit\Framework\TestCase
     public function testId() : void
     {
         $null = new NullSessionElement(2);
-        self::assertEquals(2, $null->getId());
+        self::assertEquals(2, $null->id);
     }
 }
diff --git a/tests/Models/NullSessionTest.php b/tests/Models/NullSessionTest.php
index 8444712..1c466d3 100755
--- a/tests/Models/NullSessionTest.php
+++ b/tests/Models/NullSessionTest.php
@@ -37,6 +37,6 @@ final class NullSessionTest extends \PHPUnit\Framework\TestCase
     public function testId() : void
     {
         $null = new NullSession(2);
-        self::assertEquals(2, $null->getId());
+        self::assertEquals(2, $null->id);
     }
 }
diff --git a/tests/Models/SessionElementMapperTest.php b/tests/Models/SessionElementMapperTest.php
index 21b18f1..33cbe8b 100755
--- a/tests/Models/SessionElementMapperTest.php
+++ b/tests/Models/SessionElementMapperTest.php
@@ -33,12 +33,12 @@ final class SessionElementMapperTest extends \PHPUnit\Framework\TestCase
         $element = new SessionElement(new Session(new NullEmployee(1)), new \DateTime('now'));
 
         $id = SessionElementMapper::create()->execute($element);
-        self::assertGreaterThan(0, $element->getId());
-        self::assertEquals($id, $element->getId());
+        self::assertGreaterThan(0, $element->id);
+        self::assertEquals($id, $element->id);
 
-        $elementR = SessionElementMapper::get()->with('session')->with('employee')->where('id', $element->getId())->execute();
+        $elementR = SessionElementMapper::get()->with('session')->with('employee')->where('id', $element->id)->execute();
         self::assertEquals($element->datetime->format('Y-m-d'), $elementR->datetime->format('Y-m-d'));
         self::assertEquals($element->getStatus(), $elementR->getStatus());
-        self::assertEquals($element->session->employee->getId(), $elementR->session->employee->getId());
+        self::assertEquals($element->session->employee->id, $elementR->session->employee->id);
     }
 }
diff --git a/tests/Models/SessionElementTest.php b/tests/Models/SessionElementTest.php
index 2139d66..2a1727f 100755
--- a/tests/Models/SessionElementTest.php
+++ b/tests/Models/SessionElementTest.php
@@ -39,8 +39,8 @@ final class SessionElementTest extends \PHPUnit\Framework\TestCase
      */
     public function testDefault() : void
     {
-        self::assertEquals(0, $this->element->getId());
-        self::assertEquals(0, $this->element->session->getId());
+        self::assertEquals(0, $this->element->id);
+        self::assertEquals(0, $this->element->session->id);
         self::assertInstanceOf('\DateTime', $this->element->datetime);
         self::assertEquals(ClockingStatus::START, $this->element->getStatus());
     }
diff --git a/tests/Models/SessionMapperTest.php b/tests/Models/SessionMapperTest.php
index 5c9ff62..f1070c8 100755
--- a/tests/Models/SessionMapperTest.php
+++ b/tests/Models/SessionMapperTest.php
@@ -39,16 +39,16 @@ final class SessionMapperTest extends \PHPUnit\Framework\TestCase
         $session->addSessionElement($element);
 
         $id = SessionMapper::create()->execute($session);
-        self::assertGreaterThan(0, $session->getId());
-        self::assertEquals($id, $session->getId());
+        self::assertGreaterThan(0, $session->id);
+        self::assertEquals($id, $session->id);
 
-        $sessionR = SessionMapper::get()->where('id', $session->getId())->execute();
+        $sessionR = SessionMapper::get()->where('id', $session->id)->execute();
         self::assertEquals($session->getType(), $sessionR->getType());
 
         self::assertGreaterThan(0, \count(SessionMapper::getLastSessionsFromAllEmployees()));
         self::assertNull(SessionMapper::getMostPlausibleOpenSessionForEmployee(9999));
 
         // @todo implement
-        // self::assertGreaterThan(0, SessionMapper::getMostPlausibleOpenSessionForEmployee(1)->getId());
+        // self::assertGreaterThan(0, SessionMapper::getMostPlausibleOpenSessionForEmployee(1)->id);
     }
 }
diff --git a/tests/Models/SessionTest.php b/tests/Models/SessionTest.php
index d5bfffb..7d5f329 100755
--- a/tests/Models/SessionTest.php
+++ b/tests/Models/SessionTest.php
@@ -40,7 +40,7 @@ final class SessionTest extends \PHPUnit\Framework\TestCase
      */
     public function testDefault() : void
     {
-        self::assertEquals(0, $this->session->getId());
+        self::assertEquals(0, $this->session->id);
         self::assertEquals(0, $this->session->getBusy());
         self::assertEquals(0, $this->session->getBreak());
         self::assertEquals([], $this->session->getSessionElements());