us_core_test_kit 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5065cd644a0b1a71df633c16670902c3f652888ba813dc89791c9f2812530a68
-  data.tar.gz: '04139c5a765c360de1e4a8eef004265fc1efb6695f9f175284773b3fcb188166'
+  metadata.gz: cf7aef28c22652157e161c0577936f83368ed966e95d313d43a96c3aae618a3f
+  data.tar.gz: d44b31b58c97c38e9d80462a47dbc2baa50e2e6cdc2e98ed4cb244a375c381bf
 SHA512:
-  metadata.gz: 5f6df18ebaa802e0237f0eb0980a82618ec49714e36b6148abf82a619969ed4b92cc1191e5c7907d5551f1f2c9f24d2ab17d1586a20f478adb01db1ee5a31e6f
-  data.tar.gz: 727a50e4891774a0e0d9773e698d8aa26db367de651465ac4562812c0e10a11540a3325b19cdd1d20fee4aab47a357607115676cb596ac64a50778643287d16b
+  metadata.gz: 6b87c6b6d5be087b6d28837ea02581ec2fc53bef7301e858db3b7e9e7538e8db93a54416a916ec8e8077c9cdcc5313880a63353d633d5e0039306e7c93c28758
+  data.tar.gz: 348461765954b1564b1e44bbac4c149de5740c18c13edb920a79cc1ddf00a5a6279fab8f0ee01732b9caf1bd1a4a54bb7a17f471a2abc3325ac96410e6691cf5

data/lib/us_core_test_kit/date_search_validation.rb

@@ -36,7 +36,7 @@ module USCoreTestKit
       range
     end
 
-    def fhir_date_comparer(search_range, target_range, comparator)
+    def fhir_date_comparer(search_range, target_range, comparator, extend_start = false, extend_end = false)
       # Implicitly, a missing lower boundary is "less than" any actual date. A missing upper boundary is "greater than" any actual date.
       case comparator
       when 'eq' # the range of the search value fully contains the range of the target value
@@ -44,13 +44,13 @@ module USCoreTestKit
       when 'ne' # the range of the search value does not fully contain the range of the target value
         target_range[:start].nil? || target_range[:end].nil? || search_range[:start] > target_range[:start] || search_range[:end] < target_range[:end]
       when 'gt' #  the range above the search value intersects (i.e. overlaps) with the range of the target value
-        target_range[:end].nil? || search_range[:end] < target_range[:end]
+        target_range[:end].nil? || search_range[:end] < target_range[:end] || (search_range[:end] < (target_range[:end] + 1) && extend_end)
       when 'lt' # the range below the search value intersects (i.e. overlaps) with the range of the target value
-        target_range[:start].nil? || search_range[:start] > target_range[:start]
+        target_range[:start].nil? || search_range[:start] > target_range[:start] || (search_range[:start] > (target_range[:start] - 1) && extend_start)
       when 'ge'
-        fhir_date_comparer(search_range, target_range, 'gt') || fhir_date_comparer(search_range, target_range, 'eq')
+        fhir_date_comparer(search_range, target_range, 'gt', extend_start, extend_end) || fhir_date_comparer(search_range, target_range, 'eq')
       when 'le'
-        fhir_date_comparer(search_range, target_range, 'lt') || fhir_date_comparer(search_range, target_range, 'eq')
+        fhir_date_comparer(search_range, target_range, 'lt', extend_start, extend_end) || fhir_date_comparer(search_range, target_range, 'eq')
       when 'sa' # the range above the search value contains the range of the target value
         !target_range[:start].nil? && search_range[:end] < target_range[:start]
       when 'eb' # the range below the search value contains the range of the target value
@@ -81,9 +81,11 @@ module USCoreTestKit
       else
         comparator = 'eq'
       end
+      search_is_date = is_date?(search_value)
+      target_is_date = is_date?(target_value)
       search_range = get_fhir_datetime_range(search_value)
       target_range = get_fhir_datetime_range(target_value)
-      fhir_date_comparer(search_range, target_range, comparator)
+      fhir_date_comparer(search_range, target_range, comparator, !search_is_date && target_is_date, !search_is_date && target_is_date)
     end
 
     def validate_period_search(search_value, target_value)
@@ -93,9 +95,14 @@ module USCoreTestKit
       else
         comparator = 'eq'
       end
+      search_is_date = is_date?(search_value)
       search_range = get_fhir_datetime_range(search_value)
       target_range = get_fhir_period_range(target_value)
-      fhir_date_comparer(search_range, target_range, comparator)
+      fhir_date_comparer(search_range, target_range, comparator, !search_is_date && is_date?(target_value.start), !search_is_date && is_date?(target_value.end))
+    end
+
+    def is_date?(value)
+     /^\d{4}(-\d{2})?(-\d{2})?$/.match?(value) # YYYY or YYYY-MM or YYYY-MM-DD
     end
   end
 end

data/lib/us_core_test_kit/generated/v4.0.0/metadata.yml

@@ -11880,20 +11880,12 @@
       :uscdi_only: true
     - :path: name.suffix
       :uscdi_only: true
-    - :path: name.use
-      :fixed_value: old
-      :uscdi_only: true
     - :path: name.period.end
       :uscdi_only: true
     - :path: telecom
       :uscdi_only: true
     - :path: communication
       :uscdi_only: true
-    :choices:
-    - :paths:
-      - name.period.end
-      - name.use
-      :uscdi_only: true
   :mandatory_elements:
   - Patient.identifier
   - Patient.identifier.system

data/lib/us_core_test_kit/generated/v4.0.0/patient/metadata.yml

