canql 2.5.0 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8206dd11cfeb5875812b82062933650e2c97e56df252025633093705d73386a
-  data.tar.gz: 14bfaa9148d2f3f5028f717ca48f7b4043254f194175fcaa3f4e7707f0fb69b0
+  metadata.gz: 328610120dd48f5efc67704d2c77b7516f8d36a3e03977baad98563421037026
+  data.tar.gz: ceb762e0315a816778c25437036ea0a89bcecab4a915ae228cde51d98cda9868
 SHA512:
-  metadata.gz: 94b07f6c37e22ff798f4966b29f2b3116720aaf2af1500e699fde1ddba1232e4f0370ca370366ce82dcbc9468caec19839e6e320a30ae8dbd2adab85be9f5677
-  data.tar.gz: a79d86c334fb46c637a0fda89cb9b08996fab0923a942f2db91e913f865d745cc45755cce4af8669e671737fb5ff75805ad52d9ce57f6654bbad21111c240af8
+  metadata.gz: 469d32c7c3e8dd9a7b790b72aa0db40cab6a534faa5c4018db805013d9bd0d5b7d83758498b58dda1f7685c18962f2d8fff8f7a7ceb0113bada1a33b57b0899d
+  data.tar.gz: f08d2e66f6d1ec90ffa0a889c81fd6bfc726e4b5d25e0c674287be381503b35189e8a0e7afe277370bd35fc89ff9e4233bbc134982de362e944f44b1e5c92654

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 ## [Unreleased]
 *no unreleased changes*
 
