canql 5.0.0 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99a2f7ebbb5ae3c1cbdd8368b020f8eb7c54d969278db3bdd90277f113095ce9
-  data.tar.gz: fb4f6561d61cc9da30dd9a30562c7374a95e52d615b014bc16e5e282529c4975
+  metadata.gz: 7388b9b6f880c7c55b4db80358ff06f5ac5753f70f70aae5e4791b3ad2f886d9
+  data.tar.gz: 44c1a08147f5d7eee119242432184238388af321f311149cf498550e417af5fd
 SHA512:
-  metadata.gz: 93cc26e76a35a5b47600368d7208f81c6cd6457c416f942be852536952d54b9a1bbcb49df7c17f95fb09b5bdaa4581fda91b70e36ad229aae5213914d9d7db39
-  data.tar.gz: 2a8bf966e8a0b93411117a09f790f20825c6b27850f1903cea53fd636855d920ec4fdc5dc9bb903b11ec0c2e34275af88ca2e49e4c09b3ea206a6ff2620d626b
+  metadata.gz: 3e0eec913600a18381b348c94a466ebc2ef3f8d1a92b505be0975bd77adc63781f54d63f18b7a7c890e0dcea2f3e83303d963fc767e78ee0d1287e4690f59090
+  data.tar.gz: e0ffb6f335045c5238a3b42c4469504cc6a24eaa4eff90e9f9fa217e0e76f9f06d53c6f98572302cfd8737626f4a558afae93408938c64f1e1f6aa0b7bf7f05a

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 ## [Unreleased]
 *no unreleased changes*
 
