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.

Sign up for GitHub

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

Fix max active beneficiaries #144

Draft
wants to merge 5 commits into
base: develop
Choose a base branch
from
Draft

Fix max active beneficiaries #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7bbbd0b
Add enrollment tests
amschel-de-r Dec 11, 2024
bf89f02
Refactor enrollment checks
amschel-de-r Dec 11, 2024
169e58e
Warn max active beneficiaries exceeded in enrollmentSummaryGQL, chang…
amschel-de-r Dec 11, 2024
f74846f
Link default beneficiary status to SocialProtectionConfig for consist…
amschel-de-r Dec 11, 2024
a0e02e5
Update tests and enrollment checks to allow 'None' for no max active …
amschel-de-r Dec 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions individual/gql_mutations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
from individual.services import IndividualService, GroupService, GroupIndividualService, \
CreateGroupAndMoveIndividualService
from location.models import Location, LocationManager
from social_protection.apps import SocialProtectionConfig


class CreateIndividualInputType(OpenIMISMutation.Input):
Expand All @@ -30,6 +31,7 @@ class UpdateIndividualInputType(CreateIndividualInputType):
RoleEnum = graphene.Enum.from_enum(GroupIndividual.Role)
RecipientTypeEnum = graphene.Enum.from_enum(GroupIndividual.RecipientType)

DEFAULT_BENEFICIARY_STATUS = SocialProtectionConfig.default_beneficiary_status

