Kco 32 custom fields

.github/workflows/ec2-deploy.yaml

@@ -33,7 +33,7 @@ jobs:
     environment: ${{ github.ref_name }}
     steps:
       - name: executing remote ssh commands using password
-        uses: appleboy/[email protected].0
+        uses: appleboy/[email protected].1
         with:
           host: ${{ secrets.AWS_EC2_HOST }}
           username: ${{ secrets.AWS_EC2_USERNAME }}

.github/workflows/static-analysis.yml

@@ -90,6 +90,9 @@ jobs:
       TEST_VINSOLUTIONS_API_KEY: ${{ secrets.TEST_VINSOLUTIONS_API_KEY }}
       TEST_VINSOLUTIONS_API_KEY_DIGITAL_SHOWROOM: ${{ secrets.TEST_VINSOLUTIONS_API_KEY_DIGITAL_SHOWROOM }}
       TEST_VINSOLUTIONS_COMPANY_ID: ${{ secrets.TEST_VINSOLUTIONS_COMPANY_ID }}
+      TEST_RECOMBEE_DATABASE: ${{ secrets.TEST_RECOMBEE_DATABASE }}
+      TEST_RECOMBEE_API_KEY: ${{ secrets.TEST_RECOMBEE_API_KEY }}
+      TEST_RECOMBEE_REGION: ${{ secrets.TEST_RECOMBEE_REGION }}
     strategy:
       fail-fast: false
       matrix:

.github/workflows/tests.yml

@@ -100,6 +100,9 @@ jobs:
       TEST_VINSOLUTIONS_API_KEY: ${{ secrets.TEST_VINSOLUTIONS_API_KEY }}
       TEST_VINSOLUTIONS_API_KEY_DIGITAL_SHOWROOM: ${{ secrets.TEST_VINSOLUTIONS_API_KEY_DIGITAL_SHOWROOM }}
       TEST_VINSOLUTIONS_COMPANY_ID: ${{ secrets.TEST_VINSOLUTIONS_COMPANY_ID }}
+      TEST_RECOMBEE_DATABASE: ${{ secrets.TEST_RECOMBEE_DATABASE }}
+      TEST_RECOMBEE_API_KEY: ${{ secrets.TEST_RECOMBEE_API_KEY }}
+      TEST_RECOMBEE_REGION: ${{ secrets.TEST_RECOMBEE_REGION }}
     strategy:
       fail-fast: false
       matrix:
@@ -199,6 +202,9 @@ jobs:
       - name: Setup Kanvas Integrations
         run: php artisan kanvas:create-integration shopify --config='{"client_id":{"type":"text","required":true},"client_secret":{"type":"text","required":true},"shop_url":{"type":"text","required":true}}' --handler='Kanvas\Connectors\Shopify\Handlers\ShopifyHandler'
 
+      - name: Setup Kanvas Workflow Actions
+        run: php artisan kanvas:workflow-sync-actions
+
       - name: create .env file
         run: echo '' > .env
 

.vscode/settings.json

@@ -5,6 +5,7 @@
         "Logix",
         "Meili",
         "Metafield",
-        "Nuwave"
+        "Nuwave",
+        "Typesense"
     ]
 }

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

