Merge pull request #1446 from younginnovations/1443-review-titles-of-…

…steps-in-registration-process-to-make-them-more-intuitive 1443 review titles of steps in registration process to make them more intuitive
younginnovations · May 27, 2024 · 24c9e85 · 24c9e85
2 parents a09893a + 42e1d38
commit 24c9e85
Show file tree

Hide file tree

Showing 84 changed files with 272 additions and 189,019 deletions.
diff --git a/app/IATI/Repositories/Activity/ActivityRepository.php b/app/IATI/Repositories/Activity/ActivityRepository.php
@@ -155,7 +155,7 @@ public function resetActivityWorkflow($activity_id): void
      */
     public function getActivitiesHavingIds($activityIds): object
     {
-        return $this->model->whereIn('id', $activityIds)->where('org_id', auth()->user()->organization->id)->where('status', 'draft')->get();
+        return $this->model->whereIn('id', $activityIds)->where('org_id', auth()->user()->organization->id)->where('status', 'draft')->with(['transactions', 'results.indicators.periods'])->get();
     }
 
     /**

diff --git a/app/IATI/Services/Activity/ResultService.php b/app/IATI/Services/Activity/ResultService.php
@@ -369,7 +369,7 @@ public function getXmlData(Collection $results): array
                     ],
                     'document-link' => $this->buildDocumentLink(Arr::get($result, 'document_link', [])),
                     'reference'     => $this->buildReference(Arr::get($result, 'reference', []), 'vocabulary-uri'),
-                    'indicator'     => $this->buildIndicator($totalResult->indicators()->orderBy('created_at', 'asc')->get()),
+                    'indicator'     => $this->buildIndicator($totalResult->indicators->sortBy('created_at')),
                 ];
             }
         }
@@ -406,7 +406,7 @@ protected function buildIndicator($indicators): array
                     'document-link' => $this->buildDocumentLink(Arr::get($indicator, 'document_link', [])),
                     'reference'     => $this->buildReference(Arr::get($indicator, 'reference', []), 'indicator-uri', 'indicator_uri'),
                     'baseline'      => $this->buildBaseline(Arr::get($indicator, 'baseline', []), Arr::get($indicator, 'measure', null)),
-                    'period'        => $this->buildPeriod($totalIndicator->periods()->orderBy('created_at', 'asc')->get(), Arr::get($indicator, 'measure', null)),
+                    'period'        => $this->buildPeriod($totalIndicator->periods->sortBy('created_at'), Arr::get($indicator, 'measure', null)),
                 ];
             }
         }

diff --git a/app/IATI/Services/Workflow/ActivityWorkflowService.php b/app/IATI/Services/Workflow/ActivityWorkflowService.php
@@ -248,6 +248,10 @@ public function removeActivityFromPublishedArray($publishedFile, $activity): voi
      */
     public function validateActivityOnIATIValidator($activity): string
     {
+        if (!$activity->relationLoaded('transactions') || !$activity->relationLoaded('results.indicators.periods')) {
+            $activity->load(['transactions', 'results.indicators.periods']);
+        }
+
         $organization = $activity->organization;
         $settings = $organization->settings;
 

diff --git a/app/IATI/Services/Workflow/BulkPublishingService.php b/app/IATI/Services/Workflow/BulkPublishingService.php
@@ -136,10 +136,9 @@ public function validateActivitiesOnIATI($activityIds): array
     {
         $user = Auth::user();
         $activityTitle = [];
+        $activities = $this->activityService->getActivitiesHavingIds($activityIds);
 
-        foreach ($activityIds as $activityId) {
-            $activity = $this->activityService->getActivity($activityId);
-
+        foreach ($activities as $activity) {
             if ($activity && $activity->status === 'draft') {
                 $activityTitle[] = $activity->default_title_narrative;
                 RegistryValidatorJob::dispatch($activity, $user);

diff --git a/app/Jobs/BulkPublishActivities.php b/app/Jobs/BulkPublishActivities.php
@@ -61,6 +61,11 @@ class BulkPublishActivities implements ShouldQueue
      */
     protected ActivityService $activityService;
 
+    /**
+     * @var int
+     */
+    public $timeout = 3600;
+
     /**
      * Create a new job instance.
      *
@@ -92,6 +97,7 @@ public function __construct($activities, $organization, $settings, $organization
      */
     public function handle(BulkPublishingStatusService $publishingStatusService, ActivityWorkflowService $activityWorkflowService, ActivityService $activityService): void
     {
+        $this->activities->load(['transactions', 'results.indicators.periods']);
         $counter = 0;
         $this->setServices($publishingStatusService, $activityWorkflowService, $activityService);
 

diff --git a/app/Jobs/RegistryValidatorJob.php b/app/Jobs/RegistryValidatorJob.php
@@ -37,7 +37,7 @@ class RegistryValidatorJob implements ShouldQueue
      *
      * @var int
      */
-    public int $timeout = 900;
+    public $timeout = 3600;
 
     /**
      * Activity Instance for validation.