Merge pull request #2498 from Leantime/timesheetFixesForInvalidData

Timesheet fixes for invalid data
Leantime · May 2, 2024 · 281bb2d · 281bb2d
2 parents 3458523 + fc6cf2f
commit 281bb2d
Show file tree

Hide file tree

Showing 12 changed files with 198 additions and 44 deletions.
diff --git a/.idea/leantime-oss.iml b/.idea/leantime-oss.iml
diff --git a/.idea/php.xml b/.idea/php.xml
diff --git a/.idea/phpspec.xml b/.idea/phpspec.xml
diff --git a/.idea/phpunit.xml b/.idea/phpunit.xml
diff --git a/app/Core/Middleware/RequestRateLimiter.php b/app/Core/Middleware/RequestRateLimiter.php
@@ -10,6 +10,7 @@
 use Leantime\Core\Frontcontroller;
 use Leantime\Core\IncomingRequest;
 use Leantime\Core\Middleware\Request;
+use Leantime\Domain\Api\Services\Api;
 use Symfony\Component\HttpFoundation\Response;
 
 /**
@@ -55,7 +56,7 @@ public function handle(IncomingRequest $request, Closure $next): Response
         //API Routes Limit
         if ($request instanceof ApiRequest) {
             $apiKey = "";
-            $key = app()->make(ApiRequest::class)->getAPIKeyUser($apiKey);
+            $key = app()->make(Api::class)->getAPIKeyUser($apiKey);
             $limit = 10;
         }
 

diff --git a/app/Domain/Timesheets/Controllers/ShowMy.php b/app/Domain/Timesheets/Controllers/ShowMy.php
@@ -137,13 +137,16 @@ public function saveTimeSheet(array $postData): void
                     "kind" => $kind,
                 );
 
-                try {
-                    $this->timesheetService->upsertTime($ticketId, $values);
-                    $this->tpl->setNotification("Timesheet saved successfully", "success", "save_timesheet");
-                } catch (\Exception $e) {
-                    $this->tpl->setNotification("Error logging time: " . $e->getMessage(), "error", "save_timesheet");
-                    error_log($e);
-                    continue;
+                //This should not be the case since we set the input to disabled, but check anyways
+                if($timestamp !== "false" && $timestamp != false) {
+                    try {
+                        $this->timesheetService->upsertTime($ticketId, $values);
+                        $this->tpl->setNotification("Timesheet saved successfully", "success", "save_timesheet");
+                    } catch (\Exception $e) {
+                        $this->tpl->setNotification("Error logging time: " . $e->getMessage(), "error", "save_timesheet");
+                        error_log($e);
+                        continue;
+                    }
                 }
             }
         }

diff --git a/app/Domain/Timesheets/Controllers/ShowMyList.php b/app/Domain/Timesheets/Controllers/ShowMyList.php
@@ -49,8 +49,8 @@ public function run(): Response
         // The front end javascript is hardcode to start the week on mondays, so we use that here too.
 
         //Get start of the week in current users timezone and then switch to UTC
-        $dateFrom = dtHelper()->userNow()->startOfMonth()->setToDbTimezone();
-        $dateTo = dtHelper()->userNow()->endOfMonth()->setToDbTimezone();
+        $dateFrom = dtHelper()->userNow()->startOfWeek(CarbonInterface::MONDAY)->setToDbTimezone();
+        $dateTo = dtHelper()->userNow()->endOfWeek()->setToDbTimezone();
 
         if (!empty($_POST['dateFrom'])) {
             $dateFrom = dtHelper()->parseUserDateTime($_POST['dateFrom'])->setToDbTimezone();