Clean coding in the backend

Swahilipot-Hub-Developers · Dec 3, 2023 · 2f808c4 · 2f808c4
1 parent 423d6c7
commit 2f808c4
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 18 deletions.
diff --git a/backend/artistsmgmt/__pycache__/serializers.cpython-310.pyc b/backend/artistsmgmt/__pycache__/serializers.cpython-310.pyc
diff --git a/backend/artistsmgmt/__pycache__/views.cpython-310.pyc b/backend/artistsmgmt/__pycache__/views.cpython-310.pyc
diff --git a/backend/artistsmgmt/serializers.py b/backend/artistsmgmt/serializers.py
@@ -42,10 +42,14 @@ def create(self, validated_data):
 
 
 class ArtistSerializer(serializers.ModelSerializer):
+    artist_name = serializers.SerializerMethodField()
     class Meta:
         model = Artist
         fields = '__all__'
         extra_kwargs = {'user': {'read_only': True}}
+
+    def get_artist_name(self, obj):
+        return f"{obj.user.first_name} {obj.user.last_name}"
 
 
 # Portfolio

diff --git a/backend/artistsmgmt/views.py b/backend/artistsmgmt/views.py
@@ -60,27 +60,19 @@ def post(self, request, format=None):
         request.user.auth_token.delete()
         return Response("Successfully signed out", status=status.HTTP_200_OK)
 
-# class ArtistOnlyView(generics.RetrieveAPIView):
-#     permission_classes = [permissions.IsAuthenticated, IsArtist]
-#     serializer_class = UserSerializer
 
-#     def get_object(self):
-#         return self.request.user
+class ArtistOnlyView(APIView):
+    permission_classes = [IsAuthenticated]
 
+    def get(self, request, format=None):
+        # Retrieve the authenticated artist
+        artist = Artist.objects.get(user=request.user)
 
-# class ArtistOnlyView(APIView):
-#     permission_classes = [IsAuthenticated, IsArtist]
-#     serializer_class = UserSerializer
+        # Serialize all fields and their values for the artist
+        serializer = ArtistSerializer(artist)
 
-#     def get(self, request, format=None):
-#         return Response(data={"message": "You are an artist"}, status=status.HTTP_200_OK)
-
-class ArtistOnlyView(generics.RetrieveAPIView):
-    permission_classes = [IsAuthenticated, IsArtist]
-    serializer_class = UserSerializer
-
-    def get_object(self):
-        return self.request.user
+        # Return serialized data
+        return Response(serializer.data, status=status.HTTP_200_OK)
 
 
 class ArtistCreateView(generics.ListCreateAPIView):

diff --git a/frontend/src/pages/signup.js b/frontend/src/pages/signup.js
@@ -209,7 +209,7 @@ const SignUpForm = () => {
 
                         <div className="d-flex align-items-center justify-content-center pb-4">
                           <p className="mb-0 me-2">Already have an account?</p>
-                          <a href="/signup" className="btn btn-outline-danger">
+                          <a href="/login" className="btn btn-outline-danger">
                             Log In
                           </a>
                         </div>