Fix COHIV-147; add fonts to docker image

Author: MarcoSteinacher

django/Dockerfile

@@ -35,7 +35,7 @@ ENV PYTHONDONTWRITEBYTECODE=1 \
 # Install runtime dependencies
     # mariadb-client-compat
 RUN apt-get update && \
-    apt-get install -y --no-install-recommends xmlsec1 libreoffice-writer-nogui mariadb-client locales && \
+    apt-get install -y --no-install-recommends xmlsec1 libreoffice-writer-nogui mariadb-client locales fonts-lato fonts-liberation && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 

django/geno/api_views.py

@@ -69,10 +69,12 @@ class RentalUnitViewSet(viewsets.ReadOnlyModelViewSet):
 
 class ContractViewSet(viewsets.ReadOnlyModelViewSet):
     """
-    API endpoint that allows active contracts to be viewed.
+    API endpoint that allows active contracts to be viewed (excluding subcontracts).
     """
 
-    queryset = Contract.objects.filter(state__in=("unterzeichnet", "gekuendigt"))
+    queryset = Contract.objects.filter(state__in=("unterzeichnet", "gekuendigt")).filter(
+        main_contract=None
+    )
     serializer_class = ContractSerializer
     # permission_classes = [permissions.IsAuthenticated]
 

django/geno/billing.py

@@ -83,7 +83,7 @@ def create_invoices(
     elif download_only:
         contracts = Contract.objects.filter(id=download_only)
     else:
-        contracts = Contract.objects.filter(state="unterzeichnet")
+        contracts = Contract.objects.filter(state="unterzeichnet").filter(main_contract=None)
 
     if building_ids:
         contracts = contracts.filter(rental_units__building__in=building_ids).distinct()

django/geno/models.py

@@ -1524,27 +1524,29 @@ def list_rental_units(self, short=False, exclude_minor=False, as_list=False):
 
     def get_object_actions(self):
         actions = []
-        actions.append(
-            (
-                "/geno/invoice/download/contract/%s/" % (self.pk),
-                "Mietzinsrechnung herunterladen, aktueller Monat",
-                "Es wird nur das PDF erzeugt, nicht gebucht!",
+        if not self.main_contract:
+            # No invoices for sub-contracts
+            actions.append(
+                (
+                    "/geno/invoice/download/contract/%s/" % (self.pk),
+                    "Mietzinsrechnung herunterladen, aktueller Monat",
+                    "Es wird nur das PDF erzeugt, nicht gebucht!",
+                )
             )
-        )
-        actions.append(
-            (
-                "/geno/invoice/download/contract/%s/?date=last_month" % (self.pk),
-                "Mietzinsrechnung herunterladen, letzter Monat",
-                "Es wird nur das PDF erzeugt, nicht gebucht!",
+            actions.append(
+                (
+                    "/geno/invoice/download/contract/%s/?date=last_month" % (self.pk),
+                    "Mietzinsrechnung herunterladen, letzter Monat",
+                    "Es wird nur das PDF erzeugt, nicht gebucht!",
+                )
             )
-        )
-        actions.append(
-            (
-                "/geno/invoice/download/contract/%s/?date=next_month" % (self.pk),
-                "Mietzinsrechnung herunterladen, nächster Monat",
-                "Es wird nur das PDF erzeugt, nicht gebucht!",
+            actions.append(
+                (
+                    "/geno/invoice/download/contract/%s/?date=next_month" % (self.pk),
+                    "Mietzinsrechnung herunterladen, nächster Monat",
+                    "Es wird nur das PDF erzeugt, nicht gebucht!",
+                )
             )
-        )
         for dt in DocumentType.objects.filter(active=True).filter(name__startswith="contract"):
             actions.append(
                 (

django/geno/tests/test_api_views.py

@@ -1,13 +1,16 @@
 import datetime
+import json
 from unittest.mock import patch
 
+from django.contrib.auth import get_user_model
 from django.http import FileResponse
 from django.test import tag
-from rest_framework.test import APIRequestFactory
+from django.urls import reverse
+from rest_framework.test import APIRequestFactory, force_authenticate
 
 import geno.tests.data as geno_testdata
 from finance.accounting import Account, AccountingManager, AccountKey
-from geno.api_views import Akonto, QRBill
+from geno.api_views import Akonto, ContractViewSet, QRBill
 from geno.billing import get_income_account, get_receivables_account
 from geno.models import Contract, Invoice, InvoiceCategory
 
@@ -319,3 +322,25 @@ def test_get_akonto_qrbill(self):
             ],
         )
         pdf_file.file_to_stream.close()
+
+
+class ContractViewSetTest(GenoAdminTestCase):
+    @classmethod
+    def setUpTestData(cls):
+        super().setUpTestData()
+        geno_testdata.create_contracts(cls)
+        User = get_user_model()
+        cls.user = User.objects.get(username="superuser")
+
+    def test_subcontracts_are_excluded_in_api_view(self):
+        Contract.objects.create(
+            state="unterzeichnet", date=datetime.date(2020, 1, 1), main_contract=self.contracts[0]
+        )
+        factory = APIRequestFactory()
+        view = ContractViewSet.as_view({"get": "list"})
+        request = factory.get(reverse("contract-list"))
+        force_authenticate(request, user=self.user)
+        response = view(request)
+        self.assertEqual(response.status_code, 200)
+        data = json.loads(response.render().content)
+        self.assertEqual(data["count"], 1)

django/geno/tests/test_billing.py

@@ -73,6 +73,15 @@ def test_create_invoices_return_string(self, mock_monthly_invoices):
         self.assertEqual(mock_monthly_invoices.call_count, 1)
         self.assertEqual(ret, "String")
 
+    @patch("geno.billing.create_monthly_invoices", return_value=(2, [], [], []))
+    def test_create_invoices_exclude_subcontracts(self, mock_monthly_invoices):
+        Contract.objects.create(
+            date=datetime.date(2001, 1, 1), state="unterzeichnet", main_contract=self.contracts[0]
+        )
+        ret = geno.billing.create_invoices()
+        self.assertEqual(mock_monthly_invoices.call_count, 1)
+        self.assertEqual(ret[-1]["info"], "2 Rechnungen für 1 Vertrag")
+
     def test_create_invoices_empty_contract_count(self):
         messages = geno.billing.create_invoices(reference_date=datetime.date(2001, 6, 1))
         self.assertEqual(messages[-1]["info"], "3 Rechnungen für 1 Vertrag")