Merge pull request #2484 from Leantime/addProjectReturnId

Add project return
Leantime · Apr 23, 2024 · 2c12131 · 2c12131
2 parents 7307801 + 38bb1cf
commit 2c12131
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 16 deletions.
diff --git a/app/Domain/Projects/Repositories/Projects.php b/app/Domain/Projects/Repositories/Projects.php
@@ -749,7 +749,7 @@ public function addProject(bool|array $values): int|bool
                 }
             }
 
-            return $projectId;
+            return is_numeric($projectId) ? (int) $projectId : false;
         }
 
         /**

diff --git a/app/Domain/Projects/Services/Projects.php b/app/Domain/Projects/Services/Projects.php
@@ -821,28 +821,27 @@ public function isUserAssignedToProject(int $userId, int $projectId): bool
          */
         public function isUserMemberOfProject(int $userId, int $projectId): bool
         {
-
             return $this->projectRepository->isUserMemberOfProject($userId, $projectId);
         }
 
 
         /**
          * Adds a new project to the system.
          *
-         * @param array $values The project details
-         *                      - name: string, required, the name of the project
-         *                      - details: string, optional, additional details about the project
-         *                      - clientId: int, required, the client ID associated with the project
-         *                      - hourBudget: int, optional, the hour budget for the project (default: 0)
-         *                      - assignedUsers: string, optional, the assigned users for the project (default: '')
-         *                      - dollarBudget: int, optional, the dollar budget for the project (default: 0)
-         *                      - psettings: string, optional, the project settings (default: 'restricted')
-         *                      - type: string, required, the type of the project (always set to 'project')
-         *                      - start: string|null, the start date of the project in "Y-m-d" format or null
-         *                      - end: string|null, the end date of the project in "Y-m-d" format or null
-         * @return void
+         * @param array $values An associative array containing the project details.
+         *                      - name: The name of the project.
+         *                      - details: Additional details of the project (optional, default: '').
+         *                      - clientId: The ID of the client associated with the project.
+         *                      - hourBudget: The hour budget for the project (optional, default: 0).
+         *                      - assignedUsers: Comma-separated list of user IDs assigned to the project (optional, default: '').
+         *                      - dollarBudget: The dollar budget for the project (optional, default: 0).
+         *                      - psettings: The settings for the project (optional, default: 'restricted').
+         *                      - type: The type of the project (optional, default: 'project').
+         *                      - start: The start date of the project in user format (YYYY-MM-DD).
+         *                      - end: The end date of the project in user format (YYYY-MM-DD).
+         * @return int|false The ID of the newly added project
          */
-        public function addProject($values)
+        public function addProject(array $values): int|false
         {
             $values = array(
                 "name" => $values['name'],
@@ -862,7 +861,7 @@ public function addProject($values)
             if ($values['end'] != null) {
                 $values['end'] = format($values['end'], fromFormat: FromFormat::UserDateEndOfDay)->isoDateTime();
             }
-            $this->projectRepository->addProject($values);
+            return $this->projectRepository->addProject($values);
         }
 
         /**