Merge pull request #185 from itk-dev/feature/2597-add-epic-relations-…

…modified 2597: Changed how epics are synchronized
itk-dev · Jan 6, 2025 · ef6b5c3 · ef6b5c3
2 parents 967294d + 7a9d84b
commit ef6b5c3
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 57 deletions.
diff --git a/src/Model/Invoices/IssueData.php b/src/Model/Invoices/IssueData.php
@@ -2,7 +2,6 @@
 
 namespace App\Model\Invoices;
 
-use App\Entity\Epic;
 use App\Enum\IssueStatusEnum;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
@@ -18,8 +17,7 @@ class IssueData
     public ?string $accountKey = null;
     public ?string $epicName = null;
     public ?string $epicKey = null;
-    /** @var Collection<int, Epic> */
-    public Collection $epics;
+    public array $epics;
     /** @var Collection<string, VersionData> */
     public Collection $versions;
     public ?\DateTime $resolutionDate = null;
@@ -32,7 +30,6 @@ class IssueData
 
     public function __construct()
     {
-        $this->epics = new ArrayCollection();
         $this->versions = new ArrayCollection();
     }
 }
diff --git a/src/Service/DataProviderService.php b/src/Service/DataProviderService.php
@@ -6,7 +6,6 @@
 use App\Exception\EconomicsException;
 use App\Exception\UnsupportedDataProviderException;
 use App\Interface\DataProviderServiceInterface;
-use App\Repository\EpicRepository;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\HttpClient\Retry\GenericRetryStrategy;
 use Symfony\Component\HttpClient\RetryableHttpClient;
@@ -31,7 +30,6 @@ public function __construct(
         protected readonly int $httpClientRetryDelayMs = 1000,
         protected readonly int $httpClientMaxRetries = 3,
         private readonly DateTimeHelper $dateTimeHelper,
-        private readonly EpicRepository $epicRepository,
     ) {
     }
 
@@ -67,7 +65,6 @@ public function getService(DataProvider $dataProvider): DataProviderServiceInter
                     $this->weekGoalLow,
                     $this->weekGoalHigh,
                     $this->sprintNameRegex,
-                    $this->epicRepository
                 );
                 break;
             case LeantimeApiService::class:
@@ -87,8 +84,6 @@ public function getService(DataProvider $dataProvider): DataProviderServiceInter
                     $this->weekGoalHigh,
                     $this->sprintNameRegex,
                     $this->dateTimeHelper,
-                    $this->epicRepository,
-                    $this->entityManager
                 );
                 break;
             default:

diff --git a/src/Service/DataSynchronizationService.php b/src/Service/DataSynchronizationService.php
@@ -5,6 +5,7 @@
 use App\Entity\Account;
 use App\Entity\Client;
 use App\Entity\DataProvider;
+use App\Entity\Epic;
 use App\Entity\Invoice;
 use App\Entity\Issue;
 use App\Entity\Project;
@@ -18,6 +19,7 @@
 use App\Repository\AccountRepository;
 use App\Repository\ClientRepository;
 use App\Repository\DataProviderRepository;
+use App\Repository\EpicRepository;
 use App\Repository\InvoiceRepository;
 use App\Repository\IssueRepository;
 use App\Repository\ProjectRepository;
@@ -44,7 +46,7 @@ public function __construct(
         private readonly InvoiceRepository $invoiceRepository,
         private readonly DataProviderService $dataProviderService,
         private readonly DataProviderRepository $dataProviderRepository,
-        private readonly WorkerRepository $workerRepository,
+        private readonly WorkerRepository $workerRepository, private readonly EpicRepository $epicRepository,
     ) {
     }
 
@@ -271,8 +273,20 @@ public function syncIssuesForProject(int $projectId, ?callable $progressCallback
                     }
                 }
 
