From 4c39153a75a12a7cddfdcaa336d93eeec10d4ead Mon Sep 17 00:00:00 2001
From: IgorVolochay <spore.editor@gmail.com>
Date: Sat, 8 Mar 2025 18:43:36 +0300
Subject: [PATCH] fix: file location changed

---
 .env                                     |  4 ++++
 .github/workflows/app-actions.yml        |  7 ++++---
 README.md                                | 10 +++++++++-
 requirements.txt => app/requirements.txt |  0
 4 files changed, 17 insertions(+), 4 deletions(-)
 create mode 100644 .env
 rename requirements.txt => app/requirements.txt (100%)

diff --git a/.env b/.env
new file mode 100644
index 0000000..5263644
--- /dev/null
+++ b/.env
@@ -0,0 +1,4 @@
+MONGO_HOST=127.0.0.1
+MONGO_PORT=27017
+MONGO_USER=user
+MONGO_PASS=pass
\ No newline at end of file
diff --git a/.github/workflows/app-actions.yml b/.github/workflows/app-actions.yml
index 4110409..42e030e 100644
--- a/.github/workflows/app-actions.yml
+++ b/.github/workflows/app-actions.yml
@@ -28,7 +28,7 @@ jobs:
       - name: Install dependencies
         run: |
           pip install mypy
-          pip install -r requirements.txt
+          pip install -r app/requirements.txt
 
       - name: Run mypy
         run: mypy --ignore-missing-imports ./app
@@ -46,13 +46,14 @@ jobs:
           architecture: x64
 
       - name: Setup MongoDB
-        run: docker run --name mongodb -d -p 27017:27017 -e MONGO_INITDB_ROOT_USERNAME=user -e MONGO_INITDB_ROOT_PASSWORD=pass mongodb/mongodb-community-server
+        run: docker run --name mongodb -d -p $MONGO_PORT:27017 -e MONGO_INITDB_ROOT_USERNAME=$MONGO_USER -e MONGO_INITDB_ROOT_PASSWORD=$MONGO_PASS mongodb/mongodb-community-server
 
       - name: Install dependencies
         run: |
           pip install pytest==8.3.4 pytest-asyncio==0.25.3 httpx==0.28.1
-          pip install -r requirements.txt
+          pip install -r app/requirements.txt
       - name: Setup moderated base cards
+        
         working-directory: ./app/tools
         run: python3 _add_base_cards.py -a 2 -f data/base_cards.json
       - name: Run pytest
diff --git a/README.md b/README.md
index 67a106c..b75646a 100644
--- a/README.md
+++ b/README.md
@@ -9,15 +9,23 @@ Telegram mini-app where you have to choose one of two things.
 git clone https://github.com/IgorVolochay/thisORthat
 ```
 
+### Manual setup:
+
 2. The project is written in Python3.9. Make sure you have it on your system. Go to the project folder, create a virtual environment and download pip requirements:
 ```bash
 cd ./thisORthat
 python3.9 -m venv venv
 source ./venv/bin/activate
-pip3 install -r requirements.txt
+pip3 install -r ./app/requirements.txt
 ```
 
 3. Installing MongoDB database. You can use the [official manual](https://www.mongodb.com/docs/manual/installation/) to install MongoDB manually, or use a [Docker image](https://hub.docker.com/r/mongodb/mongodb-community-server) to run the container:
 ```bash
 docker run --name mongodb -d -p 27017:27017 -e MONGO_INITDB_ROOT_USERNAME=user -e MONGO_INITDB_ROOT_PASSWORD=pass mongodb/mongodb-community-server
 ```
+### Docker Compose setup:
+
+2. Use docker-compose to automatically build the entire project. For correct build, it is better to use docker-compose version 1.29.2:
+```bash
+docker-compose up --build
+```
\ No newline at end of file
diff --git a/requirements.txt b/app/requirements.txt
similarity index 100%
rename from requirements.txt
rename to app/requirements.txt