Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MERGING RELEASE branches #34

Merged
merged 8 commits into from
Oct 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
30 changes: 30 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -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/**"

100 changes: 0 additions & 100 deletions .github/workflows/openmis-module-test.yml

This file was deleted.

55 changes: 27 additions & 28 deletions report/apps.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
Expand Down Expand Up @@ -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 = []

Expand Down
39 changes: 39 additions & 0 deletions report/migrations/0010_add_query_rights.py
Original file line number Diff line number Diff line change
@@ -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),
]
10 changes: 0 additions & 10 deletions sonar-project.properties

This file was deleted.