Merge branch 'unstable_dbsynce' of ShariX_Open/sharix-open-backend into unstable

admin/client.py

@@ -1,5 +1,5 @@
 from django.contrib import admin
-from metaservicesynced.models import Client
+from dbsynce.models import Client
 
 @admin.register(Client)
 class ClientAdmin(admin.ModelAdmin):

admin/company.py

@@ -1,5 +1,5 @@
 from django.contrib import admin
-from metaservicesynced.models import Company
+from dbsynce.models import Company
 
 @admin.register(Company)
 class CompanyAdmin(admin.ModelAdmin):

admin/documents.py

@@ -1,5 +1,5 @@
 from django.contrib import admin
-from metaservicesynced.models import Documents
+from dbsynce.models import Documents
 
 @admin.register(Documents)
 class DocumentsAdmin(admin.ModelAdmin):

admin/favoritecontacts.py

@@ -1,5 +1,5 @@
 from django.contrib import admin
-from metaservicesynced.models import Favoritecontacts
+from dbsynce.models import Favoritecontacts
 
 @admin.register(Favoritecontacts)
 class FavoritecontactsAdmin(admin.ModelAdmin):

admin/frequentaddress.py

@@ -1,5 +1,5 @@
 from django.contrib import admin
-from metaservicesynced.models import Frequentaddress
+from dbsynce.models import Frequentaddress
 
 @admin.register(Frequentaddress)
 class FrequentaddressAdmin(admin.ModelAdmin):

admin/orders.py

@@ -1,5 +1,5 @@
 from django.contrib import admin
-from metaservicesynced.models import Orders
+from dbsynce.models import Orders
 
 @admin.register(Orders)
 class OrdersAdmin(admin.ModelAdmin):

admin/permissions.py

@@ -1,5 +1,5 @@
 from django.contrib import admin
-from metaservicesynced.models import Permissions
+from dbsynce.models import Permissions
 
 @admin.register(Permissions)
 class PermissionsAdmin(admin.ModelAdmin):

admin/preferreddrivers.py

@@ -1,5 +1,5 @@
 from django.contrib import admin
-from metaservicesynced.models import Preferreddrivers
+from dbsynce.models import Preferreddrivers
 
 @admin.register(Preferreddrivers)
 class PreferreddriversAdmin(admin.ModelAdmin):

admin/provider.py

@@ -1,5 +1,5 @@
 from django.contrib import admin
-from metaservicesynced.models import Provider
+from dbsynce.models import Provider
 
 @admin.register(Provider)
 class ProviderAdmin(admin.ModelAdmin):

admin/relationship.py

@@ -1,5 +1,5 @@
 from django.contrib import admin
-from metaservicesynced.models import Relationship
+from dbsynce.models import Relationship
 
 @admin.register(Relationship)
 class RelationshipAdmin(admin.ModelAdmin):

admin/resource.py

@@ -1,5 +1,5 @@
 from django.contrib import admin
-from metaservicesynced.models import Resource
+from dbsynce.models import Resource
 
 @admin.register(Resource)
 class ResourceAdmin(admin.ModelAdmin):

admin/service.py

@@ -1,5 +1,5 @@
 from django.contrib import admin
-from metaservicesynced.models import Service
+from dbsynce.models import Service
 
 @admin.register(Service)
 class ServiceAdmin(admin.ModelAdmin):

admin/servicetype.py

@@ -1,5 +1,5 @@
 from django.contrib import admin
-from metaservicesynced.models import ServiceType
+from dbsynce.models import ServiceType
 
 @admin.register(ServiceType)
 class ServiceTypeAdmin(admin.ModelAdmin):

apiviews/client.py

@@ -1,6 +1,6 @@
-from metaservicesynced.serializer import ClientSerializer
+from dbsynce.serializer import ClientSerializer
 from rest_framework import viewsets, permissions
-from metaservicesynced.models import Client
+from dbsynce.models import Client
 
 class ClientMVS(viewsets.ModelViewSet):
 

apiviews/company.py