@@ -0,0 +1,118 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Console\Commands\Connectors\ESim;
+
+use Baka\Traits\KanvasJobsTrait;
+use Illuminate\Console\Command;
+use Kanvas\Apps\Models\Apps;
+use Kanvas\Inventory\Products\Models\Products;
+use Kanvas\Souk\Orders\Models\Order;
+
+class GenerateEsimRecommendationCommand extends Command
+{
+    use KanvasJobsTrait;
+
+    protected $signature = 'kanvas:esim-generate-recommendation {app_id} {company_id}}';
+    protected $description = 'Generate eSIM recommendation';
+
+    public function handle(): void
+    {
+        $app = Apps::getById((int) $this->argument('app_id'));
+        $this->overwriteAppService($app);
+
+        $products = Products::fromApp($app)->with('variants.attributes')->get();
+
+        foreach ($products as $product) {
+            $recommendations = $this->mapProductRecommendationAttribute($product->variants->toArray());
+
+            $product->addAttribute(
+                'recommended_plans',
+                $recommendations
+            );
+
+            $this->info('Set recommendation for product ' . $product->getId() . ' - ' . $product->name);
+        }
+    }
+
+    protected function mapProductRecommendationAttribute(array $variants): array
+    {
+        if (empty($variants)) {
+            return []; // Return empty if there are no variants
+        }
+
+        $sections = [];
+        $sectionCounter = 1;
+
+        // Sort variants by `esim_days` in ascending order
+        usort($variants, function ($a, $b) {
+            $aDays = $this->extractAttributeValue($a['attributes'], 'esim_days');
+            $bDays = $this->extractAttributeValue($b['attributes'], 'esim_days');
+
+            return $aDays <=> $bDays; // Ascending order
+        });
+
+        // Split sorted variants into two groups (low and high packages)
+        $sortedSkus = array_column($variants, 'sku');
+        $groupSize = max(1, (int)ceil(count($sortedSkus) / 2)); // Explicitly cast ceil result to int
+        $groups = array_chunk($sortedSkus, $groupSize);
+
+        $lowPackages = $groups[0] ?? [];
+        $highPackages = $groups[1] ?? [];
+
+        // Create Sections 1 to 4 with lower packages
+        $lowPackageGroups = $this->groupVariantsIntoSections($lowPackages, 4);
+        foreach ($lowPackageGroups as $group) {
+            if ($sectionCounter > 4) {
+                break;
+            }
+            $sections[] = [
+                'name' => 'section_' . $sectionCounter,
+                'variantSku' => $group,
+            ];
+            $sectionCounter++;
+        }
+
+        // Create Sections 5 to 10 with higher packages
+        $highPackageGroups = $this->groupVariantsIntoSections($highPackages, 4);
+        while (count($highPackageGroups) < 6) {
+            $highPackageGroups[] = $highPackages; // Add repeated high packages if needed
+        }
+        $highPackageGroups = array_slice($highPackageGroups, 0, 6); // Ensure only 6 groups
+
+        foreach ($highPackageGroups as $group) {
+            $sections[] = [
+                'name' => 'section_' . $sectionCounter,
+                'variantSku' => $group,
+            ];
+            $sectionCounter++;
+        }
+
+        return $sections;
+    }
+
+    // Helper function to group variants into sections of specified size
+    protected function groupVariantsIntoSections(array $variants, int $sectionSize): array
+    {
+        $groups = [];
+
+        foreach (array_chunk($variants, $sectionSize) as $group) {
+            $groups[] = $group;
+        }
+
+        return $groups;
+    }
+
+    // Extract attribute value by name from the attributes array
+    protected function extractAttributeValue(array $attributes, string $attributeName): int
+    {
+        foreach ($attributes as $attribute) {
+            if ($attribute['name'] === $attributeName) {
+                return (int) $attribute['value'];
+            }
+        }
+
+        return 0; // Default value if the attribute is not found
+    }
+}

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

@@ -13,12 +13,14 @@
 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\ProviderEnum;
 use Kanvas\Connectors\ESim\Support\FileSizeConverter;
 use Kanvas\Connectors\ESimGo\Enums\IccidStatusEnum;
 use Kanvas\Connectors\ESimGo\Services\ESimService;
+use Kanvas\Inventory\Products\Models\Products;
 use Kanvas\Social\Messages\Models\Message;
 use Kanvas\Souk\Orders\Models\Order;
 
@@ -49,7 +51,7 @@ public function handle(): void
         $messages = Message::fromApp($app)
             ->fromCompany($company)
             ->notDeleted()
-            ->whereIsPublic()
+            //->whereIsPublic()
             ->orderBy('id', 'desc')
             ->get();
 
