fix generate

lib/data.py

@@ -34,14 +34,13 @@ def create_ticket_service_category_activation(user, service_category):
         """
     )
 
-def create_service_category(service_category, metaservice, user):
+def create_service_category(service_category, user):
     """
     Создание записи категории Сервиса.
     Создается запись в БД, Тикет на проверку и уведомление в джаббер
     
     """
     return ServiceCategory.objects.create(
-        id_metaservice=service_category.id_metaservice,
         codename=service_category.codename,
         #TODO заменить дефолт после появления соответствующего функционала
         requirements="DSMPUB",
@@ -52,7 +51,7 @@ def create_service_category(service_category, metaservice, user):
         price_type=service_category.price_type,
         metaservice_comission=service_category.metaservice_comission,
         #TODO заменить дефолт после появления соответствующего функционала
-        is_global="0",
-        is_visible="0",
+        is_global="f",
+        is_visible="f",
         ticket_status=create_ticket_service_category_activation(user, service_category)
     )

lib/seed.py

@@ -4,20 +4,20 @@ from django.contrib.auth.hashers import make_password
 from tickets.models import Ticket, TicketList
 from datetime import datetime
 from dbsynce.lib.data import *
+from core.settings_vars import METASERVICE_ID
 
 def create_metaservice_default_data():
     create_metaservice_initial_groups()
     create_metaservice_ticket_lists()
+    create_metaservice_test_users()
     create_metaservice_init_data()
 
 def create_metaservice_init_data():
     if not ServiceCategory.objects.filter(codename="test").exists():
-        #TODO maybe import from config?
-        metaservice=1
-        service_category=ServiceCategory(metaservice, "test", "DSMPUB", "0", "Test", "Test service category", "https://wiki.sharix-app.org/doku.php/open/doc/usage", "3", 0.2, "0", "0", 1)
-        
-        metaserivce_admin = 
-        create_service_category(service_category, metaservice, metaserivce_admin)
+        service_category=ServiceCategory(METASERVICE_ID, "test", "DSMPUB", "0", "Test", "Test service category", "https://wiki.sharix-app.org/doku.php/open/doc/usage", "3", 0.2, "0", "0", 1)
+        metaserivce_admin = get_user_model().objects.get(phone_number=2101)
+        create_service_category(service_category, metaserivce_admin)
+
         print(f"Service category test created.")
     else:
         print(f"Service category test already exists.")
@@ -102,6 +102,9 @@ def create_metaservice_test_users():
             'Sharix!',
             phone_number="11111111111"
         )
+        print("Django admin created.")
+    else:
+        print("Django admin already exists.")
 
     password = make_password("sharix-open-test")
     test_group = Group.objects.get(pk=99)
@@ -145,6 +148,9 @@ def create_metaservice_test_users():
                     test_group,
                     group
                 )
+                print(f"User {user.username} created.")
+            else:
+                print(f"User {user.username} already exists.")
 
     # Создание тикета о создании пользователей
     if not Ticket.objects.all().exists():
@@ -152,7 +158,7 @@ def create_metaservice_test_users():
         user = get_user_model().objects.filter(phone_number=2101).get()
         ticket_list = TicketList.objects.get(pk=2103)
 
-        Ticket.objects.create(
+        ticket, created = Ticket.objects.create(
             title=f"Создание тестовых пользователей",
             ticket_list=ticket_list,
             ticket_type=1,  # ST_REQUEST
@@ -162,3 +168,8 @@ def create_metaservice_test_users():
                 Успешное создание тестовых пользователей
             """
         )
+
+        if created:
+            print("Main Ticket created.")
+        else:
+            print("Main Ticket already exists.")

management/commands/create_metaservice_test_users.py

@@ -8,7 +8,7 @@ class Command(BaseCommand):
     def handle(self, *args, **options):
         self.stdout.write(self.style.SUCCESS('Start seeding test users'))
 
-        create_metaservice_test_users()
+        # create_metaservice_test_users()
 
         self.stdout.write(self.style.SUCCESS('Successful seeding test users'))
         # raise NotImplementedError()