From dd2bcff3d7cfb52c79fe0ad6c40efc30d420107a Mon Sep 17 00:00:00 2001
From: emmatveev <emmtvv@gmail.com>
Date: Tue, 22 Oct 2024 00:19:48 +0300
Subject: [PATCH] fix

---
 .DS_Store                         | Bin 0 -> 6148 bytes
 .gitea/workflows/deploy-dev.yaml  |  47 ++++++++++++++++++++++++++++++
 .gitea/workflows/deploy-prod.yaml |  47 ++++++++++++++++++++++++++++++
 bot.py                            |   4 +++
 4 files changed, 98 insertions(+)
 create mode 100644 .DS_Store
 create mode 100644 .gitea/workflows/deploy-dev.yaml
 create mode 100644 .gitea/workflows/deploy-prod.yaml

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..4733130d2cd0b16cc898d8a13c4bc3f543c490eb
GIT binary patch
literal 6148
zcmeHLJxc>Y5S@(|6AVaD5W(h}RDu}nMC6nce?WRQACd$TFQNwRuCen+2o^Tl*jQLw
zh`n_ztwgY~^Udxi?ve{yiO5daeRn%E_vT*icC#TOv3^u566J{~i^k|ppi40Ja~rah
z9+?FSd5soDbkeF9OVwy7+6_1boC1GM0e*Kgv_Li5r4AYIZ@Z&P&4t4e?I;W@t*8P|
zc7E#NvH5bpmK0U{K~$%~vqhiH$7RSvJ#}i*p_)mwPh{pypIO7z)8*~To2+4w+m622
zll&I%_&M{Y!P}Hdlr3f|T-aWdyRdrf9lc6!Bj03Cj<EPCX8s&)<I|xNs!|!Pf$sz(
zb}ch!qa)3__NT9FJyq9;>zXxwA8psW$n~b_5c7S6r{=(}arxc$nsue}OO5BgUW0tI
zmgESVKW2W9x=?73x+c50+d4IUCihKY^P{1j)j_Vwoa8roQ<FXB{V#?!n=PAD=z6Ds
zQ@|-OP=MzLAB{247%P-h2RgY00D2gfhGX7KaE`Ar&=@O(2PRZ1P^AjJ#SkhT<Gzjy
zG{y>5Itjh`5Sm%&9g2|bxV|sLNdyXA?-Xzf*b0oP(>$;L8>9FCc9J`D3OEJ+l>)*G
zOW`_hNw2L#H^*zOkG6xx#&NMinSxF)$MS%eV*X!28hkz<00WJ&LX5!N4*@BI>zo3=
Gs=z0*g34(C

literal 0
HcmV?d00001

diff --git a/.gitea/workflows/deploy-dev.yaml b/.gitea/workflows/deploy-dev.yaml
new file mode 100644
index 0000000..8d04465
--- /dev/null
+++ b/.gitea/workflows/deploy-dev.yaml
@@ -0,0 +1,47 @@
+name: Deploy Dev
+
+on:
+  pull_request:
+    branches:
+      - dev
+    types: [closed]
+
+jobs:
+  build:
+    name: Build
+    runs-on: [ dev ]
+    steps:
+      - name: login
+        run: docker login -u mathwave -p ${{ secrets.DOCKERHUB_PASSWORD }}
+      - name: checkout
+        uses: actions/checkout@v4
+        with:
+          ref: dev
+      - name: build
+        run: docker build -t mathwave/sprint-repo:roulette-bot .
+  push:
+    name: Push
+    runs-on: [ dev ]
+    needs: build
+    steps:
+      - name: push
+        run: docker push mathwave/sprint-repo:roulette-bot
+  deploy-dev:
+    name: Deploy dev
+    runs-on: [dev]
+    needs: push
+    steps:
+      - name: login
+        run: docker login -u mathwave -p ${{ secrets.DOCKERHUB_PASSWORD }}
+      - name: checkout
+        uses: actions/checkout@v4
+        with:
+          ref: dev
+      - name: deploy
+        env:
+          TELEGRAM_TOKEN_DEV: ${{ secrets.TELEGRAM_TOKEN_DEV }}
+          MONGO_PASSWORD_DEV: ${{ secrets.MONGO_PASSWORD_DEV }}
+          PLATFORM_SECURITY_TOKEN: ${{ secrets.PLATFORM_SECURITY_TOKEN }}
+          MINIO_SECRET_KEY_DEV: ${{ secrets.MINIO_SECRET_KEY_DEV }}
+          REDIS_PASSWORD_DEV: ${{ secrets.REDIS_PASSWORD_DEV }}
+        run: docker stack deploy --with-registry-auth -c ./.deploy/deploy-dev.yaml roulette-bot
diff --git a/.gitea/workflows/deploy-prod.yaml b/.gitea/workflows/deploy-prod.yaml
new file mode 100644
index 0000000..6d2f420
--- /dev/null
+++ b/.gitea/workflows/deploy-prod.yaml
@@ -0,0 +1,47 @@
+name: Deploy Prod
+
+on:
+  pull_request:
+    branches:
+      - prod
+    types: [closed]
+
+jobs:
+  build:
+    name: Build
+    runs-on: [ dev ]
+    steps:
+      - name: login
+        run: docker login -u mathwave -p ${{ secrets.DOCKERHUB_PASSWORD }}
+      - name: checkout
+        uses: actions/checkout@v4
+        with:
+          ref: prod
+      - name: build
+        run: docker build -t mathwave/sprint-repo:roulette-bot .
+  push:
+    name: Push
+    runs-on: [ dev ]
+    needs: build
+    steps:
+      - name: push
+        run: docker push mathwave/sprint-repo:roulette-bot
+  deploy-prod:
+    name: Deploy prod
+    runs-on: [prod]
+    needs: push
+    steps:
+      - name: login
+        run: docker login -u mathwave -p ${{ secrets.DOCKERHUB_PASSWORD }}
+      - name: checkout
+        uses: actions/checkout@v4
+        with:
+            ref: prod
+      - name: deploy
+        env:
+          TELEGRAM_TOKEN_PROD: ${{ secrets.TELEGRAM_TOKEN_PROD }}
+          MONGO_PASSWORD_PROD: ${{ secrets.MONGO_PASSWORD_PROD }}
+          PLATFORM_SECURITY_TOKEN: ${{ secrets.PLATFORM_SECURITY_TOKEN }}
+          MINIO_SECRET_KEY_PROD: ${{ secrets.MINIO_SECRET_KEY_PROD }}
+          REDIS_PASSWORD_PROD: ${{ secrets.REDIS_PASSWORD_PROD }}
+        run: docker stack deploy --with-registry-auth -c ./.deploy/deploy-prod.yaml roulette-bot
diff --git a/bot.py b/bot.py
index c66a94d..fb3a140 100644
--- a/bot.py
+++ b/bot.py
@@ -120,6 +120,10 @@ class Core:
         self.send_message(self.message_text, chat_to_send)
 
     def start_new_dialog(self, chat_ids):
+        for chat in chat_ids:
+            current_dialog = mongo.get_current_dialog(chat)
+            if current_dialog:
+                mongo.finish_dialog(current_dialog['_id'])
         self.set_state('search', chat_ids)
         for chat in chat_ids:
             self.send_message("🤖 Начинаю искать собеседника. Сообщу тебе, когда найду его.", chat)