@@ -75,13 +77,23 @@ private function processMessage(
     ): void {
         $iccid = $message->message['data']['iccid'] ?? null;
         $bundle = $message->message['data']['plan'] ?? null;
-        $network = strtolower($message->message['items'][0]['variant']['attributes']['Variant Network'] ?? '');
+        //$network = strtolower($message->message['items'][0]['variant']['attributes']['Variant Network'] ?? '');
+        $network = '';
+        if (isset($message->message['items'][0]['variant']['products_id'])) {
+            $network = strtolower(Products::getById($message->message['items'][0]['variant']['products_id'])->getAttributeBySlug('product-provider')?->value ?? '');
+        }
 
         if (empty($network) && $message->appModuleMessage && $message->appModuleMessage->entity instanceof Order) {
             $network = strtolower($message->appModuleMessage->entity->items()->first()->variant?->product?->getAttributeBySlug('product-provider')?->value ?? '');
         }
 
-        if (! $iccid) {
+        if (empty($network)) {
+            $this->info("Message ID: {$message->id} does not have a network.");
+
+            return;
+        }
+
+        if ($iccid === null) {
             $this->info("Message ID: {$message->id} does not have an ICCID.");
 
             return;
@@ -182,17 +194,26 @@ private function formatCmLinkResponse(Message $message, array $response): array
 
         $variant = $message->appModuleMessage->entity->items()->first()->variant;
         $totalData = $variant->getAttributeBySlug('data')?->value ?? 0;
+        $orderId = $message->message['order_id'] ?? null;
+        $dataUsage = 0;
+        $totalBytesData = FileSizeConverter::toBytes($totalData);
+        if ($orderId) {
+            $orderService = new ServicesOrderService($message->app, $message->company);
+            $dataUsage = $orderService->getOrderStatus($orderId)['total'];
+        }
+        // Calculate remaining data usage, ensuring it doesn't go negative
+        $remainingData = max(0, $totalBytesData - max(0, $dataUsage));
 
         $esimStatus = new ESimStatus(
             id: $response['activationCode'],
             callTypeGroup: 'data',
-            initialQuantity: FileSizeConverter::toBytes($totalData),
-            remainingQuantity: FileSizeConverter::toBytes($totalData),
+            initialQuantity: $totalBytesData,
+            remainingQuantity: $remainingData,
             assignmentDateTime: $installedDate,
             assignmentReference: $response['activationCode'],
             bundleState: IccidStatusEnum::getStatus(strtolower($response['state'])),
             unlimited: $variant->getAttributeBySlug('variant-type')?->value === PlanTypeEnum::UNLIMITED->value,
-            expirationDate: Carbon::parse($installedDate)->addDays($variant->getAttributeBySlug('esim-days')?->value)->format('Y-m-d H:i:s'),
+            expirationDate: Carbon::parse($installedDate)->addDays((int) $variant->getAttributeBySlug('esim-days')?->value)->format('Y-m-d H:i:s'),
             imei: $message->message['data']['imei_number'] ?? null,
             esimStatus: $response['state'],
             message: $response['installDevice'],
@@ -209,6 +230,12 @@ private function updateMessageStatus(Message $message, array $response, string $
         $message->message = $messageData;
         $message->saveOrFail();
 
+        $order = $message->appModuleMessage->entity;
+        $metadata = is_array($order->metadata) ? $order->metadata : [];
+        $metadata['esim_status'] = $response;
+        $order->metadata = $metadata;
+        $order->saveOrFail();
+
         $this->info("Message ID: {$message->id} has been updated with the eSIM status.");
 
         $inactiveStatuses = [

app/Console/Commands/Connectors/Google/GoogleDeleteMessageDocumentCommand.php

@@ -0,0 +1,67 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Console\Commands\Connectors\Google;
+
+use Baka\Traits\KanvasJobsTrait;
+use Illuminate\Console\Command;
+use Kanvas\Apps\Models\Apps;
+use Kanvas\Companies\Models\Companies;
+use Kanvas\Connectors\Google\Services\DiscoveryEngineDocumentService;
+use Kanvas\Social\Messages\Models\Message;
+use Kanvas\Social\MessagesTypes\Models\MessageType;
+use Kanvas\Users\Models\Users;
+
+class GoogleDeleteMessageDocumentCommand extends Command
+{
+    use KanvasJobsTrait;
+
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'kanvas:google-delete-all-message-document {app_id} {company_id} {message_type_id}';
+
+    /**
+     * The console command description.
+     *
+     * @var string|null
+     */
+    protected $description = 'Send all messages to google recommendation as documents';
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        $app = Apps::getById((int) $this->argument('app_id'));
+        $this->overwriteAppService($app);
+
+        $company = Companies::getById((int) $this->argument('company_id'));
+
+        $messageType = (int) $this->argument('message_type_id');
+
+        $messageType = MessageType::getById($messageType, $app);
+        $query = Message::fromApp($app)->notDeleted()->where('message_types_id', $messageType->getId())->orderBy('id', 'DESC');
+        $cursor = $query->cursor();
+
+        $totalMessages = $query->count();
+
+        $messageRecommendation = new DiscoveryEngineDocumentService($app, $company);
+
+        $this->output->progressStart($totalMessages);
+
+        foreach ($cursor as $message) {
+            $messageRecommendation->deleteDocument($message);
+            $this->output->progressAdvance();
+        }
+
+        $this->output->progressFinish();
+
+        return;
+    }
+}