Merge branch 'develop' into hotfix-3.2.3

Author: syre

.gitlab-ci.yml

@@ -121,21 +121,22 @@ Build app image:
 .test-default: &test-default
   stage: test
   needs: ["Build app image"]
+  dependencies: []
+
+Unittest:
+  <<: *test-default
+  variables:
+    DATABASE_NAME: bev
+    DATABASE_USER: bev
+    DATABASE_PASSWORD: bev
+    BEV_USER_CONFIG_PATH: $CI_PROJECT_DIR/dev-environment/dev-settings.ini
+    COVERAGE_FILE: $CI_PROJECT_DIR/.coverage
   image: ${IMAGE_SHA}
   tags:
     - docker
   services:
-    - name: postgres:11
+    - name: magentaaps/postgres-os2bos:1-10.14-test
       alias: db
-  dependencies: []
-  variables:
-    POSTGRES_USER: bev
-    POSTGRES_PASSWORD: bev
-    BEV_USER_CONFIG_PATH: $CI_PROJECT_DIR/dev-environment/dev-settings.ini
-    COVERAGE_FILE: $CI_PROJECT_DIR/.coverage
-
-Unittest:
-  <<: *test-default
   script:
     - cd /code/backend &&
       pytest
@@ -159,15 +160,19 @@ FrontendTest:
   <<: *test-default
   variables:
     FF_NETWORK_PER_BUILD: 1
-    POSTGRES_USER: bev
-    POSTGRES_PASSWORD: bev
-    BEV_USER_CONFIG_PATH: $CI_PROJECT_DIR/dev-environment/frontend-tests-settings.ini
+    DATABASE_NAME: bev
+    DATABASE_USER: bev
+    DATABASE_PASSWORD: bev
+    BEV_USER_CONFIG_PATH: /code/dev-environment/ci-settings.ini
     SIMPLESAMLPHP_BASEURLPATH: http://idp:8080/simplesaml
     SIMPLESAMLPHP_SP_ENTITY_ID: http://bev:5000
     SIMPLESAMLPHP_SP_ASSERTION_CONSUMER_SERVICE: http://bev:5000/api/saml2_auth/acs/
   image: magentalabs/frontend-test:v0.2 #includes npm, chrome, firefox and ffmpeg
+  tags:
+    - docker
+    - high-mem
   services:
-    - name: postgres:11
+    - name: magentaaps/postgres-os2bos:1-10.14-test
       alias: db
     - name: ${IMAGE_SHA}
       alias: bev
@@ -182,15 +187,13 @@ FrontendTest:
     when: always
     paths:
       - $CI_PROJECT_DIR/artifacts
-  allow_failure: true
 
 # Release stage
 ###############
 
 .release-default: &release-default
   stage: release
-  needs: ['Unittest']
-  #needs: ["Unittest", "FrontendTest"] require also frontendTest to pass
+  needs: ["Unittest", "FrontendTest"]
   image: alpine
   variables:
     GIT_STRATEGY: none # We do not need the source code
@@ -280,7 +283,7 @@ Deploy test:
 Deploy dev:
   # Manuel deployment job to cburdev.magenta.dk
   <<: *deploy-default
-  needs: ["Unittest"]
+  needs: ["Unittest", "FrontendTest"]
   except:
     refs:
       - master
@@ -299,14 +302,27 @@ Deploy dev:
     name: dev
     url: https://cburdev.magenta.dk
 
-.deploy-rc:
+
+Deploy tag to staging:
   <<: *deploy-default
   needs: ["Release rc"]
+  when: manual
   only:
-    - /release/.*/
+    variables:
+      # Matches all of SemVer 2.0.0
+      - $CI_COMMIT_TAG =~ /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/
+  variables:
+    DEPLOYMENT_NAMESPACE: cbur.ballerup.staging
+    SALTAPI_URL: https://ctrl1.magenta-aps.dk/api/
+    SALTAPI_EAUTH: file
+    GIT_STRATEGY: none
+    PILLAR_OVERRIDE: "{\"OS2BOS_APPLICATION_DOCKER_IMAGE\":\"${IMAGE}:${CI_COMMIT_TAG}\"}"
   script:
