MERGING RELEASE branches (#34)

* CI update

* CI Update 2

* ONI-174: Fixed report permissions attributes

* ONI-174: Added migration with query rights to roles. (#37)

* ONI-174: Added migration with query rights to roles.

* ONI-174: Changed comment in migration.

* Added reports right (#35)

* Revert "Added reports right (#35)" (#39)

This reverts commit 632662e.

---------

Co-authored-by: Damian Borowiecki <dborowiecki@soldevelo.com>
Co-authored-by: Jan <jdolkowski@soldevelo.com>
Co-authored-by: wzglinieckisoldevelo <wzgliniecki@soldevelo.com>
Co-authored-by: Patrick Delcroix <patrick.delcroix@swisstph.ch>
Co-authored-by: wzglinieckisoldevelo <98958634+wzglinieckisoldevelo@users.noreply.github.com>
Co-authored-by: Thibault Dethier <84660492+tdethier@users.noreply.github.com>

.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-report_py
+      SONAR_ORGANIZATION: openimis-1
+      SONAR_PROJECT_NAME: openimis-be-report_py
+      SONAR_PROJECT_VERSION: 1.0
+      SONAR_SOURCES: report
+      SONAR_EXCLUSIONS: "**/migrations/**,**/static/**,**/media/**,**/tests/**"
+

report/apps.py

@@ -9,7 +9,6 @@
 
 DEFAULT_CFG = {
     "gql_query_report_perms": ["131200"],
-
     "gql_reports_primary_operational_indicator_policies_perms": ["131201"],
     "gql_reports_primary_operational_indicators_claims_perms": ["131202"],
     "gql_reports_derived_operational_indicators_perms": ["131203"],
@@ -43,33 +42,33 @@
 class ReportConfig(AppConfig):
     name = MODULE_NAME
 
-    gql_query_report_perms: []
-    gql_mutation_report_add_perms: []
-    gql_mutation_report_edit_perms: []
-    gql_mutation_report_delete_perms: []
-    gql_reports_primary_operational_indicator_policies_perms: []
-    gql_reports_primary_operational_indicators_claims_perms: []
-    gql_reports_derived_operational_indicators_perms: []
-    gql_reports_contribution_collection_perms: []
-    gql_reports_product_sales_perms: []
-    gql_reports_contribution_distribution_perms: []
-    gql_reports_user_activity_perms: []
-    gql_reports_enrolment_performance_indicators_perms: []
-    gql_reports_status_of_register_perms: []
-    gql_reports_insuree_without_photos_perms: []
-    gql_reports_payment_category_overview_perms: []
-    gql_reports_matching_funds_perms: []
-    gql_reports_claim_overview_report_perms: []
-    gql_reports_percentage_referrals_perms: []
-    gql_reports_families_insurees_overview_perms: []
-    gql_reports_pending_insurees_perms: []
-    gql_reports_renewals_perms: []
-    gql_reports_capitation_payment_perms: []
-    gql_reports_rejected_photo_perms: []
-    gql_reports_contribution_payment_perms: []
-    gql_reports_control_number_assignment_perms: []
-    gql_reports_overview_of_commissions_perms: []
-    gql_reports_claim_history_report_perms: []
+    gql_query_report_perms = []
+    gql_mutation_report_add_perms = []
+    gql_mutation_report_edit_perms = []
+    gql_mutation_report_delete_perms = []
+    gql_reports_primary_operational_indicator_policies_perms = []
+    gql_reports_primary_operational_indicators_claims_perms = []
+    gql_reports_derived_operational_indicators_perms = []
+    gql_reports_contribution_collection_perms = []
+    gql_reports_product_sales_perms = []
+    gql_reports_contribution_distribution_perms = []
+    gql_reports_user_activity_perms = []
+    gql_reports_enrolment_performance_indicators_perms = []
+    gql_reports_status_of_register_perms = []
+    gql_reports_insuree_without_photos_perms = []
+    gql_reports_payment_category_overview_perms = []
+    gql_reports_matching_funds_perms = []
+    gql_reports_claim_overview_report_perms = []
+    gql_reports_percentage_referrals_perms = []
+    gql_reports_families_insurees_overview_perms = []
+    gql_reports_pending_insurees_perms = []
+    gql_reports_renewals_perms = []
+    gql_reports_capitation_payment_perms = []
+    gql_reports_rejected_photo_perms = []
+    gql_reports_contribution_payment_perms = []
+    gql_reports_control_number_assignment_perms = []
+    gql_reports_overview_of_commissions_perms = []
+    gql_reports_claim_history_report_perms = []
 
     reports = []
 

report/migrations/0010_add_query_rights.py

@@ -0,0 +1,39 @@
+# Generated by Django 3.2.17 on 2023-03-01 15:02
+import logging
+
+from django.db import migrations
+
+from core.utils import insert_role_right_for_system, remove_role_right_for_system
+
+logger = logging.getLogger(__name__)
+
+# It is a dictionary with IsSystem values, it maps to RoleIDs:
+# ROLES_ID = [1, 2, 3, 5, 6, 7, 11, 12]
+ROLES_ID = [1, 2, 4, 16, 32, 64, 524288, 1048576]
+REPORT_QUERY_ROLE_ID = 131200
+
+
+def add_query_rights(apps, schema_editor):
+    """
+    Add gql_query_reports_perms to every role with report permission (based on existing data).
+    """
+    for role in ROLES_ID:
+        insert_role_right_for_system(role, REPORT_QUERY_ROLE_ID)
+
+
+def remove_query_rights(apps, schema_editor):
+    """
+    Add gql_query_reports_perms to every role with report permission (based on existing data).
+    """
+    for role in ROLES_ID:
+        remove_role_right_for_system(role, REPORT_QUERY_ROLE_ID)
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('report', '0009_set_managed_to_true'),
+    ]
+
+    operations = [
+        migrations.RunPython(add_query_rights, remove_query_rights),
+    ]