+## 5.1.0 / 2021-01-25
+
+### Added
+* Added new filters for test acceptance requirments (#59)
+
 ## 5.0.0 / 2021-01-19
 
 ### Changed

data/code_safety.yml

@@ -27,7 +27,7 @@ file safety:
   CHANGELOG.md:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: f84cb2190f46ee550db796a17455980ab00d3187
+    safe_revision: aea0d1a480e886a63b723135c7381cdcee0d4b25
   CODE_OF_CONDUCT.md:
     comments: 
     reviewed_by: drewthorp
@@ -103,7 +103,7 @@ file safety:
     comments: It is a known issue that this is potentially susceptible to certain
       kinds of DoS attack
     reviewed_by: josh.pencheon
-    safe_revision: 42bb9bd177a761b9d04d728e53fcf0ebd0083ae4
+    safe_revision: 9bb663b220e76e78f3f0f48e4bc6334fe9451925
   lib/canql/grammars/patient.treetop:
     comments: It is a known issue that this is potentially susceptible to certain
       kinds of DoS attack
@@ -130,7 +130,7 @@ file safety:
   lib/canql/grammars/test_result_group.treetop:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 8ea906ca663b98edee2592fc5b0731881573f06b
+    safe_revision: 9bb663b220e76e78f3f0f48e4bc6334fe9451925
   lib/canql/nodes.rb:
     comments: 
     reviewed_by: josh.pencheon
@@ -162,7 +162,7 @@ file safety:
   lib/canql/nodes/main.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: c5f8f76b2c335a8554f39a14d6165bf5cd8f9b67
+    safe_revision: 361dea5dc6d64bdb7b03434dd2878f8c3b128c95
   lib/canql/nodes/patient.rb:
     comments: 
     reviewed_by: josh.pencheon
@@ -182,7 +182,7 @@ file safety:
   lib/canql/nodes/test_result_group.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 42bb9bd177a761b9d04d728e53fcf0ebd0083ae4
+    safe_revision: 9bb663b220e76e78f3f0f48e4bc6334fe9451925
   lib/canql/parser.rb:
     comments: 
     reviewed_by: timgentry
@@ -194,7 +194,7 @@ file safety:
   lib/canql/version.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: cfe2f76a07880e268e1f29fbac5f6cd380202ce3
+    safe_revision: aea0d1a480e886a63b723135c7381cdcee0d4b25
   test/anomaly_test_helper.rb:
     comments: 
     reviewed_by: josh.pencheon
@@ -262,7 +262,7 @@ file safety:
   test/nodes/test_result_groups_test.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 8ea906ca663b98edee2592fc5b0731881573f06b
+    safe_revision: 9bb663b220e76e78f3f0f48e4bc6334fe9451925
   test/nodes/test_results_test.rb:
     comments: 
     reviewed_by: josh.pencheon

data/lib/canql/grammars/main.treetop

@@ -129,8 +129,8 @@ grammar Canql
 
   rule case_with_conditions
      anomalies / genetic_tests / test_results / perinatal_hospital /
-     case_field_existance / test_result_groups / mother_conditions /
-     action_or_ebr
+     case_field_existance / test_acceptance_existance / test_result_groups /
+     mother_conditions / action_or_ebr
   end
 
   rule patient_with_conditions

data/lib/canql/grammars/test_result_group.treetop

@@ -12,5 +12,17 @@ module Canql
     rule test_result_group_names
       space ('screening' / 'anomaly scan' / 'fetal medicine' / 'dating') word_break
     end
+
+    rule test_acceptance_existance
+      and_keyword? existance_modifier:test_acceptance_existance_keyword acceptance:test_acceptance_names <Nodes::TestAcceptanceExistamce::WithCondition>
+    end
+
+    rule test_acceptance_existance_keyword
+      space ('missing required' / 'missing' ) word_break
+    end
+
+    rule test_acceptance_names
+      space ('screening acceptance status' / 'anomaly scan acceptance status' ) word_break
+    end
   end
 end

data/lib/canql/nodes/main.rb

@@ -29,27 +29,38 @@ module Canql #:nodoc: all
     module WithConditions
       def meta_data_item
         conditions = {}
-        anomalies = []
-        genetic_tests = []
-        test_results = []
-        test_result_groups = []
+        sub_clauses = build_sub_clauses
 
-        post.elements.each do |element|
-          anomalies << element.to_anomaly if element.respond_to?(:to_anomaly)
-          genetic_tests << element.to_genetic_test if element.respond_to?(:to_genetic_test)
-          test_results << element.to_test_result if element.respond_to?(:to_test_result)
-          if element.respond_to?(:to_test_result_group)
-            test_result_groups << element.to_test_result_group
+        %i[
+          anomalies genetic_tests test_results test_result_groups test_acceptances
+        ].each do |condition_key|
+          if sub_clauses[condition_key].present?
+            conditions[condition_key.to_s] = { Canql::ALL => sub_clauses[condition_key] }
           end
         end
+        conditions
+      end
 
-        conditions['anomalies'] = { Canql::ALL => anomalies } if anomalies.any?
-        conditions['genetic_tests'] = { Canql::ALL => genetic_tests } if genetic_tests.any?
-        conditions['test_results'] = { Canql::ALL => test_results } if test_results.any?
-        if test_result_groups.any?
-          conditions['test_result_groups'] = { Canql::ALL => test_result_groups }
+      def build_sub_clauses
+        sub_clauses = {}
+
+        post.elements.each do |element|
+          add_sub_clause(sub_clauses, element, :anomalies, :to_anomaly)
+          add_sub_clause(sub_clauses, element, :genetic_tests, :to_genetic_test)
+          add_sub_clause(sub_clauses, element, :test_results, :to_test_result)
+          add_sub_clause(
+            sub_clauses, element, :test_result_groups, :to_test_result_group
+          )
+          add_sub_clause(sub_clauses, element, :test_acceptances, :to_test_acceptance)
         end
-        conditions
+        sub_clauses
+      end
+
+      def add_sub_clause(sub_clauses, element, key, condition)
+        return sub_clauses unless element.respond_to?(condition)
+
+        sub_clauses[key] ||= []
+        sub_clauses[key] << element.send(condition)
       end
     end
   end

data/lib/canql/nodes/test_result_group.rb

@@ -36,5 +36,40 @@ module Canql #:nodoc: all
         end
       end
     end
+
+    module TestAcceptanceExistamce
+      module WithCondition
+        def test_acceptance
+          acceptance.text_value.strip.parameterize.underscore
+        end
+
+        def to_test_acceptance
+          test_acceptance_hash = { 'exists' => existance_filter }
+          test_acceptance_hash['required'] = requirement_filter
+          test_acceptance_hash['acceptance'] = test_acceptance_filter if test_acceptance.present?
+          test_acceptance_hash
+        end
+
+        def existance_filter
+          {
+            Canql::EQUALS => ['supplied required', 'supplied'].include?(
+              existance_modifier.text_value.strip
+            )
+          }
+        end
+
+        def requirement_filter
+          {
+            Canql::EQUALS => ['supplied required', 'missing required'].include?(
+              existance_modifier.text_value.strip
+            )
+          }
+        end
+
+        def test_acceptance_filter
+          { Canql::EQUALS => test_acceptance }
+        end
+      end
+    end
   end
 end

data/lib/canql/version.rb

@@ -2,5 +2,5 @@
 
 # This stores the current version of the Canql gem
 module Canql
-  VERSION = '5.0.0'
+  VERSION = '5.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: canql
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.1.0
 platform: ruby
 authors:
 - PHE NDR Development Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-19 00:00:00.000000000 Z
+date: 2021-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic