Fixing various dateTime bugs across the system

Leantime · Aug 23, 2024 · 0538d68 · 0538d68
1 parent c64f09c
commit 0538d68
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 15 deletions.
diff --git a/app/Core/Support/DateTimeHelper.php b/app/Core/Support/DateTimeHelper.php
@@ -73,10 +73,19 @@ public function __construct($time = null, $tz = null)
      */
     public function parseUserDateTime(string $userDate, string $userTime = ""): CarbonImmutable
     {
+
         if (!$this->isValidDateString($userDate)) {
             throw new InvalidDateException("The string is not a valid date time string to parse as user datetime string", $userDate);
         }
 
+        //Check if provided date is iso8601 (from API)
+        try{
+            $this->datetime = CarbonImmutable::createFromFormat(DateTime::ISO8601, $userDate);
+            return $this->datetime;
+        } catch (\Exception $e) {
+            //Do nothing
+        }
+
         if ($userTime == "start") {
             $this->datetime = CarbonImmutable::createFromLocaleFormat("!" . $this->userDateFormat, substr($this->userLanguage, 0, 2), trim($userDate), $this->userTimezone)
                 ->startOfDay();

diff --git a/app/Domain/Auth/Services/Auth.php b/app/Domain/Auth/Services/Auth.php
@@ -325,7 +325,7 @@ public function setUsersession(mixed $user, bool $isLdap = false)
             "twoFAVerified" => false,
             "twoFASecret" => $user['twoFASecret'] ?? '',
             "isLdap" => $isLdap,
-            "createdOn" => dtHelper()->parseDbDateTime($user['createdOn']) ?? dtHelper()->userNow(),
+            "createdOn" => !empty($user['createdOn']) ? dtHelper()->parseDbDateTime($user['createdOn']) : dtHelper()->userNow(),
             "modified" => !empty($user['modified']) ? dtHelper()->parseDbDateTime($user['modified']) : dtHelper()->userNow()
         );
 

diff --git a/app/Domain/Canvas/Repositories/Canvas.php b/app/Domain/Canvas/Repositories/Canvas.php
@@ -866,10 +866,6 @@ public function getSingleCanvasItem($id): mixed
             }
         }
 
-        /**
-         * @param $values
-         * @return false|string
-         */
         /**
          * @param $values
          * @return false|string

diff --git a/app/Domain/Goalcanvas/Controllers/EditCanvasItem.php b/app/Domain/Goalcanvas/Controllers/EditCanvasItem.php
@@ -280,13 +280,13 @@ public function post($params): Response
                             'canvasId' => $params['canvasId'],
                             'parent' => $params['parent'] ?? null,
                             'kpi' => $params['kpi'] ?? '',
-                            'startDate' => format(value: $params['startDate'], fromFormat: FromFormat::UserDateStartOfDay)->isoDateTime(),
-                            'endDate' => format(value: $params['endDate'], fromFormat: FromFormat::UserDateEndOfDay)->isoDateTime(),
+                            'startDate' => format(value: $params['startDate'] ?? '', fromFormat: FromFormat::UserDateStartOfDay)->isoDateTime(),
+                            'endDate' => format(value: $params['endDate'] ?? '', fromFormat: FromFormat::UserDateEndOfDay)->isoDateTime(),
                             'setting' => $params['setting'] ?? '',
                             'metricType' =>  $params['metricType'],
                             'assignedTo' => $params['assignedTo'] ?? '',
                         );
-                        $id = $this->canvasRepo->addCanvasItem($canvasItem);                        
+                        $id = $this->canvasRepo->addCanvasItem($canvasItem);
                         $canvasTypes = $this->canvasRepo->getCanvasTypes();
 
                         $this->tpl->setNotification($canvasTypes[$params['box']]['title'] . ' successfully created', 'success', "goal_item_created");

diff --git a/app/Domain/Ideas/Controllers/IdeaDialog.php b/app/Domain/Ideas/Controllers/IdeaDialog.php
@@ -67,7 +67,9 @@ public function get($params)
                 }
                 $comments = $this->commentsRepo->getComments('idea', $canvasItem['id']);
                 $this->tpl->assign('numComments', $this->commentsRepo->countComments('ideas', $canvasItem['id']));
+
             } else {
+
                 $type = $params['type'] ?? "idea";
 
                 $canvasItem = array(
@@ -169,8 +171,8 @@ public function post($params)
                             $milestone = array();
                             $milestone['headline'] = $params['newMilestone'];
                             $milestone['tags'] = "#ccc";
-                            $milestone['editFrom'] = date("Y-m-d");
-                            $milestone['editTo'] = date("Y-m-d", strtotime("+1 week"));
+                            $milestone['editFrom'] = dtHelper()->userNow()->formatDateForUser();
+                            $milestone['editTo'] = dtHelper()->userNow()->addDays(7)->formatDateForUser();
                             $id = $this->ticketService->quickAddMilestone($milestone);
                             if ($id !== false) {
                                 $canvasItem['milestoneId'] = $id;

diff --git a/composer.json b/composer.json
@@ -10,7 +10,8 @@
         },
         "allow-plugins": {
             "dealerdirect/phpcodesniffer-composer-installer": true,
-            "metasyntactical/composer-plugin-license-check": true
+            "metasyntactical/composer-plugin-license-check": true,
+            "php-http/discovery": true
         }
     },
     "authors": [
@@ -26,14 +27,14 @@
         }
     ],
     "require": {
-        "php": "^8.1",
+        "php": "^8.2",
         "ext-ldap": "*",
         "ext-pdo": "*",
         "ext-zip": "*",
         "ext-fileinfo": "*",
 
-        "guzzlehttp/guzzle": "7.4.5",
-        "aws/aws-sdk-php": "3.219.0",
+        "guzzlehttp/guzzle": "^7.9.2",
+        "aws/aws-sdk-php": "^3.314",
         "phpmailer/phpmailer": "6.6.0",
         "robthree/twofactorauth": "1.8.2",
         "endroid/qr-code": "3.9.7",
@@ -77,7 +78,11 @@
         "spatie/icalendar-generator": "^2.6",
         "carbon-cli/carbon-cli": "^1.2",
 
-        "metasyntactical/composer-plugin-license-check": "^2.1"
+        "metasyntactical/composer-plugin-license-check": "^2.1",
+
+        "ext-fileinfo": "*",
+        "sentry/sdk": "^3.5",
+        "predis/predis": "^2.2"
     },
     "require-dev": {
         "squizlabs/php_codesniffer": "^3.8",