class CreateGroupIndividualInputType(OpenIMISMutation.Input):
group_id = graphene.UUID(required=False)
Expand Down Expand Up @@ -571,7 +573,8 @@ def _mutate(cls, user, **data):
data.pop('client_mutation_label')
custom_filters = data.pop('custom_filters', None)
benefit_plan_id = data.pop('benefit_plan_id', None)
status = data.pop('status', "ACTIVE")
# TODO check consistency of default status
status = data.pop('status', DEFAULT_BENEFICIARY_STATUS)
service = IndividualService(user)
service.select_individuals_to_benefit_plan(
custom_filters,
Expand Down Expand Up @@ -605,7 +608,7 @@ def _mutate(cls, user, **data):
data.pop('client_mutation_label')
custom_filters = data.pop('custom_filters', None)
benefit_plan_id = data.pop('benefit_plan_id', None)
status = data.pop('status', "ACTIVE")
status = data.pop('status', DEFAULT_BENEFICIARY_STATUS)
service = GroupService(user)
service.select_groups_to_benefit_plan(
custom_filters,
Expand Down
28 changes: 16 additions & 12 deletions individual/gql_queries.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,21 +275,25 @@ class Meta:


class IndividualSummaryEnrollmentGQLType(graphene.ObjectType):
number_of_selected_individuals = graphene.String()
total_number_of_individuals = graphene.String()
number_of_individuals_not_assigned_to_programme = graphene.String()
number_of_individuals_assigned_to_programme = graphene.String()
number_of_individuals_assigned_to_selected_programme = graphene.String()
number_of_individuals_to_upload = graphene.String()
number_of_selected_individuals = graphene.Int()
total_number_of_individuals = graphene.Int()
number_of_individuals_not_assigned_to_programme = graphene.Int()
number_of_individuals_assigned_to_programme = graphene.Int()
number_of_individuals_assigned_to_selected_programme = graphene.Int()
number_of_individuals_assigned_to_selected_programme_and_status = graphene.Int()
number_of_individuals_to_upload = graphene.Int()
max_active_beneficiaries_exceeded = graphene.Boolean()


class GroupSummaryEnrollmentGQLType(graphene.ObjectType):
number_of_selected_groups = graphene.String()
total_number_of_groups = graphene.String()
number_of_groups_not_assigned_to_programme = graphene.String()
number_of_groups_assigned_to_programme = graphene.String()
number_of_groups_assigned_to_selected_programme = graphene.String()
number_of_groups_to_upload = graphene.String()
number_of_selected_groups = graphene.Int()
total_number_of_groups = graphene.Int()
number_of_groups_not_assigned_to_programme = graphene.Int()
number_of_groups_assigned_to_programme = graphene.Int()
number_of_groups_assigned_to_selected_programme = graphene.Int()
number_of_groups_assigned_to_selected_programme_and_status = graphene.Int()
number_of_groups_to_upload = graphene.Int()
max_active_beneficiaries_exceeded = graphene.Boolean()


class GlobalSchemaType(graphene.ObjectType):
Expand Down
125 changes: 67 additions & 58 deletions individual/schema.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
GroupSummaryEnrollmentGQLType, GroupDataSourceGQLType
from individual.models import Individual, IndividualDataSource, Group, \
GroupIndividual, IndividualDataSourceUpload, IndividualDataUploadRecords, GroupDataSource
from individual.services import IndividualService, GroupService
from social_protection.apps import SocialProtectionConfig
from location.apps import LocationConfig


Expand All @@ -38,6 +40,7 @@ def patch_details(data_df: pd.DataFrame):
return df_final
return data_df

DEFAULT_BENEFICIARY_STATUS = SocialProtectionConfig.default_beneficiary_status

class Query(ExportableQueryMixin, graphene.ObjectType):
export_patches = {
Expand Down Expand Up @@ -141,7 +144,8 @@ class Query(ExportableQueryMixin, graphene.ObjectType):
individual_enrollment_summary = graphene.Field(
IndividualSummaryEnrollmentGQLType,
customFilters=graphene.List(of_type=graphene.String),
benefitPlanId=graphene.String()
benefitPlanId=graphene.String(),
status=graphene.String(),
)

individual_data_upload_history = OrderedDjangoFilterConnectionField(
Expand All @@ -156,7 +160,8 @@ class Query(ExportableQueryMixin, graphene.ObjectType):
group_enrollment_summary = graphene.Field(
GroupSummaryEnrollmentGQLType,
customFilters=graphene.List(of_type=graphene.String),
benefitPlanId=graphene.String()
benefitPlanId=graphene.String(),
status=graphene.String(),
)

global_schema = graphene.Field(GlobalSchemaType)
Expand Down Expand Up @@ -215,43 +220,44 @@ def resolve_individual(self, info, **kwargs):
return gql_optimizer.query(query, info)

def resolve_individual_enrollment_summary(self, info, **kwargs):
Query._check_permissions(info.context.user,
IndividualConfig.gql_individual_search_perms)
subquery = GroupIndividual.objects.filter(individual=OuterRef('pk')).values('individual')
query = Individual.objects.filter(is_deleted=False)
user = info.context.user
Query._check_permissions(user, IndividualConfig.gql_individual_search_perms)

service = IndividualService(user)
custom_filters = kwargs.get("customFilters", None)
benefit_plan_id = kwargs.get("benefitPlanId", None)
if custom_filters:
query = CustomFilterWizardStorage.build_custom_filters_queryset(
Query.module_name,
Query.object_type,
custom_filters,
query,
)
query = query.filter(~Q(pk__in=Subquery(subquery))).distinct()
# Aggregation for selected individuals
number_of_selected_individuals = query.count()
status = kwargs.get("status", DEFAULT_BENEFICIARY_STATUS)

# Aggregation for total number of individuals
total_number_of_individuals = Individual.objects.filter(is_deleted=False).count()
individuals_not_assigned_to_programme = query.\
filter(is_deleted=False, beneficiary__benefit_plan_id__isnull=True).count()
individuals_assigned_to_programme = number_of_selected_individuals - individuals_not_assigned_to_programme
enrollment_checks = service.run_enrollment_checks(
custom_filters,
benefit_plan_id,
status,
user
)

individuals_assigned_to_selected_programme = "0"
number_of_individuals_to_upload = number_of_selected_individuals
if benefit_plan_id:
individuals_assigned_to_selected_programme = query. \
filter(is_deleted=False, beneficiary__benefit_plan_id=benefit_plan_id).count()
number_of_individuals_to_upload = number_of_individuals_to_upload - individuals_assigned_to_selected_programme
total_number_of_individuals = enrollment_checks["total_number_of_individuals"]
selected_individuals = enrollment_checks["individual_query_with_filters"]
num_assigned_to_selected_programme = enrollment_checks["individuals_assigned_to_selected_programme"].count()

number_of_individuals_assigned_to_selected_programme_and_status = enrollment_checks["num_individuals_assigned_to_selected_programme_and_status"]
number_of_individuals_to_upload = enrollment_checks["num_individuals_to_enroll"]
max_active_beneficiaries_exceeded = enrollment_checks["max_active_beneficiaries_exceeded"]

number_of_selected_individuals = selected_individuals.count()

num_individuals_not_assigned_to_programme = selected_individuals.\
filter(is_deleted=False, beneficiary__benefit_plan_id__isnull=True).count()
num_individuals_assigned_to_programme = number_of_selected_individuals - num_individuals_not_assigned_to_programme

return IndividualSummaryEnrollmentGQLType(
number_of_selected_individuals=number_of_selected_individuals,
total_number_of_individuals=total_number_of_individuals,
number_of_individuals_not_assigned_to_programme=individuals_not_assigned_to_programme,
number_of_individuals_assigned_to_programme=individuals_assigned_to_programme,
number_of_individuals_assigned_to_selected_programme=individuals_assigned_to_selected_programme,
number_of_individuals_to_upload=number_of_individuals_to_upload
number_of_individuals_not_assigned_to_programme=num_individuals_not_assigned_to_programme,
number_of_individuals_assigned_to_programme=num_individuals_assigned_to_programme,
number_of_individuals_assigned_to_selected_programme=num_assigned_to_selected_programme,
number_of_individuals_assigned_to_selected_programme_and_status=number_of_individuals_assigned_to_selected_programme_and_status,
number_of_individuals_to_upload=number_of_individuals_to_upload,
max_active_beneficiaries_exceeded=max_active_beneficiaries_exceeded
)

def resolve_individual_history(self, info, **kwargs):
Expand Down Expand Up @@ -410,41 +416,44 @@ def resolve_individual_data_upload_history(self, info, **kwargs):
return gql_optimizer.query(query, info)

def resolve_group_enrollment_summary(self, info, **kwargs):
Query._check_permissions(info.context.user,
IndividualConfig.gql_group_search_perms)
query = Group.objects.filter(is_deleted=False)
user = info.context.user
Query._check_permissions(user, IndividualConfig.gql_group_search_perms)

service = GroupService(user)
custom_filters = kwargs.get("customFilters", None)
benefit_plan_id = kwargs.get("benefitPlanId", None)
if custom_filters:
query = CustomFilterWizardStorage.build_custom_filters_queryset(
Query.module_name,
"Group",
custom_filters,
query,
)
# Aggregation for selected groups
number_of_selected_groups = query.count()
status = kwargs.get("status", DEFAULT_BENEFICIARY_STATUS)

# Aggregation for total number of groups
total_number_of_groups = Group.objects.filter(is_deleted=False).count()
groups_not_assigned_to_programme = query.\
filter(is_deleted=False, groupbeneficiary__benefit_plan_id__isnull=True).count()
groups_assigned_to_programme = number_of_selected_groups - groups_not_assigned_to_programme
enrollment_checks = service.run_enrollment_checks(
custom_filters,
benefit_plan_id,
status,
user
)

total_number_of_groups = enrollment_checks["total_number_of_groups"]
selected_groups = enrollment_checks["group_query_with_filters"]
num_assigned_to_selected_programme = enrollment_checks["groups_assigned_to_selected_programme"].count()

groups_assigned_to_selected_programme = "0"
number_of_groups_to_upload = number_of_selected_groups
if benefit_plan_id:
groups_assigned_to_selected_programme = query. \
filter(is_deleted=False, groupbeneficiary__benefit_plan_id=benefit_plan_id).count()
number_of_groups_to_upload = number_of_groups_to_upload - groups_assigned_to_selected_programme
number_of_groups_assigned_to_selected_programme_and_status = enrollment_checks["num_groups_assigned_to_selected_programme_and_status"]
number_of_groups_to_upload = enrollment_checks["num_groups_to_enroll"]
max_active_beneficiaries_exceeded = enrollment_checks["max_active_beneficiaries_exceeded"]

number_of_selected_groups = selected_groups.count()

num_groups_not_assigned_to_programme = selected_groups.\
filter(is_deleted=False, groupbeneficiary__benefit_plan_id__isnull=True).count()
num_groups_assigned_to_programme = number_of_selected_groups - num_groups_not_assigned_to_programme

return GroupSummaryEnrollmentGQLType(
number_of_selected_groups=number_of_selected_groups,
total_number_of_groups=total_number_of_groups,
number_of_groups_not_assigned_to_programme=groups_not_assigned_to_programme,
number_of_groups_assigned_to_programme=groups_assigned_to_programme,
number_of_groups_assigned_to_selected_programme=groups_assigned_to_selected_programme,
number_of_groups_to_upload=number_of_groups_to_upload
number_of_groups_not_assigned_to_programme=num_groups_not_assigned_to_programme,
number_of_groups_assigned_to_programme=num_groups_assigned_to_programme,
number_of_groups_assigned_to_selected_programme=num_assigned_to_selected_programme,
number_of_groups_assigned_to_selected_programme_and_status=number_of_groups_assigned_to_selected_programme_and_status,
number_of_groups_to_upload=number_of_groups_to_upload,
max_active_beneficiaries_exceeded=max_active_beneficiaries_exceeded,
)

def resolve_global_schema(self, info):
Expand Down
Loading