complete account serializer && upgrade song models

portfolio/account/views.py

@@ -1,14 +1,8 @@
 from rest_framework import viewsets
-from rest_framework.views import APIView
-from rest_framework.decorators import action
-from rest_framework import mixins
 from rest_framework.response import Response
-
-from drf_yasg import openapi
 from drf_yasg.utils import swagger_auto_schema
 
 from django.core.paginator import Paginator
-from django.http import JsonResponse
 from django.shortcuts import get_object_or_404
 
 from .models import Account, Guest
@@ -36,11 +30,3 @@ class AccountViewSet(viewsets.ModelViewSet):
 class GuestViewSet(viewsets.ModelViewSet):
     queryset = Guest.objects.all()
     serializer_class = GuestSerializer
-
-
-
-
-# @swagger_auto_schema(request_body = AccountSerializer, responses = {
-    #     200: openapi.Response("OK", schema = AccountSerializer),
-    #     400: openapi.Response("Empty")
-    # })

portfolio/song/models.py

@@ -12,3 +12,34 @@ class Song(models.Model):
     url_code = models.CharField(max_length=255)
     album = models.ForeignKey(Album, on_delete=models.CASCADE)
     user = models.ForeignKey(Account, on_delete=models.CASCADE)
+
+class SongRow(models.Model):
+    rowNumber = models.IntegerField()
+    gruop = models.BooleanField()
+    leader = models.BooleanField()
+    link = models.IntegerField(default=None)
+    text = models.TextField()
+    description = models.TextField()
+    image = models.TextField()
+    song = models.ForeignKey(Song, on_delete=models.CASCADE)
+
+    def toDict(self):
+        if self.link is not None:
+            return {
+                self.rowNumber: {
+                    'group': self.gruop,
+                    'leader': self.leader,
+                    'link': self.link,
+                    'text': self.text,
+                }
+            }
+        else:
+            return {
+                self.rowNumber: {
+                    'group': self.gruop,
+                    'leader': self.leader,
+                    'text': self.text,
+                    'description': self.description,
+                    'image': self.image
+                }
+            }