-                foreach ($issueDatum->epics as $epicData) {
-                    $issue->addEpic($epicData);
+                foreach ($issueDatum->epics as $epicTitle) {
+                    if (empty($epicTitle)) {
+                        continue;
+                    }
+                    $epic = $this->epicRepository->findOneBy(['title' => $epicTitle]);
+
+                    if (null === $epic) {
+                        $epic = new Epic();
+                        $epic->setTitle($epicTitle);
+                        $this->entityManager->persist($epic);
+                        $this->entityManager->flush();
+                    }
+
+                    $issue->addEpic($epic);
                 }
 
                 if (null !== $progressCallback) {

diff --git a/src/Service/JiraApiService.php b/src/Service/JiraApiService.php
@@ -2,7 +2,6 @@
 
 namespace App\Service;
 
-use App\Entity\Epic;
 use App\Enum\ClientTypeEnum;
 use App\Enum\IssueStatusEnum;
 use App\Exception\ApiServiceException;
@@ -17,10 +16,7 @@
 use App\Model\Invoices\VersionData;
 use App\Model\Invoices\WorklogData;
 use App\Model\Invoices\WorklogDataCollection;
-use App\Model\Planning\Issue;
 use App\Model\Planning\PlanningData;
-use App\Model\Planning\Project;
-use App\Model\Planning\Sprint;
 use App\Model\SprintReport\SprintReportData;
 use App\Model\SprintReport\SprintReportEpic;
 use App\Model\SprintReport\SprintReportIssue;
@@ -30,7 +26,6 @@
 use App\Model\SprintReport\SprintReportVersion;
 use App\Model\SprintReport\SprintReportVersions;
 use App\Model\SprintReport\SprintStateEnum;
-use App\Repository\EpicRepository;
 use Doctrine\Common\Collections\ArrayCollection;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 
@@ -55,7 +50,6 @@ public function __construct(
         protected readonly float $weekGoalLow,
         protected readonly float $weekGoalHigh,
         protected readonly string $sprintNameRegex,
-        private readonly EpicRepository $epicRepository,
     ) {
     }
 
@@ -741,19 +735,7 @@ public function getIssuesDataForProjectPaged(string $projectId, $startAt = 0, $m
                 $issueData->epicKey = $epicKey;
                 $issueData->epicName = $epicData->fields->summary ?? null;
 
-                $epic = $this->epicRepository->findOneBy([
-                    'title' => $epicData->fields->summary,
-                ]);
-
-                if (!$epic && !empty($epicData->fields->summary)) {
-                    $epic = new Epic();
-                    $epic->setTitle($epicData->fields->summary);
-                    $this->epicRepository->save($epic);
-                }
-
-                if ($epic) {
-                    $issueData->epics->add($epic);
-                }
+                $issueData->epics = [$epicData->fields->summary];
             }
 
             foreach ($fields->fixVersions ?? [] as $fixVersion) {

diff --git a/src/Service/LeantimeApiService.php b/src/Service/LeantimeApiService.php
@@ -2,7 +2,6 @@
 
 namespace App\Service;
 
-use App\Entity\Epic;
 use App\Enum\IssueStatusEnum;
 use App\Exception\ApiServiceException;
 use App\Exception\EconomicsException;
@@ -30,9 +29,7 @@
 use App\Model\SprintReport\SprintReportVersion;
 use App\Model\SprintReport\SprintReportVersions;
 use App\Model\SprintReport\SprintStateEnum;
-use App\Repository\EpicRepository;
 use Doctrine\Common\Collections\ArrayCollection;
-use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Uid\Ulid;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 
@@ -62,8 +59,6 @@ public function __construct(
         protected readonly float $weekGoalHigh,
         protected readonly string $sprintNameRegex,
         private readonly DateTimeHelper $dateTimeHelper,
-        private readonly EpicRepository $epicRepository,
-        private readonly EntityManagerInterface $entityManager,
     ) {
     }
 
@@ -198,27 +193,7 @@ public function getIssuesDataForProjectPaged(string $projectId, $startAt = 0, $m
             $issueData->epicKey = $issue->tags;
             $issueData->epicName = $issue->tags;
 
-            $epicArray = explode(',', $issue->tags);
-
-            foreach ($epicArray as $epicTitle) {
-                if (empty($epicTitle)) {
-                    continue;
-                }
-                $epic = $this->epicRepository->findOneBy([
-                    'title' => $epicTitle,
-                ]);
-
-                if (!$epic) {
-                    $epic = new Epic();
-                    $epic->setTitle($epicTitle);
-                    $this->epicRepository->save($epic);
-                    $this->entityManager->flush();
-                }
-
-                if ($epic) {
-                    $issueData->epics->add($epic);
-                }
-            }
+            $issueData->epics = explode(',', $issue->tags);
 
             $issueData->planHours = $issue->planHours;
             $issueData->hourRemaining = $issue->hourRemaining;