FEAT: API

backend/backend/admin.py

@@ -1,6 +1,6 @@
 from django.contrib import admin
 
-from .models import ToDoList, ToDoItem
+from .models import ToDoList
 
 
 class ToDoListAdmin(admin.ModelAdmin):
@@ -9,11 +9,4 @@ class ToDoListAdmin(admin.ModelAdmin):
     list_editable = ["title"]
 
 
-class ToDoItemAdmin(admin.ModelAdmin):
-    model = ToDoItem
-    list_display = ["parent", "finished", "text", "created_at"]
-    list_editable = ["finished", "text"]
-
-
 admin.site.register(ToDoList, ToDoListAdmin)
-admin.site.register(ToDoItem, ToDoItemAdmin)

backend/backend/api.py

@@ -1,50 +1,53 @@
 from rest_framework import viewsets, serializers, permissions
 from rest_framework import routers
-from django_filters.rest_framework import DjangoFilterBackend
+from rest_framework.response import Response
+from rest_framework import status
 
-from .models import ToDoList, ToDoItem
+from .models import ToDoList
-
-
-class ToDoItemSerializer(serializers.HyperlinkedModelSerializer):
-    parent = serializers.PrimaryKeyRelatedField(many=False, read_only=True)
-
-    class Meta:
-        model = ToDoItem
-        fields = ["id", "text", "finished", "created_at", "parent"]
-
-
-class ToDoItemViewSet(viewsets.ModelViewSet):
-    serializer_class = ToDoItemSerializer
-    permission_classes = [permissions.IsAuthenticated]
-    filter_backends = [DjangoFilterBackend]
-    filterset_fields = ["parent", "finished"]
-
-    def get_queryset(self):
-        user = self.request.user
-        if not user.is_authenticated:
-            # ветка только для генерации схемы
-            return ToDoItem.objects.all()
-        return ToDoItem.objects.filter(parent__user=user)
 
 
 class ToDoListSerializer(serializers.HyperlinkedModelSerializer):
     class Meta:
         model = ToDoList
-        fields = ["id", "title", "created_at"]
+        fields = ["title", "created_at"]
 
+class WriteToDoListSerializer(serializers.Serializer):
+    class Meta:
+        model = ToDoList
+        fields = ["title", "created_at", "user"]
+    
+    def create(self, validated_data):
+        return ToDoList.objects.create(**validated_data)
+
+    def update(self, instance, validated_data):
+        instance.title = validated_data.get('title', instance.title)
+        instance.user = validated_data.get('user', instance.user)
+        instance.save()
+        return instance
 
 class ToDoListViewSet(viewsets.ModelViewSet):
     serializer_class = ToDoListSerializer
     permission_classes = [permissions.IsAuthenticated]
-
     def get_queryset(self):
+        queryset = ToDoList.objects.all()
+        print(type(queryset), queryset.__dict__)
         user = self.request.user
-        if not user.is_authenticated:
+        print(type(user), user.__dict__)
-            # ветка только для генерации схемы
+        return queryset.filter(user=user)
-            return ToDoList.objects.all()
+    
-        return ToDoList.objects.filter(user=user)
+    def create(self, request):
+        data = {
+            'user': request.user,
+            'title': request.data['title'],
+        }
+        serializer = WriteToDoListSerializer(data=data)
+        print(serializer.__dict__)
+        if serializer.is_valid():
+            serializer.save()
+            return Response(serializer.data, status=status.HTTP_201_CREATED)
+        else:
+            return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
 
 router = routers.DefaultRouter()
-router.register(r"lists", ToDoListViewSet, basename="ToDoLists")
+router.register(r"lists", ToDoListViewSet, basename="ToDoList")
-router.register(r"todo_items", ToDoItemViewSet, basename="ToDoItems")

backend/backend/migrations/0002_todoitem_finished.py

@@ -1,18 +0,0 @@
-# Generated by Django 3.2 on 2021-04-17 11:15
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("backend", "0001_initial"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="todoitem",
-            name="finished",
-            field=models.BooleanField(default=False),
-        ),
-    ]

backend/backend/migrations/0003_auto_20210417_1157.py

@@ -1,28 +0,0 @@
-# Generated by Django 3.2 on 2021-04-17 11:57
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("backend", "0002_todoitem_finished"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="todoitem",
-            name="created_at",
-            field=models.DateTimeField(auto_now_add=True, db_index=True),
-        ),
-        migrations.AlterField(
-            model_name="todoitem",
-            name="finished",
-            field=models.BooleanField(db_index=True, default=False),
-        ),
-        migrations.AlterField(
-            model_name="todolist",
-            name="created_at",
-            field=models.DateTimeField(auto_now_add=True, db_index=True),
-        ),
-    ]

backend/backend/models.py

@@ -5,11 +5,10 @@ from django.contrib.auth.models import User
 class ToDoList(models.Model):
     user = models.ForeignKey(User, on_delete=models.CASCADE, null=False, default=None)
     title = models.CharField(max_length=250)
-    created_at = models.DateTimeField(auto_now_add=True, db_index=True)
+    created_at = models.DateTimeField(auto_now_add=True)
 
 
 class ToDoItem(models.Model):
     parent = models.ForeignKey(ToDoList, on_delete=models.CASCADE, null=False, default=None)
     text = models.TextField()
-    finished = models.BooleanField(default=False, null=False, db_index=True)
+    created_at = models.DateTimeField(auto_now_add=True)
-    created_at = models.DateTimeField(auto_now_add=True, db_index=True)

backend/backend/settings.py

@@ -27,8 +27,8 @@ SECRET_KEY = "django-insecure-toz+*lt(ejm!l*)92w2ciqoh^1kz#a(abbpcn54-dbw(nxoy&7
 DEBUG = True
 
 ALLOWED_HOSTS = []
-if DEBUG:
+if DEBUG: 
-    ALLOWED_HOSTS = ["0.0.0.0", "localhost", "127.0.0.1"]
+    ALLOWED_HOSTS = ["0.0.0.0"]   
 
 # Application definition
 
@@ -45,7 +45,13 @@ INSTALLED_APPS = [
 ]
 
 SWAGGER_SETTINGS = {
-    "SECURITY_DEFINITIONS": {"Bearer": {"type": "apiKey", "name": "Authorization", "in": "header"}}
+   'SECURITY_DEFINITIONS': {
+        'Bearer': {
+            'type': 'apiKey',
+            'name': 'Authorization',
+            'in': 'header'
+        }
+    }
 }
 
 MIDDLEWARE = [
@@ -124,12 +130,7 @@ SIMPLE_JWT = {
 }
 
 REST_FRAMEWORK = {
-    "DEFAULT_AUTHENTICATION_CLASSES": (
+    "DEFAULT_AUTHENTICATION_CLASSES": ("rest_framework_simplejwt.authentication.JWTAuthentication",)
-        "rest_framework_simplejwt.authentication.JWTAuthentication",
-    ),
-    "DEFAULT_FILTER_BACKENDS": ["django_filters.rest_framework.DjangoFilterBackend"],
-    "DEFAULT_PAGINATION_CLASS": "rest_framework.pagination.LimitOffsetPagination",
-    "PAGE_SIZE": 100,
 }
 
 

backend/requirements.txt

@@ -1,5 +1,4 @@
 djangorestframework==3.12.4
-django-filter==2.4.0
 markdown==3.3.4
 appdirs==1.4.4
 asgiref==3.3.4