Commit a966fed8 authored by eduardmisa's avatar eduardmisa

models to dict implemented

parent b8d61244
from rest_framework import serializers from rest_framework import serializers
from app.entities.models import AllowedCompany from app.entities.models import AllowedCompany
from django.forms.models import model_to_dict from app.applicationlayer.utils import model_to_dict
class AllowedCompanySerializer(serializers.ModelSerializer): class AllowedCompanySerializer(serializers.ModelSerializer):
......
from app.entities import models from app.entities import models
from rest_framework import serializers from rest_framework import serializers
from django.forms.models import model_to_dict from app.applicationlayer.utils import model_to_dict
class ChangeRequestFormApproversSerializer( class ChangeRequestFormApproversSerializer(
......
from app.entities import models from app.entities import models
from rest_framework import serializers from rest_framework import serializers
from django.forms.models import model_to_dict from app.applicationlayer.utils import model_to_dict
class ChangeRequestFormAttachmentsSerializer( class ChangeRequestFormAttachmentsSerializer(
......
from app.entities import models from app.entities import models
from rest_framework import serializers from rest_framework import serializers
from django.forms.models import model_to_dict from app.applicationlayer.utils import model_to_dict
class ChangeRequestFormDetailsSerializer( class ChangeRequestFormDetailsSerializer(
......
from app.entities import models from app.entities import models
from rest_framework import serializers from rest_framework import serializers
from django.forms.models import model_to_dict from app.applicationlayer.utils import model_to_dict
from django.db.models import Q from django.db.models import Q
from app.applicationlayer.cms.form.approver.serializers import ChangeRequestFormApproversSerializer from app.applicationlayer.cms.form.approver.serializers import ChangeRequestFormApproversSerializer
......
...@@ -30,7 +30,7 @@ from app.applicationlayer.cms.utils_cr import (number_generator, ...@@ -30,7 +30,7 @@ from app.applicationlayer.cms.utils_cr import (number_generator,
entity_log_bulk) entity_log_bulk)
from app.entities import enums from app.entities import enums
from django.forms.models import model_to_dict from app.applicationlayer.utils import model_to_dict
import json import json
from django.shortcuts import get_object_or_404 from django.shortcuts import get_object_or_404
from django.db.models import Min from django.db.models import Min
......
...@@ -2,7 +2,7 @@ from app.entities import models ...@@ -2,7 +2,7 @@ from app.entities import models
from rest_framework import serializers from rest_framework import serializers
from django.db.models import Q from django.db.models import Q
from drf_writable_nested import WritableNestedModelSerializer from drf_writable_nested import WritableNestedModelSerializer
from django.forms.models import model_to_dict from app.applicationlayer.utils import model_to_dict
class ChangeRequestFormApproversSerializer( class ChangeRequestFormApproversSerializer(
......
from app.entities import models from app.entities import models
from rest_framework import serializers from rest_framework import serializers
from django.forms.models import model_to_dict from app.applicationlayer.utils import model_to_dict
class ChangeRequestFormStakeHoldersSerializer( class ChangeRequestFormStakeHoldersSerializer(
......
...@@ -31,7 +31,7 @@ from app.applicationlayer.cms.utils_cr import (number_generator, ...@@ -31,7 +31,7 @@ from app.applicationlayer.cms.utils_cr import (number_generator,
generate_template_id, generate_template_id,
crhistory_create_save) crhistory_create_save)
from app.entities import enums from app.entities import enums
from django.forms.models import model_to_dict from app.applicationlayer.utils import model_to_dict
import json import json
from django.shortcuts import get_object_or_404 from django.shortcuts import get_object_or_404
from django.db.models import Min from django.db.models import Min
......
from rest_framework import serializers from rest_framework import serializers
from app.entities.models import Department from app.entities.models import Department
from django.forms.models import model_to_dict from app.applicationlayer.utils import model_to_dict
class AdminDepartmentSerializer(serializers.ModelSerializer): class AdminDepartmentSerializer(serializers.ModelSerializer):
......
from rest_framework import viewsets, status from rest_framework import viewsets, status
from rest_framework.response import Response from rest_framework.response import Response
from django.forms.models import model_to_dict from app.applicationlayer.utils import model_to_dict
from rest_framework.filters import SearchFilter, OrderingFilter from rest_framework.filters import SearchFilter, OrderingFilter
from django_filters import rest_framework as filters from django_filters import rest_framework as filters
from app.entities.models import Department, AllowedCompany from app.entities.models import Department, AllowedCompany
......
from rest_framework import serializers from rest_framework import serializers
from app.entities.models import Department from app.entities.models import Department
from django.forms.models import model_to_dict from app.applicationlayer.utils import model_to_dict
class AdminDepartmentSerializer(serializers.ModelSerializer): class AdminDepartmentSerializer(serializers.ModelSerializer):
......
from rest_framework import viewsets, status from rest_framework import viewsets, status
from rest_framework.response import Response from rest_framework.response import Response
from django.forms.models import model_to_dict from app.applicationlayer.utils import model_to_dict
from rest_framework.filters import SearchFilter, OrderingFilter from rest_framework.filters import SearchFilter, OrderingFilter
from django_filters import rest_framework as filters from django_filters import rest_framework as filters
from app.entities.models import Department, AllowedCompany from app.entities.models import Department, AllowedCompany
......
from rest_framework import serializers from rest_framework import serializers
from app.entities import models from app.entities import models
from django.forms.models import model_to_dict from app.applicationlayer.utils import model_to_dict
class ChangeRequestTemplateApproversSerializer( class ChangeRequestTemplateApproversSerializer(
......
from rest_framework import serializers from rest_framework import serializers
from app.entities import models from app.entities import models
from django.forms.models import model_to_dict from app.applicationlayer.utils import model_to_dict
class ChangeRequestTemplateAttachmentsSerializer( class ChangeRequestTemplateAttachmentsSerializer(
......
from rest_framework import serializers from rest_framework import serializers
from app.entities import models from app.entities import models
from django.forms.models import model_to_dict from app.applicationlayer.utils import model_to_dict
class ChangeRequestTemplateDetailsSerializer( class ChangeRequestTemplateDetailsSerializer(
......
...@@ -2,7 +2,7 @@ from app.entities import models ...@@ -2,7 +2,7 @@ from app.entities import models
from rest_framework import serializers from rest_framework import serializers
from django.db.models import Q from django.db.models import Q
from django.conf import settings from django.conf import settings
from django.forms.models import model_to_dict from app.applicationlayer.utils import model_to_dict
from drf_writable_nested import WritableNestedModelSerializer from drf_writable_nested import WritableNestedModelSerializer
from app.applicationlayer.cms.utils_cr import (get_account_details, from app.applicationlayer.cms.utils_cr import (get_account_details,
get_dept_details, get_dept_details,
......
...@@ -16,7 +16,7 @@ from app.applicationlayer.utils import (CustomPagination, ...@@ -16,7 +16,7 @@ from app.applicationlayer.utils import (CustomPagination,
from app.applicationlayer.cms.utils_cr import ( from app.applicationlayer.cms.utils_cr import (
entity_log_bulk entity_log_bulk
) )
from django.forms.models import model_to_dict from app.applicationlayer.utils import model_to_dict
from app.entities import enums, models from app.entities import enums, models
from django.db.models import Q from django.db.models import Q
......
from app.entities import models from app.entities import models
from rest_framework import serializers from rest_framework import serializers
from django.db.models import Q from django.db.models import Q
from django.forms.models import model_to_dict from app.applicationlayer.utils import model_to_dict
from drf_writable_nested import WritableNestedModelSerializer from drf_writable_nested import WritableNestedModelSerializer
from app.applicationlayer.cms.utils_cr import (get_account_details, from app.applicationlayer.cms.utils_cr import (get_account_details,
get_dept_details, get_dept_details,
......
from rest_framework import serializers from rest_framework import serializers
from app.entities import models from app.entities import models
from django.forms.models import model_to_dict from app.applicationlayer.utils import model_to_dict
class ChangeRequestTemplateStakeHoldersSerializer( class ChangeRequestTemplateStakeHoldersSerializer(
......
...@@ -18,7 +18,7 @@ from app.applicationlayer.utils import (CustomPagination, ...@@ -18,7 +18,7 @@ from app.applicationlayer.utils import (CustomPagination,
from app.applicationlayer.cms.utils_cr import ( from app.applicationlayer.cms.utils_cr import (
entity_log_bulk entity_log_bulk
) )
from django.forms.models import model_to_dict from app.applicationlayer.utils import model_to_dict
from app.entities import enums, models from app.entities import enums, models
from django.db.models import Q from django.db.models import Q
......
...@@ -10,7 +10,7 @@ from app.applicationlayer.utils import main_threading, notification_create ...@@ -10,7 +10,7 @@ from app.applicationlayer.utils import main_threading, notification_create
from app.helper.email_service import sender from app.helper.email_service import sender
from app.applicationlayer.utils import log_save from app.applicationlayer.utils import log_save
from app.entities import enums from app.entities import enums
from django.forms.models import model_to_dict from app.applicationlayer.utils import model_to_dict
from rest_framework.exceptions import ParseError from rest_framework.exceptions import ParseError
from django.db import IntegrityError from django.db import IntegrityError
from rest_framework.exceptions import APIException from rest_framework.exceptions import APIException
......
...@@ -4,7 +4,7 @@ import ast ...@@ -4,7 +4,7 @@ import ast
from django.contrib.auth.hashers import make_password, check_password from django.contrib.auth.hashers import make_password, check_password
import re import re
from django.contrib.auth import authenticate from django.contrib.auth import authenticate
from django.forms.models import model_to_dict from app.applicationlayer.utils import model_to_dict
class UserSerializer(serializers.ModelSerializer): class UserSerializer(serializers.ModelSerializer):
......
...@@ -10,7 +10,7 @@ from rest_framework.decorators import action ...@@ -10,7 +10,7 @@ from rest_framework.decorators import action
from django.contrib.auth import authenticate from django.contrib.auth import authenticate
from django.contrib.auth.hashers import check_password from django.contrib.auth.hashers import check_password
from rest_framework.response import Response from rest_framework.response import Response
from django.forms.models import model_to_dict from app.applicationlayer.utils import model_to_dict
from app.entities.models import ( from app.entities.models import (
User, EntityLog, PasswordReset, Application, UserImage User, EntityLog, PasswordReset, Application, UserImage
) )
......
...@@ -3,7 +3,7 @@ from django.db import transaction ...@@ -3,7 +3,7 @@ from django.db import transaction
from app.helper import decorators from app.helper import decorators
from rest_framework import viewsets, status from rest_framework import viewsets, status
from rest_framework.response import Response from rest_framework.response import Response
from django.forms.models import model_to_dict from app.applicationlayer.utils import model_to_dict
from rest_framework.filters import SearchFilter, OrderingFilter from rest_framework.filters import SearchFilter, OrderingFilter
from django_filters import rest_framework as filters from django_filters import rest_framework as filters
from app.entities.models import Application, EntityLog from app.entities.models import Application, EntityLog
......
...@@ -2,7 +2,7 @@ from app.entities import enums ...@@ -2,7 +2,7 @@ from app.entities import enums
from django.db import transaction from django.db import transaction
from rest_framework import viewsets, status from rest_framework import viewsets, status
from rest_framework.response import Response from rest_framework.response import Response
from django.forms.models import model_to_dict from app.applicationlayer.utils import model_to_dict
from rest_framework.filters import SearchFilter, OrderingFilter from rest_framework.filters import SearchFilter, OrderingFilter
from django_filters import rest_framework as filters from django_filters import rest_framework as filters
from app.entities.models import Company, EntityLog from app.entities.models import Company, EntityLog
......
...@@ -2,7 +2,7 @@ from app.entities import enums ...@@ -2,7 +2,7 @@ from app.entities import enums
from django.db import transaction from django.db import transaction
from rest_framework import viewsets, status from rest_framework import viewsets, status
from rest_framework.response import Response from rest_framework.response import Response
from django.forms.models import model_to_dict from app.applicationlayer.utils import model_to_dict
from rest_framework.filters import SearchFilter, OrderingFilter from rest_framework.filters import SearchFilter, OrderingFilter
from django_filters import rest_framework as filters from django_filters import rest_framework as filters
from app.entities.models import Department, EntityLog from app.entities.models import Department, EntityLog
......
...@@ -2,7 +2,7 @@ from app.entities import enums ...@@ -2,7 +2,7 @@ from app.entities import enums
from django.db import transaction from django.db import transaction
from rest_framework import viewsets, status from rest_framework import viewsets, status
from rest_framework.response import Response from rest_framework.response import Response
from django.forms.models import model_to_dict from app.applicationlayer.utils import model_to_dict
from rest_framework.filters import SearchFilter, OrderingFilter from rest_framework.filters import SearchFilter, OrderingFilter
from django_filters import rest_framework as filters from django_filters import rest_framework as filters
from app.entities.models import Module, EntityLog from app.entities.models import Module, EntityLog
......
...@@ -3,7 +3,7 @@ import json ...@@ -3,7 +3,7 @@ import json
from app.entities import enums from app.entities import enums
# from app.businesslayer import log_save # from app.businesslayer import log_save
from django.forms.models import model_to_dict from app.applicationlayer.utils import model_to_dict
from django.shortcuts import render from django.shortcuts import render
from rest_framework.response import Response from rest_framework.response import Response
......
from rest_framework import serializers from rest_framework import serializers
from app.entities.models import User from app.entities.models import User
from django.forms.models import model_to_dict from app.applicationlayer.utils import model_to_dict
class AdminAccountSerializer(serializers.ModelSerializer): class AdminAccountSerializer(serializers.ModelSerializer):
......
from rest_framework import viewsets, status from rest_framework import viewsets, status
from rest_framework.response import Response from rest_framework.response import Response
from django.forms.models import model_to_dict from app.applicationlayer.utils import model_to_dict
from rest_framework.filters import SearchFilter, OrderingFilter from rest_framework.filters import SearchFilter, OrderingFilter
from django_filters import rest_framework as filters from django_filters import rest_framework as filters
from app.entities.models import User from app.entities.models import User
......
from rest_framework import serializers from rest_framework import serializers
from app.entities.models import Department from app.entities.models import Department
from django.forms.models import model_to_dict from app.applicationlayer.utils import model_to_dict
class AdminDepartmentSerializer(serializers.ModelSerializer): class AdminDepartmentSerializer(serializers.ModelSerializer):
......
from rest_framework import viewsets, status from rest_framework import viewsets, status
from rest_framework.response import Response from rest_framework.response import Response
from django.forms.models import model_to_dict from app.applicationlayer.utils import model_to_dict
from rest_framework.filters import SearchFilter, OrderingFilter from rest_framework.filters import SearchFilter, OrderingFilter
from django_filters import rest_framework as filters from django_filters import rest_framework as filters
from app.entities.models import Department from app.entities.models import Department
......
...@@ -4,14 +4,41 @@ from rest_framework.response import Response ...@@ -4,14 +4,41 @@ from rest_framework.response import Response
from functools import wraps from functools import wraps
from app.entities import enums from app.entities import enums
from app.entities.models import EntityLog, Notification from app.entities.models import EntityLog, Notification
from django.forms.models import model_to_dict
from django.conf import settings from django.conf import settings
from websocket import create_connection from websocket import create_connection
import json import json
from rest_framework import status from rest_framework import status
from rest_framework import serializers
import copy
import json
REALTIMESERVER_IP = settings.REALTIMESERVER_IP REALTIMESERVER_IP = settings.REALTIMESERVER_IP
def from app.applicationlayer.utils import model_to_dict(instance):
try:
mySerializer = copy.deepcopy(DynamicSerializer)
mySerializer.Meta.model = instance.__class__
dataPre = mySerializer(instance).data
strData = json.dumps(dataPre)
return strData
except expression as identifier:
return 'Serialization Error'
class DynamicSerializer(serializers.ModelSerializer):
class Meta:
model = None
fields = '__all__'
class CustomPagination(PageNumberPagination): class CustomPagination(PageNumberPagination):
page_size = 10 page_size = 10
max_page_size = 50 max_page_size = 50
...@@ -40,7 +67,7 @@ class CustomPagination(PageNumberPagination): ...@@ -40,7 +67,7 @@ class CustomPagination(PageNumberPagination):
# req_method = enums.LogEnum.DELETED.value # req_method = enums.LogEnum.DELETED.value
# elif req_method.upper == 'PUT': # elif req_method.upper == 'PUT':
# req_method = enums.LogEnum.UPDATE.value # req_method = enums.LogEnum.UPDATE.value
# from_instance = model_to_dict(self.get_object()) # from_instance = from app.applicationlayer.utils import model_to_dict(self.get_object())
# print("self.serializer.data['id']") # print("self.serializer.data['id']")
# print(self.serializer.data['id']) # print(self.serializer.data['id'])
# EntityLog.objects.create( # EntityLog.objects.create(
...@@ -57,7 +84,7 @@ def log_save(action, entity, row_id, fromValue, toValue): ...@@ -57,7 +84,7 @@ def log_save(action, entity, row_id, fromValue, toValue):
EntityLog.objects.create( EntityLog.objects.create(
action=action, action=action,
entity=entity, entity=entity,
row_id=row_id, row_id=int(row_id),
fromValue=fromValue, fromValue=fromValue,
toValue=toValue toValue=toValue
) )
......
...@@ -16,7 +16,7 @@ from app.applicationlayer.cms.utils_cr import ( ...@@ -16,7 +16,7 @@ from app.applicationlayer.cms.utils_cr import (
number_generator, crhistory_save, entity_log_bulk, number_generator, crhistory_save, entity_log_bulk,
crhistory_log_bulk_delete crhistory_log_bulk_delete
) )
from django.forms.models import model_to_dict from app.applicationlayer.utils import model_to_dict
from app.entities import enums, models from app.entities import enums, models
from app.applicationlayer.utils import log_save, CustomPagination from app.applicationlayer.utils import log_save, CustomPagination
from app.applicationlayer.cms.template import serializers from app.applicationlayer.cms.template import serializers
......
...@@ -15,7 +15,7 @@ from django.db.models import Q ...@@ -15,7 +15,7 @@ from django.db.models import Q
from app.applicationlayer.cms.utils_cr import ( from app.applicationlayer.cms.utils_cr import (
number_generator, crhistory_save, entity_log_bulk number_generator, crhistory_save, entity_log_bulk
) )
from django.forms.models import model_to_dict from app.applicationlayer.utils import model_to_dict
from app.entities import enums, models from app.entities import enums, models
from app.applicationlayer.utils import log_save, CustomPagination from app.applicationlayer.utils import log_save, CustomPagination
from app.applicationlayer.cms.template import serializers from app.applicationlayer.cms.template import serializers
......
from rest_framework import viewsets, status from rest_framework import viewsets, status
from rest_framework.response import Response from rest_framework.response import Response
from django.forms.models import model_to_dict from app.applicationlayer.utils import model_to_dict
from rest_framework.filters import SearchFilter, OrderingFilter from rest_framework.filters import SearchFilter, OrderingFilter
from django_filters import rest_framework as filters from django_filters import rest_framework as filters
from app.entities.models import Department from app.entities.models import Department
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment