Merge pull request #119 from nochlezhka/report-date-fix

fix: invalid report dates and unexpected report type
nochlezhka · Oct 4, 2023 · 9d76b1d · 9d76b1d
2 parents d7f7d26 + 4d46933
commit 9d76b1d
Showing 1 changed file with 13 additions and 6 deletions.
diff --git a/shared/homeless/src/Service/ReportService.php b/shared/homeless/src/Service/ReportService.php
@@ -64,15 +64,21 @@ public function generate(
         mixed $breadwinner,
     ): void {
         if ($dateFrom) {
-            $date = new \DateTimeImmutable();
-            $date = $date->setTimestamp(strtotime($dateFrom));
-            $dateFrom = $date->format('Y-m-d');
+            $time = strtotime($dateFrom);
+            if ($time !== false) {
+                $date = new \DateTimeImmutable();
+                $date = $date->setTimestamp($time);
+                $dateFrom = $date->format('Y-m-d');
+            }
         }
 
         if ($dateTo) {
-            $date = new \DateTimeImmutable();
-            $date = $date->setTimestamp(strtotime($dateTo));
-            $dateTo = $date->format('Y-m-d');
+            $time = strtotime($dateTo);
+            if ($time !== false) {
+                $date = new \DateTimeImmutable();
+                $date = $date->setTimestamp($time);
+                $dateTo = $date->format('Y-m-d');
+            }
         }
 
         $result = match ($type) {
@@ -84,6 +90,7 @@ public function generate(
             static::AVERAGE_COMPLETED_ITEMS => $this->averageCompletedItems($dateFrom, $dateTo, $userId),
             static::AGGREGATED => $this->aggregated($createClientdateFrom, $createClientFromTo, $createServicedateFrom, $createServiceFromTo),
             static::AGGREGATED2 => $this->aggregated2($createClientdateFrom, $createClientFromTo, $createServicedateFrom, $createServiceFromTo, $homelessReason, $disease, $breadwinner),
+            default => throw new \RuntimeException('Unexpected report type "'.$type.'"'),
         };
 
         $this->doc->setActiveSheetIndex(0);