-    - echo Deploying ${IMAGE_RC} to moratest.magneta.dk
-    # TODO: push ${IMAGE_RC} to moratest.magneta.dk
+    - echo Deploying ${IMAGE_TAG} to https://test-bevilling.balk.dk
+    - pepper --client runner --fail-any state.orchestrate ${DEPLOYMENT_NAMESPACE} pillar=$(echo $PILLAR_OVERRIDE)
+  environment:
+    name: ballerup-staging
+    url: https://test-bevilling.balk.dk
 
 
 .deploy-master:

README.rst

@@ -180,11 +180,11 @@ to connect them. It starts four services:
 
 - `frontend`: the vue frontend reachable at  http://localhost:8080
 - `bev`: the django backend
-- `db`: a `postgres database server`_
+- `db`: a OS2BOS specific `postgres database server`_
 - `postfix`: a `postfix email server`_
 
 .. _postfix email server: https://hub.docker.com/r/catatnight/postfix
-.. _postgres database server: https://hub.docker.com/_/postgres
+.. _postgres database server: https://git.magenta.dk/bevillingsplatform/postgres-os2bos
 
 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
@@ -196,11 +196,11 @@ requests to the backend. The exact list of proxied endpoints can be seen in
 automatically restarts the server on changes to the backend files. This enables
 you to edit the backend files and the server will be reloaded automatically.
 
-To pull the images and start the three service run:
+To pull the images and start the services run:
 
 .. code-block:: bash
 
-   docker-compose up -d --build frontend
+   docker-compose up -d --build
 
 
 The ``-d`` flag move the services to the background. You can inspect the output of
@@ -213,16 +213,6 @@ services, but the data will persist. To completely remove the containers and
 data run ``docker-compose down -v``.
 
 
-Postgres initialisation
-^^^^^^^^^^^^^^^^^^^^^^^
-
-The ``docker-compose.yml`` file contains a service named ``bev-cp``. Its purpose
-is to copy the files needed to initialize the database and database user to a
-volume. This volume can then be mounted to the postgres image to automatically
-initialize the database. This functionality is not needed by default because the
-needed files are mounted directly from the host. It is included as an example
-when you want to use an environment closer to production.
-
 Tests and shell access
 ======================
 

VERSION

@@ -1 +1 @@
-3.2.3
+3.2.3

backend/bevillingsplatform/settings.py

@@ -305,15 +305,13 @@
                 fallback=os.path.join(LOG_DIR, "generate_payments_report.log"),
             ),
         },
