Merge branch 'release/3.3.0' into 'master'

Release/3.3.0 - master

See merge request bevillingsplatform/bevillingsplatform!1028

Author: Søren Howe Gersager

.gitlab-ci.yml

@@ -182,7 +182,7 @@ FrontendTest:
     - cd frontend-tests
     - npm install
   script:
-    - ./node_modules/.bin/testcafe chrome:headless tests/*.js --baseurl http://bev:5000/ --screenshot $CI_PROJECT_DIR/artifacts --video $CI_PROJECT_DIR/artifacts
+    - ./node_modules/.bin/testcafe chrome:headless tests/*.js --baseurl http://bev:5000 --screenshot $CI_PROJECT_DIR/artifacts --video $CI_PROJECT_DIR/artifacts --assertion-timeout 15000 --selector-timeout 15000
   artifacts:
     when: always
     paths:

NEWS.rst

@@ -1,3 +1,31 @@
+Version 3.3.0, 2020-12-17
+-------------------------
+
+New in this version:
+
+Features
+^^^^^^^^
+
+- Add redirect after SSO login.
+- Save filters across page transitions.
+- Save filters in URL to make them bookmarkable.
+- Change "reset" functionality of overview pages.
+- Remove unneeded Team on Case and instead display and filter on Team of the case worker.
+- Validate CVR number for recipient_id on PaymentSchedule when recipient is "Firma".
+- Add generic time intervals for payments (previous, current, next - week, month, year).
+- Added fields to payments report.
+- Changed the flow of emails when manipulating activities.
+- Add child name to CPR number of Payments overview.
+- Add Users and Teams to workflow users Admin page.
+- Update third party dependencies.
+
+Bug fixes
+^^^^^^^^^
+
+- Fix a bug where updating a payment caused a PATCH twice.
+- Various fixes to frontend tests.
+
+
 Version 3.2.5, 2020-12-02
 -------------------------
 

README.rst

@@ -1,3 +1,7 @@
+======
+OS2BOS
+======
+
 |pipeline status|
 |coverage report|
 
@@ -119,7 +123,7 @@ We log the following:
 
 * Export to Prism log - Log related to the PRISM exports management command. The log is written to ``/log/export_to_prism.log``.
 
-* Mark Fictive Payments Paid log - Log related to the marking fictive payments paid management command. The log is written to ``mark_fictive_payments_paid.log``.
+* Mark Payments Paid log - Log related to the marking payments paid management command. The log is written to ``mark_payments_paid.log``.
 
 * Generate Payments Report log - Log related to generating the payment reports. The log is written to ``/log/generate_payments_report.log``.
 
@@ -173,18 +177,22 @@ Docker-compose
 --------------
 
 You can use ``docker-compose`` to start up bevillingsplatform and related
-service such as postgres and postfix.
+services such as postgres and postfix.
 
 A ``docker-compose.yml`` for development is included. It includes the settings
-to connect them. It starts four services:
+to connect them. It starts the following services:
 
 - `frontend`: the vue frontend reachable at  http://localhost:8080
 - `bev`: the django backend
 - `db`: a OS2BOS specific `postgres database server`_
+- `bev-cron`: `supercronic`_, a job runner running our cronjobs
+- `idp`: a local version of the IdP running our version of `SimpleSAMLphp`_
 - `postfix`: a `postfix email server`_
 
 .. _postfix email server: https://hub.docker.com/r/catatnight/postfix
 .. _postgres database server: https://git.magenta.dk/bevillingsplatform/postgres-os2bos
+.. _supercronic: https://github.com/aptible/supercronic
+.. _SimpleSAMLphp: https://simplesamlphp.org/
 
 Normally the backend image also serves the frontend code, but to ease frontend
 development, we include a frontend service that run `vue-cli-service serve

VERSION

@@ -1 +1 @@
-3.2.5
+3.3.0

backend/bevillingsplatform/settings.py

@@ -354,6 +354,16 @@
                 fallback=os.path.join(LOG_DIR, "serviceplatformen.log"),
             ),
         },
+        # handler for the django-mailer package.
+        "mailer": {
+            "level": "INFO",
+            "class": "logging.FileHandler",
+            "formatter": "verbose",
+            "filename": settings.get(
+                "MAILER_LOG_FILE",
+                fallback=os.path.join(LOG_DIR, "cron_mail.log"),
+            ),
+        },
     },
     "formatters": {
         "verbose": {
@@ -406,6 +416,12 @@
             "level": "INFO",
             "propagate": True,
         },
+        # logger for the django-mailer package.
+        "mailer": {
+            "handlers": ["mailer"],
+            "level": "INFO",
+            "propagate": True,
+        },
     },
 }
 
@@ -501,7 +517,7 @@
         "BEFORE_LOGIN": "core.utils.saml_before_login",
     },
     "USE_JWT": True,
-    "FRONTEND_URL": settings.get("SAML_PUBLIC_HOST") + "#/",
+    "FRONTEND_URL": settings.get("SAML_PUBLIC_HOST") + "#",
     "CERT_FILE": settings.get("CERT_FILE", fallback=""),
     "KEY_FILE": settings.get("KEY_FILE", fallback=""),
     "AUTHN_REQUESTS_SIGNED": settings.getboolean(
@@ -511,6 +527,20 @@
 
 SILENCED_SYSTEM_CHECKS = ["rest_framework.W001"]
 
+# Settings for manage.py graph_models from django-extensions.
+GRAPH_MODELS = {
+    "exclude_models": [
+        "AbstractUser",
+        "AuditModelMixin",
+        "SectionEffortStepProxy",
+        "ActivityDetailsSectionProxy",
+        "HistoricalRatePerDateProxy",
+        "HistoricalRatePerDate",
+        "HistoricalPayment",
+        "HistoricalCase",
+    ]
+}
+
 ALLOW_EDIT_OF_PAST_PAYMENTS = settings.getboolean(
     "ALLOW_EDIT_OF_PAST_PAYMENTS", fallback=False
 )
@@ -520,3 +550,7 @@
     "watchman.checks.databases",
     # disable storage check since fileupload is not used.
 )
+
+# Prometheus logging.
+LOG_TO_PROMETHEUS = settings.getboolean("LOG_TO_PROMETHEUS", fallback=False)
+PROMETHEUS_HOST = settings.get("PROMETHEUS_HOST", fallback="localhost:9091")

backend/core/admin.py

@@ -52,10 +52,6 @@
     HistoricalRatePerDateProxy,
 )
 
-for klass in (PaymentMethodDetails, Team):
-    admin.site.register(klass, admin.ModelAdmin)
-
-
 User = get_user_model()
 
 
@@ -262,7 +258,7 @@ class PriceAdmin(VariableRateAdmin):
 
 @admin.register(Payment)
 class PaymentAdmin(SimpleHistoryAdmin):
-    """Dislay read only fields on payment."""
+    """ModelAdmin for Payment."""
 
     readonly_fields = ("payment_id", "account_string", "account_alias")
     search_fields = ("payment_schedule__payment_id",)
@@ -413,6 +409,20 @@ def account_alias(self, obj):
     account_alias.short_description = _("kontoalias")
 
 
+@admin.register(PaymentMethodDetails)
+class PaymentMethodDetails(admin.ModelAdmin):
+    """ModelAdmin for PaymentMethodDetails."""
+
+    pass
+
+
+@admin.register(Team)
+class TeamAdmin(ClassificationAdmin):
+    """ModelAdmin for Team."""
+
+    pass
+
+
 @admin.register(User)
 class CustomUserAdmin(BaseUserAdmin):
     """Add team to user admin interface."""
@@ -421,6 +431,31 @@ class CustomUserAdmin(BaseUserAdmin):
         ("Organisation", {"fields": ("team",)}),
     ) + BaseUserAdmin.fieldsets
 
+    def has_view_permission(self, request, obj=None):
+        """Override has_view_permission for ModelAdmin."""
+        user = request.user
+        return user.is_authenticated and user.is_workflow_engine_or_admin()
+
+    def has_add_permission(self, request):
+        """Override has_add_permission for ModelAdmin."""
+        user = request.user
+        return user.is_authenticated and user.is_workflow_engine_or_admin()
+
+    def has_change_permission(self, request, obj=None):
+        """Override has_change_permission for ModelAdmin."""
+        user = request.user
+        return user.is_authenticated and user.is_workflow_engine_or_admin()
+
+    def has_delete_permission(self, request, obj=None):
+        """Override has_delete_permission for ModelAdmin."""
+        user = request.user
+        return user.is_authenticated and user.is_workflow_engine_or_admin()
+
+    def has_module_permission(self, request):
+        """Override has_model_permission for ModelAdmin."""
+        user = request.user
+        return user.is_authenticated and user.is_workflow_engine_or_admin()
+
 
 class SectionInfoInline(ClassificationInline):
     """SectionInfoInline for ActivityDetailsAdmin."""
@@ -634,6 +669,6 @@ class SectionInfoAdmin(ClassificationAdmin):
 
 @admin.register(AccountAlias)
 class AccountAliasAdmin(ClassificationAdmin):
-    """ModelAdmin for SectionInfo."""
+    """ModelAdmin for AccountAlias."""
 
     list_display = ("section_info", "activity_details", "alias")

backend/core/decorators.py

@@ -0,0 +1,56 @@
+# Copyright (C) 2019 Magenta ApS, http://magenta.dk.
+# Contact: [email protected].
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+"""Decorators used by other parts of this app."""
+from django.conf import settings
+
+from prometheus_client import Gauge, CollectorRegistry, pushadd_to_gateway
+
+
+def log_to_prometheus(job_name):
+    """
+    Log function metrics to prometheus.
+
+    for example @log_to_prometheus('send_expired_emails')
+    """
+
+    def decorator_log_to_prometheus(job_func):
+        def wrapper_log_to_prometheus(*args, **kwargs):
+            result = None
+            if not settings.LOG_TO_PROMETHEUS:
+                result = job_func(*args, **kwargs)
+            else:
+                registry = CollectorRegistry()
+                duration = Gauge(
+                    f"os2bos_{job_name}_duration_seconds",
+                    f"Duration of {job_name}",
+                    registry=registry,
+                )
+
+                try:
+                    with duration.time():
+                        result = job_func(*args, **kwargs)
+                except Exception:
+                    pass
+                else:
+                    # only runs when there are no exceptions
+                    last_success = Gauge(
+                        f"os2bos_{job_name}_last_success",
+                        f"Unixtime {job_name} last succeeded",
+                        registry=registry,
+                    )
+                    last_success.set_to_current_time()
+                finally:
+                    pushadd_to_gateway(
+                        settings.PROMETHEUS_HOST,
+                        job=f"{job_name}",
+                        registry=registry,
+                    )
+            return result
+
+        return wrapper_log_to_prometheus
+
+    return decorator_log_to_prometheus