test

.github/workflows/app-vue.yml

@@ -24,7 +24,7 @@ jobs:
         uses: actions/setup-node@v1
         with:
           node-version: ${{ matrix.node-version }}
-      - run: npm ci
+      - run: npm install && npm ci
         working-directory: ${{env.working-directory}}
       - run: npm run build --if-present
         working-directory: ${{env.working-directory}}

.github/workflows/sonarcloud.yml

@@ -4,9 +4,9 @@ name: SonarCloud Scan
 
 on:
   push:
-    branches: [ master ]
+    branches: [master]
   pull_request:
-    branches: [ master ]
+    branches: [master]
 
   workflow_dispatch:
 
@@ -23,7 +23,7 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: SonarCloud Scan
-        uses: SonarSource/sonarcloud-github-action@v1.6
+        uses: SonarSource/sonarcloud-github-action@v2.3
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

.gitignore

@@ -2,6 +2,10 @@
 *_DeploymentConfig.json
 *_BuildConfig.json
 
+.env
+env/
+.env.*
+
 /prototypes
 *.local.*
 
@@ -45,4 +49,4 @@ Temporary Items
 
 # Output files
 pdf/*.pdf
-/__pycache__
+/__pycache__

README.md

@@ -12,36 +12,40 @@ Currently it requires: Npm 6.14.14, Node 12, Python 3.8/3.9/3.10. Running on Doc
 A Vue client application which serves out the SurveyJS based questionnaire.
 
 #### Important commands for the web folder:
-`npm run-script serve` # Serve web under hot reloading  
-`npm run-script build` # Build production web package  
+`npm run-script serve` # Serve web under hot reloading
+`npm run-script build` # Build production web package
 
 ###	REST API (api)
 A Django based REST API which provides the heavy lifting.  The API includes a Swagger interface containing API documentation and UI that allows you to interact with the various APIs manually.
 
 #### Important commands for the api folder (May require environment variables set, check settings.py):
-`python manage.py migrate`  
-`python manage.py makemigrations`    
-`python manage.py runserver 8081` 
+`python manage.py migrate`
+`python manage.py makemigrations`
+`python manage.py runserver 8081`
 
 #### Required Environment Variable keys (check settings.py):
-`DATABASE_SERVICE_NAME, DATABASE_NAME, DATABASE_USER, DATABASE_PASSWORD, DATABASE_ENGINE, LOCAL_SERVICE_HOST, LOCAL_SERVICE_PORT`  
+`DATABASE_SERVICE_NAME, DATABASE_NAME, DATABASE_USER, DATABASE_PASSWORD, DATABASE_ENGINE, LOCAL_SERVICE_HOST, LOCAL_SERVICE_PORT`
 
 ### PDF Microservice (pdf)
 An html to PDF microservice used to generate reports.
-This can be started up by `./manage start pdf` under the docker folder (refer to Running on Docker). 
+This can be started up by `./manage start pdf` under the docker folder (refer to Running on Docker).
 
 ###	Database (db)
 A PostgreSQL database for storage.
 This can be started up by `./manage start db` under the docker folder (refer to Running on Docker). Alternatively a local version could be installed on a different port than the docker container.
 
+## Running on Docker
+The project can also be run locally using Docker and Docker Compose.  Refer to [Running with Docker Compose](./docker/README.md) for instructions.
+
 ## Running on OpenShift
 To deploy using a local instance of OpenShift, refer to [Running on OpenShift](./RunningOnOpenShift.md).  These instructions, apart from the steps that are specific to setting up your local environment, can be used to get the project deployed to a production OpenShift environment.
 
-## Running on Docker
-The project can also be run locally using Docker and Docker Compose.  Refer to [Running with Docker Compose](./docker/README.md) for instructions.
+## High Level Architecture
+
+![Family Law Act Application](./doc/diagrams/Family%20Law%20Act%20Application.drawio.svg)
 
 ## Code of Conduct
-Please refer to the [Code of Conduct](./CODE_OF_CONDUCT.md) 
+Please refer to the [Code of Conduct](./CODE_OF_CONDUCT.md)
 
 ## Contributing
 For information on how to contribute, refer to [Contributing](CONTRIBUTING.md)

api/api/settings.py

@@ -268,4 +268,4 @@
 FORCE_SCRIPT_NAME = os.getenv("WEB_BASE_HREF", DEFAULT_BASE_URL)
 LOGOUT_REDIRECT_URL = os.getenv("LOGOUT_REDIRECT_URL", DEFAULT_BASE_URL)
 SITEMINDER_LOGOFF_URL = os.getenv("SITEMINDER_LOGOFF_URL", "https://logontest.gov.bc.ca/clp-cgi/logoff.cgi")
-STATS_AUTHORIZED_LIST = os.getenv("STATS_AUTHORIZED_LIST")
+STATS_AUTHORIZED_LIST = os.getenv("STATS_AUTHORIZED_LIST", "[]")

api/api/stats/statistics.py

@@ -32,20 +32,39 @@ def statistics_info(start_date, end_date, tz):
         last_updated__gte=start_date,
         last_updated__lte=end_date
     )
+    LOGGER.info("STATISTIC -> Application in this period: %i", len(applications_with_date))
 
     report = {"start_date":start_date, "end_date":end_date}
-    report["users_registration_info"] = get_users_info(start_date, end_date)
-
-    report["users_with_application"] = users(applications_with_date)
-
-    report["logged_in_users"] = get_logged_in_users()
-
-    report["prepared_pdfs"] = num_of_prepared_pdfs(start_date, end_date)
-    report["efiling_submissions"] = num_of_efiling_submissions(start_date, end_date)
+    try:
+        report["users_registration_info"] = get_users_info(start_date, end_date)
+    except Exception as err:
+        LOGGER.debug(err)
+
+    try:
+        report["users_with_application"] = users(applications_with_date)
+    except Exception as err:
+        LOGGER.debug(err)
+
+    try:
+        report["logged_in_users"] = get_logged_in_users()
+    except Exception as err:
+        LOGGER.debug(err)
+
+    try:
+        report["prepared_pdfs"] = num_of_prepared_pdfs(start_date, end_date)
+    except Exception as err:
+        LOGGER.debug(err)
+
+    try:
+        report["efiling_submissions"] = num_of_efiling_submissions(start_date, end_date)
+    except Exception as err:
+        LOGGER.debug(err)
 
     # report["steps"] = steps(applications_with_date)
-
-    report["application_details"] = application_details(applications_with_date)
+    try:
+        report["application_details"] = application_details(applications_with_date)
+    except Exception as err:
+        LOGGER.debug(err)
 
     return report
 
@@ -81,6 +100,10 @@ def application_details(applications):
         "NLP":{"total":0, "started":0, "draft":0, "completed":0, "efiled":0},
         "NLPR":{"total":0, "started":0, "draft":0, "completed":0, "efiled":0},
         "AFF":{"total":0, "started":0, "draft":0, "completed":0, "efiled":0},
+        "GA":{"total":0, "started":0, "draft":0, "completed":0, "efiled":0},
+        "APS":{"total":0, "started":0, "draft":0, "completed":0, "efiled":0},
+        "APSP":{"total":0, "started":0, "draft":0, "completed":0, "efiled":0},
+        "CSV":{"total":0, "started":0, "draft":0, "completed":0, "efiled":0},
         "EFSP":{"total":0, "started":0, "draft":0, "completed":0, "efiled":0}
     }
     stat_keys = list(stat.keys())
@@ -112,6 +135,10 @@ def application_details(applications):
             "NLP":["NLP"],
             "NLPR":["NLPR"],
             "AFF":["AFF"],
+            "GA":["GA"],
+            "APS":["APS"],
+            "APSP":["APSP"],
+            "CSV":["CSV"],
             "EFSP":["EFSP"]
         }
 

api/api/urls.py

@@ -65,7 +65,7 @@ def get(self, request):
     path("efiling/<int:application_id>/rejection/<int:package_id>/", EFilingRejectionView.as_view()),
     path("efiling/<int:package_id>/doc/<int:doc_id>/", EFilingDocumentView.as_view()),
     path("print-fillable-pdf", FillablePdfView.as_view()),
-    path("statistics/", StatisticsView.as_view())
+    path("statistics", StatisticsView.as_view())
 ]
 
 if settings.OIDC_ENABLED:

api/api/views/statistics_view.py

@@ -39,7 +39,7 @@ def get(self, request):
             tz =  0
         else:
             tz = int(tz)        
-
+        logger.info("STATISTIC -> startDate: %s, endDate: %s, tz: %i", start_date, end_date, tz)
         return Response(statistics_info(start_date, end_date, tz))
 
 

api/core/auth.py

@@ -1,5 +1,5 @@
 import logging
-import urllib
+import requests
 import json
 
 from rest_framework.request import Request
@@ -22,7 +22,7 @@ def get_login_uri(request: Request = None, next: str = None) -> str:
         try:
             uri = "{base_url}?{querystring}".format(
                 base_url=reverse("oidc_auth_request", request=request),
-                querystring=urllib.parse.urlencode(query_dictionary),
+                querystring=requests.compat.urlencode(query_dictionary),
             )
         except NoReverseMatch:
             pass
@@ -82,13 +82,13 @@ def build_get_user_object(logged_in, request):
 
 def user_authorized_for_stats(request):
 
-    if (isinstance(request.user, User)): 
+    if (isinstance(request.user, User)):
         user_email = request.user.email
         username = request.user.username
         stats_authorized_list = json.loads(settings.STATS_AUTHORIZED_LIST)
 
         for person in stats_authorized_list:
             if person["email"]==user_email and person["username"]==username:
-                return True    
-    
+                return True
+
     return False

api/requirements.txt

@@ -1,5 +1,5 @@
 # Main
-django==4.0.7
+django==4.1.10
 django-filter>=21.1,<22
 djangorestframework>=3.13.1,<4
 djangorestframework-bulk>=0.2.1,<1

docker/docker-compose.yml

@@ -63,6 +63,8 @@ services:
       - SITEMINDER_LOGOFF_URL=${SITEMINDER_LOGOFF_URL}
       - OIDC_RP_CLIENT_SECRET=${OIDC_RP_CLIENT_SECRET}
       - OIDC_RP_KC_IDP_HINT=${OIDC_RP_KC_IDP_HINT}
+      - OIDC_RP_HOST=${OIDC_RP_HOST}
+      - OIDC_RP_PROVIDER_ENDPOINT=${OIDC_RP_PROVIDER_ENDPOINT}
       - EFILING_HUB_API_BASE_URL=${EFILING_HUB_API_BASE_URL}
       - EFILING_HUB_KEYCLOAK_CLIENT_ID=${EFILING_HUB_KEYCLOAK_CLIENT_ID}
       - EFILING_HUB_KEYCLOAK_SECRET=${EFILING_HUB_KEYCLOAK_SECRET}

docker/manage

@@ -85,7 +85,7 @@ build-web() {
     --copy \
     -e WEB_BASE_HREF=${WEB_BASE_HREF} \
     '../web' \
-    'centos/nodejs-10-centos7:10' \
+    'centos/nodejs-12-centos7:12' \
     ${COMPOSE_PROJECT_NAME}'-web-artifacts'
   echo -e "===================================================================================================="
 
@@ -117,7 +117,7 @@ build-web-dev() {
     --copy \
     -e "DEV_MODE=true" \
     '../web' \
-    'centos/nodejs-10-centos7:10' \
+    'centos/nodejs-12-centos7:12' \
     ${COMPOSE_PROJECT_NAME}'-web-dev'
   echo -e "===================================================================================================="
 }
@@ -152,8 +152,9 @@ build-api() {
   echo -e "----------------------------------------------------------------------------------------------------"
   ${S2I_EXE} build \
     --copy \
+    -e "DISABLE_SETUP_PY_PROCESSING=True" \
     '../api' \
-    'centos/python-38-centos7' \
+    'quay.io/fedora/python-39' \
     ${COMPOSE_PROJECT_NAME}'-api'
   echo -e "===================================================================================================="
 }
@@ -166,7 +167,13 @@ build-pdf() {
   echo
 }
 
-configureEnvironment () {
+configureEnvironment () {  
+
+  if [ -f .env ]; then
+    echo -e "\nLoading environment variables from .env ...\n"
+    source .env
+  fi
+
   for arg in $@; do
     case "$arg" in
       *=*)

openshift/pipelines/eventlistener-pipeline-listener.yaml

@@ -0,0 +1,40 @@
+apiVersion: triggers.tekton.dev/v1alpha1
+kind: EventListener
+metadata:
+  name: pipeline-listener
+  namespace: 09e0c5-tools
+spec:
+  namespaceSelector: {}
+  resources: {}
+  serviceAccountName: pipeline
+  triggers:
+    - bindings:
+        - kind: TriggerBinding
+          ref: pipeline-trigger-binding
+      interceptors:
+        - name: Cel filter only Main branch
+          params:
+            - name: filter
+              value: body.ref == 'refs/heads/master'
+            - name: overlays
+              value:
+                - expression: body.head_commit.modified.marshalJSON()
+                  key: git-commits
+          ref:
+            kind: ClusterInterceptor
+            name: cel
+        - name: validate GitHub payload and filter on eventType
+          params:
+            - name: secretRef
+              value:
+                secretKey: secretToken
+                secretName: github-tekton-secret
+            - name: eventTypes
+              value:
+                - push
+          ref:
+            kind: ClusterInterceptor
+            name: github
+      name: github-listener
+      template:
+        ref: pipeline-trigger-template