- [x] Completed

IATI · Jan 24, 2025 · 75e695c · 75e695c
1 parent 9ba7996
commit 75e695c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 18 deletions.
diff --git a/app/IATI/Services/ElementCompleteService.php b/app/IATI/Services/ElementCompleteService.php
@@ -1174,7 +1174,7 @@ public function checkIfRecipientCountryElementCompleted($activity): bool
             })['total'];
 
             if ($firstGroupTotalPercentage === 100.0) {
-                return $countryStatus;
+                return true;
             }
 
             return false;

diff --git a/app/Observers/TransactionObserver.php b/app/Observers/TransactionObserver.php
@@ -42,6 +42,7 @@ public function __construct()
      */
     public function updateActivityElementStatus($transaction, bool $changeUpdatedAt = true): void
     {
+        logger('transaction observer called');
         $activityObj = $transaction->activity;
         $elementStatus = $activityObj->element_status;
 
@@ -56,23 +57,10 @@ public function updateActivityElementStatus($transaction, bool $changeUpdatedAt
         $isSectorFilledInTransactionLevel = $transactionService->checkIfTransactionHasElementDefined($activityObj, 'sector');
         $isSectorCompleteInTransactionLevel = $this->elementCompleteService->isSectorElementCompletedInTransaction($transaction->activity);
 
-        /*
-         * Basically performing AND operations in the switch case.
-         */
-        switch([
-            $isSectorFilledInActivityLevel,
-            $isSectorCompletedInActivityLevel,
-            $isSectorFilledInTransactionLevel,
-            $isSectorCompleteInTransactionLevel,
-        ]) {
-            case [false, false, true, true]:
-            case [false, true, true, true]:
-            case [true, true, false, false]:
-                $elementStatus['sector'] = true;
-                break;
-            default:
-                $elementStatus['sector'] = false;
-                break;
+        $elementStatus['sector'] = false;
+
+        if (($isSectorFilledInActivityLevel && $isSectorCompletedInActivityLevel) || ($isSectorFilledInTransactionLevel && $isSectorCompleteInTransactionLevel)) {
+            $elementStatus['sector'] = true;
         }
 
         $recipientRegionOrCountryIsCompleteInActivity = $this->elementCompleteService->isRecipientCountryElementCompleted($activityObj) || $this->elementCompleteService->isRecipientRegionElementCompleted($activityObj);
@@ -125,6 +113,7 @@ public function created(Transaction $transaction): void
      */
     public function updated(Transaction $transaction): void
     {
+        logger('ypdated call jula');
         $this->updateActivityElementStatus($transaction);
         $this->resetActivityStatus($transaction);
         $this->setTransactionDefaultValues($transaction);