-        "mark_fictive_payments_paid": {
+        "mark_payments_paid": {
             "level": "INFO",
             "class": "logging.FileHandler",
             "formatter": "verbose",
             "filename": settings.get(
                 "FICTIVE_PAYMENTS_LOG_FILE",
-                fallback=os.path.join(
-                    LOG_DIR, "mark_fictive_payments_paid.log"
-                ),
+                fallback=os.path.join(LOG_DIR, "mark_payments_paid.log"),
             ),
         },
         "send_expired_emails": {
@@ -383,8 +381,8 @@
             "level": "INFO",
             "propagate": True,
         },
-        "bevillingsplatform.mark_fictive_payments_paid": {
-            "handlers": ["mark_fictive_payments_paid"],
+        "bevillingsplatform.mark_payments_paid": {
+            "handlers": ["mark_payments_paid"],
             "level": "INFO",
             "propagate": True,
         },

backend/core/management/commands/mark_fictive_payments_paid.py renamed to backend/core/management/commands/mark_payments_paid.py

@@ -12,25 +12,25 @@
 
 from django.db import transaction
 from django.core.management.base import BaseCommand
-from core.models import Payment, STATUS_GRANTED, SD
+from core.models import Payment, STATUS_GRANTED, SD, CASH, PaymentSchedule
 
-logger = logging.getLogger("bevillingsplatform.mark_fictive_payments_paid")
+logger = logging.getLogger("bevillingsplatform.mark_payments_paid")
 
 
 class Command(BaseCommand):
-    help = "Marks fictive payments paid on the given date."
+    help = "Marks payments paid on the given date."
 
     def add_arguments(self, parser):
         parser.add_argument(
             "-d",
             "--date",
-            help=("Mark payments fictive for date"),
+            help=("Mark payments for date"),
             default=None,
         )
 
     @transaction.atomic
     def handle(self, *args, **options):
-        """Mark fictive payments paid for the given date."""
+        """Mark payments paid for the given date."""
         date = options["date"]
         if date is not None:
             try:
@@ -45,19 +45,22 @@ def handle(self, *args, **options):
             date = datetime.now().date()
 
         try:
-            fictive_payments = Payment.objects.filter(
+            # Filter cash payments except for PERSON payments as
+            # those are handled by the PRISM export management command.
+            non_person_cash_payments = Payment.objects.filter(
                 date=date,
-                payment_schedule__fictive=True,
+                payment_method=CASH,
                 paid=False,
                 payment_schedule__activity__status=STATUS_GRANTED,
-            )
+            ).exclude(recipient_type=PaymentSchedule.PERSON)
+
             sd_payments = Payment.objects.filter(
                 date=date,
                 payment_schedule__payment_method=SD,
                 paid=False,
                 payment_schedule__activity__status=STATUS_GRANTED,
             )
-            payments = list(fictive_payments) + list(sd_payments)
+            payments = list(non_person_cash_payments) + list(sd_payments)
             payment_ids = [payment.id for payment in payments]
             for payment in payments:
                 print(payment)
@@ -71,5 +74,5 @@ def handle(self, *args, **options):
             )
         except Exception:
             logger.exception(
-                "An exception occurred during marking payments fictive."
+                "An exception occurred during marking payments paid."
             )

backend/core/migrations/0087_mark_fictive_non_cash_payments_not_paid.py

@@ -0,0 +1,27 @@
+from django.db import migrations, models
+from django.db.models import Q
+
+def mark_fictive_internal_and_invoice_payments_not_paid(apps, schema_editor):
+    Payment = apps.get_model("core", "Payment")
+
+    payments = Payment.objects.filter(
+        Q(payment_method="INVOICE")|Q(payment_method="INTERNAL"),
+        payment_schedule__fictive=True,
+        paid=True,
+    )
+
+    for payment in payments:
+        print(f"Marking payment with id: {payment.id} not paid")
+        payment.paid = False
+        payment.paid_date = None
+        payment.paid_amount = None
+        payment.save()
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0086_auto_20200918_1106'),
+    ]
+
+    operations = [migrations.RunPython(mark_fictive_internal_and_invoice_payments_not_paid)]

backend/core/models.py

@@ -2103,7 +2103,7 @@ def save(self, *args, **kwargs):
     def is_valid_activity_start_date(self):
         """Determine if a date is valid for a activity start_date."""
         # A start_date is valid for cash activities if at least two
-        # consecutive days without payment date exclusions exist between
+        # days without payment date exclusions exist between
         # today and the start_date.
         if (
             self.payment_plan.payment_method == CASH
@@ -2130,14 +2130,12 @@ def is_valid_activity_start_date(self):
                 )
             ]
 
-            consecutive_days = 0
+            days_without_exclusions = 0
             for day_date in tomorrow_to_start_date_in_days:
-                if exclusions.filter(date=day_date).exists():
-                    consecutive_days = 0
-                else:
-                    consecutive_days += 1
+                if not exclusions.filter(date=day_date).exists():
+                    days_without_exclusions += 1
 
-                if consecutive_days == 2:
+                if days_without_exclusions == 2:
                     return True
 
             return False

backend/core/serializers.py

@@ -158,6 +158,9 @@ class PaymentSerializer(serializers.ModelSerializer):
     case__cpr_number = serializers.ReadOnlyField(
         source="payment_schedule.activity.appropriation.case.cpr_number"
     )
+    case__name = serializers.ReadOnlyField(
+        source="payment_schedule.activity.appropriation.case.name"
+    )
     activity__id = serializers.ReadOnlyField(
         source="payment_schedule.activity.id"
     )
@@ -575,7 +578,7 @@ def validate(self, data):
             raise serializers.ValidationError(
                 _(
                     "Startdato skal være i fremtiden og "
-                    "der skal være mindst to udbetalingsdage i række"
+                    "der skal være mindst to udbetalingsdage"
                     " fra nu og til startdatoen"
                 )
             )