Исправлены недочеты в оформлении

Для запуска docker-compose exec web python manage.py test

.gitignore

@@ -65,6 +65,5 @@ target/
 *.jsl
 *.db
 tmp*
-test_*
 .env*
 venv*

README.md

@@ -53,3 +53,8 @@ docker-compose up
 ```bash
 docker-compose exec web python manage.py makemigrations backend
 ```
+
+Для запуска тестов использовать
+```bash
+docker-compose run -e DJANGO_SETTINGS_MODULE=backend.settings web pytest --cov=backend
+```

backend/.coveragerc

@@ -0,0 +1,3 @@
+[run]
+omit =
+  backend/migrations/*

backend/backend/admin.py

@@ -1,6 +1,6 @@
 from django.contrib import admin
 
-from .models import ToDoList
+from .models import ToDoList, ToDoItem
 
 
 class ToDoListAdmin(admin.ModelAdmin):
@@ -9,4 +9,11 @@ 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,20 +1,62 @@
 from rest_framework import viewsets, serializers, permissions
 from rest_framework import routers
+from django_filters.rest_framework import DjangoFilterBackend
 
-from .models import ToDoList
+from .models import ToDoList, ToDoItem
+
+
+class ToDoListField(serializers.PrimaryKeyRelatedField):
+    def get_queryset(self):
+        user = self.context["request"].user
+        return ToDoList.objects.filter(user=user)
+
+
+class ToDoItemSerializer(serializers.HyperlinkedModelSerializer):
+    parent = ToDoListField(many=False, read_only=False, help_text="ID родительского списка")
+
+    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 = ["title", "created_at"]
+        fields = ["id", "title", "created_at"]
+
+    def create(self, validated_data):
+        todo_list = ToDoList.objects.create(
+            user=self.context["request"].user, title=validated_data["title"]
+        )
+        return todo_list
 
 
 class ToDoListViewSet(viewsets.ModelViewSet):
-    queryset = ToDoList.objects.all()
     serializer_class = ToDoListSerializer
     permission_classes = [permissions.IsAuthenticated]
 
+    def get_queryset(self):
+        user = self.request.user
+        if not user.is_authenticated:
+            # ветка только для генерации схемы
+            return ToDoList.objects.all()
+        return ToDoList.objects.filter(user=user)
+
 
 router = routers.DefaultRouter()
-router.register(r"lists", ToDoListViewSet)
+router.register(r"lists", ToDoListViewSet, basename="ToDoLists")
+router.register(r"todo_items", ToDoItemViewSet, basename="ToDoItems")

backend/backend/migrations/0002_todoitem_finished.py

@@ -0,0 +1,18 @@
+# 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

@@ -0,0 +1,28 @@
+# 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,10 +5,11 @@ 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)
+    created_at = models.DateTimeField(auto_now_add=True, db_index=True)
 
 
 class ToDoItem(models.Model):
     parent = models.ForeignKey(ToDoList, on_delete=models.CASCADE, null=False, default=None)
     text = models.TextField()
-    created_at = models.DateTimeField(auto_now_add=True)
+    finished = models.BooleanField(default=False, null=False, db_index=True)
+    created_at = models.DateTimeField(auto_now_add=True, db_index=True)

backend/backend/settings.py

@@ -28,7 +28,7 @@ DEBUG = True
 
 ALLOWED_HOSTS = []
 if DEBUG:
-    ALLOWED_HOSTS = ["0.0.0.0"]   
+    ALLOWED_HOSTS = ["0.0.0.0", "localhost", "127.0.0.1", "ALLOWED_HOSTS", "testserver"]
 
 # Application definition
 
@@ -45,13 +45,7 @@ INSTALLED_APPS = [
 ]
 
 SWAGGER_SETTINGS = {
-   'SECURITY_DEFINITIONS': {
-        'Bearer': {
-            'type': 'apiKey',
-            'name': 'Authorization',
-            'in': 'header'
-        }
-    }
+    "SECURITY_DEFINITIONS": {"Bearer": {"type": "apiKey", "name": "Authorization", "in": "header"}}
 }
 
 MIDDLEWARE = [
@@ -130,7 +124,12 @@ SIMPLE_JWT = {
 }
 
 REST_FRAMEWORK = {
-    "DEFAULT_AUTHENTICATION_CLASSES": ("rest_framework_simplejwt.authentication.JWTAuthentication",)
+    "DEFAULT_AUTHENTICATION_CLASSES": (
+        "rest_framework_simplejwt.authentication.JWTAuthentication",
+    ),
+    "DEFAULT_FILTER_BACKENDS": ["django_filters.rest_framework.DjangoFilterBackend"],
+    "DEFAULT_PAGINATION_CLASS": "rest_framework.pagination.LimitOffsetPagination",
+    "PAGE_SIZE": 100,
 }
 
 

backend/backend/urls.py

@@ -13,13 +13,13 @@ from drf_yasg import openapi
 from .api import router
 
 schema_view = get_schema_view(
-   openapi.Info(
-      title="ToDo List",
-      default_version='v1',
-      description="Swagger Interface for ToDo List",
-   ),
-   public=True,
-   permission_classes=(permissions.AllowAny,),
+    openapi.Info(
+        title="ToDo List",
+        default_version="v1",
+        description="Swagger Interface for ToDo List",
+    ),
+    public=True,
+    permission_classes=(permissions.AllowAny,),
 )
 
 urlpatterns = [
@@ -28,5 +28,5 @@ urlpatterns = [
     path("api/token/refresh/", TokenRefreshView.as_view(), name="token_refresh"),
     path("api/", include(router.urls)),
     path("api-auth/", include("rest_framework.urls", namespace="rest_framework")),
-    path('swagger/', schema_view.with_ui('swagger', cache_timeout=0), name='schema-swagger-ui'),
+    path("swagger/", schema_view.with_ui("swagger", cache_timeout=0), name="schema-swagger-ui"),
 ]

backend/requirements.txt

@@ -1,4 +1,7 @@
+pytest==6.2.3
+pytest-cov==2.11.1
 djangorestframework==3.12.4
+django-filter==2.4.0
 markdown==3.3.4
 appdirs==1.4.4
 asgiref==3.3.4

backend/tests/__init__.py

@@ -0,0 +1,3 @@
+from django.core.wsgi import get_wsgi_application
+
+application = get_wsgi_application()

backend/tests/test_item.py

@@ -0,0 +1,154 @@
+from django.urls import reverse
+from rest_framework import status
+from rest_framework.test import APITestCase
+from django.contrib.auth.models import User
+from .test_todo import create_todo
+
+
+class ItemTest(APITestCase):
+    """Tests API for items."""
+
+    def prepare(self):
+        user = User.objects.create_user("test_user4", "test@test.com", "test_password")
+        self.client.force_authenticate(user=user)
+        to_do_id_1 = create_todo(self.client, "ToDoList1").data["id"]
+        to_do_id_2 = create_todo(self.client, "ToDoList2").data["id"]
+        return to_do_id_1, to_do_id_2
+
+    def get(self, expected_titles, todo_id=None, finished=None):
+        url = reverse("ToDoItems-list")
+        data = {}
+        if finished is not None:
+            data["finished"] = finished
+        if todo_id is not None:
+            data["parent"] = todo_id
+
+        response = self.client.get(url, data, format="json")
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        real_titles = [(d["text"], d["parent"]) for d in response.data["results"]]
+        self.assertEqual(real_titles, expected_titles)
+
+        if finished is not None:
+            item_status = [data["finished"] for data in response.data["results"]]
+            self.assertEqual(finished, all(item_status))
+
+    def post(self, item_text, todo_id, finished=None):
+        url = reverse("ToDoItems-list")
+        if finished is not None:
+            data = {"text": item_text, "parent": todo_id, "finished": finished}
+        else:
+            data = {"text": item_text, "parent": todo_id}
+        response = self.client.post(url, data, format="json")
+
+        self.assertEqual(response.status_code, status.HTTP_201_CREATED)
+        check_finished = False if (finished is None) else finished
+        self.assertEqual(response.data["text"], item_text)
+        self.assertEqual(response.data["parent"], todo_id)
+        self.assertEqual(response.data["finished"], check_finished)
+
+        return response.data["id"], response.data["finished"]
+
+    def get_by_id(self, id, text, finished, parent):
+        url_with_id = reverse("ToDoItems-detail", args=(id,))
+        response = self.client.get(url_with_id, {id: id}, format="json")
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertEqual(response.data["text"], text)
+        self.assertEqual(response.data["finished"], finished)
+        self.assertEqual(response.data["parent"], parent)
+
+    def put(self, id, text, parent, finished=None):
+        url_with_id = reverse("ToDoItems-detail", args=(id,))
+        data = {"text": text, "parent": parent}
+        if finished is not None:
+            data["finished"] = finished
+        response = self.client.put(url_with_id, data, format="json")
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertEqual(response.data["text"], text)
+        self.assertEqual(response.data["parent"], parent)
+        if finished is not None:
+            self.assertEqual(response.data["finished"], finished)
+
+    def patch(self, id, text=None, finished=None, parent=None):
+        url_with_id = reverse("ToDoItems-detail", args=(id,))
+        data = {}
+        if text is not None:
+            data["text"] = text
+        if finished is not None:
+            data["finished"] = finished
+        if parent is not None:
+            data["parent"] = parent
+        response = self.client.patch(url_with_id, data, format="json")
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        if text is not None:
+            self.assertEqual(response.data["text"], text)
+        if finished is not None:
+            self.assertEqual(response.data["finished"], finished)
+        if parent is not None:
+            self.assertEqual(response.data["parent"], parent)
+
+    def delete(self, id, title, finished, to_do_id):
+        self.get_by_id(id, title, finished, to_do_id)
+        url_with_id = reverse("ToDoItems-detail", args=(id,))
+        response = self.client.delete(url_with_id, {}, format="json")
+        self.assertEqual(response.status_code, status.HTTP_204_NO_CONTENT)
+
+    def test_create_delete(self):
+        """
+        /todo_items/: get, post (create)
+        /todo_items/{id}/: get (read), delete
+        """
+        to_do_id_1, to_do_id_2 = self.prepare()
+        self.get([], to_do_id_1)
+        item_text_1, item_text_2, item_text_3, item_text_4 = "Item1", "Item2", "Item3", "Item4"
+        item_id_1, item_finished_1 = self.post(item_text_1, to_do_id_1)
+        self.get([(item_text_1, to_do_id_1)], to_do_id_1)
+        item_id_2, item_finished_2 = self.post(item_text_2, to_do_id_1, finished=False)
+        self.get([(item_text_1, to_do_id_1), (item_text_2, to_do_id_1)], to_do_id_1)
+        item_id_3, item_finished_3 = self.post(item_text_3, to_do_id_1, finished=True)
+        self.get(
+            [(item_text_1, to_do_id_1), (item_text_2, to_do_id_1), (item_text_3, to_do_id_1)],
+            to_do_id_1,
+        )
+        item_id_4, item_finished_4 = self.post(item_text_4, to_do_id_2, finished=False)
+        self.get(
+            [
+                (item_text_1, to_do_id_1),
+                (item_text_2, to_do_id_1),
+                (item_text_3, to_do_id_1),
+                (item_text_4, to_do_id_2),
+            ]
+        )
+
+        self.get(
+            [(item_text_1, to_do_id_1), (item_text_2, to_do_id_1), (item_text_3, to_do_id_1)],
+            to_do_id_1,
+        )
+        self.get([(item_text_1, to_do_id_1), (item_text_2, to_do_id_1)], to_do_id_1, finished=False)
+        self.get([(item_text_3, to_do_id_1)], to_do_id_1, finished=True)
+
+        self.get_by_id(item_id_1, item_text_1, item_finished_1, to_do_id_1)
+        self.get_by_id(item_id_2, item_text_2, item_finished_2, to_do_id_1)
+        self.get_by_id(item_id_3, item_text_3, item_finished_3, to_do_id_1)
+
+        self.delete(item_id_3, item_text_3, item_finished_3, to_do_id_1)
+        self.get([(item_text_1, to_do_id_1), (item_text_2, to_do_id_1)], to_do_id_1)
+
+    def test_update(self):
+        """
+        /todo_items/{id}/: put (update), patch (partial_update)
+        """
+
+        to_do_id_1, to_do_id_2 = self.prepare()
+
+        item_text_1 = "Item1"
+        item_id_1, item_finished_1 = self.post(item_text_1, to_do_id_1)
+
+        item_text_1_2 = "Item5"
+        self.put(item_id_1, item_text_1_2, to_do_id_2)
+        self.put(item_id_1, item_text_1_2, to_do_id_2, finished=False)
+        self.put(item_id_1, item_text_1_2, to_do_id_2, finished=True)
+
+        item_text_1_3 = "Item6"
+        self.patch(item_id_1, parent=to_do_id_1)
+        self.patch(item_id_1, finished=True)
+        self.patch(item_id_1, text=item_text_1_3)

backend/tests/test_todo.py

@@ -0,0 +1,85 @@
+from django.urls import reverse
+from rest_framework import status
+from rest_framework.test import APITestCase
+from django.contrib.auth.models import User
+
+
+def create_todo(client, title):
+    url = reverse("ToDoLists-list")
+    response = client.post(url, {"title": title}, format="json")
+    return response
+
+
+class ToDoTest(APITestCase):
+    """Tests API for todo."""
+
+    def get(self, expected_titles):
+        url = reverse("ToDoLists-list")
+        response = self.client.get(url, {}, format="json")
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        real_titles = [data["title"] for data in response.data["results"]]
+        self.assertEqual(real_titles, expected_titles)
+
+    def post(self, to_do_title):
+        response = create_todo(self.client, to_do_title)
+        self.assertEqual(response.status_code, status.HTTP_201_CREATED)
+        self.assertEqual(response.data["title"], to_do_title)
+        return response.data["id"]
+
+    def get_by_id(self, id, expected_title):
+        url_with_id = reverse("ToDoLists-detail", args=(id,))
+        response = self.client.get(url_with_id, {id: id}, format="json")
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertEqual(response.data["title"], expected_title)
+
+    def put(self, id, new_title):
+        url_with_id = reverse("ToDoLists-detail", args=(id,))
+        response = self.client.put(url_with_id, {"title": new_title}, format="json")
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertEqual(response.data["title"], new_title)
+
+    def patch(self, id, new_title):
+        url_with_id = reverse("ToDoLists-detail", args=(id,))
+        response = self.client.patch(url_with_id, {"title": new_title}, format="json")
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertEqual(response.data["title"], new_title)
+
+    def delete(self, id, title):
+        self.get_by_id(id, title)
+        url_with_id = reverse("ToDoLists-detail", args=(id,))
+        response = self.client.delete(url_with_id, {}, format="json")
+        self.assertEqual(response.status_code, status.HTTP_204_NO_CONTENT)
+
+    def prepare(self):
+        user = User.objects.create_user("test_user", "test@test.com", "test_password")
+        self.client.force_authenticate(user=user)
+
+    def test_create_delete(self):
+        """
+        lists/{id}/: put (update), patch (partial_update)
+        """
+        self.prepare()
+        to_do_title_1 = "ToDoList1"
+        to_do_id1 = self.post(to_do_title_1)
+        self.put(to_do_id1, "ToDoList11")
+        self.patch(to_do_id1, "ToDoList12")
+
+    def test_todo(self):
+        """
+        lists/: get, post
+        lists/{id}/: get, delete
+        """
+
+        self.prepare()
+        self.get([])
+        to_do_title_1, to_do_title_2 = "ToDoList1", "ToDoList2"
+        to_do_id1 = self.post(to_do_title_1)
+        self.get([to_do_title_1])
+        to_do_id2 = self.post(to_do_title_2)
+        self.get([to_do_title_1, to_do_title_2])
+
+        self.get_by_id(to_do_id1, to_do_title_1)
+        self.get_by_id(to_do_id2, to_do_title_2)
+
+        self.delete(to_do_id2, to_do_title_2)
+        self.get([to_do_title_1])

frontend/api.py

@@ -1,218 +0,0 @@
-from types import SimpleNamespace
-import urllib
-import requests
-
-DEFAULT_URL = "http://127.0.0.1:8000"
-
-API_TODO_ITEMS_LIST = "api/todo_items/"
-API_TODO_ITEMS_CREATE = "api/todo_items/"
-API_TODO_ITEMS_READ = "api/todo_items/{0}/"
-API_TODO_ITEMS_UPDATE = "api/todo_items/{0}/"
-API_TODO_ITEMS_PARTIAL_UPDATE = "api/todo_items/{0}/"
-API_TODO_ITEMS_DELETE = "api/todo_items/{0}/"
-
-API_LISTS_LIST = "api/lists/"
-API_LISTS_CREATE = "api/lists/"
-API_LISTS_READ = "lists/{0}/"
-API_LISTS_UPDATE = "lists/{0}/"
-API_LISTS_PARTIAL_UPDATE = "lists/{0}/"
-API_LISTS_DELETE = "lists/{0}/"
-
-API_TOKEN = "api/token/"
-
-
-class UserApi(object):
-    def __init__(self, url=DEFAULT_URL, token=None):
-        """
-        Constructor
-
-        Parameters
-        ----------
-        url : str, optional
-            Server url. The default is DEFAULT_URL.
-        token : dict, optional
-            Existing user tokens to bypass authorization.
-            The default is None.
-
-        Returns
-        -------
-        None.
-
-        """
-        self.token = token
-        self.get_api = lambda x: urllib.parse.urljoin(url, x)
-
-    # ToDo - store tokens in config
-    def auth(self, user, passwd):
-        """
-        Authosization
-
-        Parameters
-        ----------
-        user : str
-            Login.
-        passwd : str
-            Password.
-
-        Returns
-        -------
-        dict
-            Generated auth token.
-
-        """
-        token = UserApi._raise_or_return_(
-            requests.post(url=self.get_api(API_TOKEN), json={"username": user, "password": passwd})
-        )
-        self.token = SimpleNamespace(**token)
-        return self.token
-
-    def lists_list(self, **argv):
-        """
-        List all the exsiting to-do lists.
-        Auth required
-
-        Returns
-        -------
-        list
-            to-do lists.
-
-        """
-        return UserApi._raise_or_return_(
-            requests.get(
-                url=self.get_api(API_LISTS_LIST), headers=self._access_token_(), params=argv
-            )
-        )
-
-    def lists_create(self, title="Untitled"):
-        """
-        Create a new to-do list
-        Auth required
-
-        Parameters
-        ----------
-        title : str, optional
-            New list name. The default is "Untitled".
-
-        """
-        return UserApi._raise_or_return_(
-            requests.post(
-                url=self.get_api(API_LISTS_CREATE),
-                json={"title": title},
-                headers=self._access_token_(),
-            )
-        )
-
-    def todo_items_list(self, **argv):
-        """
-        List all the exsiting to-do items.
-        Auth required
-
-        Returns
-        -------
-        list
-            to-do items.
-
-        """
-        return UserApi._raise_or_return_(
-            requests.get(
-                url=self.get_api(API_TODO_ITEMS_LIST), headers=self._access_token_(), params=argv
-            )
-        )
-
-    # def create(self, title="Untitled"):
-    # """
-    # Create a new to-do list
-    # Auth required
-
-    # Parameters
-    # ----------
-    # title : str, optional
-    # New list name. The default is "Untitled".
-
-    # """
-    # response = requests.post(
-    # url=self.get_api(API_LISTS_CREATE), json={"title": title}, headers=self._access_token_()
-    # url=self.get_api(API_TODO_ITEMS_CREATE), json={"title": title}, headers=self._access_token_()
-    # )
-    # response.raise_for_status()
-    # return response.json()
-
-    # def read(self, id):
-    # """
-    # Read a to-do list contents
-
-    # Parameters
-    # ----------
-    # id : int
-    # List id.
-
-    # Returns
-    # -------
-    # list
-    # Requested contents
-
-    # """
-    # response = requests.post(
-    # url=self.get_api(API_LISTS_READ).format(id), headers=self._access_token_()
-    # )
-    # response.raise_for_status()
-    # return response.json()
-
-    # def update(self, id, title="Untitled"):
-    # """
-    # Add a to-do item to the list
-
-    # Parameters
-    # ----------
-    # id : int
-    # List id.
-    # title : str, optional
-    # To-do item title. The default is "Untitled".
-
-    # """
-    # response = requests.put(
-    # json={"title": title},
-    # url=self.get_api(API_LISTS_UPDATE).format(id),
-    # headers=self._access_token_(),
-    # )
-    # response.raise_for_status()
-    # return response.json()
-
-    # def partial_update(self, id, title="Untitled"):
-    # """
-    # Update list item - untrusted
-
-    # """
-    # response = requests.patch(
-    # json={"title": title},
-    # url=self.get_api(API_LISTS_PARTIAL_UPDATE).format(id),
-    # headers=self._access_token_(),
-    # )
-    # response.raise_for_status()
-    # return response.json()
-
-    # def delete(self, id):
-    # """
-    # Delete list
-
-    # Parameters
-    # ----------
-    # id : int
-    # List id to delete.
-
-    # """
-    # response = requests.delete(
-    # url=self.get_api(API_LISTS_DELETE).format(id), headers=self._access_token_()
-    # )
-    # response.raise_for_status()
-    # return response.json()
-
-    def _access_token_(self):
-        if self.token is None:
-            raise RuntimeError("Authosization required for requested operation!")
-        return {"Authorization": f"Bearer {self.token.access}"}
-
-    @staticmethod
-    def _raise_or_return_(response):
-        response.raise_for_status()
-        return response.json()

frontend/api_demo.py

@@ -1,48 +0,0 @@
-from user import User
-
-
-def print_lists(lists):
-    for item in lists:
-        print(f"List: '{item}'", f"Id: {item.id}", "|", "|".join([str(x) for x in item.items]))
-
-
-DEFAULT_URL = "http://127.0.0.1:8000"
-
-user = User(url=DEFAULT_URL)
-user.auth("root", "root")
-
-# Fetch existing lists:
-lists = user.fetchUserLists()
-print("Fecthing...")
-print_lists(lists)
-
-# Remove user list by id:
-user.removeUserList(5)
-lists = user.fetchUserLists()
-print(f"Removing {5}...")
-print_lists(lists)
-
-# Append a new list to user:
-print("Appending list...")
-scroll = user.appendUserList(title="a new list!")
-print_lists(lists)
-
-# Modify list 0:
-print("Modifyng list...")
-lists[0].modify(title="A new title")
-print_lists(lists)
-
-# Append item to list:
-print("Appending item to last list...")
-item = lists[-1].append(text="this is an item")
-print_lists(lists)
-
-# Modifying item
-print("Modifyng appended item...")
-item.modify(finished=True, text="this is an updated item")
-print_lists(lists)
-
-# Removing item at 0
-print("Removing item 0 from list 0...")
-lists[0].remove(0)
-print_lists(lists)

frontend/login.py

@@ -1,68 +0,0 @@
-import tkinter as tk
-from user import User
-import message
-
-
-class LoginFrame(tk.Frame):
-
-    loggedIn = False
-
-    def __init__(self, master=None, url=None) -> None:
-        """
-        Функция инициаизации класса
-        """
-        super().__init__(master)
-
-        # Иницализируем параметры окна
-        self.master = master
-        self.pack(fill=tk.BOTH, expand=1)
-
-        # self.grid(row=0, column=0, sticky=tk.N + tk.S + tk.E + tk.W)
-        # tk.Grid.rowconfigure(master, 0, weight=1)
-        # tk.Grid.columnconfigure(master, 0, weight=1)
-
-        # Иницализируем параметры пользователя
-        self.user = User(url=url)
-
-        # Настраиваем размеры и включаем иницализацию
-        self.initAUTH()
-
-    def login_clicked(self) -> None:
-        """
-        Функция авторизации
-        """
-        try:
-            self.user.auth(self.login.get(), self.password.get())
-            self.loggedIn = True
-        except Exception as ex:
-            print(ex)
-            message.invalid_login()
-
-    def initAUTH(self) -> None:
-        """
-        Создает окно авторизации программы
-        """
-        # Конфигурируем сетку
-        for rows in range(25):
-            tk.Grid.rowconfigure(self, rows, weight=1)
-
-        for columns in range(25):
-            tk.Grid.columnconfigure(self, columns, weight=1)
-
-        # Подпись и поле ввода для логина
-        login_label = tk.Label(self, text="Введите логин")
-        login_label.grid(row=9, column=12, columnspan=3, rowspan=1, sticky="nsew")
-
-        self.login = tk.Entry(self)
-        self.login.grid(row=10, column=12, columnspan=3, rowspan=1, sticky="nsew")
-
-        # Подпись и поле ввода для пароля
-        password_label = tk.Label(self, text="Введите пароль")
-        password_label.grid(row=11, column=12, columnspan=3, rowspan=1, sticky="nsew")
-
-        self.password = tk.Entry(self, show="*")
-        self.password.grid(row=12, column=12, columnspan=3, rowspan=1, sticky="nsew")
-
-        # Кнопка авториазции
-        btn = tk.Button(self, text="Войти", command=self.login_clicked)
-        btn.grid(row=14, column=12, columnspan=3, rowspan=1, sticky="nsew")

frontend/message.py

@@ -1,20 +0,0 @@
-from tkinter import messagebox as mb
-
-TITLE_INFO_BOX = "Сообщение!"
-MESSAGE_INVALID_LOGIN = "Неправильный логин или пароль"
-MESSAGE_EMPTY = "Сдесь могло быть ваше сообщение"
-
-
-def infobox(msg: str = None) -> None:
-    """
-    Показывает передаваемое сообщение в messagebox
-
-    :param msg: передаваемое сообщение
-    """
-    if msg is None:
-        msg = MESSAGE_EMPTY
-    mb.showinfo(TITLE_INFO_BOX, msg)
-
-
-def invalid_login():
-    infobox(MESSAGE_INVALID_LOGIN)

frontend/todo_tk.py

@@ -1,55 +1,14 @@
 #!/usr/bin/env python3
 
-import sys
 import tkinter as tk
-from login import LoginFrame
-from workspace import WorkSpaceFrame
-
-if "win" in sys.platform.lower():
-    DEFAULT_URL = "http://localhost:8000"
-else:
-    DEFAULT_URL = "http://0.0.0.0:8000"
-
-BASE_W = 580
-BASE_H = 400
-
-TITLE_APP = "ToDo Application"
 
 
-class Application(tk.Tk):
-    def __init__(self):
-        super().__init__()
-        self.center_window()
-        self.title(TITLE_APP)
-
-    def login(self):
-        """Возвращает пользователя - его можно потом сериализовать"""
-        self.frame = LoginFrame(master=self, url=DEFAULT_URL)
-        while not self.frame.loggedIn:
-            self.update_idletasks()
-            self.update()
-        self.frame.destroy()
-        return self.frame.user
-
-    def main(self, user):
-        self.frame = WorkSpaceFrame(master=self, user=user)
-        self.mainloop()
-
-    def center_window(self, width: str = BASE_W, heigh: str = BASE_H) -> None:
-        """
-        Центрирует приложение по центру экрана
-
-        :param width: ширина окна
-        :param heigh: высота окна
-        """
-        sw = self.winfo_screenwidth()
-        sh = self.winfo_screenheight()
-
-        x = (sw - width) / 2
-        y = (sh - heigh) / 2
-        self.geometry("%dx%d+%d+%d" % (width, heigh, x, y))
+class Application(tk.Frame):
+    def __init__(self, master=None):
+        super().__init__(master)
 
 
 if __name__ == "__main__":
     app = Application()
-    app.main(app.login())
+    app.master.title("ToDo")
+    app.mainloop()

frontend/user.py

@@ -1,108 +0,0 @@
-import os
-
-from datetime import datetime
-from api import UserApi
-
-
-class ToDoList(object):
-    def __init__(self, id, title, created_at=None, items=[], parent=None):
-        self.id = id
-        self.title = title
-        self.items = items
-        self.created_at = created_at
-
-    def __iter__(self):
-        for item in self.items:
-            yield item
-
-    def __getitem__(self, index):
-        return self.items[index]
-
-    def __len__(self):
-        return len(self.items)
-
-    def __str__(self):
-        return f"[{self.id}] {self.title}"
-
-    def index(self, value):
-        return self.items.index(value)
-
-    # ToDo
-    def remove(self, index):
-        self.items.remove(self.items[index])
-        self.sync()
-
-    # ToDo
-    def append(self, text):
-        item = ToDoItem(id=None, text=text, created_at=datetime.now())
-        self.items.append(item)
-        item.sync()
-        self.sync()
-        return item
-
-    def modify(self, **argv):
-        for key, value in argv.items():
-            setattr(self, key, value)
-        self.sync()
-
-    # ToDo
-    def sync(self):
-        # ToDo send request or store in form
-        print(f"Item '{self}' is being synchronized...")
-
-
-class ToDoItem(object):
-    def __init__(self, id, text, finished=False, created_at=None, parent=None):
-        self.id = id
-        self.text = text
-        self.finished = finished
-        self.created_at = created_at
-
-    def __str__(self):
-        return f"[{self.id}] {self.text}"
-
-    def modify(self, **argv):
-        for key, value in argv.items():
-            setattr(self, key, value)
-        self.sync()
-
-    # ToDo
-    def sync(self):
-        # ToDo send request or store in form
-        print(f"Item '{self}' is being synchronized...")
-
-
-class User(UserApi):
-    def auth(self, user, passwd):
-        if "DEBUG" in os.environ:
-            return
-        UserApi.auth(self, user, passwd)
-
-    # ToDo
-    items = [
-        ToDoList(
-            id=i,
-            title=f"List {i}",
-            created_at=datetime.now(),
-            items=[
-                ToDoItem(id=i * 10 + j, text=f"Item {i*10+j}", created_at=datetime.now())
-                for j in range(10)
-            ],
-        )
-        for i in range(10)
-    ]
-
-    # ToDo
-    def fetchUserLists(self):
-        return self.items
-
-    # ToDo
-    def removeUserList(self, id):
-        self.items = [item for item in self.items if item.id != id]
-
-    # ToDo
-    def appendUserList(self, title):
-        item = ToDoList(id=None, title=title, created_at=datetime.now())
-        self.items.append(item)
-        item.sync()
-        return item

frontend/workspace.py

@@ -1,163 +0,0 @@
-import tkinter as tk
-
-
-def str_time(time):
-    return time.strftime("%Y-%m-%d %H:%M:%S")
-
-
-TODO_ITEM_TABLE_TEXT_WIDTH = 15
-TODO_ITEM_TABLE_FINISHED_WIDTH = 8
-TODO_ITEM_TABLE_CREATED_AT_WIDTH = 15
-
-
-def placeholder():
-    print("Не реализовано")
-
-
-class ToDoItemWidget(tk.Frame):
-    @staticmethod
-    def header(parent):
-        body = tk.Frame(parent)
-
-        text = tk.Label(body, text="Текст", width=TODO_ITEM_TABLE_TEXT_WIDTH)
-        text.pack(side="left")
-
-        text = tk.Label(body, text="Выполнено", width=TODO_ITEM_TABLE_FINISHED_WIDTH)
-        text.pack(side="left")
-
-        text = tk.Label(body, text="Создано", width=TODO_ITEM_TABLE_CREATED_AT_WIDTH)
-        text.pack(side="left")
-
-        return body
-
-    def __init__(self, *args, item, **argv):
-        super().__init__(*args, **argv)
-
-        self.parent = self.master
-        self.item = item
-
-        self.noteLabel = tk.Label(self, text=item.text, width=TODO_ITEM_TABLE_TEXT_WIDTH)
-        self.noteLabel.pack(side="left")
-
-        self.finished = tk.IntVar(value=int(item.finished))
-        self.finishedButton = tk.Checkbutton(
-            self,
-            variable=self.finished,
-            command=self.finishedButton_command,
-            width=TODO_ITEM_TABLE_FINISHED_WIDTH,
-        )
-        self.finishedButton.pack(side="left")
-
-        self.createdAt = tk.Label(
-            self, text=str_time(item.created_at), width=TODO_ITEM_TABLE_CREATED_AT_WIDTH
-        )
-        self.createdAt.pack(side="left")
-
-        self.remove = tk.Button(self, text="Удалить", command=lambda: self.parent.remove(self.item))
-        self.remove.pack(side="left")
-
-    def finishedButton_command(self):
-        self.item.modify(finished=self.finished.get() > 0)
-
-
-class ToDoListWidget(tk.Frame):
-    def __init__(self, *args, **argv):
-        super().__init__(*args, **argv)
-
-    def fill(self, itemList):
-
-        header = ToDoItemWidget.header(self)
-        header.pack(side="left")
-        header.pack(side="top", fill="y")
-
-        self.itemList = itemList
-
-        for item in itemList:
-            item = ToDoItemWidget(self, item=item)
-            item.pack(side="top", fill="y")
-
-        self.itemToAdd = tk.Text(self, width=15, height=1)
-        self.itemToAdd.pack(side="top")
-
-        add = tk.Button(self, text="Добавить заметку", command=self.add_command)
-        add.pack(side="top")
-
-        delete = tk.Button(self, text="Удалить лист", command=placeholder)
-        delete.pack(side="top")
-
-    def update(self, itemList=None):
-        self.clear()
-        if itemList is None:
-            self.fill(self.itemList)
-        else:
-            self.fill(itemList)
-
-    def add_command(self):
-        self.itemList.append(self.itemToAdd.get(1.0, "end"))
-        self.update()
-
-    def remove(self, item):
-        self.itemList.remove(self.itemList.index(item))
-        self.update()
-
-    def clear(self):
-        for widget in self.winfo_children():
-            widget.destroy()
-
-
-class WorkSpaceFrame(tk.Frame):
-    def __init__(self, user, master=None, url=None) -> None:
-        """
-        Функция инициаизации класса
-        """
-        super().__init__(master)
-
-        self.master = master
-        self.user = user
-
-        self.pack(fill=tk.BOTH, expand=1)
-        self.initLayout(user)
-
-    def initLayout(self, user):
-
-        # data
-        self.lists = user.fetchUserLists()
-
-        text = tk.Text(self, width=15, height=1)
-        text.pack(anchor="sw")
-
-        add = tk.Button(self, text="Добавить лист", command=placeholder)
-        add.pack(anchor="sw")
-
-        # select list box
-        self.listBox = tk.Listbox(self, width=30, selectmode=tk.SINGLE)
-        self.listBox.pack(side="left", fill="y")
-        self.listBox.bind("<<ListboxSelect>>", self.listBox_selected)
-
-        # scroll bar
-        scrollbar = tk.Scrollbar(self, orient="vertical")
-        scrollbar.config(command=self.listBox.yview)
-        scrollbar.pack(side="left", fill="y")
-
-        # add scroll bar to list box
-        self.listBox.config(yscrollcommand=scrollbar.set)
-
-        # fill list box
-        for item in self.lists:
-            s = f"{str(item)}: {item.created_at.strftime('%Y-%m-%d %H:%M:%S')}"
-            self.listBox.insert(tk.END, s)
-        self.listBox.pack()
-        len(self.lists) > 0 and self.listBox.selection_set(first=0)
-
-        # todo lists
-        self.toToList = ToDoListWidget(self)
-        self.toToList.pack(side="left", fill="both", expand=1)
-
-    def listBox_selected(self, *args):
-
-        self.toToList.clear()
-
-        selection = self.listBox.curselection()
-        cur = selection[0]
-
-        self.toToList.fill(self.lists[cur])