Merge branch 'unstable' of blezz-tech/sharix-open-backend into unstable

admin/__init__.py

@@ -7,4 +7,4 @@ from .provider import ProviderAdmin
 from .relationship import RelationshipAdmin
 from .resource import ResourceAdmin
 from .service import ServiceAdmin
-from .service_type import ServiceTypeAdmin
+from .service_category import ServiceCategoryAdmin

admin/orders.py

@@ -8,7 +8,7 @@ class OrdersAdmin(admin.ModelAdmin):
     list_display = (
         'id',
         'service',
-        'service_type',
+        'service_category',
         'status',
         'id_metaservice',
         'title',
@@ -30,7 +30,7 @@ class OrdersAdmin(admin.ModelAdmin):
     )
     list_filter = (
         'service',
-        'service_type',
+        'service_category',
         'provider',
         'receiver',
         'client',

admin/service.py

@@ -7,7 +7,7 @@ from dbsynce.models import Service
 class ServiceAdmin(admin.ModelAdmin):
     list_display = (
         'id',
-        'service_type',
+        'service_category',
         'resource',
         'requirements',
         'id_metaservice',
@@ -22,7 +22,7 @@ class ServiceAdmin(admin.ModelAdmin):
         'is_visible',
     )
     list_filter = (
-        'service_type',
+        'service_category',
         'resource',
         'ticket_status',
     )

admin/service_type.py → admin/service_category.py

@@ -1,10 +1,10 @@
 from django.contrib import admin
 
-from dbsynce.models import ServiceType
+from dbsynce.models import ServiceCategory
 
 
-@admin.register(ServiceType)
-class ServiceTypeAdmin(admin.ModelAdmin):
+@admin.register(ServiceCategory)
+class ServiceCategoryAdmin(admin.ModelAdmin):
     list_display = (
         'id',
         'codename',

apiviews/__init__.py

@@ -7,4 +7,4 @@ from .provider import ProviderMVS
 from .relationship import RelationshipMVS
 from .resource import ResourceMVS
 from .service import ServiceMVS
-from .service_type import ServiceTypeMVS
+from .service_category import ServiceCategoryMVS

apiviews/service_category.py

@@ -0,0 +1,11 @@
+from rest_framework import viewsets, permissions
+
+from dbsynce.models import ServiceCategory
+from dbsynce.serializer import ServiceCategorySerializer
+
+
+class ServiceCategoryMVS(viewsets.ModelViewSet):
+    queryset = ServiceCategory.objects.all()
+    serializer_class = ServiceCategorySerializer
+    # permission_classes = [IsOwnerOrReadOnly]
+    permission_classes = [permissions.IsAuthenticated]

apiviews/service_type.py

@@ -1,11 +0,0 @@
-from rest_framework import viewsets, permissions
-
-from dbsynce.models import ServiceType
-from dbsynce.serializer import ServiceTypeSerializer
-
-
-class ServiceTypeMVS(viewsets.ModelViewSet):
-    queryset = ServiceType.objects.all()
-    serializer_class = ServiceTypeSerializer
-    # permission_classes = [IsOwnerOrReadOnly]
-    permission_classes = [permissions.IsAuthenticated]

docs/database/__init__.py

@@ -10,5 +10,5 @@ from .rating_pos import RatingPos
 from .relationship import Relationship
 from .resource import Resource
 from .service import Service
-from .service_type import ServiceType
+from .service_category import ServiceCategory
 from .template import Template

docs/database/orders.py

@@ -35,7 +35,7 @@ class Orders():
         "(id_service - уникальный идентификатор шаблона услуги, необходим "
         "для установления цены и исполнителей."
     )
-    service_type = "тип заказа по классификатору услу"
+    service_category = "тип заказа по классификатору услу"
     client = "клиент/аккаунт, который оплачивает все оказанные услуги"
     provider = (
         "уникальный идентификатор поставщика услуги/аккаунта, который "

docs/database/rating_neg.py

@@ -19,4 +19,4 @@ class RatingNeg():
     # FK
     user_who = "уникальный идентификатор инициатора договорных отношений"
     user_whom = " уникальный идентификатор того с кем связываются"
-    service_type = "тип оказываемой услуги по классификатору услуг сервиса"
+    service_category = "тип оказываемой услуги по классификатору услуг сервиса"

docs/database/rating_ok.py

@@ -19,5 +19,5 @@ class RatingOk():
     # FK
     user_who = "уникальный идентификатор инициатора договорных отношений"
     user_whom = " уникальный идентификатор того с кем связываются"
-    service_type = "тип оказываемой услуги по классификатору услуг сервиса"
+    service_category = "тип оказываемой услуги по классификатору услуг сервиса"
     

docs/database/rating_pos.py

@@ -18,4 +18,4 @@ class RatingPos():
     # FK
     user_who = "уникальный идентификатор инициатора договорных отношений"
     user_whom = " уникальный идентификатор того с кем связываются"
-    service_type = "тип оказываемой услуги по классификатору услуг сервиса"
+    service_category = "тип оказываемой услуги по классификатору услуг сервиса"

docs/database/service.py

@@ -70,4 +70,4 @@ class Service():
         "пользователь (он и указывается в таблице со свойствами ресурса), "
         "а услугу доступа или перевозки может оказывать иное лицо."
     )
-    service_type = "тип оказываемой услуги по классификатору услуг сервиса"
+    service_category = "тип оказываемой услуги по классификатору услуг сервиса"

docs/database/service_type.py → docs/database/service_category.py

@@ -1,7 +1,7 @@
 from .template import Template
 
 
-class ServiceType():
+class ServiceCategory():
     description = (
         "Перечень типов услуг"
     )

models/__init__.py

@@ -10,4 +10,4 @@ from .rating_pos import RatingPos
 from .relationship import Relationship
 from .resource import Resource
 from .service import Service
-from .service_type import ServiceType
+from .service_category import ServiceCategory

models/orders.py

@@ -5,7 +5,7 @@ from dbsynce.models.client import Client
 from dbsynce.models.company import Company
 from dbsynce.models.provider import Provider
 from dbsynce.models.service import Service
-from dbsynce.models.service_type import ServiceType
+from dbsynce.models.service_category import ServiceCategory
 from tickets.models import Ticket
 
 from dbsynce.docs.database.orders import Orders as HelpTexts
@@ -104,11 +104,11 @@ class Orders(models.Model):
         on_delete=models.DO_NOTHING,
         help_text=HelpTexts.service
     )
