Tracking pull request to merge release-2.17.0 to master (#2849)

* fix: added type check for exclusion report on snapshot (#2855)

Co-authored-by: Your Name <[email protected]>

---------

Co-authored-by: Alex Zorkin <[email protected]>
Co-authored-by: Your Name <[email protected]>

.github/workflows/dev-release.yaml

@@ -1,11 +1,11 @@
 ## For each release, the value of name, branches, RELEASE_NAME and PR_NUMBER need to be adjusted accordingly
 ## For each release, update lib/config.js: version and releaseBranch
 
-name: TFRS Dev release-2.16.0
+name: TFRS Dev release-2.17.0
 
 on:
   push:
-    branches: [ release-2.16.0 ]
+    branches: [ release-2.17.0 ]
     paths:
       - frontend/**
       - backend/**
@@ -15,8 +15,8 @@ on:
 env:
   ## The pull request number of the Tracking pull request to merge the release branch to main
   ## Also remember to update the version in .pipeline/lib/config.js
-  PR_NUMBER: 2836
-  RELEASE_NAME: release-2.16.0
+  PR_NUMBER: 2849
+  RELEASE_NAME: release-2.17.0
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

.github/workflows/tfrs-release.yaml

@@ -1,7 +1,7 @@
 ## For each release, the value of name, branches, RELEASE_NAME and PR_NUMBER need to be adjusted accordingly
 ## For each release, update lib/config.js: version and releaseBranch
 
-name: TFRS release-2.16.0
+name: TFRS release-2.17.0
 
 on:
   workflow_dispatch:
@@ -10,8 +10,8 @@ on:
 env:
   ## The pull request number of the Tracking pull request to merge the release branch to main
   ## Also remember to update the version in .pipeline/lib/config.js
-  PR_NUMBER: 2836
-  RELEASE_NAME: release-2.16.0
+  PR_NUMBER: 2849
+  RELEASE_NAME: release-2.17.0
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

.pipeline/lib/config.js

@@ -1,7 +1,7 @@
 'use strict';
 const options= require('@bcgov/pipeline-cli').Util.parseArguments()
 const changeId = options.pr //aka pull-request
-const version = '2.16.0'
+const version = '2.17.0'
 const name = 'tfrs'
 const ocpName = 'apps.silver.devops'
 
@@ -13,7 +13,7 @@ options.git.repository='tfrs'
 const phases = {
   build: {  namespace:'0ab226-tools'    , name: `${name}`, phase: 'build'  , changeId:changeId, suffix: `-build-${changeId}`  , 
             instance: `${name}-build-${changeId}`  , version:`${version}-${changeId}`, tag:`build-${version}-${changeId}`,
-            releaseBranch: 'release-2.16.0'
+            releaseBranch: 'release-2.17.0'
           },
   dev: {namespace:'0ab226-dev'    , name: `${name}`, phase: 'dev'  , changeId:changeId, suffix: `-dev`  , 
         instance: `${name}-dev`  , version:`${version}`, tag:`dev-${version}`, dbServiceName: 'tfrs-spilo',

backend/api/viewsets/ComplianceReport.py

@@ -552,7 +552,8 @@ def list(self, request, *args, **kwargs):
         return Response(data)
 
     def compliance_to_new_act(self, obj, snapshot):
-        if int(obj.compliance_period.description) > 2022 and snapshot is not None:
+        if int(obj.compliance_period.description) > 2022 \
+          and snapshot is not None and obj.type.the_type != "Exclusion Report":
             lines = snapshot.get('summary').get('lines')
             if lines.get('29A') is None:
                 previous_transactions = []

frontend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tfrs",
-  "version": "2.16.0",
+  "version": "2.17.0",
   "dependencies": {
     "@babel/eslint-parser": "^7.19.1",
     "@babel/plugin-proposal-object-rest-spread": "^7.20.7",

openshift-v4/templates/backup-container-2.6.1/cronjob.md

@@ -6,7 +6,7 @@ KNP: allow CronJob to connect to Spilo
 oc process -f ./db-backup-cronjob-2.6.1.yaml \
 JOB_NAME=tfrs-db-backup \
 JOB_PERSISTENT_STORAGE_NAME=backup \
-SCHEDULE="00 07 * * *" \
+SCHEDULE="00 07,21 * * *" \
 TAG_NAME=2.6.1 \
 DATABASE_SERVICE_NAME=tfrs-spilo-readonly \
 DATABASE_DEFAULT_PORT=5432 \