#18 File upload in certain folders

* refactors documents and file upload to be distributed into different subfolders, depending on the type of document (InterventionDocument, RevocationDocument, ...)
* refactors Document model into AbstractDocument
* subclasses RevocationDocument, InterventionDocument, COmpensationDocument, EmaDocument and EcoAccountDocument from AbstractDocument to provide proper functionality for each
* adds new specialized routes for each new document type (opening, removing)
* drops generic get and remove routes for documents

ema/models.py

@@ -2,7 +2,8 @@ from django.contrib.auth.models import User
 from django.db import models
 
 from compensation.models import AbstractCompensation
-from konova.settings import DEFAULT_SRID_RLP, LANIS_LINK_TEMPLATE
+from konova.models import AbstractDocument, generate_document_file_upload_path
+from konova.settings import DEFAULT_SRID_RLP, LANIS_LINK_TEMPLATE, EMA_DOC_PATH
 from user.models import UserActionLogEntry
 
 
@@ -83,4 +84,18 @@ class Ema(AbstractCompensation):
 
         # ToDo: Add check methods!
 
-        return ret_msgs
+        return ret_msgs
+
+
+class EmaDocument(AbstractDocument):
+    """
+    Specializes document upload for ema with certain path
+    """
+    instance = models.ForeignKey(
+        Ema,
+        on_delete=models.CASCADE,
+        related_name="documents",
+    )
+    file = models.FileField(
+        upload_to=generate_document_file_upload_path
+    )

ema/templates/ema/detail/includes/documents.html

@@ -39,14 +39,14 @@
             {% for doc in obj.documents.all %}
             <tr>
                 <td class="align-middle">
-                    <a href="{% url 'doc-open' doc.id %}">
+                    <a href="{% url 'ema:get-doc' doc.id %}">
                         {{ doc.title }}
                     </a>
                 </td>
                 <td class="align-middle">{{ doc.comment }}</td>
                 <td>
                     {% if is_default_member and has_access  %}
-                    <button data-form-url="{% url 'doc-remove' doc.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove document' %}">
+                    <button data-form-url="{% url 'ema:remove-doc' doc.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove document' %}">
                         {% fa5_icon 'trash' %}
                     </button>
                     {% endif %}

ema/urls.py

@@ -24,6 +24,8 @@ urlpatterns = [
     # Documents
     # Document remove route can be found in konova/urls.py
     path('<id>/document/new/', document_new_view, name='new-doc'),
+    path('document/<doc_id>', get_document_view, name='get-doc'),
+    path('document/<doc_id>/remove/', remove_document_view, name='remove-doc'),
 
     # Generic state routes
     path('state/<id>/remove', state_remove_view, name='state-remove'),

ema/views.py

@@ -10,9 +10,10 @@ from compensation.forms import NewStateModalForm, NewActionModalForm, NewDeadlin
 from ema.tables import EmaTable
 from konova.contexts import BaseContext
 from konova.decorators import conservation_office_group_required
-from ema.models import Ema
+from ema.models import Ema, EmaDocument
 from konova.forms import RemoveModalForm, NewDocumentForm, SimpleGeomForm, RecordModalForm
 from konova.settings import DEFAULT_GROUP, ZB_GROUP, ETS_GROUP
+from konova.utils.documents import get_document, remove_document
 from konova.utils.user_checks import in_group
 
 
@@ -250,6 +251,43 @@ def document_new_view(request: HttpRequest, id: str):
     )
 
 
+@login_required
+def get_document_view(request: HttpRequest, doc_id: str):
+    """ Returns the document as downloadable file
+
+    Wraps the generic document fetcher function from konova.utils.
+
+    Args:
+        request (HttpRequest): The incoming request
+        doc_id (str): The document id
+
+    Returns:
+
+    """
+    doc = get_object_or_404(EmaDocument, id=doc_id)
+    return get_document(doc)
+
+
+@login_required
+def remove_document_view(request: HttpRequest, doc_id: str):
+    """ Removes the document from the database and file system
+
+    Wraps the generic functionality from konova.utils.
+
+    Args:
+        request (HttpRequest): The incoming request
+        doc_id (str): The document id
+
+    Returns:
+
+    """
+    doc = get_object_or_404(EmaDocument, id=doc_id)
+    return remove_document(
+        request,
+        doc
+    )
+
+
 @login_required
 def state_remove_view(request: HttpRequest, id: str):
     """ Renders a form for removing an EMA state