diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..2d19384 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,30 @@ +name: Module CI +on: + pull_request: + types: [opened, synchronize, reopened] + push: + branches: + - main + - 'release/**' + - develop + - 'feature/**' + workflow_dispatch: + inputs: + comment: + description: Just a simple comment to know the purpose of the manual build + required: false + +jobs: + call: + name: Default CI Flow + uses: openimis/openimis-be_py/.github/workflows/ci_module.yml@develop + secrets: + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + with: + SONAR_PROJECT_KEY: openimis_openimis-be-tasks_management_py + SONAR_ORGANIZATION: openimis-1 + SONAR_PROJECT_NAME: openimis-be-tasks_management_py + SONAR_PROJECT_VERSION: 1.0 + SONAR_SOURCES: tasks_management + SONAR_EXCLUSIONS: "**/migrations/**,**/static/**,**/media/**,**/tests/**" + diff --git a/.github/workflows/openmis-module-test-psql.yml b/.github/workflows/openmis-module-test-psql.yml deleted file mode 100644 index 31f996d..0000000 --- a/.github/workflows/openmis-module-test-psql.yml +++ /dev/null @@ -1,80 +0,0 @@ -name: POSTGRES - Automated CI testing -# This workflow run automatically for every commit on github it checks the syntax and launch the tests. -# | grep . | uniq -c filters out empty lines and then groups consecutive lines together with the number of occurrences -on: - pull_request: - workflow_dispatch: - inputs: - comment: - description: Just a simple comment to know the purpose of the manual build - required: false - -jobs: - run_test: - runs-on: ubuntu-20.04 - services: - psql: - image: ghcr.io/openimis/openimis-pgsql:develop - env: - POSTGRES_PASSWORD: postgres - POSTGRES_DB: IMIS - POSTGRES_USER: postgres - ports: - - 1433:5432 - options: >- - --health-cmd pg_isready - --health-interval 10s - --health-timeout 5s - --health-retries 5 - steps: - - name: Set up Python 3.8 - uses: actions/setup-python@v2 - with: - python-version: 3.8 - - name: Setup PostgreSQL - run: | - sudo apt-get -yqq install libpq-dev - python -m pip install psycopg2-binary - - name: Pull openIMIS Backend - run: | - rm ./openimis -rf - git clone --depth 1 --branch coreMIS https://github.com/openimis/openimis-be_py.git ./openimis - - name: Copy Current branch - uses: actions/checkout@v2 - with: - path: './current-module' - - name: Update the configuration - working-directory: ./openimis - run: | - export MODULE_NAME="$(echo $GITHUB_REPOSITORY | sed 's#^openimis/openimis-be-\(.*\)_py$#\1#')" - echo "the local module called $MODULE_NAME will be injected in openIMIS .json" - jq --arg name "$MODULE_NAME" 'if [.modules[].name == ($name)]| max then (.modules[] | select(.name == ($name)) | .pip)|="../current-module" else .modules |= .+ [{name:($name), pip:"../current-module"}] end' openimis.json - echo $(jq --arg name "$MODULE_NAME" 'if [.modules[].name == ($name)]| max then (.modules[] | select(.name == ($name)) | .pip)|="../current-module" else .modules |= .+ [{name:($name), pip:"../current-module"}] end' openimis.json) > openimis.json - - name: Install openIMIS Python dependencies - working-directory: ./openimis - run: | - pip install -r requirements.txt - python modules-requirements.py openimis.json > modules-requirements.txt - cat modules-requirements.txt - pip install -r modules-requirements.txt - - name: Django tests - working-directory: ./openimis/openIMIS - run: | - export MODULE_NAME="$(echo $GITHUB_REPOSITORY | sed 's#^openimis/openimis-be-\(.*\)_py$#\1#')" - python manage.py migrate - python manage.py showmigrations - python init_test_db.py | grep . | uniq -c - python manage.py test --keep $MODULE_NAME - env: - SECRET_KEY: secret - DEBUG: true - #DJANGO_SETTINGS_MODULE: hat.settings - DB_HOST: localhost - DB_PORT: 1433 - DB_NAME: IMIS - DB_USER: postgres - DB_PASSWORD: postgres - #DEV_SERVER: true - SITE_ROOT: api - REMOTE_USER_AUTHENTICATION: True - DB_ENGINE: django.db.backends.postgresql diff --git a/.github/workflows/openmis-module-test.yml b/.github/workflows/openmis-module-test.yml deleted file mode 100644 index 2cbc165..0000000 --- a/.github/workflows/openmis-module-test.yml +++ /dev/null @@ -1,99 +0,0 @@ -name: Automated CI testing -# This workflow run automatically for every commit on github it checks the syntax and launch the tests. -# | grep . | uniq -c filters out empty lines and then groups consecutive lines together with the number of occurrences -on: - pull_request: - workflow_dispatch: - inputs: - comment: - description: Just a simple comment to know the purpose of the manual build - required: false - -jobs: - run_test: - runs-on: ubuntu-20.04 - services: - mssql: - image: mcr.microsoft.com/mssql/server:2017-latest - env: - ACCEPT_EULA: Y - SA_PASSWORD: GitHub999 - ports: - - 1433:1433 - # needed because the mssql container does not provide a health check - options: --health-interval=10s --health-timeout=3s --health-start-period=10s --health-retries=10 --health-cmd="/opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P ${SA_PASSWORD} -Q 'SELECT 1' || exit 1" - - steps: - - name: Set up Python 3.8 - uses: actions/setup-python@v2 - with: - python-version: 3.8 - - name: install linux packages - run: | - git clone --depth 1 --branch develop https://github.com/openimis/database_ms_sqlserver.git ./sql - cd sql/ && bash concatenate_files.sh && cd .. - curl https://packages.microsoft.com/keys/microsoft.asc | sudo apt-key add - - curl https://packages.microsoft.com/config/ubuntu/20.04/prod.list | sudo tee /etc/apt/sources.list.d/msprod.list - sudo apt-get update - sudo ACCEPT_EULA=Y apt-get install -y mssql-tools build-essential dialog apt-utils unixodbc-dev -y - python -m pip install --upgrade pip - - name: pull openimis backend - run: | - rm ./openimis -rf - git clone --depth 1 --branch coreMIS https://github.com/openimis/openimis-be_py.git ./openimis - - name: copy current branch - uses: actions/checkout@v2 - with: - path: './current-module' - - name: Update the configuration - working-directory: ./openimis - run: | - export MODULE_NAME="$(echo $GITHUB_REPOSITORY | sed 's#^openimis/openimis-be-\(.*\)_py$#\1#')" - echo "the local module called $MODULE_NAME will be injected in openIMIS .json" - jq --arg name "$MODULE_NAME" 'if [.modules[].name == ($name)]| max then (.modules[] | select(.name == ($name)) | .pip)|="../current-module" else .modules |= .+ [{name:($name), pip:"../current-module"}] end' openimis.json - echo $(jq --arg name "$MODULE_NAME" 'if [.modules[].name == ($name)]| max then (.modules[] | select(.name == ($name)) | .pip)|="../current-module" else .modules |= .+ [{name:($name), pip:"../current-module"}] end' openimis.json) > openimis.json - - name: Install openIMIS Python dependencies - working-directory: ./openimis - run: | - pip install -r requirements.txt - python modules-requirements.py openimis.json > modules-requirements.txt - cat modules-requirements.txt - pip install -r modules-requirements.txt - - name: Environment info - working-directory: ./openimis - run: | - pip list - - name: Initialize DB - run: | - /opt/mssql-tools/bin/sqlcmd -S localhost,1433 -U SA -P $SA_PASSWORD -Q 'DROP DATABASE IF EXISTS imis' - /opt/mssql-tools/bin/sqlcmd -S localhost,1433 -U SA -P $SA_PASSWORD -Q 'CREATE DATABASE imis' - /opt/mssql-tools/bin/sqlcmd -S localhost,1433 -U SA -P $SA_PASSWORD -d imis -i sql/output/fullDemoDatabase.sql | grep . | uniq -c - env: - SA_PASSWORD: GitHub999 - ACCEPT_EULA: Y - -# - name: Check formatting with black -# run: | -# black --check . - - - name: Django tests - working-directory: ./openimis/openIMIS - run: | - export MODULE_NAME="$(echo $GITHUB_REPOSITORY | sed 's#^openimis/openimis-be-\(.*\)_py$#\1#')" - python -V - ls -l - python manage.py migrate - python init_test_db.py | grep . | uniq -c - python manage.py test --keepdb $MODULE_NAME - env: - SECRET_KEY: secret - DEBUG: true - #DJANGO_SETTINGS_MODULE: hat.settings - DB_HOST: localhost - DB_PORT: 1433 - DB_NAME: imis - DB_USER: sa - DB_PASSWORD: GitHub999 - #DEV_SERVER: true - SITE_ROOT: api - REMOTE_USER_AUTHENTICATION: True diff --git a/sonar-project.properties b/sonar-project.properties deleted file mode 100644 index eaa6d52..0000000 --- a/sonar-project.properties +++ /dev/null @@ -1,10 +0,0 @@ -# must be unique in a given SonarScanner instance -sonar.projectKey=openimis_openimis-be-tasks_management_py -sonar.organization=openimis-1 -sonar.projectName=openimis-be-tasks_management_py -sonar.projectVersion=1.0 - -sonar.python.version=3.8 -sonar.sources=tasks_management -sonar.python.coverage.reportPaths=openimis/openIMIS/coverage.xml -sonar.python.flake8.reportPaths=../openimis/flake8-report.txt diff --git a/tasks_management/services.py b/tasks_management/services.py index 050329a..17d9566 100644 --- a/tasks_management/services.py +++ b/tasks_management/services.py @@ -184,7 +184,7 @@ def _adjust_create_task_data(self, obj_data): return obj_data def _data_for_json_ext_create(self, obj_data): - return dict + return {} class UpdateCheckerLogicServiceMixin(ABC): @@ -235,7 +235,7 @@ def _adjust_update_task_data(self, obj_data): return obj_data def _data_for_json_ext_update(self, obj_data): - return dict + return {} class DeleteCheckerLogicServiceMixin(ABC): @@ -286,7 +286,7 @@ def _adjust_delete_task_data(self, obj_data): return obj_data def _data_for_json_ext_delete(self, obj_data): - return dict + return {} class CheckerLogicServiceMixin(CreateCheckerLogicServiceMixin,