+## 2.6.0 / 2019-03-12
+### Added
+* Added the ability to limit cases to primary or alias patients (#20)
+* Added support for ENOTE2, BADGER and UCYTO batched types (#21)
+
 ## 2.5.0 / 2019-01-25
 ### Added
 * Added the abiltity to filter actions by trust as well as hospital (#18)

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 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 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

@@ -19,7 +19,7 @@ file safety:
   CHANGELOG.md:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 6bbb80cd4d98411f7e263705074c3d55dcdaab5f
+    safe_revision: d26cf2ffd4e2615c9c140cce56be1a809252f331
   CODE_OF_CONDUCT.md:
     comments: 
     reviewed_by: drewthorp
@@ -35,7 +35,7 @@ file safety:
   README.md:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 5241b851650e52fd094dad505a9bc0294b27204a
+    safe_revision: 1b5795e8b5e20395f17277050f17ff0db6f0f556
   Rakefile:
     comments: 
     reviewed_by: timgentry
@@ -76,8 +76,8 @@ file safety:
     safe_revision: 695cec7ee61f36a9ef054a4079f290421d814666
   lib/canql/grammars/batch_types.treetop:
     comments: 
-    reviewed_by: timgentry
-    safe_revision: 41d8f146c456e7bf252784476438574a9d283408
+    reviewed_by: josh.pencheon
+    safe_revision: '0967ae095f7215d4972856133f5c36bf00a28391'
   lib/canql/grammars/dates.treetop:
     comments: It is a known issue that this is potentially susceptible to certain
       kinds of DoS attack
@@ -95,12 +95,12 @@ 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: c431b8a476b84d077e9c39a2a13c2b17a296773d
+    safe_revision: 1b5795e8b5e20395f17277050f17ff0db6f0f556
   lib/canql/grammars/patient.treetop:
     comments: It is a known issue that this is potentially susceptible to certain
       kinds of DoS attack
-    reviewed_by: timgentry
-    safe_revision: 1b73bdcf483c6e44979e183c5873a1f0612a49a1
+    reviewed_by: josh.pencheon
+    safe_revision: 1b5795e8b5e20395f17277050f17ff0db6f0f556
   lib/canql/grammars/perinatal_hospital.treetop:
     comments: 
     reviewed_by: josh.pencheon
@@ -133,8 +133,8 @@ file safety:
     safe_revision: 695cec7ee61f36a9ef054a4079f290421d814666
   lib/canql/nodes/batch_types.rb:
     comments: 
-    reviewed_by: timgentry
-    safe_revision: 6932d590299ad4a9d2ba24b425b158c67142bf74
+    reviewed_by: josh.pencheon
+    safe_revision: '0967ae095f7215d4972856133f5c36bf00a28391'
   lib/canql/nodes/dates.rb:
     comments: 
     reviewed_by: timgentry
@@ -154,7 +154,7 @@ file safety:
   lib/canql/nodes/patient.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: a1686a3905ee6d7ebc8c5b1786efba4f8df42a2d
+    safe_revision: 1b5795e8b5e20395f17277050f17ff0db6f0f556
   lib/canql/nodes/perinatal_hospital.rb:
     comments: 
     reviewed_by: josh.pencheon
@@ -178,7 +178,7 @@ file safety:
   lib/canql/version.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 6bbb80cd4d98411f7e263705074c3d55dcdaab5f
+    safe_revision: d26cf2ffd4e2615c9c140cce56be1a809252f331
   test/anomaly_test_helper.rb:
     comments: 
     reviewed_by: timgentry
@@ -206,7 +206,7 @@ file safety:
   test/nodes/e_base_records_test.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: c431b8a476b84d077e9c39a2a13c2b17a296773d
+    safe_revision: '0967ae095f7215d4972856133f5c36bf00a28391'
   test/nodes/genetic_tests_test.rb:
     comments: 
     reviewed_by: josh.pencheon
@@ -218,11 +218,11 @@ file safety:
   test/nodes/mother_e_base_records_test.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: c431b8a476b84d077e9c39a2a13c2b17a296773d
+    safe_revision: '0967ae095f7215d4972856133f5c36bf00a28391'
   test/nodes/patient_test.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: a1686a3905ee6d7ebc8c5b1786efba4f8df42a2d
+    safe_revision: 1b5795e8b5e20395f17277050f17ff0db6f0f556
   test/nodes/perinatal_hospital_test.rb:
     comments: 
     reviewed_by: josh.pencheon
@@ -238,7 +238,7 @@ file safety:
   test/parser_test.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: c431b8a476b84d077e9c39a2a13c2b17a296773d
+    safe_revision: 1b5795e8b5e20395f17277050f17ff0db6f0f556
   test/test_helper.rb:
     comments: 
     reviewed_by: josh.pencheon

data/lib/canql/grammars/batch_types.treetop

@@ -1,11 +1,23 @@
 module Canql
   grammar BatchTypes
     rule batch_type
-      paediatric <Nodes::BatchTypeNode>
+      (paediatric / enote2 / badger / ucyto) <Nodes::BatchTypeNode>
     end
 
     rule paediatric
       'paediatric' <Nodes::PaediatricNode>
     end
+
+    rule enote2
+      ('enote' / 'electronic notification') <Nodes::Enote2Node>
+    end
+
+    rule badger
+      'badger' <Nodes::BadgerNode>
+    end
+
+    rule ucyto
+      ('ucyto' / 'cytogenetic' / 'cyto') <Nodes::UcytoNode>
+    end
   end
 end

data/lib/canql/grammars/main.treetop

@@ -48,7 +48,7 @@ grammar Canql
   end
 
   rule preconditions
-    registry / gender / outcome
+    registry / gender / outcome / primacy
   end
 
   rule additional_conditions

data/lib/canql/grammars/patient.treetop

@@ -8,6 +8,10 @@ module Canql
       space outcome:('stillborn' / 'liveborn' / 'miscarried' / 'terminated' / 'registrable' / 'non-registrable' ) word_break <Nodes::Patient::OutcomeNode>
     end
 
+    rule primacy
+      space primacy:('primary' / 'alias' ) word_break <Nodes::Patient::PrimacyNode>
+    end
+
     rule expected_keyword
       space ('expected' / 'due') word_break
     end

data/lib/canql/nodes/batch_types.rb

@@ -14,5 +14,23 @@ module Canql #:nodoc: all
         'paediatric'
       end
     end
+
+    module Enote2Node
+      def normalise
+        'enote2'
+      end
+    end
+
+    module BadgerNode
+      def normalise
+        'badger'
+      end
+    end
+
+    module UcytoNode
+      def normalise
+        'ucyto'
+      end
+    end
   end
 end

data/lib/canql/nodes/patient.rb

@@ -15,6 +15,12 @@ module Canql #:nodoc: all
         end
       end
 
+      module PrimacyNode
+        def meta_data_item
+          { 'patient.primacy' => { Canql::EQUALS => primacy.text_value } }
+        end
+      end
+
       module FieldExists
         FIELDS = {
           'date of birth':          { patient: 'birthdate', mother: 'birthdate' },

data/lib/canql/version.rb

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

metadata

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