15 Commits

Author SHA1 Message Date
Derinhelm
16c151a1f3 Изменен интейрфейс 2021-06-07 20:47:42 +03:00
Derinhelm
bb8e1365bb Изменен путь к директории po 2021-06-07 16:36:01 +03:00
Derinhelm
fbd033e6ef Добавлена локализация
Перед запуском программы сгенерировать mo-файл
pybabel compile -D todo -i po/eng/LC_MESSAGES/todo.po -o po/eng/LC_MESSAGES/todo.mo
2021-06-07 00:38:53 +03:00
Aleksey Lobanov
bd1d2c65b9 Merge pull request #23 from AlekseyLobanov/feat_9.functional_api
Implemented most of the api placeholders
2021-04-28 23:02:43 +03:00
Aleksey Lobanov
07e4f56061 Merge pull request #24 from AlekseyLobanov/tests
Tests
2021-04-28 23:02:35 +03:00
Derinhelm
9152cc9772 Исправлены недочеты в оформлении 2021-04-28 15:47:08 +03:00
fdd40d4592 feat: Добавлено вычисления покрытия для тестов бекенда 2021-04-27 23:13:16 +03:00
0ee81d4b42 feat: Используем pytest для бекенда 2021-04-27 23:12:51 +03:00
Derinhelm
bba4be6b27 В README добавлена команда для запуска тестов 2021-04-27 20:38:49 +03:00
Derinhelm
4ab5f11dd2 Перегруппированы тесты 2021-04-27 17:52:16 +03:00
Derinhelm
e3b93f3524 Добавлены тесты для Item 2021-04-26 23:35:45 +03:00
Derinhelm
a6a31c8c10 Добавлены простейшие тесты на создание Item 2021-04-26 12:57:47 +03:00
Derinhelm
889acf6c45 Добавлены тесты для ToDoList 2021-04-26 11:46:01 +03:00
Derinhelm
7e02dff184 Добавлен тест на простейшее создание ToDoList
Для запуска docker-compose exec web python manage.py test
2021-04-25 21:58:27 +03:00
Derinhelm
61bb90540e Добавлены тесты 2021-04-25 21:58:27 +03:00
14 changed files with 455 additions and 55 deletions

1
.gitignore vendored
View File

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

View File

@@ -15,4 +15,4 @@ repos:
rev: 3.9.0
hooks:
- id: flake8
args: ["--ignore=E203,W503,FI10,FI11,FI12,FI13,FI14,FI15,FI16,FI17,FI58,E501"]
args: ["--ignore=E203,W503,FI10,FI11,FI12,FI13,FI14,FI15,FI16,FI17,FI58,E501", "--builtins=_"]

View File

@@ -32,10 +32,16 @@
## Как запустить проект
### Frontend
Интерфейс на русском языке
```bash
python3 todo_tk.py
```
Интерфейс на английском языке
```bash
LANG=eng python3 todo_tk.py
```
### backend
```bash
docker-compose up
@@ -53,3 +59,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
```

3
backend/.coveragerc Normal file
View File

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

View File

@@ -28,7 +28,7 @@ DEBUG = True
ALLOWED_HOSTS = []
if DEBUG:
ALLOWED_HOSTS = ["0.0.0.0", "localhost", "127.0.0.1"]
ALLOWED_HOSTS = ["0.0.0.0", "localhost", "127.0.0.1", "ALLOWED_HOSTS", "testserver"]
# Application definition

View File

@@ -1,3 +1,5 @@
pytest==6.2.3
pytest-cov==2.11.1
djangorestframework==3.12.4
django-filter==2.4.0
markdown==3.3.4

View File

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

154
backend/tests/test_item.py Normal file
View File

@@ -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)

View File

@@ -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])

View File

@@ -1,7 +1,11 @@
import gettext
import os
import tkinter as tk
from user import User
import message
gettext.install("todo", os.path.join(os.path.dirname(__file__), "po"))
class LoginFrame(tk.Frame):
@@ -57,21 +61,22 @@ class LoginFrame(tk.Frame):
tk.Grid.columnconfigure(self, columns, weight=1)
# Подпись и поле ввода для логина
login_label = tk.Label(self, text="Введите логин")
t = _("Введите логин")
login_label = tk.Label(self, text=t)
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 = 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 = tk.Button(self, text=_("Войти"), command=self.login_clicked)
btn.grid(row=14, column=12, columnspan=3, rowspan=1, sticky="nsew")
# Если захочется реализовать в логине

