Merge e22e9ab into a301b84

code/shkenev_petr/infrastructure/.gitignore

@@ -0,0 +1,138 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+cover/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+.pybuilder/
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+#   For a library or package, you might want to ignore these files since the code is
+#   intended to run in multiple environments; otherwise, check them in:
+# .python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# pytype static type analyzer
+.pytype/
+
+# Cython debug symbols
+cython_debug/

code/shkenev_petr/infrastructure/logger.py

@@ -0,0 +1,16 @@
+import logging
+
+from ..logger.ilogger import ILogger
+
+
+class Logger(ILogger):
+    def __init__(self):
+        self.messages = []
+        logging.basicConfig(filename='queue.log', level=logging.INFO)
+
+    def get_messages_list(self):
+        return self.messages
+
+    def log(self, message):
+        self.messages.append(message)
+        logging.info(message)

code/shkenev_petr/infrastructure/queue_view.py

@@ -0,0 +1,63 @@
+import tkinter as tk
+
+from .queue_viewmodel import QueueViewmodel
+from .logger import Logger
+
+
+class QueueView(tk.Frame):
+    def __init__(self, master=None):
+        super().__init__(master)
+        self.master = master
+        self.pack()
+        self.create_widgets()
+        self.viewmodel = QueueViewmodel(Logger())
+
+    def create_widgets(self):
+        # Поле ввода элемента для постановки в очередь
+        self.text_box = tk.Text(self, height=1)
+        self.text_box.pack()
+
+        # Кнопка вставки
+        self.button_enqueue = tk.Button(self)
+        self.button_enqueue["text"] = "Enqueue"
+        self.button_enqueue["command"] = self.enqueue
+        self.button_enqueue.pack()
+
+        # Отображение содержимого очереди
+        self.text_box_queue = tk.Text(self, height=10)
+        self.text_box_queue.pack()
+
+        # Кнопка извлечения элемента из очереди
+        self.button_dequeue = tk.Button(self)
+        self.button_dequeue["text"] = "Dequeue"
+        self.button_dequeue["command"] = self.dequeue
+        self.button_dequeue.pack()
+
+        # Отображение первого в очереди элемента
+        self.label = tk.Label(self)
+        self.label.pack()
+
+        # Отображение журнала
+        self.history = tk.Text(self, height=10)
+        self.history.pack()
+
+    def enqueue(self):
+        self.viewmodel.enqueue(self.text_box.get("1.0", 'end-1c'))
+        self.label['text'] = self.viewmodel.peek
+        self.text_box_queue.delete(1.0, "end-1c")
+        self.text_box_queue.insert("end-1c", self.viewmodel.string)
+        self.history.delete(1.0, "end-1c")
+        self.history.insert("end-1c", self.viewmodel.history)
+
+    def dequeue(self):
+        self.viewmodel.dequeue()
+        self.label['text'] = self.viewmodel.peek
+        self.text_box_queue.delete(1.0, "end-1c")
+        self.text_box_queue.insert("end-1c", self.viewmodel.string)
+        self.history.delete(1.0, "end-1c")
+        self.history.insert("end-1c", self.viewmodel.history)
+
+
+root = tk.Tk()
+app = QueueView(master=root)
+app.mainloop()

code/shkenev_petr/infrastructure/queue_viewmodel.py

@@ -0,0 +1,30 @@
+from ..model.queue import Queue
+
+
+class QueueViewmodel:
+
+    def __init__(self, _logger):
+        self.queue = Queue()
+        self.peek = ''
+        self.logger = _logger
+        self.make_string()
+
+    def make_string(self):
+        self.queue.items = [str(i) for i in self.queue.items]
+        self.string = '\n'.join(self.queue.items)
+        self.history = '\n'.join(self.logger.messages)
+
+    def enqueue(self, x):
+        self.queue.enqueue(x)
+        self.logger.log('Enqueued: ' + str(x))
+        self.make_string()
+        self.peek = self.queue.peek()
+
+    def dequeue(self):
+        x = self.queue.dequeue()
+        self.logger.log('Dequeued: ' + str(x))
+        self.make_string()
+        if self.queue.is_empty():
+            self.peek = ''
+        else:
+            self.peek = self.queue.peek()

code/shkenev_petr/infrastructure/test_queue_viewmodel.py

@@ -0,0 +1,40 @@
+import unittest
+
+from .queue_viewmodel import QueueViewmodel
+from .logger import Logger
+
+
+class TestQueueViewmodelLogging(unittest.TestCase):
+
+    def test_new_queue_viewmodel_empty(self):
+        new_queue_viewmodel = QueueViewmodel(Logger())
+        assert new_queue_viewmodel.logger.messages == []
+
+    def test_queue_viewmodel_enqueue(self):
+        queue_viewmodel = QueueViewmodel(Logger())
+        queue_viewmodel.enqueue('x')
+        assert queue_viewmodel.logger.messages == ['Enqueued: x']
+
+    def test_queue_viewmodel_dequeue(self):
+        queue_viewmodel = QueueViewmodel(Logger())
+        queue_viewmodel.enqueue('x')
+        queue_viewmodel.dequeue()
+        assert queue_viewmodel.logger.messages == ['Enqueued: x', 'Dequeued: x']
+
+    def test_queue_viewmodel_dequeue_several_elements(self):
+        queue_viewmodel = QueueViewmodel(Logger())
+        queue_viewmodel.enqueue('x')
+        queue_viewmodel.enqueue('y')
+        queue_viewmodel.dequeue()
+        assert queue_viewmodel.logger.messages == ['Enqueued: x', 'Enqueued: y', 'Dequeued: x']
+
+    def test_queue_viewmodel_type(self):
+        queue_viewmodel = QueueViewmodel(Logger())
+        queue_viewmodel.enqueue(1)
+        queue_viewmodel.dequeue()
+        assert queue_viewmodel.logger.messages == ['Enqueued: 1', 'Dequeued: 1']
+
+    def test_queue_viewmodel_get_messages_list(self):
+        queue_viewmodel = QueueViewmodel(Logger())
+        queue_viewmodel.enqueue('x')
+        assert queue_viewmodel.logger.get_messages_list() == ['Enqueued: x']