diff --git a/access_controller/settings.py b/access_controller/settings.py index a534ac9..4b011a7 100644 --- a/access_controller/settings.py +++ b/access_controller/settings.py @@ -10,7 +10,7 @@ For the full list of settings and their values, see https://docs.djangoproject.com/en/3.1/ref/settings/ """ import os -from pathlib import Path + # Build paths inside the project like this: BASE_DIR / 'subdir'. BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) @@ -180,18 +180,18 @@ LOGGING = { } ZENDESK_ROLES = { - 'engineer': 360005209000, - 'light_agent': 360005208980, + 'engineer': int(os.getenv('ENG_CROLE_ID')), + 'light_agent': int(os.getenv('LA_CROLE_ID')), } ZENDESK_GROUPS = { - 'employees': 'Поддержка', - 'buffer': 'Сменная группа', + 'employees': os.getenv('EMPL_GROUP'), + 'buffer': os.getenv('BUF_GROUP'), } -SOLVED_TICKETS_EMAIL = 'd.krikov@ngenix.net' +SOLVED_TICKETS_EMAIL = os.getenv('ST_EMAIL') -ZENDESK_MAX_AGENTS = 3 +ZENDESK_MAX_AGENTS = int(os.getenv('LICENSE_NO')) REST_FRAMEWORK = { # Use Django's standard `django.contrib.auth` permissions, @@ -201,4 +201,4 @@ REST_FRAMEWORK = { ] } -ONE_DAY = 12 # Количество часов в 1 рабочем дне +ONE_DAY = int(os.getenv('SHIFTH')) # Количество часов в 1 рабочем дне diff --git a/db/zd_db.sqlite3 b/db/zd_db.sqlite3 index fd85558..ea41825 100644 Binary files a/db/zd_db.sqlite3 and b/db/zd_db.sqlite3 differ diff --git a/main/apiauth.py b/main/apiauth.py index c24e85f..34b6e5d 100644 --- a/main/apiauth.py +++ b/main/apiauth.py @@ -15,7 +15,7 @@ def api_auth() -> dict: :return: данные пользователя """ credentials = { - 'subdomain': 'ngenix1612197338' + 'subdomain': os.getenv('ZD_DOMAIN') } email = os.getenv('ACCESS_CONTROLLER_API_EMAIL') token = os.getenv('ACCESS_CONTROLLER_API_TOKEN') diff --git a/main/migrations/0001_initial.py b/main/migrations/0001_initial.py index ab7c944..4773f00 100644 --- a/main/migrations/0001_initial.py +++ b/main/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.6 on 2021-03-30 15:31 +# Generated by Django 3.1.6 on 2021-03-30 22:06 from django.conf import settings from django.db import migrations, models