- [x] Added skipping critical error activities on publish

IATI · Dec 9, 2024 · e57df7a · e57df7a
1 parent 971c604
commit e57df7a
Show file tree

Hide file tree

Showing 7 changed files with 436 additions and 746 deletions.
diff --git a/app/Http/Controllers/Admin/Workflow/BulkPublishingController.php b/app/Http/Controllers/Admin/Workflow/BulkPublishingController.php
@@ -265,20 +265,35 @@ public function startBulkPublish(Request $request): JsonResponse
             }
 
             if ($this->publishingStatusService->ongoingBulkPublishing($organization->id)) {
-                $pubishingStatus = $this->bulkPublishingService->getOrganisationBulkPublishingStatus();
+                $publishingStatus = $this->bulkPublishingService->getOrganisationBulkPublishingStatus();
 
                 return response()->json([
                     'success'     => false,
                     'message'     => 'Another bulk publishing is already in progress.',
-                    'data'        => $pubishingStatus['publishingData'],
-                    'in_progress' => $pubishingStatus['inProgress'],
+                    'data'        => $publishingStatus['publishingData'],
+                    'in_progress' => $publishingStatus['inProgress'],
                 ]);
             }
 
             $activityIds = json_decode($request->get('activities'), false, 512, JSON_THROW_ON_ERROR);
 
             if (!empty($activityIds)) {
-                $activities = $this->activityService->getActivitiesHavingIds($activityIds);
+                $filteredActivityIds = $this->bulkPublishingService->getPublishableActivityIds($activityIds);
+
+                if (empty($filteredActivityIds)) {
+                    return response()->json(
+                        [
+                            'success' => false,
+                            'status'  => 'error',
+                            'message' => 'All of the selected activities have critical error.',
+                            'data'    => ['activity_ids' => $activityIds],
+                        ]
+                    );
+                }
+
+                DB::beginTransaction();
+
+                $activities = $this->activityService->getActivitiesHavingIds($filteredActivityIds);
 
                 if (!count($activities)) {
                     return response()->json(['success' => false, 'message' => 'No activities selected.']);

diff --git a/app/IATI/Repositories/Activity/ValidationStatusRepository.php b/app/IATI/Repositories/Activity/ValidationStatusRepository.php
@@ -269,4 +269,19 @@ private function getHighestSeverityErrorFromResponse(array $responseSummary): ?s
             return Arr::get($responseSummary, $level, 0) > 0;
         });
     }
+
+    /**
+     * Returns array of activity_id of the activities that do not contain critical error.
+     *
+     * @param array $activityIds
+     *
+     * @return array
+     */
+    public function getActivitiesWithNoCriticalErrors(array $activityIds): array
+    {
+        return $this->model->whereIn('activity_id', $activityIds)
+            ->where('status', 'completed')
+            ->whereRaw("(response->'response'->'summary'->>'critical')::integer = 0")
+            ->pluck('activity_id')->toArray();
+    }
 }
diff --git a/app/IATI/Services/Workflow/BulkPublishingService.php b/app/IATI/Services/Workflow/BulkPublishingService.php
@@ -505,4 +505,16 @@ public function getActivitiesWithDeprecatedValueArray(mixed $activityIds, Activi
 
         return $returnArr;
     }
+
+    /**
+     * Returns array of activity_id of the activities that do not contain critical error.
+     *
+     * @param array $activityIds
+     *
+     * @return array
+     */
+    public function getPublishableActivityIds(array $activityIds): array
+    {
+        return $this->validationStatusRepository->getActivitiesWithNoCriticalErrors($activityIds);
+    }
 }
diff --git a/public/css/app.css b/public/css/app.css
diff --git a/public/css/webportal-app.css b/public/css/webportal-app.css
diff --git a/public/js/app.js b/public/js/app.js
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -1,5 +1,6 @@
 {
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
     "/js/app.js": "/js/app.js?id=75d010634adbd8f89d258514fd8fc9c5",
 =======
@@ -61,4 +62,14 @@
     "/css/app.css": "/css/app.css?id=deb09ddfdcf1f43142ef9e8b2b247960",
 >>>>>>> f00f34ca (-[x] Disabled Checkbox for Critical Errored Activitities)
     "/js/vendor.js": "/js/vendor.js?id=1d9dc84f31934bcf90e4083803feee6b"
+=======
+    "/js/app.js": "/js/app.js",
+    "/js/script.js": "/js/script.js",
+    "/js/webportal-script.js": "/js/webportal-script.js",
+    "/js/formbuilder.js": "/js/formbuilder.js",
+    "/manifest.js": "/manifest.js",
+    "/css/webportal-app.css": "/css/webportal-app.css",
+    "/css/app.css": "/css/app.css",
+    "/js/vendor.js": "/js/vendor.js"
+>>>>>>> eeaf05c7 (- [x] Added skipping critical error activities on publish)
 }