undid regressions from code merge with diego

core/views.py

@@ -17,7 +17,6 @@ from rest_framework.generics import UpdateAPIView
 from rest_framework.decorators import api_view, permission_classes
 
 from companies.models import Company
-from history.models import HistorySync
 
 from . import models
 from . import serializers as core_serializers
@@ -43,9 +42,13 @@ class CustomUserViewSet(viewsets.ModelViewSet):
     model_name = 'custom_user'
     queryset = models.CustomUser.objects.all()
     permission_classes = [CustomUserPermissions,]
+    read_serializer_class = core_serializers.CustomUserReadSerializer
+    write_serializer_class = core_serializers.CustomUserWriteSerializer
 
     def get_serializer_class(self):
-        if self.action == 'update' and self.request.user.is_staff is False:
+        if self.action=='create':
+            return core_serializers.CustomUserWriteSerializer
+        elif self.action == 'update' and self.request.user.is_staff is False:
             return core_serializers.UpdateUserSerializer
         elif self.request.user.is_staff is True:
             return core_serializers.CustomUserAdminSerializer
@@ -60,8 +63,8 @@ class CustomUserViewSet(viewsets.ModelViewSet):
         """
         Create Instance
         """
-        serializer_class = self.get_serializer_class()
         try:
+            serializer_class = self.get_serializer_class()
             serializer = serializer_class(
                 data=request.data,
             )
@@ -72,7 +75,7 @@ class CustomUserViewSet(viewsets.ModelViewSet):
                 instance.set_password(password)
                 instance.save()
 
-                return Response(serializer_class(
+                return Response(self.read_serializer_class(
                     instance, many=False, context={'request': request}).data,
                                 status=status.HTTP_201_CREATED)
             else:
@@ -120,9 +123,6 @@ def load_coop_managers(request):
         logging.info(f"Reading contents of  {csv_file.name}")
         decoded_file = csv_file.read().decode('utf-8').splitlines()
         csv_reader =  csv.DictReader(decoded_file, delimiter=',')
-        # create historysync instance
-        history = HistorySync.objects.create(sync_date=datetime.datetime.now(), quantity=len(decoded_file))
-
         coop_counter = 0
         user_counter = 0
         for row in csv_reader:
@@ -136,7 +136,6 @@ def load_coop_managers(request):
                     'short_name': row['nombre-corto'].strip(),
                     'shop': bool(row['es-tienda'].strip()),
                     'shop_link': row['url'].strip(),
-                    'history': history,
                 }
                 coop = Company.objects.create(**coop_data)
                 logging.info(f"Created Coop: {coop_data}")