Skip to content
Merged
Changes from all commits
Commits
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
13 changes: 8 additions & 5 deletions cdisc_rules_engine/utilities/rule_processor.py
Original file line number Diff line number Diff line change
Expand Up @@ -179,12 +179,15 @@ def _domain_matched_ap_or_supp(
Check that domain name match with only
AP / APFA / APRELSUB / SUPP / SQ naming pattern
"""
supp_ap_domains = {f"{domain}--" for domain in SUPPLEMENTARY_DOMAINS}
supp_ap_domains.update({f"{AP_DOMAIN}--", f"{APFA_DOMAIN}--"})
domains_to_check = set(domains_to_check)
supp_domains = {f"{domain}--" for domain in SUPPLEMENTARY_DOMAINS}
ap_domains = {f"{AP_DOMAIN}--", f"{APFA_DOMAIN}--"}

return any(set(domains_to_check).intersection(supp_ap_domains)) and (
dataset_metadata.is_supp or dataset_metadata.is_ap
)
if dataset_metadata.is_supp and (domains_to_check & supp_domains):
return True
if dataset_metadata.is_ap and (domains_to_check & ap_domains):
return True
return False

def rule_applies_to_data_structure(
self, rule, dataset_metadata: SDTMDatasetMetadata
Expand Down
Loading