Merge pull request #3656 from bakaphp/hotfix-status

hotfix: status

Author: kaioken

app/Console/Commands/Connectors/ESim/SyncEsimWithProviderCommand.php

@@ -14,7 +14,6 @@
 use Kanvas\Companies\Models\Companies;
 use Kanvas\Connectors\CMLink\Enums\PlanTypeEnum;
 use Kanvas\Connectors\CMLink\Services\CustomerService;
-use Kanvas\Connectors\CMLink\Services\OrderService as ServicesOrderService;
 use Kanvas\Connectors\EasyActivation\Services\OrderService;
 use Kanvas\Connectors\ESim\DataTransferObject\ESimStatus;
 use Kanvas\Connectors\ESim\Enums\ConfigurationEnum;
@@ -225,6 +224,7 @@ private function formatCmLinkResponse(Message $message, array $response, Custome
                         }
                     }
                     $activePlan = $plan;
+
                     break;
                 }
             }
@@ -234,6 +234,7 @@ private function formatCmLinkResponse(Message $message, array $response, Custome
                 foreach ($userPlans['userDataBundles'] as $plan) {
                     if ($plan['status'] == 1) {
                         $activePlan = $plan;
+
                         break;
                     }
                 }
@@ -242,7 +243,9 @@ private function formatCmLinkResponse(Message $message, array $response, Custome
 
         $installedDate = $response['installTime'] ?? (! empty($message->message['order']['created_at']) ? $message->message['order']['created_at'] : now()->format('Y-m-d H:i:s'));
         $status = strtolower($response['state']);
-        $isActive = IccidStatusEnum::getStatus($status) == 'active';
+
+        $isActive = isset($activePlan['status']) ? IccidStatusEnum::getStatusById($activePlan['status']) == 'active' : IccidStatusEnum::getStatus($status) == 'active';
+        //$isActive = IccidStatusEnum::getStatus($status) == 'active';
 
         $activationDate = null;
         if ($iccid && $isActive && $activePlan) {
@@ -324,14 +327,15 @@ private function formatCmLinkResponse(Message $message, array $response, Custome
             $message->setPrivate();
         }
 
+        $bundleStatus = isset($activePlan) ? IccidStatusEnum::getStatusById($activePlan['status']) : IccidStatusEnum::getStatus(strtolower($response['state']));
         $esimStatus = new ESimStatus(
             id: $response['activationCode'],
             callTypeGroup: 'data',
             initialQuantity: $totalBytesData,
             remainingQuantity: $remainingData,
             assignmentDateTime: $installedDate,
             assignmentReference: $response['activationCode'],
-            bundleState: IccidStatusEnum::getStatus(strtolower($response['state'])),
+            bundleState: $bundleStatus,
             unlimited: $variant->getAttributeBySlug('variant-type')?->value === PlanTypeEnum::UNLIMITED->value,
             expirationDate: $expirationDate,
             imei: $message->message['data']['imei_number'] ?? null,
@@ -343,7 +347,6 @@ private function formatCmLinkResponse(Message $message, array $response, Custome
         );
 
         $esimStatusArray = $esimStatus->toArray();
-
         // Check and send notifications if needed
         $this->checkAndSendNotifications($message, $esimStatusArray, $isValidState);
 

src/Domains/Connectors/ESimGo/Enums/IccidStatusEnum.php

@@ -14,6 +14,7 @@ enum IccidStatusEnum: string
     case ACTIVE = 'active';
     case UNAVAILABLE = 'unavailable';
     case INACTIVE = 'inactive';
+    case REFUND = 'refund';
     case EXPIRED = 'expired';
     case RELEASED = 'released';
     case DELETED = 'delete';
@@ -56,4 +57,15 @@ public static function getStatus(string $string): string
             default => '',
         };
     }
+
+    public static function getStatusById(string|int $id): string
+    {
+        return match ($id) {
+            1 => self::PENDING->value,
+            2 => self::EXPIRED->value,
+            3 => self::ACTIVE->value,
+            99 => self::REFUND->value,
+            default => '',
+        };
+    }
 }