@@ -1,6 +1,6 @@
-from metaservicesynced.serializer import CompanySerializer
+from dbsynce.serializer import CompanySerializer
 from rest_framework import viewsets, permissions
-from metaservicesynced.models import Company
+from dbsynce.models import Company
 
 class CompanyMVS(viewsets.ModelViewSet):
 

apiviews/documents.py

@@ -1,7 +1,7 @@
 from django.http import HttpResponse
-from metaservicesynced.serializer import DocumentsSerializer
+from dbsynce.serializer import DocumentsSerializer
 from rest_framework import viewsets, permissions
-from metaservicesynced.models import Documents
+from dbsynce.models import Documents
 
 class DocumentsMVS(viewsets.ModelViewSet):
 

apiviews/favoritecontacts.py

@@ -2,8 +2,8 @@ from django.db.models import CharField
 from django.db.models.functions import Cast
 from rest_framework import viewsets, permissions
 from rest_framework.response import Response
-from metaservicesynced.serializer import FavoritecontactsSerializer
-from metaservicesynced.models import Favoritecontacts
+from dbsynce.serializer import FavoritecontactsSerializer
+from dbsynce.models import Favoritecontacts
 
 class FavoritecontactsMVS(viewsets.ModelViewSet):
     queryset = Favoritecontacts.objects.all()

apiviews/frequentaddress.py

@@ -2,8 +2,8 @@ from django.db.models import CharField
 from django.db.models.functions import Cast
 from rest_framework import viewsets, permissions
 from rest_framework.response import Response
-from metaservicesynced.serializer import FrequentaddressSerializer
-from metaservicesynced.models import Frequentaddress
+from dbsynce.serializer import FrequentaddressSerializer
+from dbsynce.models import Frequentaddress
 
 class FrequentaddressMVS(viewsets.ModelViewSet):
     queryset = Frequentaddress.objects.all()

apiviews/orders.py

@@ -1,6 +1,6 @@
-from metaservicesynced.serializer import OrdersSerializer
+from dbsynce.serializer import OrdersSerializer
 from rest_framework import viewsets, permissions
-from metaservicesynced.models import Orders
+from dbsynce.models import Orders
 
 class OrdersMVS(viewsets.ModelViewSet):
 

apiviews/permissions.py

@@ -1,6 +1,6 @@
-from metaservicesynced.serializer import PermissionsSerializer
+from dbsynce.serializer import PermissionsSerializer
 from rest_framework import viewsets, permissions
-from metaservicesynced.models import Permissions
+from dbsynce.models import Permissions
 
 class PermissionsMVS(viewsets.ModelViewSet):
 

apiviews/personinfo.py

@@ -1,4 +1,4 @@
-from metaservicesynced.serializer import PersonInfoSerializer
+from dbsynce.serializer import PersonInfoSerializer
 from rest_framework import viewsets, permissions
 from SharixAdmin.models import SharixUser
 

apiviews/preferreddrivers.py

@@ -2,8 +2,8 @@ from django.db.models import CharField
 from django.db.models.functions import Cast
 from rest_framework import viewsets, permissions
 from rest_framework.response import Response
-from metaservicesynced.serializer import PreferreddriversSerializer
-from metaservicesynced.models import Preferreddrivers
+from dbsynce.serializer import PreferreddriversSerializer
+from dbsynce.models import Preferreddrivers
 
 class PreferreddriversMVS(viewsets.ModelViewSet):
     queryset = Preferreddrivers.objects.all()

apiviews/provider.py

@@ -1,6 +1,6 @@
-from metaservicesynced.serializer import ProviderSerializer
+from dbsynce.serializer import ProviderSerializer
 from rest_framework import viewsets, permissions
-from metaservicesynced.models import Provider
+from dbsynce.models import Provider
 
 class ProviderMVS(viewsets.ModelViewSet):
 

apiviews/relationship.py

@@ -1,6 +1,6 @@
-from metaservicesynced.serializer import RelationshipSerializer
+from dbsynce.serializer import RelationshipSerializer
 from rest_framework import viewsets, permissions
-from metaservicesynced.models import Relationship
+from dbsynce.models import Relationship
 
 class RelationshipMVS(viewsets.ModelViewSet):
 

apiviews/resource.py

@@ -1,6 +1,6 @@
-from metaservicesynced.serializer import ResourceSerializer
+from dbsynce.serializer import ResourceSerializer
 from rest_framework import viewsets, permissions
-from metaservicesynced.models import Resource
+from dbsynce.models import Resource
 
 class ResourceMVS(viewsets.ModelViewSet):
 

apiviews/service.py

@@ -1,6 +1,6 @@
-from metaservicesynced.serializer import ServiceSerializer
+from dbsynce.serializer import ServiceSerializer
 from rest_framework import viewsets, permissions
-from metaservicesynced.models import Service
+from dbsynce.models import Service
 
 class ServiceMVS(viewsets.ModelViewSet):
 

apiviews/servicetype.py

@@ -1,6 +1,6 @@
-from metaservicesynced.serializer import ServiceTypeSerializer
+from dbsynce.serializer import ServiceTypeSerializer
 from rest_framework import viewsets, permissions
-from metaservicesynced.models import ServiceType
+from dbsynce.models import ServiceType
 
 class ServiceTypeMVS(viewsets.ModelViewSet):
 

apps.py

@@ -1,5 +1,5 @@
 from django.apps import AppConfig
 
-class MetaservicesyncedConfig(AppConfig):
+class DbsynceConfig(AppConfig):
     default_auto_field = "django.db.models.BigAutoField"
-    name = "metaservicesynced"
+    name = "dbsynce"

handlers/jsonAndRequest.py

@@ -257,7 +257,7 @@ def requestGetListUser():
 def requestGetList(auth_token, url):
     headers = {'Authorization': f'Token {auth_token}'}
     response = requests.get(url, headers=headers)
-    #response = requests.get(config.API_URL+"/metaservicesynced/api/orders/", headers=headers)
+    #response = requests.get(config.API_URL+"/dbsynce/api/orders/", headers=headers)
     ordertext=response.json()
     startlist = []
     

handlers/open_servicerequest_booked.py

@@ -158,7 +158,7 @@ tasklist = []
 #надо инициализировать tasklist при запуске из API
 token = jsreq.requestGetToken(botname, PASSWORD, config.API_URL+"/api/v1/auth/token/login/")
 #ВАЖНО! Надо еще фильтровать список по статусу обработки заявки
-tasklist=jsreq.requestGetList(token, config.API_URL+"/metaservicesynced/api/orders/")
+tasklist=jsreq.requestGetList(token, config.API_URL+"/dbsynce/api/orders/")
 
 print (len(tasklist))
 

models/documents.py

@@ -1,6 +1,6 @@
 from django.db import models
 from SharixAdmin.models import SharixUser
-from metaservicesynced.models.company import Company
+from dbsynce.models.company import Company
 from tickets.models import Task
 
 

models/orders.py

@@ -1,9 +1,9 @@
 from django.db import models
 from SharixAdmin.models import SharixUser
-from metaservicesynced.models.client import Client
-from metaservicesynced.models.provider import Provider
-from metaservicesynced.models.service import Service
-from metaservicesynced.models.servicetype import ServiceType
+from dbsynce.models.client import Client
+from dbsynce.models.provider import Provider
+from dbsynce.models.service import Service
+from dbsynce.models.servicetype import ServiceType
 from tickets.models import Task
 
 class Orders(models.Model):

models/provider.py

@@ -1,6 +1,6 @@
 from django.db import models
 from SharixAdmin.models import SharixUser
-from metaservicesynced.models.company import Company
+from dbsynce.models.company import Company
 from tickets.models import Task
 
 class Provider(models.Model):

models/service.py

@@ -1,8 +1,8 @@
 from django.db import models
-from metaservicesynced.models.provider import Provider
-from metaservicesynced.models.servicetype import ServiceType
+from dbsynce.models.provider import Provider
+from dbsynce.models.servicetype import ServiceType
 from tickets.models import Task
-from metaservicesynced.models.resource import Resource
+from dbsynce.models.resource import Resource
 
 class Service(models.Model):
     """

serializer/client.py

@@ -1,5 +1,5 @@
 from rest_framework import serializers
-from metaservicesynced.models import Client
+from dbsynce.models import Client
 
 class ClientSerializer(serializers.ModelSerializer):
     class Meta:

serializer/company.py

@@ -1,5 +1,5 @@
 from rest_framework import serializers
-from metaservicesynced.models import Company
+from dbsynce.models import Company
 
 class CompanySerializer(serializers.ModelSerializer):
     class Meta:

serializer/documents.py

@@ -1,5 +1,5 @@
 from rest_framework import serializers
-from metaservicesynced.models import Documents
+from dbsynce.models import Documents
 
 class DocumentsSerializer(serializers.ModelSerializer):
     class Meta:

serializer/favoritecontacts.py

@@ -1,5 +1,5 @@
 from rest_framework import serializers
-from metaservicesynced.models import Favoritecontacts
+from dbsynce.models import Favoritecontacts
 
 class FavoritecontactsSerializer(serializers.ModelSerializer):
     class Meta:

serializer/frequentaddress.py

@@ -1,5 +1,5 @@
 from rest_framework import serializers
-from metaservicesynced.models import Frequentaddress
+from dbsynce.models import Frequentaddress
 
 class FrequentaddressSerializer(serializers.ModelSerializer):
     class Meta:

serializer/orders.py

@@ -1,6 +1,6 @@
 from rest_framework import serializers
-from metaservicesynced.models import Orders, Client
-from metaservicesynced.ejabber import *
+from dbsynce.models import Orders, Client
+from dbsynce.ejabber import *
 from tickets.models import Task, TaskList
 from core.config import DEBUG, WEBSERVICE_NAME, EJ_HOST, EJ_SERVICE
 import traceback

serializer/permissions.py

@@ -1,5 +1,5 @@
 from rest_framework import serializers
-from metaservicesynced.models import Permissions
+from dbsynce.models import Permissions
 
 class PermissionsSerializer(serializers.ModelSerializer):
     class Meta:

serializer/preferreddrivers.py

@@ -1,5 +1,5 @@
 from rest_framework import serializers
-from metaservicesynced.models import Preferreddrivers
+from dbsynce.models import Preferreddrivers
 
 class PreferreddriversSerializer(serializers.ModelSerializer):
     class Meta:

serializer/provider.py

@@ -1,5 +1,5 @@
 from rest_framework import serializers
-from metaservicesynced.models import Provider
+from dbsynce.models import Provider
 
 class ProviderSerializer(serializers.ModelSerializer):
     class Meta:

serializer/relationship.py

@@ -1,5 +1,5 @@
 from rest_framework import serializers
-from metaservicesynced.models import Relationship
+from dbsynce.models import Relationship
 
 class RelationshipSerializer(serializers.ModelSerializer):
     class Meta:

serializer/resource.py

@@ -1,5 +1,5 @@
 from rest_framework import serializers
-from metaservicesynced.models import Resource
+from dbsynce.models import Resource
 
 class ResourceSerializer(serializers.ModelSerializer):
     class Meta:

serializer/service.py

@@ -1,5 +1,5 @@
 from rest_framework import serializers
-from metaservicesynced.models import Service
+from dbsynce.models import Service
 
 class ServiceSerializer(serializers.ModelSerializer):
     class Meta:

serializer/servicetype.py

@@ -1,5 +1,5 @@
 from rest_framework import serializers
-from metaservicesynced.models import ServiceType
+from dbsynce.models import ServiceType
 
 class ServiceTypeSerializer(serializers.ModelSerializer):
     class Meta:

urls.py

@@ -1,4 +1,4 @@
-from metaservicesynced.apiviews import *
+from dbsynce.apiviews import *
 from rest_framework import routers
 from django.urls import path, include