-    service_type = models.ForeignKey(
-        ServiceType,
+    service_category = models.ForeignKey(
+        ServiceCategory,
         null=True,
         on_delete=models.DO_NOTHING,
-        help_text=HelpTexts.service_type
+        help_text=HelpTexts.service_category
     )
     client = models.ForeignKey(
         Client,

models/rating_neg.py

@@ -1,7 +1,7 @@
 from django.contrib.auth import get_user_model
 from django.db import models
 
-from dbsynce.models.service_type import ServiceType
+from dbsynce.models.service_category import ServiceCategory
 
 from dbsynce.docs.database.rating_neg import RatingNeg as HelpTexts
 
@@ -51,10 +51,10 @@ class RatingNeg(models.Model):
         on_delete=models.DO_NOTHING,
         help_text=HelpTexts.user_whom
     )
-    service_type = models.ForeignKey(
-        ServiceType,
+    service_category = models.ForeignKey(
+        ServiceCategory,
         on_delete=models.DO_NOTHING,
-        help_text=HelpTexts.service_type
+        help_text=HelpTexts.service_category
     )
 
     class Meta:

models/rating_ok.py

@@ -1,7 +1,7 @@
 from django.contrib.auth import get_user_model
 from django.db import models
 
-from dbsynce.models.service_type import ServiceType
+from dbsynce.models.service_category import ServiceCategory
 
 from dbsynce.docs.database.rating_ok import RatingOk as HelpTexts
 
@@ -51,10 +51,10 @@ class RatingOk(models.Model):
         on_delete=models.DO_NOTHING,
         help_text=HelpTexts.user_whom
     )
-    service_type = models.ForeignKey(
-        ServiceType,
+    service_category = models.ForeignKey(
+        ServiceCategory,
         on_delete=models.DO_NOTHING,
-        help_text=HelpTexts.service_type
+        help_text=HelpTexts.service_category
     )
 
     class Meta:

models/rating_pos.py

@@ -1,7 +1,7 @@
 from django.contrib.auth import get_user_model
 from django.db import models
 
-from dbsynce.models.service_type import ServiceType
+from dbsynce.models.service_category import ServiceCategory
 
 from dbsynce.docs.database.rating_pos import RatingPos as HelpTexts
 
@@ -51,10 +51,10 @@ class RatingPos(models.Model):
         on_delete=models.DO_NOTHING,
         help_text=HelpTexts.user_whom
     )
-    service_type = models.ForeignKey(
-        ServiceType,
+    service_category = models.ForeignKey(
+        ServiceCategory,
         on_delete=models.DO_NOTHING,
-        help_text=HelpTexts.service_type
+        help_text=HelpTexts.service_category
     )
 
     class Meta:

models/service.py

@@ -1,7 +1,7 @@
 from django.db import models
 
 from dbsynce.models.resource import Resource
-from dbsynce.models.service_type import ServiceType
+from dbsynce.models.service_category import ServiceCategory
 from tickets.models import Ticket
 
 from dbsynce.docs.database.service import Service as HelpTexts
@@ -85,10 +85,10 @@ class Service(models.Model):
         null=True,
         help_text=HelpTexts.resource
     )
-    service_type = models.ForeignKey(
-        ServiceType,
+    service_category = models.ForeignKey(
+        ServiceCategory,
         on_delete=models.DO_NOTHING,
-        help_text=HelpTexts.service_type
+        help_text=HelpTexts.service_category
     )
 
     class Meta:

models/service_type.py → models/service_category.py

@@ -2,10 +2,10 @@ from django.db import models
 
 from tickets.models import Ticket
 
-from dbsynce.docs.database.service_type import ServiceType as HelpTexts
+from dbsynce.docs.database.service_category import ServiceCategory as HelpTexts
 
 
-class ServiceType(models.Model):
+class ServiceCategory(models.Model):
     """
     Перечень типов услуг
     """
@@ -73,6 +73,6 @@ class ServiceType(models.Model):
     )
 
     class Meta:
-        db_table = "service_type"
+        db_table = "service_category"
         verbose_name = "Тип услуги"
         verbose_name_plural = "Типы услуг"

serializer/__init__.py

@@ -7,4 +7,4 @@ from .provider import ProviderSerializer
 from .relationship import RelationshipSerializer
 from .resource import ResourceSerializer
 from .service import ServiceSerializer
-from .service_type import ServiceTypeSerializer
+from .service_category import ServiceCategorySerializer

serializer/service_category.py

@@ -0,0 +1,9 @@
+from rest_framework import serializers
+
+from dbsynce.models import ServiceCategory
+
+
+class ServiceCategorySerializer(serializers.ModelSerializer):
+    class Meta:
+        model = ServiceCategory
+        exclude = ["id"]

serializer/service_type.py

@@ -1,9 +0,0 @@
-from rest_framework import serializers
-
-from dbsynce.models import ServiceType
-
-
-class ServiceTypeSerializer(serializers.ModelSerializer):
-    class Meta:
-        model = ServiceType
-        exclude = ["id"]

urls.py

@@ -13,7 +13,7 @@ router.register(r'provider', ProviderMVS)
 router.register(r'relationship', RelationshipMVS)
 router.register(r'resource', ResourceMVS)
 router.register(r'service', ServiceMVS)
-router.register(r'service_type', ServiceTypeMVS)
+router.register(r'service_category', ServiceCategoryMVS)
 
 urlpatterns = [
     path('api/', include(router.urls), name="dbsynced"),