Merge pull request #275 from pbashyal-nmdp/serology_bug_254

Check for individual allele in the serology mapped list

Author: mmaiers-nmdp

pyard/ard.py

@@ -272,14 +272,13 @@ def _redux_allele(
             # find serology equivalent in serology_mapping
             serology_mapping = db.find_serology_for_allele(self.db_connection, allele)
             serology_set = set()
-            if is_2_field_allele(allele):
+            for serology, allele_list in serology_mapping.items():
+                if allele in allele_list.split("/"):
+                    serology_set.add(serology)
+            if not serology_set and is_2_field_allele(allele):
                 for serology, allele_list in serology_mapping.items():
                     allele_list_lgx = self.redux(allele_list, "lgx")
-                    if allele in allele_list_lgx:
-                        serology_set.add(serology)
-            else:
-                for serology, allele_list in serology_mapping.items():
-                    if allele in allele_list:
+                    if allele in allele_list_lgx.split("/"):
                         serology_set.add(serology)
             return "/".join(
                 sorted(

tests/features/serology_redux.feature

@@ -19,3 +19,4 @@ Feature: Serology Reduction
       | B*13:03                         | S     | B13                 |
       | B*13:04                         | S     | B15/B21             |
       | B*15:01/B*15:02/B*15:03/B*15:04 | S     | B15/B62/B70/B72/B75 |
+      | B*15:10                         | S     | B15/B70/B71         |