canql 4.3.0 → 4.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b054c9d0f56e07afcd4521b2e56b23fc21647f419f9bef7f04104bd2544e3b5
-  data.tar.gz: 48bf63bc902135454291778e23905535570bc5fd3019c13acb55709c9795e827
+  metadata.gz: 111a269a59bd7e152809bb8488f7f070b6f7fc74a12b0d154a5d88754c3c8cfa
+  data.tar.gz: 242095730ead9834f8f7a2a71ac5b662f07c7f031239f72b3aca329d550eb08d
 SHA512:
-  metadata.gz: ad41792d7cfb4d5c79077ac53ca462e03cac72042095c51f41a03c53b92a01e3b16777e4f55d7c3167ab589be134cdf35547724a35b61b496bf9beb58f37ae1a
-  data.tar.gz: ca725da517e80d207eaaed88a7128461bfdadc3a23e5754682e342367762d2dbc7d69ae9d1b462fc8529f7135a1486c90d57516882b972964642cacf8b265618
+  metadata.gz: adfa06b51ad500fb38a578c6cb82079daf699717c8d7f48fb1898edf71ca1031c249d81fc8eeba2013f0b8a7efbbb8cff12c7297c4d35ab27aefd6d1ff2487b3
+  data.tar.gz: ed4d2926c48c699b70a0c9a9c4ceff97e56eaf4a5c42e615b0368c0433623aee9efce6a4774b7e59fdbbd18f9d19a7e3fd26f5328080323ec82fed70617f802a

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 ## [Unreleased]
 *no unreleased changes*
 