View File

@@ -1,8 +1,12 @@
import gettext
import os
from tkinter import messagebox as mb
TITLE_INFO_BOX = "Сообщение!"
MESSAGE_INVALID_LOGIN = "Неправильный логин или пароль"
MESSAGE_EMPTY = "Сдесь могло быть ваше сообщение"
gettext.install("todo", os.path.join(os.path.dirname(__file__), "po"))
TITLE_INFO_BOX = _("Сообщение!")
MESSAGE_INVALID_LOGIN = _("Неправильный логин или пароль")
MESSAGE_EMPTY = _("Сдесь могло быть ваше сообщение")
def infobox(msg: str = None) -> None:

View File

@@ -0,0 +1,83 @@
# English (United States) translations for PROJECT.
# Copyright (C) 2021 ORGANIZATION
# This file is distributed under the same license as the PROJECT project.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2021.
#
msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2021-06-06 23:42+0300\n"
"PO-Revision-Date: 2021-06-07 00:24+0300\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language: en_US\n"
"Language-Team: en_US <LL@li.org>\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 2.8.1\n"
#: todo_tk.py:20
msgid "Приложение для планирования"
msgstr "ToDo Application"
#: message.py:6
msgid "Сообщение!"
msgstr "Message!"
#: message.py:7
msgid "Неправильный логин или пароль"
msgstr "Wrong login or password"
#: message.py:8
msgid "Сдесь могло быть ваше сообщение"
msgstr "This could have been your message"
#: login.py:63
msgid "Введите логин"
msgstr "Enter your username"
#: login.py:71
msgid "Введите пароль"
msgstr "Enter your password"
#: login.py:78
msgid "Войти"
msgstr "Enter"
#: workspace.py:17
msgid "Не реализовано"
msgstr "Not implemented"
#: workspace.py:25
msgid "Текст"
msgstr "Text"
#: workspace.py:28
msgid "Выполнено"
msgstr "Done"
#: workspace.py:31
msgid "Создано"
msgstr "Created"
#: workspace.py:60
msgid "Удалить"
msgstr "Delete"
#: workspace.py:88
msgid "Добавить заметку"
msgstr "Add note"
#: workspace.py:91
msgid "Удалить лист"
msgstr "Delete list"
#: workspace.py:149
msgid "Запомнить меня"
msgstr "Remember me"
#: workspace.py:158
msgid "Добавить лист"
msgstr "Add list"

View File

@@ -1,20 +1,24 @@
#!/usr/bin/env python3
import gettext
import os
import sys
import tkinter as tk
from login import LoginFrame
from workspace import WorkSpaceFrame
from user import User
gettext.install("todo", os.path.join(os.path.dirname(__file__), "po"))
if "win" in sys.platform.lower():
DEFAULT_URL = "http://localhost:8000"
else:
DEFAULT_URL = "http://0.0.0.0:8000"
BASE_W = 600
BASE_W = 900
BASE_H = 400
TITLE_APP = "ToDo Application"
TITLE_APP = _("Приложение для планирования")
class Application(tk.Tk):
@@ -50,7 +54,6 @@ class Application(tk.Tk):
def center_window(self, width: str = BASE_W, heigh: str = BASE_H) -> None:
"""
Центрирует приложение по центру экрана
:param width: ширина окна
:param heigh: высота окна
"""

View File

@@ -1,60 +1,65 @@
import gettext
import os
import tkinter as tk
gettext.install("todo", os.path.join(os.path.dirname(__file__), "po"))
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
TODO_ITEM_TABLE_TEXT_WIDTH = 25
TODO_ITEM_TABLE_FINISHED_WIDTH = 20
TODO_ITEM_TABLE_CREATED_AT_WIDTH = 25
def placeholder():
print("Не реализовано")
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):
def __init__(self, *args, row_number, item, table, **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.noteLabel = tk.Label(
table,
text=item.text,
width=TODO_ITEM_TABLE_TEXT_WIDTH,
justify="center",
font=("Arial", 8),
)
self.noteLabel.grid(row=row_number, column=0)
self.finished = tk.IntVar(value=int(item.finished))
self.finishedButton = tk.Checkbutton(
self,
table,
variable=self.finished,
command=self.finishedButton_command,
width=TODO_ITEM_TABLE_FINISHED_WIDTH,
justify="center",
)
self.finishedButton.pack(side="left")
self.finishedButton.grid(row=row_number, column=1)
self.createdAt = tk.Label(
self, text=str_time(item.created_at), width=TODO_ITEM_TABLE_CREATED_AT_WIDTH
table,
text=str_time(item.created_at),
width=TODO_ITEM_TABLE_CREATED_AT_WIDTH,
justify="center",
)
self.createdAt.pack(side="left")
self.createdAt.grid(row=row_number, column=2)
self.remove = tk.Button(self, text="Удалить", command=lambda: self.parent.remove(self.item))
self.remove.pack(side="left")
self.remove = tk.Button(
table,
text=_("Удалить"),
command=lambda: self.parent.remove(self.item),
justify="center",
)
self.remove.grid(row=row_number, column=3)
def finishedButton_command(self):
self.item.modify(finished=self.finished.get() > 0)
@@ -65,26 +70,69 @@ class ToDoListWidget(tk.Frame):
super().__init__(*args, **argv)
self.delete_list = delete_list
def fill(self, itemList):
def create_table_header(self, body):
header = ToDoItemWidget.header(self)
header.pack(side="left")
header.pack(side="top", fill="y")
header_font = ("Arial", "10", "bold")
text = tk.Label(
body,
text=_("Текст"),
width=TODO_ITEM_TABLE_TEXT_WIDTH,
justify="center",
font=header_font,
)
text.grid(row=0, column=0)
done = tk.Label(
body,
text=_("Выполнено"),
width=TODO_ITEM_TABLE_FINISHED_WIDTH,
justify="center",
font=header_font,
)
done.grid(row=0, column=1)
created = tk.Label(
body,
text=_("Создано"),
width=TODO_ITEM_TABLE_CREATED_AT_WIDTH,
justify="center",
font=header_font,
)
created.grid(row=0, column=2)
def create_table(self, itemList):
table = tk.LabelFrame(self, relief=tk.GROOVE)
table.grid()
self.create_table_header(table)
self.itemList = itemList
row_number = 1
for item in itemList:
item = ToDoItemWidget(self, item=item)
item.pack(side="top", fill="y")
item = ToDoItemWidget(self, row_number=row_number, item=item, table=table)
row_number += 1
return table
self.itemToAdd = tk.Text(self, width=15, height=1)
self.itemToAdd.pack(side="top")
def create_new_item(self):
table = tk.LabelFrame(self, relief=tk.GROOVE)
table.grid()
self.itemToAdd = tk.Text(table, width=15, height=1)
self.itemToAdd.grid(row=0, column=0)
add = tk.Button(self, text="Добавить заметку", command=self.add_command)
add.pack(side="top")
add = tk.Button(table, text=_("Добавить заметку"), command=self.add_command)
add.grid(row=0, column=1)
return table
delete = tk.Button(self, text="Удалить лист", command=self.delete_list)
delete.pack(side="top")
def fill(self, itemList):
self.frame = tk.LabelFrame(self, relief=tk.GROOVE)
self.frame.grid(sticky="NEWS")
table = self.create_table(itemList)
table.grid(row=0, column=0)
new = self.create_new_item()
new.grid(row=2, column=0)
delete = tk.Button(self, text=_("Удалить лист"), command=self.delete_list)
delete.grid(row=4, column=0)
def update(self, itemList=None):
self.clear()
@@ -141,7 +189,7 @@ class WorkSpaceFrame(tk.Frame):
# Запомнить пользователя
self.rbtn_var = tk.IntVar(value=1)
rbtn = tk.Checkbutton(self, text="Запомнить меня", variable=self.rbtn_var, command=None)
rbtn = tk.Checkbutton(self, text=_("Запомнить меня"), variable=self.rbtn_var, command=None)
rbtn.pack(anchor="n")
# data
@@ -150,7 +198,7 @@ class WorkSpaceFrame(tk.Frame):
self.add_list_text = tk.Text(self, width=15, height=1)
self.add_list_text.pack(anchor="sw")
add = tk.Button(self, text="Добавить лист", command=self.add_list)
add = tk.Button(self, text=_("Добавить лист"), command=self.add_list)
add.pack(anchor="sw")
# select list box