#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

compensation/views/compensation_views.py

@@ -5,11 +5,12 @@ from django.shortcuts import render, get_object_or_404
 from django.utils.translation import gettext_lazy as _
 
 from compensation.forms import NewStateModalForm, NewDeadlineModalForm, NewActionModalForm
-from compensation.models import Compensation, CompensationState, CompensationAction
+from compensation.models import Compensation, CompensationState, CompensationAction, CompensationDocument
 from compensation.tables import CompensationTable
 from konova.contexts import BaseContext
 from konova.decorators import *
 from konova.forms import RemoveModalForm, SimpleGeomForm, NewDocumentForm
+from konova.utils.documents import get_document, remove_document
 from konova.utils.user_checks import in_group
 
 
@@ -163,6 +164,43 @@ def new_document_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(CompensationDocument, 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(CompensationDocument, id=doc_id)
+    return remove_document(
+        request,
+        doc
+    )
+
+
 @login_required
 def state_new_view(request: HttpRequest, id: str):
     """ Renders a form for adding new states for a compensation

compensation/views/eco_account_views.py

@@ -14,13 +14,14 @@ from django.http import HttpRequest, Http404
 from django.shortcuts import render, get_object_or_404
 
 from compensation.forms import NewStateModalForm, NewActionModalForm, NewDeadlineModalForm
-from compensation.models import EcoAccount
+from compensation.models import EcoAccount, EcoAccountDocument
 from compensation.tables import EcoAccountTable
 from intervention.forms import NewDeductionForm
 from konova.contexts import BaseContext
 from konova.decorators import any_group_check, default_group_required, conservation_office_group_required
 from konova.forms import RemoveModalForm, SimpleGeomForm, NewDocumentForm, 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
 
 
@@ -289,6 +290,43 @@ def new_document_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(EcoAccountDocument, 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(EcoAccountDocument, id=doc_id)
+    return remove_document(
+        request,
+        doc
+    )
+
+
 @login_required
 @default_group_required
 def new_deduction_view(request: HttpRequest, id: str):