rename class ServiceType to ServiceCategory

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_type import ServiceCategoryAdmin

admin/service_type.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_type import ServiceCategoryMVS

apiviews/service_type.py

@@ -1,11 +1,11 @@
 from rest_framework import viewsets, permissions
 
-from dbsynce.models import ServiceType
-from dbsynce.serializer import ServiceTypeSerializer
+from dbsynce.models import ServiceCategory
+from dbsynce.serializer import ServiceCategorySerializer
 
 
-class ServiceTypeMVS(viewsets.ModelViewSet):
-    queryset = ServiceType.objects.all()
-    serializer_class = ServiceTypeSerializer
+class ServiceCategoryMVS(viewsets.ModelViewSet):
+    queryset = ServiceCategory.objects.all()
+    serializer_class = ServiceCategorySerializer
     # 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_type import ServiceCategory
 from .template import Template

docs/database/service_type.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_type 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_type import ServiceCategory
 from tickets.models import Ticket
 
 from dbsynce.docs.database.orders import Orders as HelpTexts
@@ -105,7 +105,7 @@ class Orders(models.Model):
         help_text=HelpTexts.service
     )
     service_type = models.ForeignKey(
-        ServiceType,
+        ServiceCategory,
         null=True,
         on_delete=models.DO_NOTHING,
         help_text=HelpTexts.service_type

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_type import ServiceCategory
 
 from dbsynce.docs.database.rating_neg import RatingNeg as HelpTexts
 
@@ -52,7 +52,7 @@ class RatingNeg(models.Model):
         help_text=HelpTexts.user_whom
     )
     service_type = models.ForeignKey(
-        ServiceType,
+        ServiceCategory,
         on_delete=models.DO_NOTHING,
         help_text=HelpTexts.service_type
     )

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_type import ServiceCategory
 
 from dbsynce.docs.database.rating_ok import RatingOk as HelpTexts
 
@@ -52,7 +52,7 @@ class RatingOk(models.Model):
         help_text=HelpTexts.user_whom
     )
     service_type = models.ForeignKey(
-        ServiceType,
+        ServiceCategory,
         on_delete=models.DO_NOTHING,
         help_text=HelpTexts.service_type
     )

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_type import ServiceCategory
 
 from dbsynce.docs.database.rating_pos import RatingPos as HelpTexts
 
@@ -52,7 +52,7 @@ class RatingPos(models.Model):
         help_text=HelpTexts.user_whom
     )
     service_type = models.ForeignKey(
-        ServiceType,
+        ServiceCategory,
         on_delete=models.DO_NOTHING,
         help_text=HelpTexts.service_type
     )

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_type import ServiceCategory
 from tickets.models import Ticket
 
 from dbsynce.docs.database.service import Service as HelpTexts
@@ -86,7 +86,7 @@ class Service(models.Model):
         help_text=HelpTexts.resource
     )
     service_type = models.ForeignKey(
-        ServiceType,
+        ServiceCategory,
         on_delete=models.DO_NOTHING,
         help_text=HelpTexts.service_type
     )

models/service_type.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_type import ServiceCategory as HelpTexts
 
 
-class ServiceType(models.Model):
+class ServiceCategory(models.Model):
     """
     Перечень типов услуг
     """

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_type import ServiceCategorySerializer

serializer/service_type.py

@@ -1,9 +1,9 @@
 from rest_framework import serializers
 
-from dbsynce.models import ServiceType
+from dbsynce.models import ServiceCategory
 
 
-class ServiceTypeSerializer(serializers.ModelSerializer):
+class ServiceCategorySerializer(serializers.ModelSerializer):
     class Meta:
-        model = ServiceType
+        model = ServiceCategory
         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_type', ServiceCategoryMVS)
 
 urlpatterns = [
     path('api/', include(router.urls), name="dbsynced"),