canql 5.4.0 → 5.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6fcbeb6ccebc9a99388e3eeb15f29d9faa270ac17f85cafecdf0384936fc8229
-  data.tar.gz: 99b63524c4ac676bf7e878475ec59d53701cc35003ecc9dfdafd10630a98b637
+  metadata.gz: 6f1406cd4a6e0b0e9f66ef6386f0356b8b60e7c9ed6300ac8366a3e6b65aad4c
+  data.tar.gz: 6933617a2d3b293fa5c844d4885ee2e0b005cb5ba4596de4699fcaf3254faff5
 SHA512:
-  metadata.gz: d7b16d016a069fb971fdbf749a3aaa935a9310d9f461109c3a12eb8a72d65ac98beb60eb3f6f7c5040c16b6a52fd39afdb513414cf82b3bdf35b7528c70ad8ae
-  data.tar.gz: c44e33ce868f67731f27918dad42d4a683057390a9668c60332171ac337d3f643c6f0b03c103da05517be16720ac883cd4824a4a57870653f0363c30b3884649
+  metadata.gz: 458ad85cf4588bde403a34ec3721a5e6f22b2a7242029f9d21b4f9f4fa1264355c408e8ba84f8cb280023b5fff5ab480ba5a29d163e62030e7b2b3354d1b301d
+  data.tar.gz: dd916f281f0d531b84ac6e6ff696d28761d92915e70eca5266bfdd4c5ea3f93daaa1dbb246e9482e47b6e6a6b9907f6d1fdca8ac2e8e47f69ea1da1a1ff5b359

data/.github/workflows/test.yml

@@ -1,6 +1,6 @@
 name: Test
 
-on: [push, pull_request]
+on: [push]
 
 jobs:
   test:

data/CHANGELOG.md

@@ -1,25 +1,27 @@
 ## [Unreleased]
 * no relevant changes
 
-## 5.4.0 / 2021-03-08
+## 5.5.0 / 2021-03-16
+### Added
+* Add HES event filter (#72)
 
+## 5.4.0 / 2021-03-08
+### Added
 * Add 'pending data' option to the anomaly screening status filter (#69)
 
 ## 5.3.0 / 2021-03-05
-
+### Added
 * Added new FASP case RAG rating filters (#66)
 
 ## 5.2.0 / 2021-03-04
-
+### Added
 * Added new FASP anomaly RAG rating filters (#63)
 
 ## 5.1.0 / 2021-01-25
-
 ### Added
 * Added new filters for test acceptance requirments (#59)
 
 ## 5.0.0 / 2021-01-19
-
 ### Changed
 * Changed the values of registry to use registry name rather than codes and added new supra-region options (#54)
 

data/README.md

@@ -50,7 +50,7 @@ would output:
       and booking at hospital RGT01 and delivery at addenbrookes trust
 The parser is case insensitive. An example of an almost fully involved CANQL query is:
 
-> First 27 Male Liveborn Thames Primary Cases Due between 20/06/2015 and 25/06/2015 and Born on 22/06/2015 and that Died on 07/07/2015 with Suspected Prenatal Q20 Anomalies and Booking at hospital RGT01 and Delivery at addenbrookes trust and Postnatal Tests and Missing Postcode and Date of Birth and QA Action and Unprocessed paediatric records and Mother Born between 01/10/1990 and 10/01/1999 and who Died on 01/08/2015 with Populated Postcode and NHS Number
+> First 27 Male Liveborn Thames Primary Cases Due between 20/06/2015 and 25/06/2015 and Born on 22/06/2015 and that Died on 07/07/2015 with Suspected Prenatal Q20 Anomalies and Booking at hospital RGT01 and Delivery at addenbrookes trust and Postnatal Tests and Missing Postcode and Date of Birth and QA Action and Unprocessed paediatric records and hes records and Mother Born between 01/10/1990 and 10/01/1999 and who Died on 01/08/2015 with Populated Postcode and NHS Number
 
 Please see the tests for many more examples.
 

data/code_safety.yml

@@ -11,7 +11,7 @@ file safety:
   ".github/workflows/test.yml":
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 865fc970554fee9207f8e3cd0247133c6a849b24
+    safe_revision: a3f5265f1d20a6dcb8c45ab5f09207ca7d1e255c
   ".gitignore":
     comments: 
     reviewed_by: timgentry
@@ -26,8 +26,8 @@ file safety:
     safe_revision: 146b255b240b0efc928d39dd1b70ab221ddc3138
   CHANGELOG.md:
     comments: 
-    reviewed_by: ollietulloch
-    safe_revision: 8e66f9ea2d880e368446969c3b0e63a1660cb427
+    reviewed_by: josh.pencheon
+    safe_revision: 154d287a89e13c77b34642ffb33eb4c07953aa1b
   CODE_OF_CONDUCT.md:
     comments: 
     reviewed_by: drewthorp
@@ -43,7 +43,7 @@ file safety:
   README.md:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 8c07968aa84db92b6f1cc528180f73530ddc6ff5
+    safe_revision: 3ace8794c1c545b47898da1fbee49af8afdbf521
   Rakefile:
     comments: 
     reviewed_by: timgentry
@@ -71,7 +71,7 @@ file safety:
   lib/canql/grammars.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: c5f8f76b2c335a8554f39a14d6165bf5cd8f9b67
+    safe_revision: 3ace8794c1c545b47898da1fbee49af8afdbf521
   lib/canql/grammars/age.treetop:
     comments: It is a known issue that this is potentially susceptible to certain
       kinds of DoS attack
@@ -99,11 +99,15 @@ file safety:
     comments: 
     reviewed_by: josh.pencheon
     safe_revision: 526dbe8a3dc3334b4174928e6f51d07e48ed9247
+  lib/canql/grammars/hes_event.treetop:
+    comments: 
+    reviewed_by: josh.pencheon
+    safe_revision: 3ace8794c1c545b47898da1fbee49af8afdbf521
   lib/canql/grammars/main.treetop:
     comments: It is a known issue that this is potentially susceptible to certain
       kinds of DoS attack
     reviewed_by: josh.pencheon
-    safe_revision: 9bb663b220e76e78f3f0f48e4bc6334fe9451925
+    safe_revision: 3ace8794c1c545b47898da1fbee49af8afdbf521
   lib/canql/grammars/patient.treetop:
     comments: It is a known issue that this is potentially susceptible to certain
       kinds of DoS attack
@@ -134,7 +138,7 @@ file safety:
   lib/canql/nodes.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: c5f8f76b2c335a8554f39a14d6165bf5cd8f9b67
+    safe_revision: 3ace8794c1c545b47898da1fbee49af8afdbf521
   lib/canql/nodes/age.rb:
     comments: 
     reviewed_by: timgentry
@@ -159,10 +163,14 @@ file safety:
     comments: 
     reviewed_by: josh.pencheon
     safe_revision: 526dbe8a3dc3334b4174928e6f51d07e48ed9247
+  lib/canql/nodes/hes_event.rb:
+    comments: 
+    reviewed_by: josh.pencheon
+    safe_revision: 3ace8794c1c545b47898da1fbee49af8afdbf521
   lib/canql/nodes/main.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 361dea5dc6d64bdb7b03434dd2878f8c3b128c95
+    safe_revision: 3ace8794c1c545b47898da1fbee49af8afdbf521
   lib/canql/nodes/patient.rb:
     comments: 
     reviewed_by: ollietulloch
@@ -193,8 +201,8 @@ file safety:
     safe_revision: 6932d590299ad4a9d2ba24b425b158c67142bf74
   lib/canql/version.rb:
     comments: 
-    reviewed_by: ollietulloch
-    safe_revision: 8e66f9ea2d880e368446969c3b0e63a1660cb427
+    reviewed_by: josh.pencheon
+    safe_revision: 154d287a89e13c77b34642ffb33eb4c07953aa1b
   test/anomaly_test_helper.rb:
     comments: 
     reviewed_by: ollietulloch
@@ -203,6 +211,10 @@ file safety:
     comments: 
     reviewed_by: timgentry
     safe_revision: 6932d590299ad4a9d2ba24b425b158c67142bf74
+  test/hes_event_test_helper.rb:
+    comments: 
+    reviewed_by: josh.pencheon
+    safe_revision: 3ace8794c1c545b47898da1fbee49af8afdbf521
   test/minitest_helper.rb:
     comments: 
     reviewed_by: timgentry
@@ -231,6 +243,10 @@ file safety:
     comments: 
     reviewed_by: josh.pencheon
     safe_revision: 511e4238f83eb5b32839c25d94ec2a59145539bb
+  test/nodes/hes_event_test.rb:
+    comments: 
+    reviewed_by: josh.pencheon
+    safe_revision: 3ace8794c1c545b47898da1fbee49af8afdbf521
   test/nodes/main_case_test.rb:
     comments: 
     reviewed_by: josh.pencheon
@@ -270,7 +286,7 @@ file safety:
   test/parser_test.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 293248a17d087d7557a6aacdcb5bf3fbec946b87
+    safe_revision: 3ace8794c1c545b47898da1fbee49af8afdbf521
   test/test_helper.rb:
     comments: 
     reviewed_by: josh.pencheon

data/lib/canql/grammars.rb

@@ -14,4 +14,5 @@ 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__))
 Treetop.load File.expand_path('grammars/perinatal_hospital', File.dirname(__FILE__))
+Treetop.load File.expand_path('grammars/hes_event', File.dirname(__FILE__))
 Treetop.load File.expand_path('grammars/main', File.dirname(__FILE__))

data/lib/canql/grammars/hes_event.treetop

@@ -0,0 +1,15 @@
+module Canql
+  grammar HesEvent
+    rule hes_events
+      and_keyword? existance_modifier:hes_no_keyword? hes_keyword <Nodes::HesEvent::WithCondition>
+    end
+
+    rule hes_no_keyword
+      space ('no' / 'some') word_break
+    end
+
+    rule hes_keyword
+      space ('hes events' / 'hes records') word_break
+    end
+  end
+end

data/lib/canql/grammars/main.treetop

@@ -6,6 +6,7 @@ grammar Canql
   include GeneticTest
   include TestResult
   include TestResultGroup
+  include HesEvent
   include Dates
   include EBaseRecords
   include BatchTypes
@@ -130,10 +131,11 @@ grammar Canql
   rule case_with_conditions
      anomalies / genetic_tests / test_results / perinatal_hospital /
      case_field_existance / test_acceptance_existance / test_result_groups /
-     mother_conditions / action_or_ebr
+     mother_conditions / action_or_ebr / hes_events
   end
 
   rule patient_with_conditions
-     anomalies / genetic_tests / test_results / patient_field_existance / action_or_ebr
+     anomalies / genetic_tests / test_results / patient_field_existance /
+     action_or_ebr / hes_events
   end
 end

data/lib/canql/nodes.rb

@@ -22,3 +22,4 @@ require 'canql/nodes/patient'
 require 'canql/nodes/main'
 require 'canql/nodes/registry'
 require 'canql/nodes/perinatal_hospital'
+require 'canql/nodes/hes_event'

data/lib/canql/nodes/hes_event.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Canql #:nodoc: all
+  module Nodes
+    module HesEvent
+      module WithCondition
+        def to_hes
+          { 'exists' => existance_filter }
+        end
+
+        def existance_filter
+          { Canql::EQUALS => existance_modifier.text_value.strip != 'no' }
+        end
+      end
+    end
+  end
+end

data/lib/canql/nodes/main.rb

@@ -32,7 +32,7 @@ module Canql #:nodoc: all
         sub_clauses = build_sub_clauses
 
         %i[
-          anomalies genetic_tests test_results test_result_groups test_acceptances
+          anomalies genetic_tests test_results test_result_groups test_acceptances hes_events
         ].each do |condition_key|
           if sub_clauses[condition_key].present?
             conditions[condition_key.to_s] = { Canql::ALL => sub_clauses[condition_key] }
@@ -52,6 +52,7 @@ module Canql #:nodoc: all
             sub_clauses, element, :test_result_groups, :to_test_result_group
           )
           add_sub_clause(sub_clauses, element, :test_acceptances, :to_test_acceptance)
+          add_sub_clause(sub_clauses, element, :hes_events, :to_hes)
         end
         sub_clauses
       end

data/lib/canql/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: canql
 version: !ruby/object:Gem::Version
-  version: 5.4.0
+  version: 5.5.0
 platform: ruby
 authors:
 - PHE NDR Development Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-08 00:00:00.000000000 Z
+date: 2021-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic
@@ -235,6 +235,7 @@ files:
 - lib/canql/grammars/dates.treetop
 - lib/canql/grammars/e_base_records.treetop
 - lib/canql/grammars/genetic_test.treetop
+- lib/canql/grammars/hes_event.treetop
 - lib/canql/grammars/main.treetop
 - lib/canql/grammars/patient.treetop
 - lib/canql/grammars/perinatal_hospital.treetop
@@ -249,6 +250,7 @@ files:
 - lib/canql/nodes/dates.rb
 - lib/canql/nodes/e_base_records.rb
 - lib/canql/nodes/genetic_test.rb
+- lib/canql/nodes/hes_event.rb
 - lib/canql/nodes/main.rb
 - lib/canql/nodes/patient.rb
 - lib/canql/nodes/perinatal_hospital.rb