From 95dd545dc5718046cd421d70ad2d4ea137919852 Mon Sep 17 00:00:00 2001
From: Nikita Kiselev <kiselev2008@gmail.com>
Date: Fri, 5 Dec 2025 02:38:46 +0300
Subject: [PATCH] fix: pulse ingest

---
 docker-compose.yaml                                  |  2 +-
 .../framework/TeleCartPulse/TeleCartPulseService.php | 12 ++++++++----
 .../oc_telegram_shop/src/Handlers/ETLHandler.php     |  4 ++++
 .../upload/oc_telegram_shop/version.txt              |  0
 4 files changed, 13 insertions(+), 5 deletions(-)
 mode change 100644 => 100755 module/oc_telegram_shop/upload/oc_telegram_shop/version.txt

diff --git a/docker-compose.yaml b/docker-compose.yaml
index 57ff888..bfb0aef 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -29,7 +29,7 @@ services:
       - XDEBUG_CLIENT_HOST=host.docker.internal
       - XDEBUG_CLIENT_PORT=9003
       - XDEBUG_DISCOVER_CLIENT_HOST=false
-      - PHP_IDE_CONFIG=serverName=orbstack
+      - PHP_IDE_CONFIG=serverName=telecart
       - php.session.gc_maxlifetime=28800
       - php.session.cookie_lifetime=0
     depends_on:
diff --git a/module/oc_telegram_shop/upload/oc_telegram_shop/framework/TeleCartPulse/TeleCartPulseService.php b/module/oc_telegram_shop/upload/oc_telegram_shop/framework/TeleCartPulse/TeleCartPulseService.php
index ec34346..018c936 100755
--- a/module/oc_telegram_shop/upload/oc_telegram_shop/framework/TeleCartPulse/TeleCartPulseService.php
+++ b/module/oc_telegram_shop/upload/oc_telegram_shop/framework/TeleCartPulse/TeleCartPulseService.php
@@ -177,6 +177,10 @@ class TeleCartPulseService
      */
     private function pushEvent(array $json): void
     {
+        $this->logger->debug('Pushing event: ' . Arr::get($json, 'payload.event'), [
+            'data' => $json,
+        ]);
+
         $baseUri = rtrim(env('PULSE_API_HOST', 'http://localhost'), '/') . '/';
 
         $client = new Client([
@@ -218,10 +222,10 @@ class TeleCartPulseService
                 'tracking_id' => $deserialized['tracking_id'],
                 'meta' => [
                     'domain' => Utils::getCurrentDomain(),
-                    'version' => Arr::get($data, 'webapp.version'),
-                    'platform' => Arr::get($data, 'webapp.platform'),
-                    'order_id' => Arr::get($data, 'eventData.order_id'),
-                    'currency' => Arr::get($data, 'eventData.currency'),
+                    'version' => Arr::get($data, 'payload.webapp.version'),
+                    'platform' => Arr::get($data, 'payload.webapp.platform'),
+                    'order_id' => Arr::get($data, 'payload.eventData.order_id'),
+                    'currency' => Arr::get($data, 'payload.eventData.currency'),
                 ],
                 'timestamp' => Carbon::now('UTC')->toJSON(),
             ];
diff --git a/module/oc_telegram_shop/upload/oc_telegram_shop/src/Handlers/ETLHandler.php b/module/oc_telegram_shop/upload/oc_telegram_shop/src/Handlers/ETLHandler.php
index 17ec542..36ba02a 100755
--- a/module/oc_telegram_shop/upload/oc_telegram_shop/src/Handlers/ETLHandler.php
+++ b/module/oc_telegram_shop/upload/oc_telegram_shop/src/Handlers/ETLHandler.php
@@ -98,6 +98,8 @@ class ETLHandler
         $query
             ->select([
                 'tracking_id',
+                'username',
+                'photo_url',
                 'telegram_user_id' => 'tg_user_id',
                 'telecart_customers.oc_customer_id',
                 'is_premium',
@@ -149,6 +151,8 @@ class ETLHandler
             'data' => array_map(static function ($item) {
                 return [
                     'tracking_id' => $item['tracking_id'],
+                    'username' => $item['username'],
+                    'photo_url' => $item['photo_url'],
                     'tg_user_id' => filter_var($item['tg_user_id'], FILTER_VALIDATE_INT),
                     'oc_customer_id' => filter_var($item['oc_customer_id'], FILTER_VALIDATE_INT),
                     'is_premium' => filter_var($item['is_premium'], FILTER_VALIDATE_BOOLEAN),
diff --git a/module/oc_telegram_shop/upload/oc_telegram_shop/version.txt b/module/oc_telegram_shop/upload/oc_telegram_shop/version.txt
old mode 100644
new mode 100755