update

rog/serializers.py

@@ -1,12 +1,15 @@
 from rest_framework import serializers
 from rest_framework_gis.serializers import GeoFeatureModelSerializer
 from sqlalchemy.sql.functions import mode
-from .models import Location, Location_line, Location_polygon, JpnAdminMainPerf, JpnAdminPerf, JpnSubPerf
+from .models import Location, Location_line, Location_polygon, JpnAdminMainPerf, JpnAdminPerf, JpnSubPerf, Useractions
 from drf_extra_fields.fields import Base64ImageField
 
-from django.contrib.auth.models import User
+#from django.contrib.auth.models import User
+from .models import CustomUser
 from django.contrib.auth import authenticate
 
+from .models import TestModel
+
 
 class LocationCatSerializer(serializers.ModelSerializer):
     class Meta:
@@ -54,28 +57,56 @@ class JPN_perfSerializer(serializers.ModelSerializer):
 
 class CreateUserSerializer(serializers.ModelSerializer):
     class Meta:
-        model = User
-        fields = ('id', 'username', 'password')
+        model = CustomUser
+        fields = ('email', 'password')
         extra_kwargs = {'password': {'write_only': True}}
 
     def create(self, validated_data):
-        user = User.objects.create_user(validated_data['username'],
-                                        None,
-                                        validated_data['password'])
+        user = CustomUser.objects.create_user(validated_data['email'],validated_data['password'])
         return user
 
 class UserSerializer(serializers.ModelSerializer):
     class Meta:
-        model = User
-        fields = ('id', 'username')
+        model = CustomUser
+        fields = ('id','email',)
 
 
 class LoginUserSerializer(serializers.Serializer):
-    username = serializers.CharField()
+    email = serializers.CharField()
     password = serializers.CharField()
 
     def validate(self, data):
         user = authenticate(**data)
         if user and user.is_active:
             return user
-        raise serializers.ValidationError("Invalid Details.")
+        raise serializers.ValidationError("Invalid Details.")
+
+
+class UseractionsSerializer(serializers.ModelSerializer):
+
+    #user = UserSerializer(read_only=True)
+    #location = LocationSerializer(read_only=True)
+    #location = serializers.RelatedField(source='Location', read_only=True)
+    #location = serializers.PrimaryKeyRelatedField(many=True, read_only=True)
+
+    class Meta:
+        model = Useractions
+        fields = ('id', 'user', 'location', 'wanttogo', 'like', 'checkin', 'order',)
+
+class UserDestinationSerializer(serializers.ModelSerializer):
+
+    #user = UserSerializer(read_only=True)
+    location = LocationSerializer(read_only=True)
+    #location = serializers.RelatedField(source='Location', read_only=True)
+    #location = serializers.PrimaryKeyRelatedField(many=True, read_only=True)
+
+    class Meta:
+        model = Useractions
+        fields = ('id', 'user', 'location', 'wanttogo', 'like', 'checkin')
+
+    
+class TestSerialiser(serializers.ModelSerializer):
+
+    class Meta:
+        model = TestModel
+        fields = ('id', 'testbane', 'wanttogo', 'like', 'checkin')