+## 4.4.0 / 2020-07-08
+### Added
+* Added filter for missing and supplied required test result groups (#47)
+
 ## 4.3.0 / 2020-06-10
 ### Added
 * Added additional field existance options (#45)

data/code_safety.yml

@@ -19,7 +19,7 @@ file safety:
   CHANGELOG.md:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 23852bc731fdf82a87fd06070a89ec81affe8155
+    safe_revision: 7b5bc84b813b7ff156665a1a37cfe5dd5b53afe7
   CODE_OF_CONDUCT.md:
     comments: 
     reviewed_by: drewthorp
@@ -63,7 +63,7 @@ file safety:
   lib/canql/grammars.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: c431b8a476b84d077e9c39a2a13c2b17a296773d
+    safe_revision: c5f8f76b2c335a8554f39a14d6165bf5cd8f9b67
   lib/canql/grammars/age.treetop:
     comments: It is a known issue that this is potentially susceptible to certain
       kinds of DoS attack
@@ -94,8 +94,8 @@ file safety:
   lib/canql/grammars/main.treetop:
     comments: It is a known issue that this is potentially susceptible to certain
       kinds of DoS attack
-    reviewed_by: timgentry
-    safe_revision: 05ccd47fcbba92bf5525c4d36118274696169d61
+    reviewed_by: josh.pencheon
+    safe_revision: 42bb9bd177a761b9d04d728e53fcf0ebd0083ae4
   lib/canql/grammars/patient.treetop:
     comments: It is a known issue that this is potentially susceptible to certain
       kinds of DoS attack
@@ -119,10 +119,14 @@ file safety:
       kinds of DoS attack
     reviewed_by: timgentry
     safe_revision: c39d24bb500719971969762e94545e82866bf92f
+  lib/canql/grammars/test_result_group.treetop:
+    comments: 
+    reviewed_by: josh.pencheon
+    safe_revision: 42bb9bd177a761b9d04d728e53fcf0ebd0083ae4
   lib/canql/nodes.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: c431b8a476b84d077e9c39a2a13c2b17a296773d
+    safe_revision: c5f8f76b2c335a8554f39a14d6165bf5cd8f9b67
   lib/canql/nodes/age.rb:
     comments: 
     reviewed_by: timgentry
@@ -150,7 +154,7 @@ file safety:
   lib/canql/nodes/main.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 511e4238f83eb5b32839c25d94ec2a59145539bb
+    safe_revision: c5f8f76b2c335a8554f39a14d6165bf5cd8f9b67
   lib/canql/nodes/patient.rb:
     comments: 
     reviewed_by: josh.pencheon
@@ -167,6 +171,10 @@ file safety:
     comments: 
     reviewed_by: timgentry
     safe_revision: c39d24bb500719971969762e94545e82866bf92f
+  lib/canql/nodes/test_result_group.rb:
+    comments: 
+    reviewed_by: josh.pencheon
+    safe_revision: 42bb9bd177a761b9d04d728e53fcf0ebd0083ae4
   lib/canql/parser.rb:
     comments: 
     reviewed_by: timgentry
@@ -178,7 +186,7 @@ file safety:
   lib/canql/version.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 23852bc731fdf82a87fd06070a89ec81affe8155
+    safe_revision: 7b5bc84b813b7ff156665a1a37cfe5dd5b53afe7
   test/anomaly_test_helper.rb:
     comments: 
     reviewed_by: josh.pencheon
@@ -243,6 +251,10 @@ file safety:
     comments: 
     reviewed_by: josh.pencheon
     safe_revision: 511e4238f83eb5b32839c25d94ec2a59145539bb
+  test/nodes/test_result_groups_test.rb:
+    comments: 
+    reviewed_by: josh.pencheon
+    safe_revision: 42bb9bd177a761b9d04d728e53fcf0ebd0083ae4
   test/nodes/test_results_test.rb:
     comments: 
     reviewed_by: josh.pencheon
@@ -254,4 +266,4 @@ file safety:
   test/test_helper.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 511e4238f83eb5b32839c25d94ec2a59145539bb
+    safe_revision: 42bb9bd177a761b9d04d728e53fcf0ebd0083ae4

data/lib/canql/grammars.rb

@@ -9,6 +9,7 @@ Treetop.load File.expand_path('grammars/batch_types', File.dirname(__FILE__))
 Treetop.load File.expand_path('grammars/e_base_records', File.dirname(__FILE__))
 Treetop.load File.expand_path('grammars/genetic_test', File.dirname(__FILE__))
 Treetop.load File.expand_path('grammars/test_result', File.dirname(__FILE__))
+Treetop.load File.expand_path('grammars/test_result_group', File.dirname(__FILE__))
 Treetop.load File.expand_path('grammars/patient', File.dirname(__FILE__))
 Treetop.load File.expand_path('grammars/registry', File.dirname(__FILE__))
 Treetop.load File.expand_path('grammars/provider', File.dirname(__FILE__))

data/lib/canql/grammars/main.treetop

@@ -5,6 +5,7 @@ grammar Canql
   include Anomaly
   include GeneticTest
   include TestResult
+  include TestResultGroup
   include Dates
   include EBaseRecords
   include BatchTypes
@@ -127,7 +128,9 @@ grammar Canql
   end
 
   rule case_with_conditions
-     anomalies / genetic_tests / test_results / perinatal_hospital / case_field_existance / mother_conditions / action_or_ebr
+     anomalies / genetic_tests / test_results / perinatal_hospital /
+     case_field_existance / test_result_groups / mother_conditions /
+     action_or_ebr
   end
 
   rule patient_with_conditions

data/lib/canql/grammars/test_result_group.treetop

@@ -0,0 +1,16 @@
+module Canql
+  grammar TestResultGroup
+    rule test_result_groups
+      and_keyword? existance_modifier:test_result_group_existance_keyword group:test_result_group_names <Nodes::TestResultGroup::WithCondition>
+    end
+
+    rule test_result_group_existance_keyword
+      # If in furture the reverse is needed use 'supplied require'
+      space ('missing required' / 'missing' / 'supplied required' / 'supplied') word_break
+    end
+
+    rule test_result_group_names
+      space ('screening' / 'anomaly scan') word_break
+    end
+  end
+end

data/lib/canql/nodes.rb

@@ -17,6 +17,7 @@ require 'canql/nodes/batch_types'
 require 'canql/nodes/anomaly'
 require 'canql/nodes/genetic_test'
 require 'canql/nodes/test_result'
+require 'canql/nodes/test_result_group'
 require 'canql/nodes/patient'
 require 'canql/nodes/main'
 require 'canql/nodes/registry'

data/lib/canql/nodes/main.rb

@@ -32,16 +32,23 @@ module Canql #:nodoc: all
         anomalies = []
         genetic_tests = []
         test_results = []
+        test_result_groups = []
 
         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
+          end
         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 }
+        end
         conditions
       end
     end

data/lib/canql/nodes/test_result_group.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Canql #:nodoc: all
+  module Nodes
+    module TestResultGroup
+      module WithCondition
+        def test_result_group
+          group.text_value.strip.parameterize.underscore
+        end
+
+        def to_test_result_group
+          test_result_group_hash = { 'exists' => existance_filter }
+          test_result_group_hash['required'] = requirement_filter
+          test_result_group_hash['group'] = test_result_group_filter if test_result_group.present?
+          test_result_group_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_result_group_filter
+          { Canql::EQUALS => test_result_group }
+        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 = '4.3.0'
+  VERSION = '4.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: canql
 version: !ruby/object:Gem::Version
-  version: 4.3.0
+  version: 4.4.0
 platform: ruby
 authors:
 - PHE NDR Development Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-10 00:00:00.000000000 Z
+date: 2020-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic
@@ -238,6 +238,7 @@ files:
 - lib/canql/grammars/provider.treetop
 - lib/canql/grammars/registry.treetop
 - lib/canql/grammars/test_result.treetop
+- lib/canql/grammars/test_result_group.treetop
 - lib/canql/nodes.rb
 - lib/canql/nodes/age.rb
 - lib/canql/nodes/anomaly.rb
@@ -250,6 +251,7 @@ files:
 - lib/canql/nodes/perinatal_hospital.rb
 - lib/canql/nodes/registry.rb
 - lib/canql/nodes/test_result.rb
+- lib/canql/nodes/test_result_group.rb
 - lib/canql/parser.rb
 - lib/canql/treetop/extensions.rb
 - lib/canql/version.rb