Merge pull request #5 from Leenominai/develop

Develop v1.52
Leenominai · Nov 19, 2023 · 9d4c8bf · 9d4c8bf
2 parents 297d8f2 + 35cf527
commit 9d4c8bf
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/.github/workflows/git-workflow.yml b/.github/workflows/git-workflow.yml
@@ -4,9 +4,6 @@ on:
   push:
     branches:
       - main
-  pull_request:
-    branches:
-      - main
 
 jobs:
   build_and_push_backend_to_docker_hub:

diff --git a/backend/docmanager/api/token.json b/backend/docmanager/api/token.json
@@ -1 +1 @@
-{"token": "ya29.a0AfB_byDaORx3ULwGcFR8xulbITlJwBi8SX28Ptf2mUibRcM5BVTn_V34ArGFQKVR4EUp1RUF0BTC4YlHiCg3ViPNtefjNQkWxsZvu6f4cfXy0CEiFy0CkAphNJ9IDTO8KepB4KPk_WRB_KvH28tjFmnGY7bAoZEH2xpdaCgYKAQUSARISFQHGX2MiFWALT66T5G5ONGFRT76gTg0171", "refresh_token": "1//0c8aJrYSVWzqvCgYIARAAGAwSNwF-L9Ir4-AXoT7b5u7IZRLnitdlxeGQ7Bz5MwyglgBZa3d5wml-kyyYMofx-D6CtBVi2iIkEhY", "token_uri": "https://oauth2.googleapis.com/token", "client_id": "350493863594-jgkuku5tl845jm65gk7ac98rg7i8u9sp.apps.googleusercontent.com", "client_secret": "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", "scopes": ["https://www.googleapis.com/auth/drive.file"], "expiry": "2023-11-18T20:36:15.441650Z"}
+{"token": "ya29.a0AfB_byBz5gAtDrbs57ytkMjQG_KcYz1mFfQVm5ro81GjDufBHHs8O_taZBIuG5iZR5tKRqGoIBxQwoURRbVK87g8w8XGataZt2P04qxLZb0QzrBnM40KCm276ZgaaQeFDipluxggsu0NzNI_q24KJCHBrLx8a20QMjIcaCgYKAc8SARISFQHGX2Mi5_oM0_GxC_2iWWn0xXgkOg0171", "refresh_token": "1//0cmD14vtJQ9YgCgYIARAAGAwSNwF-L9IroBRPx2C6918nRXz9IAnafYASIImCHFEbgKJf3tH0YNGyfvZHztWsAoQ8BLv4XfIHyQc", "token_uri": "https://oauth2.googleapis.com/token", "client_id": "350493863594-jgkuku5tl845jm65gk7ac98rg7i8u9sp.apps.googleusercontent.com", "client_secret": "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", "scopes": ["https://www.googleapis.com/auth/drive.file"], "expiry": "2023-11-18T23:41:41.640697Z"}
diff --git a/backend/docmanager/api/views.py b/backend/docmanager/api/views.py
@@ -96,7 +96,7 @@ def create_google_drive_document(request):
                 logging.warning(f"Документ с именем {name} уже существует.")
                 return Response(
                     {"Ошибка": "Документ с таким именем уже существует."},
-                    status=status.HTTP_200_OK,
+                    status=status.HTTP_409_CONFLICT,
                 )
 
             file = (