canql 5.1.0 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7388b9b6f880c7c55b4db80358ff06f5ac5753f70f70aae5e4791b3ad2f886d9
-  data.tar.gz: 44c1a08147f5d7eee119242432184238388af321f311149cf498550e417af5fd
+  metadata.gz: c11d88eb61eaebcc1fee8bbcf02c3528a26799b7a62800971c34517619b98668
+  data.tar.gz: ac2d55b1fcf88636a1ccfdf3a2f11b4d4ef7e878ba886fceddd2dcdce26a6fb6
 SHA512:
-  metadata.gz: 3e0eec913600a18381b348c94a466ebc2ef3f8d1a92b505be0975bd77adc63781f54d63f18b7a7c890e0dcea2f3e83303d963fc767e78ee0d1287e4690f59090
-  data.tar.gz: e0ffb6f335045c5238a3b42c4469504cc6a24eaa4eff90e9f9fa217e0e76f9f06d53c6f98572302cfd8737626f4a558afae93408938c64f1e1f6aa0b7bf7f05a
+  metadata.gz: 767d7da5878ba53e624db9090a0bce25ee2b17c039b5ecce4bbb65126f0d32bc988851f7b31e41be235f9911919051a07a7e5478b54d11bc0aefdf7c6a939389
+  data.tar.gz: bd874eb46ba2641c84ba40d2a521db212b218879cf6e789777514d36bea0672fd9b38e24804ca4a86b54b722c62b5a7a89003d3040cd8179991b134ebb7543ab

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## [Unreleased]
-*no unreleased changes*
+* no relevent changes
+
+## 5.2.0 / 2021-03-04
+
+* Added new FASP anomaly RAG rating filters (#63)
 
 ## 5.1.0 / 2021-01-25
 

data/code_safety.yml

@@ -26,8 +26,8 @@ file safety:
     safe_revision: 146b255b240b0efc928d39dd1b70ab221ddc3138
   CHANGELOG.md:
     comments: 
-    reviewed_by: josh.pencheon
-    safe_revision: aea0d1a480e886a63b723135c7381cdcee0d4b25
+    reviewed_by: ollietulloch
+    safe_revision: 9af6ea0bcdac493fe5f31d62b504b285658867c4
   CODE_OF_CONDUCT.md:
     comments: 
     reviewed_by: drewthorp
@@ -80,8 +80,8 @@ file safety:
   lib/canql/grammars/anomaly.treetop:
     comments: It is a known issue that this is potentially susceptible to certain
       kinds of DoS attack
-    reviewed_by: josh.pencheon
-    safe_revision: b7778ca1d536022a807420cc9fe0f1c2df7f73ef
+    reviewed_by: ollietulloch
+    safe_revision: e549c0dcafdd6004ec279bd256fae8b9964c9629
   lib/canql/grammars/batch_types.treetop:
     comments: 
     reviewed_by: josh.pencheon
@@ -141,8 +141,8 @@ file safety:
     safe_revision: 6932d590299ad4a9d2ba24b425b158c67142bf74
   lib/canql/nodes/anomaly.rb:
     comments: 
-    reviewed_by: josh.pencheon
-    safe_revision: b7778ca1d536022a807420cc9fe0f1c2df7f73ef
+    reviewed_by: ollietulloch
+    safe_revision: e549c0dcafdd6004ec279bd256fae8b9964c9629
   lib/canql/nodes/batch_types.rb:
     comments: 
     reviewed_by: josh.pencheon
@@ -193,12 +193,12 @@ file safety:
     safe_revision: 6932d590299ad4a9d2ba24b425b158c67142bf74
   lib/canql/version.rb:
     comments: 
-    reviewed_by: josh.pencheon
-    safe_revision: aea0d1a480e886a63b723135c7381cdcee0d4b25
+    reviewed_by: ollietulloch
+    safe_revision: 9af6ea0bcdac493fe5f31d62b504b285658867c4
   test/anomaly_test_helper.rb:
     comments: 
-    reviewed_by: josh.pencheon
-    safe_revision: 73a7dac17b20fcc77bcbd9d38777c8aa4d524816
+    reviewed_by: ollietulloch
+    safe_revision: e549c0dcafdd6004ec279bd256fae8b9964c9629
   test/canql_test.rb:
     comments: 
     reviewed_by: timgentry
@@ -221,8 +221,8 @@ file safety:
     safe_revision: 7490099869e368dcd5c26ded11eb90229baf4cae
   test/nodes/code_test.rb:
     comments: 
-    reviewed_by: josh.pencheon
-    safe_revision: b7778ca1d536022a807420cc9fe0f1c2df7f73ef
+    reviewed_by: ollietulloch
+    safe_revision: e549c0dcafdd6004ec279bd256fae8b9964c9629
   test/nodes/e_base_records_test.rb:
     comments: 
     reviewed_by: josh.pencheon

data/lib/canql/grammars/anomaly.treetop

@@ -35,7 +35,7 @@ module Canql
     end
 
     rule anomalies_icd_code
-      (icd_code_name / code_group)
+      (fasp_rating  / icd_code_name / code_group)
     end
 
     rule icd_code_name
@@ -45,5 +45,9 @@ module Canql
     rule code_group
       ('fasp plus' / 'plus' / 'fasp' / 'structural' / 'trisomy') <Nodes::Anomaly::SingleCodeGroupNode>
     end
+
+    rule fasp_rating
+      ('fasp red and amber' / 'fasp amber and red' / 'fasp red' / 'fasp amber' / 'fasp green') <Nodes::Anomaly::SingleFaspRatingNode>
+    end
   end
 end

data/lib/canql/nodes/anomaly.rb

@@ -23,13 +23,21 @@ module Canql #:nodoc: all
           if anomaly_screening_status_type.present?
             anomaly_hash['screening_status'] = anomaly_screening_status_type_filter
           end
-          anomaly_hash['icd_codes'] = code_filter[:icd_code] if code_filter[:icd_code].present?
-          return anomaly_hash if code_filter[:code_group].blank?
+          code_filters(anomaly_hash)
 
-          anomaly_hash['code_groups'] = code_filter[:code_group]
           anomaly_hash
         end
 
+        def code_filters(anomaly_hash)
+          anomaly_hash['icd_codes'] = code_filter[:icd_code] if code_filter[:icd_code].present?
+          if code_filter[:code_group].present?
+            anomaly_hash['code_groups'] = code_filter[:code_group]
+          end
+          return if code_filter[:fasp_rating].blank?
+
+          anomaly_hash['fasp_rating'] = code_filter[:fasp_rating]
+        end
+
         def existance_filter
           { Canql::EQUALS => existance_modifier.text_value.strip != 'no' }
         end
@@ -49,36 +57,50 @@ module Canql #:nodoc: all
         def code_type(code)
           return :icd_code if code.respond_to?(:to_code) && code.to_code.present?
           return :code_group if code.respond_to?(:to_code_group) && code.to_code_group.present?
+          return :fasp_rating if code.respond_to?(:to_fasp_rating) && code.to_fasp_rating.present?
 
           raise 'Unable to find code type'
         end
 
         def code_value(code)
           return code.to_code if :icd_code == code_type(code)
+          return code.to_code_group if :code_group == code_type(code)
 
-          code.to_code_group
+          code.to_fasp_rating
         end
 
         def prepare_code_filters(code_array)
-          code_array[:icd_code].flatten!
-          code_array[:icd_code].delete_if(&:blank?)
-          code_array[:code_group].flatten!
-          code_array[:code_group].delete_if(&:blank?)
+          clean_code_array(code_array)
 
           code_filters = {}
           if code_array[:icd_code].any?
             code_filters[:icd_code] = { Canql::BEGINS => code_array[:icd_code] }
           end
-          return code_filters if code_array[:code_group].blank?
 
-          code_filters[:code_group] = { Canql::EQUALS => code_array[:code_group] }
+          if code_array[:code_group].any?
+            code_filters[:code_group] = { Canql::EQUALS => code_array[:code_group] }
+          end
+
+          if code_array[:fasp_rating].any?
+            code_filters[:fasp_rating] = { Canql::EQUALS => code_array[:fasp_rating] }
+          end
+
           code_filters
         end
 
+        def clean_code_array(code_array)
+          code_array[:icd_code].flatten!
+          code_array[:icd_code].delete_if(&:blank?)
+          code_array[:code_group].flatten!
+          code_array[:code_group].delete_if(&:blank?)
+          code_array[:fasp_rating].flatten!
+          code_array[:fasp_rating].delete_if(&:blank?)
+        end
+
         def code_filter
           return {} if code_data.text_value.blank?
 
-          code_arrays = { icd_code: [], code_group: [] }
+          code_arrays = { icd_code: [], code_group: [], fasp_rating: [] }
           code_arrays[code_type(code_data.first)] << code_value(code_data.first)
           code_data.rest.elements.each do |code|
             code_arrays[code_type(code)] << code_value(code)
@@ -90,8 +112,9 @@ module Canql #:nodoc: all
       module AdditionalCodeNode
         def code_type
           return :icd_code if anomalies_icd_code.respond_to?(:to_code)
+          return :code_group if anomalies_icd_code.respond_to?(:to_code_group)
 
-          :code_group
+          :fasp_rating
         end
 
         def to_code
@@ -101,6 +124,10 @@ module Canql #:nodoc: all
         def to_code_group
           anomalies_icd_code.to_code_group if :code_group == code_type
         end
+
+        def to_fasp_rating
+          anomalies_icd_code.to_fasp_rating if :fasp_rating == code_type
+        end
       end
 
       module SingleIcdCodeNode
@@ -114,6 +141,14 @@ module Canql #:nodoc: all
           text_value.gsub(/( )/, '_').upcase
         end
       end
+
+      module SingleFaspRatingNode
+        def to_fasp_rating
+          text_value.gsub(/( )/, '_').upcase.split('_AND_').map do |value|
+            value.start_with?('FASP_') ? value : "FASP_#{value}"
+          end
+        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.1.0'
+  VERSION = '5.2.0'
 end

metadata

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