@@ -185,20 +185,12 @@
     :uscdi_only: true
   - :path: name.suffix
     :uscdi_only: true
-  - :path: name.use
-    :fixed_value: old
-    :uscdi_only: true
   - :path: name.period.end
     :uscdi_only: true
   - :path: telecom
     :uscdi_only: true
   - :path: communication
     :uscdi_only: true
-  :choices:
-  - :paths:
-    - name.period.end
-    - name.use
-    :uscdi_only: true
 :mandatory_elements:
 - Patient.identifier
 - Patient.identifier.system

data/lib/us_core_test_kit/generated/v4.0.0/patient/patient_must_support_test.rb

@@ -34,7 +34,7 @@ module USCoreTestKit
         * Patient.extension:birthsex
         * Patient.extension:ethnicity
         * Patient.extension:race
-        * Patient.name.period.end or Patient.name.use
+        * Patient.name.period.end
         * Patient.name.suffix
         * Patient.telecom
         * Patient.telecom.system

data/lib/us_core_test_kit/generated/v5.0.1/metadata.yml

@@ -17444,9 +17444,6 @@
       :uscdi_only: true
     - :path: name.suffix
       :uscdi_only: true
-    - :path: name.use
-      :fixed_value: old
-      :uscdi_only: true
     - :path: name.period.end
       :uscdi_only: true
     - :path: telecom
@@ -17456,10 +17453,8 @@
     - :path: address.use
       :fixed_value: old
       :uscdi_only: true
-    :choices:
-    - :paths:
-      - name.period.end
-      - name.use
+    - :path: name.use
+      :fixed_value: old
       :uscdi_only: true
   :mandatory_elements:
   - Patient.identifier

data/lib/us_core_test_kit/generated/v5.0.1/patient/metadata.yml

@@ -188,9 +188,6 @@
     :uscdi_only: true
   - :path: name.suffix
     :uscdi_only: true
-  - :path: name.use
-    :fixed_value: old
-    :uscdi_only: true
   - :path: name.period.end
     :uscdi_only: true
   - :path: telecom
@@ -200,10 +197,8 @@
   - :path: address.use
     :fixed_value: old
     :uscdi_only: true
-  :choices:
-  - :paths:
-    - name.period.end
-    - name.use
+  - :path: name.use
+    :fixed_value: old
     :uscdi_only: true
 :mandatory_elements:
 - Patient.identifier

data/lib/us_core_test_kit/generated/v5.0.1/patient/patient_must_support_test.rb

@@ -36,8 +36,9 @@ module USCoreTestKit
         * Patient.extension:ethnicity
         * Patient.extension:genderIdentity
         * Patient.extension:race
-        * Patient.name.period.end or Patient.name.use
+        * Patient.name.period.end
         * Patient.name.suffix
+        * Patient.name.use
         * Patient.telecom
         * Patient.telecom.system
         * Patient.telecom.use

data/lib/us_core_test_kit/generator/must_support_metadata_extractor.rb

@@ -375,11 +375,6 @@ module USCoreTestKit
             choices << { paths: ['location.location', 'serviceProvider'] }
           when 'MedicationRequest'
             choices << { paths: ['reportedBoolean', 'reportedReference'] }
-          when 'Patient'
-            choices << {
-              paths: ['name.period.end', 'name.use'],
-              uscdi_only: true
-            }
           end
         when '5.0.1'
           case profile.type
@@ -400,13 +395,7 @@ module USCoreTestKit
             choices << { paths: ['location.location', 'serviceProvider'] }
           when 'MedicationRequest'
             choices << { paths: ['reportedBoolean', 'reportedReference'] }
-          when 'Patient'
-            choices << {
-              paths: ['name.period.end', 'name.use'],
-              uscdi_only: true
-            }
           end
-
         end
 
         @must_supports[:choices] = choices if choices.present?
@@ -445,11 +434,6 @@ module USCoreTestKit
           path: 'name.suffix',
           uscdi_only: true
         }
-        @must_supports[:elements] << {
-          path: 'name.use',
-          fixed_value: 'old',
-          uscdi_only: true
-        }
         @must_supports[:elements] << {
           path: 'name.period.end',
           uscdi_only: true
@@ -483,6 +467,11 @@ module USCoreTestKit
             fixed_value: 'old',
             uscdi_only: true
           }
+          @must_supports[:elements] << {
+            path: 'name.use',
+            fixed_value: 'old',
+            uscdi_only: true
+          }
         end
       end
 

data/lib/us_core_test_kit/search_test.rb

@@ -609,9 +609,8 @@ module USCoreTestKit
               #   Patient.birthDate does not mandate comparators so cannot be converted
               #   Goal.target-date has day precision
               #   All others have second + time offset precision
-              if /^\d{4}$/.match?(element) || # YYYY
-                 /^\d{4}-\d{2}$/.match?(element) || # YYYY-MM
-                (/^\d{4}-\d{2}-\d{2}$/.match?(element) && resource_type != "Goal") # YYYY-MM-DD AND Resource is NOT Goal
+              if /^\d{4}(-\d{2})?$/.match?(element) || # YYYY or YYYY-MM
+                (/^\d{4}-\d{2}-\d{2}$/.match?(element) && resource_type != "Goal") # YYY-MM-DD AND Resource is NOT Goal
                 "gt#{(DateTime.xmlschema(element)-1).xmlschema}"
               else
                 element

data/lib/us_core_test_kit/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module USCoreTestKit
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: us_core_test_kit
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Stephen MacVicar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-12 00:00:00.000000000 Z
+date: 2022-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inferno_core