Merge pull request #592 from NBISweden/test-prodtoprod

Test prod to production

.github/workflows/create_packages.yml

@@ -3,7 +3,6 @@ on:
   push:
     branches:
 
-
 jobs:
   main:
     runs-on: ubuntu-latest
@@ -12,36 +11,43 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
+      - name: Update tags.json version
+        uses: jossef/[email protected]
+        with:
+          file: frontend/src/tags.json
+          field: gitBranch
+          value: ${{github.ref_name}}
+
       - name: Build container
         env:
           GHCR_PAT: ${{ secrets.GHCR_PAT }}
           GHCR_USER: ${{ secrets.GHCR_USER }}
           DOCKER_BUILDKIT: 1
           COMPOSE_DOCKER_CLI_BUILD: 1
         run: |
-             echo "${GHCR_PAT}" | docker login ghcr.io -u "${GHCR_USER}" --password-stdin
-
-             branch=${GITHUB_REF##*/}
-             
-             for image in herdbook_r-api herdbook_main herdbook_frontend; do
-               docker pull "ghcr.io/nbisweden/$image:latest" || true
-               docker pull "ghcr.io/nbisweden/$image:$branch" || true
-             done
-             
-             for p in .docker/*.default ; do
-               mv "$p" "${p%.default}"
-             done
-
-             docker-compose build --build-arg BUILDKIT_INLINE_CACHE=1 herdbook-frontend main;
-
-             for image in herdbook_main herdbook_frontend; do
-               docker tag "$image:latest" "ghcr.io/nbisweden/$image:$branch"
-               docker push "ghcr.io/nbisweden/$image:$branch"
-
-               for mb in main master develop; do
-                 if [ "$mb" = "$branch" ]; then
-                   docker tag "$image:latest" "ghcr.io/nbisweden/$image:latest"
-                   docker push "ghcr.io/nbisweden/$image:latest"
-                 fi
-               done
-             done
+          echo "${GHCR_PAT}" | docker login ghcr.io -u "${GHCR_USER}" --password-stdin
+
+          branch=${GITHUB_REF##*/}
+
+          for image in herdbook_r-api herdbook_main herdbook_frontend; do
+            docker pull "ghcr.io/nbisweden/$image:latest" || true
+            docker pull "ghcr.io/nbisweden/$image:$branch" || true
+          done
+
+          for p in .docker/*.default ; do
+            mv "$p" "${p%.default}"
+          done
+
+          docker-compose build --build-arg BUILDKIT_INLINE_CACHE=1 herdbook-frontend main
+
+          for image in herdbook_main herdbook_frontend; do
+            docker tag "$image:latest" "ghcr.io/nbisweden/$image:$branch"
+            docker push "ghcr.io/nbisweden/$image:$branch"
+
+            for mb in main master develop; do
+              if [ "$mb" = "$branch" ]; then
+                docker tag "$image:latest" "ghcr.io/nbisweden/$image:latest"
+                docker push "ghcr.io/nbisweden/$image:latest"
+              fi
+            done
+          done

.github/workflows/lint.yml

@@ -39,7 +39,7 @@ jobs:
       # Checkout the code base #
       ##########################
       - name: Checkout Code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           # Full git history is needed to get a proper list of changed files within `super-linter`
           fetch-depth: 0
@@ -48,7 +48,7 @@ jobs:
       # Run Linter against code base #
       ################################
       - name: Lint Code Base
-        uses: github/super-linter@v4
+        uses: github/super-linter/slim@v4
         env:
           VALIDATE_ALL_CODEBASE: false
           DEFAULT_BRANCH: develop

app/certs/ca.pem

@@ -1,31 +1,31 @@
 -----BEGIN CERTIFICATE-----
-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
+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
+o0aDVImytw==
 -----END CERTIFICATE-----

app/certs/key.pem

@@ -1,52 +1,52 @@
 -----BEGIN PRIVATE KEY-----
-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
-ODto2kpe84wtLMTYH/akvyk0nCDMxA==
+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
+cNnPFbL3C3vCtL3/qAPV0h8tBbwJuDE=
 -----END PRIVATE KEY-----

app/herdbook.py

@@ -302,6 +302,7 @@ def herd_breeding_list(h_id):
     exact birth date if it exists.
     """
     breedings = da.get_breeding_events_with_ind(h_id, session.get("user_id", None))
+
     if request.method == "POST":
         form = request.json
         birth_date = da.validate_date(form.get("birth_date", None))
@@ -316,13 +317,17 @@ def herd_breeding_list(h_id):
                 and (
                     start
                     <= (
-                        da.validate_date(item["birth_date"])
+                        da.validate_date(item.get("birth_date"))
                         - datetime.timedelta(days=30)
                         if item.get("breed_date") is None
                         else da.validate_date(item.get("breed_date"))
                     )
                     <= end
-                    or da.validate_date(item["birth_date"]) == birth_date
+                    or (
+                        da.validate_date(item.get("birth_date")) == birth_date
+                        if item.get("birth_date") is not None
+                        else None
+                    )
                 )
             ),
             None,

app/requirements.txt

@@ -28,3 +28,4 @@ endesive==2.0.9
 boto3==1.17.54
 moto==2.0.8
 google-auth
+setuptools>=65.5.1 # not directly required, pinned by Snyk to avoid a vulnerability

app/utils/data_access.py

@@ -860,6 +860,26 @@ def form_to_individual(form, user=None):
             else:
                 if not form.get("new_individual", False):
                     if getattr(individual, key) != form[key]:
+                        # Reset if switching from paper to digital certificate or vice versa
+                        if (
+                            key == "digital_certificate"
+                            and getattr(individual, "certificate") is not None
+                        ):
+                            update_logger.info(
+                                f"{user.username},{individual.number},"
+                                f"certificate,{getattr(individual,'certificate')},'None',"
+                            )
+                            setattr(individual, "certificate", None)
+
+                        if (
+                            key == "certificate"
+                            and getattr(individual, "digital_certificate") is not None
+                        ):
+                            update_logger.info(
+                                f"{user.username},{individual.number},"
+                                f"digital_certificate,{getattr(individual,'digital_certificate')},'None',"
+                            )
+                            setattr(individual, "digital_certificate", None)
                         update_logger.info(
                             f"{user.username},{individual.number},{key},{getattr(individual,key)},{form[key]},"
                         )
@@ -894,14 +914,33 @@ def add_individual(form, user_uuid):
         return {"status": "error", "message": "Forbidden"}
 
     if form.get("number", None) is None and "breeding" in form:
-        form["number"] = next_individual_number(
+        nextind = next_individual_number(
             herd=form["herd"],
             birth_date=form["birth_date"],
             breeding_event=form["breeding"],
         )
+        logger.error(f"nextind is ${nextind}")
+        if nextind.get("status", None) == "success":
+            form["number"] = nextind["number"]
+        else:
+            logger.error(f"Next in is not successfull: ${nextind.get('message')}")
+            return {
+                "status": "error",
+                "message": f"kan inte hämta nästa individ nummer: ${nextind.get('message')}",
+            }
 
     if Individual.select().where(Individual.number == form["number"]).exists():
         return {"status": "error", "message": "Individual number already exists"}
+    if form.get("certificate", None) is not None:
+        if (
+            Individual.select()
+            .where(Individual.certificate == form["certificate"])
+            .exists()
+        ):
+            return {
+                "status": "error",
+                "message": "Individual certificate already exists",
+            }
 
     birth_date = form.get("birth_date", None)
     if birth_date is None: