Release/24.10

.env.example

@@ -61,3 +61,7 @@ RATELIMIT_RATE=150/m  # Rate limit (150 requests per minute)
 RATELIMIT_METHOD=ALL  # HTTP methods to rate limit; 'ALL' means all methods
 RATELIMIT_GROUP=graphql  # Group name for the rate limit
 RATELIMIT_SKIP_TIMEOUT=False  # Whether to skip rate limiting during c
+
+
+OPENSEARCH_ADMIN=admin
+OPENSEARCH_PASSWORD=B9wc9VrqX7pY

.github/workflows/ci_assembly.yml

@@ -44,6 +44,21 @@ jobs:
           --health-interval 10s
           --health-timeout 5s
           --health-retries 10
+      opensearch:
+        image: opensearchproject/opensearch:latest
+        ports:
+          - 9200:9200
+        env:
+          discovery.type: single-node
+          cluster.name: my_opensearch_local
+          http.port: 9200
+          plugins.security.ssl.http.enabled: false
+          OPENSEARCH_INITIAL_ADMIN_PASSWORD: B9wc9VrqX7pY
+        options: >-
+          --health-cmd "curl -f -u admin:${OPENSEARCH_INITIAL_ADMIN_PASSWORD} http://localhost:9200/_cluster/health || exit 1"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 10
     steps:
       - uses: actions/checkout@v2
 
@@ -145,8 +160,8 @@ jobs:
           SECRET_KEY: secret
           MODE: DEV
           DB_DEFAULT: postgresql
-          CELERY_BROKER_URL": "memory://openIMIS-test//"
-          CELERY_RESULT_BACKEND": "cache+memory://openIMIS-test//"
+          CELERY_BROKER_URL: "memory://openIMIS-test//"
+          CELERY_RESULT_BACKEND: "cache+memory://openIMIS-test//"
           #DJANGO_SETTINGS_MODULE: hat.settings
           DB_HOST: localhost
           DB_PORT: 5432
@@ -156,6 +171,10 @@ jobs:
           #DEV_SERVER: true
           SITE_ROOT: api
           CI_EXCLUDED_MODULE: ${{ vars.CI_EXCLUDED_MODULE }}
+          OPENSEARCH_ADMIN: admin
+          OPENSEARCH_PASSWORD: B9wc9VrqX7pY
+          OPEN_SEARCH_HTTP_PORT: 9200
+          OPENSEARCH_HOSTS: "localhost:9200"
 
       - name: Django tests MSSQL
         working-directory: ./openIMIS
@@ -171,8 +190,8 @@ jobs:
           SECRET_KEY: secret
           MODE: DEV
           DB_DEFAULT: mssql
-          CELERY_BROKER_URL": "memory://openIMIS-test//"
-          CELERY_RESULT_BACKEND": "cache+memory://openIMIS-test//"
+          CELERY_BROKER_URL: "memory://openIMIS-test//"
+          CELERY_RESULT_BACKEND: "cache+memory://openIMIS-test//"
           #DJANGO_SETTINGS_MODULE: hat.settings
           DB_HOST: localhost
           DB_PORT: 1433
@@ -183,3 +202,7 @@ jobs:
           SITE_ROOT: api
           #REMOTE_USER_AUTHENTICATION: False
           CI_EXCLUDED_MODULE: ${{ vars.CI_EXCLUDED_MODULE }}
+          OPENSEARCH_ADMIN: admin
+          OPENSEARCH_PASSWORD: B9wc9VrqX7pY
+          OPEN_SEARCH_HTTP_PORT: 9200
+          OPENSEARCH_HOSTS: "localhost:9200"

.github/workflows/ci_module.yml

@@ -50,8 +50,32 @@ jobs:
 
       - name: Pull openIMIS Backend
         run: |
-          rm ./openimis -rf
-          git clone --depth=1 --branch=${{ inputs.branchName }} https://github.com/openimis/openimis-be_py.git ./openimis
+          # Determine the target branch
+          if [ "${{ github.event_name }}" == "pull_request" ]; then
+            TARGET_BRANCH="${{ github.event.pull_request.base.ref }}"
+          else
+            TARGET_BRANCH="${{ github.event.ref }}"
+            TARGET_BRANCH=${TARGET_BRANCH#refs/heads/}
+          fi
+
+          # Use 'develop' as fallback if TARGET_BRANCH is empty or not a release branch
+          if [[ -z "$TARGET_BRANCH" ]]; then
+            TARGET_BRANCH="develop"
+          fi
+
+          echo "Target branch: $TARGET_BRANCH"
+
+          # Clone the repository
+          rm -rf ./openimis
+          git clone --depth=1 --branch=$TARGET_BRANCH https://github.com/openimis/openimis-be_py.git ./openimis || {
+            echo "Failed to clone $TARGET_BRANCH, falling back to develop"
+            git clone --depth=1 --branch=develop https://github.com/openimis/openimis-be_py.git ./openimis
+          }
+
+          # Verify the cloned branch
+          cd ./openimis
+          CLONED_BRANCH=$(git rev-parse --abbrev-ref HEAD)
+          echo "Cloned branch: $CLONED_BRANCH"
 
       - name: Copy Current branch
         uses: actions/checkout@v2
@@ -124,6 +148,22 @@ jobs:
     runs-on: ubuntu-20.04
     needs: build_backend
     services:
+      opensearch:
+        image: opensearchproject/opensearch:latest
+        ports:
+          - 9200:9200
+        env:
+          discovery.type: single-node
+          cluster.name: my_opensearch_local
+          http.port: 9200
+          plugins.security.ssl.http.enabled: false
+          OPENSEARCH_INITIAL_ADMIN_PASSWORD: B9wc9VrqX7pY
+        options: >-
+          --health-cmd "curl -f -u admin:${OPENSEARCH_INITIAL_ADMIN_PASSWORD} http://localhost:9200/_cluster/health || exit 1"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 10
+
       mssql:
         image: mcr.microsoft.com/mssql/server:2017-latest
         env:
@@ -228,11 +268,30 @@ jobs:
           #REMOTE_USER_AUTHENTICATION: False
           CI_EXCLUDED_MODULE: ${{ vars.CI_EXCLUDED_MODULE }}
           MODE: DEV
+          OPENSEARCH_ADMIN: admin
+          OPENSEARCH_PASSWORD: B9wc9VrqX7pY
   ci_module_psql_test_module_only:
     name: Run Module Tests (PSQL)
     runs-on: ubuntu-20.04
     needs: build_backend
     services:
+      opensearch:
+        image: opensearchproject/opensearch:latest
+        ports:
+          - 9200:9200
+        env:
+          discovery.type: single-node
+          cluster.name: my_opensearch_local
+          http.port: 9200
+          plugins.security.ssl.http.enabled: false
+          OPENSEARCH_INITIAL_ADMIN_PASSWORD: B9wc9VrqX7pY
+        options: >-
+          --health-cmd "curl -f -u admin:${OPENSEARCH_INITIAL_ADMIN_PASSWORD} http://localhost:9200/_cluster/health || exit 1"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 10
+
+
       pgsql:
         image: postgres
         env:
@@ -332,11 +391,31 @@ jobs:
           SITE_ROOT: api
           CI_EXCLUDED_MODULE: ${{ vars.CI_EXCLUDED_MODULE }}
           MODE: DEV
+          OPENSEARCH_ADMIN: admin
+          OPENSEARCH_PASSWORD: B9wc9VrqX7pY
+          OPENSEARCH_HOSTS: "localhost:9200"
   ci_module_psql_test:
     name: Run All Tests (PSQL)
     runs-on: ubuntu-20.04
     needs: build_backend
     services:
+      opensearch:
+        image: opensearchproject/opensearch:latest
+        ports:
+          - 9200:9200
+        env:
+          discovery.type: single-node
+          cluster.name: my_opensearch_local
+          http.port: 9200
+          plugins.security.ssl.http.enabled: false
+          OPENSEARCH_INITIAL_ADMIN_PASSWORD: B9wc9VrqX7pY
+        options: >-
+          --health-cmd "curl -f -u admin:${OPENSEARCH_INITIAL_ADMIN_PASSWORD} http://localhost:9200/_cluster/health || exit 1"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 10
+
+
       pgsql:
         image: postgres
         env:
@@ -435,6 +514,9 @@ jobs:
           SITE_ROOT: api
           CI_EXCLUDED_MODULE: ${{ vars.CI_EXCLUDED_MODULE }}
           MODE: DEV
+          OPENSEARCH_ADMIN: admin
+          OPENSEARCH_PASSWORD: B9wc9VrqX7pY
+          OPENSEARCH_HOSTS: "localhost:9200"
       - name: Generate Coverage Report
         if: always()
         working-directory: ./openimis/openIMIS
@@ -492,7 +574,7 @@ jobs:
           # Flake8 Report
           export MODULE_NAME="$(echo $GITHUB_REPOSITORY | sed 's#^openimis/openimis-be-\(.*\)_py$#\1#')"
           MOD_DIR="../current-module/$MODULE_NAME"
-          python -m flake8 --output-file=flake8-report.txt $MOD_DIR --exit-zero
+          python -m flake8 --output-file=flake8-report.txt $MOD_DIR --exit-zero --ignore W503
           sed -i 's|\.\./current-module/||g' flake8-report.txt
 
           python -m flake8 $MOD_DIR

.vscode/launch.json

@@ -21,6 +21,7 @@
         "product",
         "insuree",
         "policy",
+        "calcrule_validations",
         "contribution",
         "payer",
         "payment",
@@ -213,6 +214,7 @@
         "opensearch_reports",
         "payment_cycle",
         "calcrule_social_protection",
+        "calcrule_validations",
         "payroll"
       ],
       "django": true,