From 46b4e95d4587a0455d4dcfb413a04fba0208bd2a Mon Sep 17 00:00:00 2001 From: "MH.Dmitrii" Date: Sun, 21 Dec 2025 17:51:41 +0300 Subject: [PATCH] refactoring --- env_example | 34 ++++++++++++++++++- run.py | 4 +-- server/backend/api/__init__.py | 0 server/backend/api/realisation.py | 0 server/backend/api/report.py | 0 server/backend/handlers/ozon_handler.py | 2 +- .../handlers/ozon_purchases_handler.py | 2 +- .../handlers/ozon_wb_yandex_com_handler.py | 2 +- server/backend/handlers/wb_handler.py | 2 +- .../backend/handlers/wb_purchases_handler.py | 2 +- server/backend/handlers/yandex_handler.py | 2 +- server/backend/schemas/__init__.py | 0 server/backend/{ => schemas}/pydantic.py | 0 server/backend/services/__init__.py | 0 server/backend/{ => services}/excel.py | 0 .../{ => services}/validating_files.py | 2 +- 16 files changed, 42 insertions(+), 10 deletions(-) create mode 100644 server/backend/api/__init__.py create mode 100644 server/backend/api/realisation.py create mode 100644 server/backend/api/report.py create mode 100644 server/backend/schemas/__init__.py rename server/backend/{ => schemas}/pydantic.py (100%) create mode 100644 server/backend/services/__init__.py rename server/backend/{ => services}/excel.py (100%) rename server/backend/{ => services}/validating_files.py (98%) diff --git a/env_example b/env_example index b36ef0a..4601ce2 100644 --- a/env_example +++ b/env_example @@ -1 +1,33 @@ -DIR="/dir/dir/dir" \ No newline at end of file +DIR="/dir/dir/dir" +PATTERN=[A-ZА-Я]{0,1}\d{4}[A-ZА-Я]{1,2}\d{0,1} + +USERNAME = "..." +PASSWORD = "..." +URL_REPORT = "..." +URL_REALISATION = "..." + +BUYER = "..." #Физические лица-розница +COMPANY="..." #Организация_Key +STORE = "..." #Склад_Key + +CONTRAGENT_RWB = "..." #WB +CONTRAGENT_OZON = "..." #Озон +CONTRAGENT_YANDEX="..." #Яндекс + +CONTRACT_RWB0 = "..." #Основной для ВБ +CONTRACT_RWB1 = "..." #основной для яндекса +CONTRACT_RWB2 = "..." #основной для озона + +MEASURE="..." #"ЕдиницаИзмерения_Key" шт + +#Accountant + +A60_01="..." # 60.01 СчетУчетаРасчетовЗаПосредническиеУслуги_Key +A62_02= "..." # 62.02 СчетУчетаРасчетовПоАвансамПолученным_Key +A60_02= "..." # 60.02 СчетУчетаРасчетовПоАвансамВыданным_Key +A62_01= "..." # 62.01 СчетУчетаРасчетовСКонтрагентом_Key +A45_02="..." # 45.02 СчетУчета_Key +A90_01_1="..." # 90.01.1 СчетДоходов_Key +A90_02_1="..." # 90.02.1 СчетРасходов_Key +A90_03="..." # 90.03 СчетУчетаНДСПоРеализации_Key +A76_09="..." # 76.09 СчетУчетаРасчетовПоАвансамПолученным_Key and СчетУчетаРасчетовСКонтрагентом_Key \ No newline at end of file diff --git a/run.py b/run.py index 6324908..09897fd 100644 --- a/run.py +++ b/run.py @@ -1,3 +1,3 @@ -import server.backend.excel as excel -from server.backend.validating_files import validating +import server.backend.services.excel as excel +from server.backend.services.validating_files import validating print(validating()) \ No newline at end of file diff --git a/server/backend/api/__init__.py b/server/backend/api/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/server/backend/api/realisation.py b/server/backend/api/realisation.py new file mode 100644 index 0000000..e69de29 diff --git a/server/backend/api/report.py b/server/backend/api/report.py new file mode 100644 index 0000000..e69de29 diff --git a/server/backend/handlers/ozon_handler.py b/server/backend/handlers/ozon_handler.py index cf91666..6bdf8e6 100644 --- a/server/backend/handlers/ozon_handler.py +++ b/server/backend/handlers/ozon_handler.py @@ -1,5 +1,5 @@ from pydantic import ValidationError -from server.backend.pydantic import ExcelInfo +from server.backend.schemas.pydantic import ExcelInfo import re from dotenv import load_dotenv #Работа с env diff --git a/server/backend/handlers/ozon_purchases_handler.py b/server/backend/handlers/ozon_purchases_handler.py index ffe8233..bd143ef 100644 --- a/server/backend/handlers/ozon_purchases_handler.py +++ b/server/backend/handlers/ozon_purchases_handler.py @@ -1,5 +1,5 @@ from pydantic import ValidationError -from server.backend.pydantic import ExcelInfo +from server.backend.schemas.pydantic import ExcelInfo import re from dotenv import load_dotenv #Работа с env diff --git a/server/backend/handlers/ozon_wb_yandex_com_handler.py b/server/backend/handlers/ozon_wb_yandex_com_handler.py index d8debcd..f9c4108 100644 --- a/server/backend/handlers/ozon_wb_yandex_com_handler.py +++ b/server/backend/handlers/ozon_wb_yandex_com_handler.py @@ -1,5 +1,5 @@ from pydantic import ValidationError -from server.backend.pydantic import ExcelInfo +from server.backend.schemas.pydantic import ExcelInfo import re from dotenv import load_dotenv #Работа с env diff --git a/server/backend/handlers/wb_handler.py b/server/backend/handlers/wb_handler.py index 3d90565..377667b 100644 --- a/server/backend/handlers/wb_handler.py +++ b/server/backend/handlers/wb_handler.py @@ -1,5 +1,5 @@ from pydantic import ValidationError -from server.backend.pydantic import ExcelInfo +from server.backend.schemas.pydantic import ExcelInfo import re from dotenv import load_dotenv #Работа с env diff --git a/server/backend/handlers/wb_purchases_handler.py b/server/backend/handlers/wb_purchases_handler.py index e57ca74..efc125f 100644 --- a/server/backend/handlers/wb_purchases_handler.py +++ b/server/backend/handlers/wb_purchases_handler.py @@ -1,5 +1,5 @@ from pydantic import ValidationError -from server.backend.pydantic import ExcelInfo +from server.backend.schemas.pydantic import ExcelInfo import re from dotenv import load_dotenv #Работа с env diff --git a/server/backend/handlers/yandex_handler.py b/server/backend/handlers/yandex_handler.py index f29e5e5..bf78ed0 100644 --- a/server/backend/handlers/yandex_handler.py +++ b/server/backend/handlers/yandex_handler.py @@ -1,5 +1,5 @@ from pydantic import ValidationError -from server.backend.pydantic import ExcelInfo +from server.backend.schemas.pydantic import ExcelInfo import re from dotenv import load_dotenv #Работа с env diff --git a/server/backend/schemas/__init__.py b/server/backend/schemas/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/server/backend/pydantic.py b/server/backend/schemas/pydantic.py similarity index 100% rename from server/backend/pydantic.py rename to server/backend/schemas/pydantic.py diff --git a/server/backend/services/__init__.py b/server/backend/services/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/server/backend/excel.py b/server/backend/services/excel.py similarity index 100% rename from server/backend/excel.py rename to server/backend/services/excel.py diff --git a/server/backend/validating_files.py b/server/backend/services/validating_files.py similarity index 98% rename from server/backend/validating_files.py rename to server/backend/services/validating_files.py index 52827a2..e2b6dd4 100644 --- a/server/backend/validating_files.py +++ b/server/backend/services/validating_files.py @@ -1,4 +1,4 @@ -import server.backend.excel as excel +import server.backend.services.excel as excel from dotenv import load_dotenv #Работа с env import os