yourtar-cli 1.3.3 → 2.0.1

package/bin/backTemplate/Makefile

@@ -25,5 +25,12 @@ down:
 shell:
 	cd docker && docker compose -f docker-compose.${APP_MODE}.yml run php_{{name}}_back bash
 
+update:
+	make down
+	git pull
+	make up
+	sudo chmod -R 777 var/ public/
+	make -C ~/gateway restart
+
 database:
 	cd docker && docker compose -f docker-compose.${APP_MODE}.yml exec mysql_{{name}}_back mysql -uroot -p$(DATABASE_PASSWORD)

package/bin/backTemplate/config/packages/monolog.yaml

@@ -0,0 +1,61 @@
+monolog:
+    channels:
+        - deprecation # Deprecations are logged in the dedicated "deprecation" channel when it exists
+        - {{name}}
+
+when@dev:
+    monolog:
+        handlers:
+            main:
+                type: stream
+                path: "%kernel.logs_dir%/%kernel.environment%.log"
+                level: debug
+                channels: ["!event"]
+            # uncomment to get logging in your browser
+            # you may have to allow bigger header sizes in your Web server configuration
+            #firephp:
+            #    type: firephp
+            #    level: info
+            #chromephp:
+            #    type: chromephp
+            #    level: info
+            console:
+                type: console
+                process_psr_3_messages: false
+                channels: ["!event", "!doctrine", "!console"]
+
+when@test:
+    monolog:
+        handlers:
+            main:
+                type: fingers_crossed
+                action_level: error
+                handler: nested
+                excluded_http_codes: [404, 405]
+                channels: ["!event"]
+            nested:
+                type: stream
+                path: "%kernel.logs_dir%/%kernel.environment%.log"
+                level: debug
+
+when@prod:
+    monolog:
+        handlers:
+            main:
+                type: stream
+                action_level: error
+                path: "%kernel.logs_dir%/%kernel.environment%.log"
+                level: error
+                channels: ["!event", "{{name}}"]
+                service_name: "{{name}}"
+                formatter: monolog.formatter.json
+            console:
+                type: console
+                process_psr_3_messages: false
+                channels: ["!event", "!doctrine"]
+                formatter: monolog.formatter.json
+            deprecation:
+                type: stream
+                channels: [deprecation]
+                path: php://stderr
+                formatter: monolog.formatter.json

package/bin/backTemplate/docker/config/promtail/config.yml

@@ -0,0 +1,18 @@
+server:
+  http_listen_port: 9080
+  grpc_listen_port: 0
+
+positions:
+  filename: /tmp/positions.yaml
+
+clients:
+  - url: http://monitor.inf.yourtar.ru:3100/loki/api/v1/push
+
+scrape_configs:
+- job_name: system
+  static_configs:
+  - targets:
+      - localhost
+    labels:
+      job: varlogs
+      __path__: /var/log/*log

package/bin/backTemplate/docker/docker-compose.prod.yml

@@ -82,6 +82,17 @@ services:
 #      - {{name}}
 #    restart: on-failure
 
+#  promtail_{{name}}:
+#    image: grafana/promtail:latest
+#    container_name: promtail_{{name}}
+#    restart: unless-stopped
+#    environment:
+#      TZ: "Europe/Moscow"
+#    volumes:
+#      - ../var/log:/var/log
+#      - ./config/promtail/config.yml:/etc/promtail/config.yml
+#    command: -config.file=/etc/promtail/config.yml
+
 networks:
   yourtar:
     external:

package/bin/backTemplate/docker/docker-compose.stage.yml

@@ -77,6 +77,17 @@ services:
 #    networks:
 #      - demo
 
+#  promtail_{{name}}:
+#    image: grafana/promtail:latest
+#    container_name: promtail_{{name}}
+#    restart: unless-stopped
+#    environment:
+#      TZ: "Europe/Moscow"
+#    volumes:
+#      - ../var/log:/var/log
+#      - ./config/promtail/config.yml:/etc/promtail/config.yml
+#    command: -config.file=/etc/promtail/config.yml
+
 networks:
   demo:
     external: true

package/bin/backTemplate/src/Logging/YTExtraDataProcessor.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Logging;
+
+use Monolog\Attribute\AsMonologProcessor;
+use Monolog\LogRecord;
+use Monolog\Processor\ProcessorInterface;
+
+#[AsMonologProcessor]
+class YTExtraDataProcessor implements ProcessorInterface
+{
+    public function __invoke(LogRecord $record): LogRecord
+    {
+        // Add data to the 'extra' array
+        $record->extra['yourtar_log'] = true;
+        $record->extra['project'] = '{{name}}';
+
+        return $record;
+    }
+}

package/bin/botTemplate/.env.dev-example

@@ -16,8 +16,10 @@ DATABASE_HOST=mysql_{{name}}_back
 CORS_ALLOW_ORIGIN=^https?://(localhost|127\.0\.0\.1)(:[0-9]+)?$
 ###< nelmio/cors-bundle ###
 
-DEFAULT_URI="http://localhost:8000"
+DEFAULT_URI=http://localhost:8000
 
 ###> Bot ###
-BOT_TOKEN=475749278:AAGxVLFFGiuymbuQYz-oHF_OoOIZhyxClA4
+#TG_TOKEN=7590949811:AAEg62uBqmOMaatJXUaQueSnqRLujdokWNE
+#VK_TOKEN=vk1.a.59H83PysK2tYXqAjWD1ZrSAPBht8B4cAiNmYfY_LHPuOgNnmcTBEEz_UHIOKu4k2zESyFHDKGAi4NJQAOztVbU5b3508ytakCGjRiGmpr5dUXrNMbGnSkHZW5uBVfHTGvYBwEjbBMQUP2SJkEXITDpUqluH5FCHCBn_b7DnarRs41QtKA_sEgsWQROJLRoNVZTvxcH4bL48BYkgldQ51lA
+#MAX_TOKEN=f9LHodD0cOKr6uAZuM3uWU41JlGYUiPuRMBhWDYbj_hz_bVxQVCbbgG0vP6p2eeu5OmX7EOYHnFGPCxUaJKz
 ###< Bot ###

package/bin/botTemplate/.env.prod-example

@@ -16,8 +16,10 @@ DATABASE_HOST=mysql_{{name}}_back
 CORS_ALLOW_ORIGIN=^https?://(localhost|127\.0\.0\.1)(:[0-9]+)?$
 ###< nelmio/cors-bundle ###
 
-DEFAULT_URI="http://localhost:8000"
+DEFAULT_URI=http://localhost:8000
 
 ###> Bot ###
-BOT_TOKEN=475749278:AAGxVLFFGiuymbuQYz-oHF_OoOIZhyxClA4
+#TG_TOKEN=7590949811:AAEg62uBqmOMaatJXUaQueSnqRLujdokWNE
+#VK_TOKEN=vk1.a.59H83PysK2tYXqAjWD1ZrSAPBht8B4cAiNmYfY_LHPuOgNnmcTBEEz_UHIOKu4k2zESyFHDKGAi4NJQAOztVbU5b3508ytakCGjRiGmpr5dUXrNMbGnSkHZW5uBVfHTGvYBwEjbBMQUP2SJkEXITDpUqluH5FCHCBn_b7DnarRs41QtKA_sEgsWQROJLRoNVZTvxcH4bL48BYkgldQ51lA
+#MAX_TOKEN=f9LHodD0cOKr6uAZuM3uWU41JlGYUiPuRMBhWDYbj_hz_bVxQVCbbgG0vP6p2eeu5OmX7EOYHnFGPCxUaJKz
 ###< Bot ###

package/bin/botTemplate/.env.stage-example

@@ -16,8 +16,10 @@ DATABASE_HOST=mysql_{{name}}_back
 CORS_ALLOW_ORIGIN=^https?://(localhost|127\.0\.0\.1)(:[0-9]+)?$
 ###< nelmio/cors-bundle ###
 
-DEFAULT_URI="http://localhost:8000"
+DEFAULT_URI=http://localhost:8000
 
 ###> Bot ###
-BOT_TOKEN=475749278:AAGxVLFFGiuymbuQYz-oHF_OoOIZhyxClA4
+#TG_TOKEN=7590949811:AAEg62uBqmOMaatJXUaQueSnqRLujdokWNE
+#VK_TOKEN=vk1.a.59H83PysK2tYXqAjWD1ZrSAPBht8B4cAiNmYfY_LHPuOgNnmcTBEEz_UHIOKu4k2zESyFHDKGAi4NJQAOztVbU5b3508ytakCGjRiGmpr5dUXrNMbGnSkHZW5uBVfHTGvYBwEjbBMQUP2SJkEXITDpUqluH5FCHCBn_b7DnarRs41QtKA_sEgsWQROJLRoNVZTvxcH4bL48BYkgldQ51lA
+#MAX_TOKEN=f9LHodD0cOKr6uAZuM3uWU41JlGYUiPuRMBhWDYbj_hz_bVxQVCbbgG0vP6p2eeu5OmX7EOYHnFGPCxUaJKz
 ###< Bot ###

package/bin/botTemplate/Makefile

@@ -18,13 +18,22 @@ else
 endif
 	cd docker && docker compose -f docker-compose.${APP_MODE}.yml exec php_{{name}}_back bin/console doctrine:database:create --if-not-exists
 	cd docker && docker compose -f docker-compose.${APP_MODE}.yml exec php_{{name}}_back bin/console doctrine:migrations:migrate --no-interaction --allow-no-migration
+	make webhook
 
 down:
 	cd docker && docker compose -f docker-compose.${APP_MODE}.yml down
+	make webhook-delete
 
 shell:
 	cd docker && docker compose -f docker-compose.${APP_MODE}.yml run php_{{name}}_back bash
 
+update:
+	make down
+	git pull
+	make up
+	sudo chmod -R 777 var/ public/
+	make -C ~/gateway restart
+
 database:
 	cd docker && docker compose -f docker-compose.${APP_MODE}.yml exec mysql_{{name}}_back mysql -uroot -p$(DATABASE_PASSWORD)
 
@@ -32,7 +41,17 @@ commands:
 	curl -X POST -H "Content-Type: application/json" -d "{\"commands\":[{\"command\":\"help\",\"description\":\"Помощь\"}]}" https://api.telegram.org/bot$(BOT_TOKEN)/setMyCommands
 
 webhook:
-	curl https://api.telegram.org:443/bot$(BOT_TOKEN)/setWebhook?url=$(domain)/api/message/
+ifndef TG_TOKEN
+	curl https://api.telegram.org:443/bot$(TG_TOKEN)/setWebhook?url=$(DEFAULT_URI)/api/message/tg
+endif
+ifndef MAX_TOKEN
+	curl -X POST "https://platform-api.max.ru/subscriptions" -H "Authorization: $(MAX_TOKEN)" -H "Content-Type: application/json" -d '{"url": "$(DEFAULT_URI)/api/message/max","update_types": ["message_created", "bot_started", "message_callback"],"secret": "your_secret"}'
+endif
 
 webhook-delete:
-	curl https://api.telegram.org:443/bot$(BOT_TOKEN)/deleteWebhook
+ifndef TG_TOKEN
+	curl https://api.telegram.org:443/bot$(TG_TOKEN)/deleteWebhook
+endif
+ifndef MAX_TOKEN
+	curl -X DELETE "https://platform-api.max.ru/subscriptions?url=$(DEFAULT_URI)/api/message/max" -H "Authorization: $(MAX_TOKEN)"
+endif

package/bin/botTemplate/config/packages/monolog.yaml

@@ -0,0 +1,61 @@
+monolog:
+    channels:
+        - deprecation # Deprecations are logged in the dedicated "deprecation" channel when it exists
+        - {{name}}
+
+when@dev:
+    monolog:
+        handlers:
+            main:
+                type: stream
+                path: "%kernel.logs_dir%/%kernel.environment%.log"
+                level: debug
+                channels: ["!event"]
+            # uncomment to get logging in your browser
+            # you may have to allow bigger header sizes in your Web server configuration
+            #firephp:
+            #    type: firephp
+            #    level: info
+            #chromephp:
+            #    type: chromephp
+            #    level: info
+            console:
+                type: console
+                process_psr_3_messages: false
+                channels: ["!event", "!doctrine", "!console"]
+
+when@test:
+    monolog:
+        handlers:
+            main:
+                type: fingers_crossed
+                action_level: error
+                handler: nested
+                excluded_http_codes: [404, 405]
+                channels: ["!event"]
+            nested:
+                type: stream
+                path: "%kernel.logs_dir%/%kernel.environment%.log"
+                level: debug
+
+when@prod:
+    monolog:
+        handlers:
+            main:
+                type: stream
+                action_level: error
+                path: "%kernel.logs_dir%/%kernel.environment%.log"
+                level: error
+                channels: ["!event", "{{name}}"]
+                service_name: "{{name}}"
+                formatter: monolog.formatter.json
+            console:
+                type: console
+                process_psr_3_messages: false
+                channels: ["!event", "!doctrine"]
+                formatter: monolog.formatter.json
+            deprecation:
+                type: stream
+                channels: [deprecation]
+                path: php://stderr
+                formatter: monolog.formatter.json

package/bin/botTemplate/docker/config/promtail/config.yml

@@ -0,0 +1,18 @@
+server:
+  http_listen_port: 9080
+  grpc_listen_port: 0
+
+positions:
+  filename: /tmp/positions.yaml
+
+clients:
+  - url: http://monitor.inf.yourtar.ru:3100/loki/api/v1/push
+
+scrape_configs:
+- job_name: system
+  static_configs:
+  - targets:
+      - localhost
+    labels:
+      job: varlogs
+      __path__: /var/log/*log

package/bin/botTemplate/docker/docker-compose.prod.yml

@@ -82,6 +82,17 @@ services:
 #      - {{name}}
 #    restart: on-failure
 
+#  promtail_{{name}}:
+#    image: grafana/promtail:latest
+#    container_name: promtail_{{name}}
+#    restart: unless-stopped
+#    environment:
+#      TZ: "Europe/Moscow"
+#    volumes:
+#      - ../var/log:/var/log
+#      - ./config/promtail/config.yml:/etc/promtail/config.yml
+#    command: -config.file=/etc/promtail/config.yml
+
 networks:
   yourtar:
     external:

package/bin/botTemplate/docker/docker-compose.stage.yml

@@ -77,6 +77,17 @@ services:
 #    networks:
 #      - demo
 
+#  promtail_{{name}}:
+#    image: grafana/promtail:latest
+#    container_name: promtail_{{name}}
+#    restart: unless-stopped
+#    environment:
+#      TZ: "Europe/Moscow"
+#    volumes:
+#      - ../var/log:/var/log
+#      - ./config/promtail/config.yml:/etc/promtail/config.yml
+#    command: -config.file=/etc/promtail/config.yml
+
 networks:
   demo:
     external: true

package/bin/botTemplate/src/Controller/MessageController.php

@@ -2,19 +2,15 @@
 
 namespace App\Controller;
 
-use App\Entity\Chat;
-use App\Entity\Lead;
-use App\Entity\Token;
-use App\Repository\ChatRepository;
-use App\Repository\PaymentRepository;
-use App\Repository\TokenRepository;
 use App\Service\MessageProcessService;
-use App\Service\TelegramService;
+use App\Service\MessengerService\MaxService;
+use App\Service\MessengerService\TelegramService;
+use App\Service\MessengerService\VkService;
 use Psr\Log\LoggerInterface;
-use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Attribute\Route;
 
 #[Route('/api/message')]
@@ -26,14 +22,81 @@ final class MessageController extends AbstractController
     {
         $this->messageService = $messageService;
     }
-    
-    #[Route('/', name: 'app_message_webhook')]
+
+    #[Route('/tg', name: 'app_message_webhook_tg')]
     public function index(Request $request): JsonResponse
     {
         $value = json_decode($request->getContent(), true);
 
-        $this->messageService->processMessage($value);
+        $result = $this->messageService->processMessage(new TelegramService()->normalizeMessage($value));
+        if (!$result) return $this->json(['error' => true], 500);
+
+        return $this->json(['message' => 'OK',]);
+    }
+
+//    #[Route('/tg/{id}', name: 'app_message_webhook_tg_for_bot')]
+//    public function tgWebhookForOrg($id, Request $request): JsonResponse
+//    {
+//        $value = json_decode($request->getContent(), true);
+//
+//        //TODO: доделать для бота
+//        $result = $this->messageService->processMessage(new TelegramService()->normalizeMessage($value));
+//        if (!$result) return $this->json(['error' => true], 500);
+//
+//        return $this->json(['message' => 'OK',]);
+//    }
+
+    #[Route('/vk', name: 'app_message_webhook_vk', methods: 'post')]
+    public function vkWebhook(Request $request, LoggerInterface $logger)
+    {
+        $data = json_decode($request->getContent(), true);
+        $logger->error('VK: ' . $request->getContent());
+
+        if (array_key_exists('type', $data) && ($data['type'] === 'message_new' || $data['type'] === 'message_event')) {
+            $result = $this->messageService->processMessage(new VkService()->normalizeMessage($data));
+            if (!$result) return $this->json(['error' => true], 500);
+        }
+
+        if ($data['type'] === 'confirmation') return new Response('8e9b12dd');
+        return new Response('ok');
+    }
+
+//    #[Route('/vk/{id}', name: 'app_message_webhook_vk_for_bot', methods: 'post')]
+//    public function vkWebhookForBot($id, Request $request)
+//    {
+//        $data = json_decode($request->getContent(), true);
+//
+//        //TODO: доделать для бота
+//        if (array_key_exists('type', $data) && ($data['type'] === 'message_new' || $data['type'] === 'message_event')) {
+//            $result = $this->messageService->processMessage(new VkService()->normalizeMessage($data));
+//            if (!$result) return $this->json(['error' => true], 500);
+//        }
+//
+//        if ($data['type'] === 'confirmation') return new Response('b852d1d2');
+//        return new Response('ok');
+//    }
+
+    #[Route('/max', name: 'app_message_webhook_max')]
+    public function max(Request $request, LoggerInterface $logger): JsonResponse
+    {
+        $data = json_decode($request->getContent(), true);
+//        $logger->error('LOG MES ' . $request->getContent());
+        $data = new MaxService()->normalizeMessage($data);
+        $result = $this->messageService->processMessage($data);
+        if (!$result) return $this->json(['error' => true], 500);
 
         return $this->json(['message' => 'OK',]);
     }
+
+//    #[Route('/max', name: 'app_message_webhook_max_for_bot')]
+//    public function maxForBot(Request $request): JsonResponse
+//    {
+//        $data = json_decode($request->getContent(), true);
+//        //TODO: доделать для бота
+//        $data = new MaxService()->normalizeData($data);
+//        $result = $this->messageService->processMessage($data);
+//        if (!$result) return $this->json(['error' => true], 500);
+//
+//        return $this->json(['message' => 'OK',]);
+//    }
 }

package/bin/botTemplate/src/Entity/Chat.php

@@ -3,13 +3,18 @@
 namespace App\Entity;
 
 use App\Repository\ChatRepository;
+use App\Service\MessengerService\MaxService;
+use App\Service\MessengerService\TelegramService;
+use App\Service\MessengerService\VkService;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
 
 #[ORM\Entity(repositoryClass: ChatRepository::class)]
 class Chat
 {
-
+    public const TYPE_TG = 'telegram';
+    public const TYPE_VK = 'vkontakte';
+    public const TYPE_MAX = 'max';
     public const ROLE_ADMIN = 'admin';
 
     #[ORM\Id]
@@ -20,18 +25,22 @@ class Chat
     #[ORM\Column(length: 255)]
     private ?string $chatId = null;
 
-    #[ORM\Column(length: 255)]
+    #[ORM\Column(name: 'messenger_user_id', length: 255)]
     private ?string $userId = null;
 
-    #[ORM\Column(length: 255, nullable: true)]
-    private ?string $role = null;
-
     #[ORM\Column(length: 255, nullable: true)]
     private ?string $username = null;
 
     #[ORM\Column(length: 255, nullable: true)]
     private ?string $phone = null;
 
+    #[ORM\Column(length: 255)]
+    private ?string $type = null;
+
+    #[ORM\ManyToOne(inversedBy: 'chats')]
+    #[ORM\JoinColumn(nullable: false)]
+    private ?User $user = null;
+
     public function getId(): ?int
     {
         return $this->id;
@@ -61,51 +70,56 @@ class Chat
         return $this;
     }
 
-    public function getRole(): ?string
+    public function getUsername(): ?string
     {
-        return $this->role;
+        return $this->username;
     }
 
-    public function getRoleName(): ?string
+    public function setUsername(?string $username): static
     {
-        $role = 'Роль отсутствует!';
+        $this->username = $username;
 
-        switch ($this->role) {
-            case self::ROLE_ADMIN:
-                $role = 'Администратор (может все)';
-                break;
-        }
+        return $this;
+    }
 
-        return $role;
+    public function getPhone(): ?string
+    {
+        return $this->phone;
     }
 
-    public function setRole(?string $role): static
+    public function setPhone(?string $phone): static
     {
-        $this->role = $role;
+        $this->phone = $phone;
 
         return $this;
     }
 
-    public function getUsername(): ?string
+    public function getMessenger() {
+        if ($this->type === self::TYPE_MAX) return new MaxService($this);
+        if ($this->type === self::TYPE_VK) return new VkService($this);
+        if ($this->type === self::TYPE_TG) return new TelegramService($this);
+    }
+
+    public function getType(): ?string
     {
-        return $this->username;
+        return $this->type;
     }
 
-    public function setUsername(?string $username): static
+    public function setType(string $type): static
     {
-        $this->username = $username;
+        $this->type = $type;
 
         return $this;
     }
 
-    public function getPhone(): ?string
+    public function getUser(): ?User
     {
-        return $this->phone;
+        return $this->user;
     }
 
-    public function setPhone(?string $phone): static
+    public function setUser(?User $user): static
     {
-        $this->phone = $phone;
+        $this->user = $user;
 
         return $this;
     }

package/bin/botTemplate/src/Entity/DialogContext.php

@@ -18,7 +18,7 @@ class DialogContext
     #[ORM\JoinColumn(nullable: false)]
     private ?Chat $chat = null;
 
-    #[ORM\Column(type: Types::SIMPLE_ARRAY)]
+    #[ORM\Column(type: Types::JSON)]
     private array $context = [];
 
     public function getId(): ?int
@@ -49,35 +49,4 @@ class DialogContext
 
         return $this;
     }
-
-    public function getNextMessage($order = null):array
-    {
-        $result = array('message' => '', 'buttons' => array());
-
-        switch ($this->context['data'][0]) {
-            case 'name':
-                $result['message'] = "Материал №" . $this->context['id'] . "\r\n\r\nВведите, пожалуйста, название материала:";
-                break;
-            case 'description':
-                $result['message'] = "Материал №" . $this->context['id'] . "\r\n\r\nВведите, пожалуйста, описание материала:";
-                break;
-            case 'price':
-                $result['message'] = "Материал №" . $this->context['id'] . "\r\n\r\nВведите, пожалуйста, стоимость заказа (введите 0 для бесплатных материалов)";
-                break;
-            case 'file':
-                $result['message'] = "Материал №" . $this->context['id'] . "\r\n\r\nПрикрепите, пожалуйста, файл, который будет продаваться";
-                break;
-            case 'photo':
-                $result['message'] = "Материал №" . $this->context['id'] . "\r\n\r\nПрикрепите, пожалуйста, изображение, которое будет показываться на экране с подробностями о материале";
-                break;
-            case 'materialDelete':
-                $result['message'] = "Материал №" . $this->context['id'] . "\r\n\r\nВы точно хотите его удалить?";
-                $result['buttons'] = [
-                    [['text' => "Да", 'callback_data' => json_encode(array('command' => 'materialDeleteConfirm', 'id' => $this->context['id']))], ['text' => "Нет", 'callback_data' => json_encode(array('command' => 'materialDeleteCancel', 'id' => $this->context['id']))]]
-                ];
-                break;
-        }
-
-        return $result;
-    }
 }