ipa_test_kit 0.2.0 → 0.3.1

data/lib/ipa_test_kit/generator/must_support_metadata_extractor.rb

@@ -1,49 +1,31 @@
+require_relative 'value_extractor'
+
 module IpaTestKit
   class Generator
     class MustSupportMetadataExtractor
-      attr_accessor :profile_elements, :profile, :resource
+      attr_accessor :profile_elements, :profile, :resource, :ig_resources
 
-      def initialize(profile_elements, profile, resource)
+      def initialize(profile_elements, profile, resource, ig_resources)
         self.profile_elements = profile_elements
         self.profile = profile
         self.resource = resource
+        self.ig_resources = ig_resources
       end
 
       def must_supports
-        {
+        @must_supports = {
           extensions: must_support_extensions,
           slices: must_support_slices,
           elements: must_support_elements
         }
-      end
-
-      # exclude component from vital sign profiles except observation-bp and observation-pulse-ox
-      # observation-bp is excluded by profile.name != 'observation-bp'
-      # observation-plux-ox is excluded by profile.baseDefinition == 'http://hl7.org/fhir/StructureDefinition/vitalsigns'
-      def vital_signs_component?(element)
-        profile.baseDefinition == 'http://hl7.org/fhir/StructureDefinition/vitalsigns' &&
-          profile.name != 'observation-bp' &&
-          element.path.include?('component')
-      end
 
-      def blood_pressure_value?(element)
-        profile.name == 'observation-bp' && element.path.include?('Observation.value[x]')
-      end
+        handle_special_cases
 
-      # ONC clarified that health IT developers that always provide HL7 FHIR "observation" values
-      # are not required to demonstrate Health IT Module support for "dataAbsentReason" elements.
-      # Remove MS check for dataAbsentReason and component.dataAbsentReason from vital sign profiles      
-      def data_absent_reason?(element)
-        profile.type == 'Observation' && ['Observation.dataAbsentReason', 'Observation.component.dataAbsentReason'].include?(element.path)
+        @must_supports
       end
 
       def all_must_support_elements
-        profile_elements
-          .select { |element| element.mustSupport }
-          .reject do |element|
-            # TODO: Can special cases be moved out of here?
-            vital_signs_component?(element) || blood_pressure_value?(element) || data_absent_reason?(element)
-          end
+        profile_elements.select { |element| element.mustSupport }
       end
 
       def must_support_extension_elements
@@ -101,12 +83,32 @@ module IpaTestKit
                   code: pattern_element.patternCodeableConcept.coding.first.code,
                   system: pattern_element.patternCodeableConcept.coding.first.system
                 }
+              elsif pattern_element.patternCoding.present?
+                {
+                  type: 'patternCoding',
+                  path: discriminator_path,
+                  code: pattern_element.patternCoding.code,
+                  system: pattern_element.patternCoding.system
+                }
               elsif pattern_element.patternIdentifier.present?
                 {
                   type: 'patternIdentifier',
                   path: discriminator_path,
                   system: pattern_element.patternIdentifier.system
                 }
+              elsif pattern_element.binding&.strength == 'required' &&
+                    pattern_element.binding&.valueSet.present?
+
+                value_extractor = ValueExactor.new(ig_resources, resource, profile_elements)
+
+                values = value_extractor.values_from_value_set_binding(pattern_element).presence ||
+                         value_extractor.values_from_resource_metadata([metadata[:path]]).presence || []
+
+                {
+                  type: 'requiredBinding',
+                  path: discriminator_path,
+                  values: values
+                }
               else
                 raise StandardError, 'Unsupported discriminator pattern type'
               end
@@ -166,7 +168,6 @@ module IpaTestKit
                   element.path == "#{current_element.path}.#{discriminator.path}"
               end
 
-              binding.pry if fixed_element.nil?
               {
                 path: discriminator.path,
                 value: fixed_element.fixedUri || fixed_element.fixedCode
@@ -198,24 +199,233 @@ module IpaTestKit
         end
       end
 
+      def type_must_support_extension?(extensions)
+        extensions&.any? do |extension|
+          extension.url == 'http://hl7.org/fhir/StructureDefinition/elementdefinition-type-must-support' &&
+          extension.valueBoolean
+        end
+      end
+
+      def save_type_code?(type)
+        'Reference' == type.code
+      end
+
+      def get_type_must_support_metadata(current_metadata, current_element)
+        current_element.type.map do |type|
+          if type_must_support_extension?(type.extension)
+            metadata =
+            {
+              path: "#{current_metadata[:path].delete_suffix('[x]')}#{type.code.upcase_first}",
+              original_path: current_metadata[:path]
+            }
+            metadata[:type] = [type.code] if save_type_code?(type)
+            handle_type_must_support_target_profiles(type, metadata) if type.code == 'Reference'
+
+            metadata
+          end
+        end.compact
+      end
+
+      def handle_type_must_support_target_profiles(type, metadata)
+        index = 0
+        target_profiles = []
+
+        type.source_hash['_targetProfile']&.each do |hash|
+          if hash.present?
+            element = FHIR::Element.new(hash)
+            target_profiles << type.targetProfile[index] if type_must_support_extension?(element.extension)
+          end
+          index += 1
+        end
+
+        metadata[:target_profiles] = target_profiles if target_profiles.present?
+      end
+
+      def handle_choice_type_in_sliced_element(current_metadata, must_support_elements_metadata)
+        choice_element_metadata = must_support_elements_metadata.find do |metadata|
+          metadata[:original_path].present? &&
+          current_metadata[:path].include?( metadata[:original_path] )
+        end
+
+        if choice_element_metadata.present?
+          current_metadata[:original_path] = current_metadata[:path]
+          current_metadata[:path] = current_metadata[:path].sub(choice_element_metadata[:original_path], choice_element_metadata[:path])
+        end
+      end
+
       def must_support_elements
         plain_must_support_elements.each_with_object([]) do |current_element, must_support_elements_metadata|
           {
             path: current_element.path.gsub("#{resource}.", '')
           }.tap do |current_metadata|
-            path = current_element.path.gsub("#{resource}.", '')
-            current_metadata[:path] = path
+            type_must_support_metadata = get_type_must_support_metadata(current_metadata, current_element)
 
-            handle_fixed_values(current_metadata, current_element)
+            if type_must_support_metadata.any?
+              must_support_elements_metadata.concat(type_must_support_metadata)
+            else
+              handle_choice_type_in_sliced_element(current_metadata, must_support_elements_metadata)
 
-            must_support_elements_metadata.delete_if do |metadata|
-              metadata[:path] == current_metadata[:path] && metadata[:fixed_value].blank?
-            end
+              supported_types = current_element.type.select { |type| save_type_code?(type) }.map { |type| type.code }
+              current_metadata[:types] = supported_types if supported_types.present?
+
+              handle_type_must_support_target_profiles(current_element.type.first, current_metadata) if current_element.type.first&.code == 'Reference'
+
+              handle_fixed_values(current_metadata, current_element)
+
+              must_support_elements_metadata.delete_if do |metadata|
+                metadata[:path] == current_metadata[:path] && metadata[:fixed_value].blank?
+              end
 
-            must_support_elements_metadata << current_metadata
+              must_support_elements_metadata << current_metadata
+            end
           end
         end.uniq
       end
+
+      #### SPECIAL CASE ####
+
+      def handle_special_cases
+        remove_vital_sign_component
+        remove_blood_pressure_value
+        add_must_support_choices
+
+        case profile.version
+        when '3.1.1'
+          remove_document_reference_custodian
+        when '4.0.0'
+          add_device_distinct_identifier
+        when '5.0.1'
+          add_document_reference_category_values
+          remove_survey_questionnaire_response
+        end
+      end
+
+      def is_vital_sign?
+        [
+          'http://hl7.org/fhir/StructureDefinition/vitalsigns',
+          'http://hl7.org/fhir/us/core/StructureDefinition/us-core-vital-signs'
+        ].include?(profile.baseDefinition)
+      end
+
+      def is_blood_pressure?
+        ['observation-bp', 'IpaBloodPressureProfile'].include?(profile.name)
+      end
+
+      # Exclude Observation.component from vital sign profiles except observation-bp and observation-pulse-ox
+      def remove_vital_sign_component
+        if is_vital_sign? && !is_blood_pressure? && profile.name != 'IpaPulseOximetryProfile'
+          @must_supports[:elements].delete_if do |element|
+            element[:path].start_with?('component')
+          end
+        end
+      end
+
+      # Exclude Observation.value[x] from observation-bp
+      def remove_blood_pressure_value
+        if is_blood_pressure?
+          @must_supports[:elements].delete_if do |element|
+            element[:path].start_with?('value[x]') || element[:original_path]&.start_with?('value[x]')
+          end
+          @must_supports[:slices].delete_if do |slice|
+            slice[:path].start_with?('value[x]')
+          end
+        end
+      end
+
+      def remove_device_carrier
+        if profile.type == 'Device'
+          @must_supports[:elements].delete_if do |element|
+            ['udiCarrier.carrierAIDC', 'udiCarrier.carrierHRF'].include?(element[:path])
+          end
+        end
+      end
+
+      # US Core clarified that server implmentation is not required to support DocumentReference.custodian (FHIR-28393)
+      def remove_document_reference_custodian
+        if profile.type == 'DocumentReference'
+          @must_supports[:elements].delete_if do |element|
+            element[:path] == 'custodian'
+          end
+        end
+      end
+
+      def remove_document_reference_attachment_data_url
+        if profile.type == 'DocumentReference'
+          @must_supports[:elements].delete_if do |element|
+            ['content.attachment.data', 'content.attachment.url'].include?(element[:path])
+          end
+        end
+      end
+
+      def add_must_support_choices
+        choices = []
+
+        choices << { paths: ['content.attachment.data', 'content.attachment.url'] } if profile.type == 'DocumentReference'
+
+        case profile.version
+        when '3.1.1'
+          choices << { paths: ['udiCarrier.carrierAIDC', 'udiCarrier.carrierHRF'] } if profile.type == 'Device'
+        when '4.0.0'
+          case profile.type
+          when 'Encounter'
+            choices << { paths: ['reasonCode', 'reasonReference'] }
+            choices << { paths: ['location.location', 'serviceProvider'] }
+          when 'MedicationRequest'
+            choices << { paths: ['reportedBoolean', 'reportedReference'] }
+          end
+        when '5.0.1'
+          case profile.type
+          when 'CareTeam'
+            choices << {
+              target_profiles: [
+                'http://hl7.org/fhir/us/core/StructureDefinition/us-core-practitioner',
+                'http://hl7.org/fhir/us/core/StructureDefinition/us-core-practitionerrole'
+              ]
+            }
+          when 'Condition'
+            choices << {
+              paths: ['onsetDateTime'],
+              extension_ids: ['Condition.extension:assertedDate']
+            }
+          when 'Encounter'
+            choices << { paths: ['reasonCode', 'reasonReference'] }
+            choices << { paths: ['location.location', 'serviceProvider'] }
+          when 'MedicationRequest'
+            choices << { paths: ['reportedBoolean', 'reportedReference'] }
+          end
+        end
+
+        @must_supports[:choices] = choices if choices.present?
+      end
+
+      def add_device_distinct_identifier
+        if profile.type == 'Device'
+          # FHIR-36303 US Core 4.0.0 mistakenly removed MS from Device.distinctIdentifier
+          # This will be fixed in US Core 5.0.0
+          @must_supports[:elements] << {
+            path: 'distinctIdentifier'
+          }
+        end
+      end
+
+      def add_document_reference_category_values
+        return unless profile.type == 'DocumentReference'
+
+        slice = @must_supports[:slices].find{|slice| slice[:path] == 'category'}
+
+        slice[:discriminator][:values] = ['clinical-note'] if slice.present?
+      end
+
+      # FHIR-37794 Server systems are not required to support US Core QuestionnaireResponse
+      def remove_survey_questionnaire_response
+        return unless profile.type == 'Observation' &&
+          ['us-core-observation-survey', 'us-core-observation-sdoh-assessment'].include?(profile.id)
+
+        element = @must_supports[:elements].find { |element| element[:path] == 'derivedFrom' }
+        element[:target_profiles].delete_if do |url|
+          url == 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-questionnaireresponse'
+        end
+      end
     end
   end
 end

data/lib/ipa_test_kit/generator/must_support_test_generator.rb

@@ -5,17 +5,18 @@ module IpaTestKit
   class Generator
     class MustSupportTestGenerator
       class << self
-        def generate(ig_metadata)
+        def generate(ig_metadata, base_output_dir)
           ig_metadata.groups
-            .reject { |group| SpecialCases.exclude_resource? group.resource }
-            .each { |group| new(group).generate }
+            .reject { |group| SpecialCases.exclude_group? group }
+            .each { |group| new(group, base_output_dir).generate }
         end
       end
 
-      attr_accessor :group_metadata
+      attr_accessor :group_metadata, :base_output_dir
 
-      def initialize(group_metadata)
+      def initialize(group_metadata, base_output_dir)
         self.group_metadata = group_metadata
+        self.base_output_dir = base_output_dir
       end
 
       def template
@@ -31,7 +32,7 @@ module IpaTestKit
       end
 
       def output_file_directory
-        File.join(__dir__, '..', 'generated', profile_identifier)
+        File.join(base_output_dir, profile_identifier)
       end
 
       def output_file_name
@@ -47,13 +48,17 @@ module IpaTestKit
       end
 
       def test_id
-        "ipa_010_#{profile_identifier}_must_support_test"
+        "ipa_#{group_metadata.reformatted_version}_#{profile_identifier}_must_support_test"
       end
 
       def class_name
         "#{Naming.upper_camel_case_for_profile(group_metadata)}MustSupportTest"
       end
 
+      def module_name
+        "Ipa#{group_metadata.reformatted_version.upcase}"
+      end
+
       def resource_type
         group_metadata.resource
       end
@@ -63,12 +68,28 @@ module IpaTestKit
       end
 
       def must_support_list_string
-        slice_names = group_metadata.must_supports[:slices].map { |slice| slice[:name] }
-        element_names = group_metadata.must_supports[:elements].map { |slice| "#{resource_type}.#{slice[:path]}" }
-        extension_names = group_metadata.must_supports[:extensions].map { |slice| slice[:id] }
+        build_must_support_list_string
+      end
+
+      def build_must_support_list_string
+        slice_names = group_metadata.must_supports[:slices]
+          .map { |slice| slice[:name] }
+
+        element_names = group_metadata.must_supports[:elements]
+          .map { |element| "#{resource_type}.#{element[:path]}" }
+
+        extension_names = group_metadata.must_supports[:extensions]
+          .map { |extension| extension[:id] }
+
+        group_metadata.must_supports[:choices]&.each do |choice|
+          choice[:paths].each { |path| element_names.delete("#{resource_type}.#{path}") }
+          element_names << choice[:paths].map { |path| "#{resource_type}.#{path}" }.join(' or ')
+        end
+
         (slice_names + element_names + extension_names)
+          .uniq
           .sort
-          .map { |name| "      * #{name}" }
+          .map { |name| "#{' ' * 8}* #{name}" }
           .join("\n")
       end
 

data/lib/ipa_test_kit/generator/naming.rb

@@ -1,25 +1,36 @@
 module IpaTestKit
   class Generator
     module Naming
-      ALLERGY_INTOLERANCE = 'http://hl7.org/fhir/uv/ipa/StructureDefinition/ipa-allergyintolerance'
-      CONDITION = 'http://hl7.org/fhir/uv/ipa/StructureDefinition/ipa-condition'
-      DOCUMENT_REFERENCE = 'http://hl7.org/fhir/uv/ipa/StructureDefinition/ipa-documentreference'
-      IMMUNIZATION = 'http://hl7.org/fhir/uv/ipa/StructureDefinition/ipa-immunization'
-      MEDICATION = 'http://hl7.org/fhir/uv/ipa/StructureDefinition/ipa-medication'
-      MEDICATION_REQUEST = 'http://hl7.org/fhir/uv/ipa/StructureDefinition/ipa-medicationrequest'
-      MEDICATION_STATEMENT = 'http://hl7.org/fhir/uv/ipa/StructureDefinition/ipa-medicationstatement'
-      OBSERVATION = 'http://hl7.org/fhir/uv/ipa/StructureDefinition/ipa-observation'
-      BMI = 'http://hl7.org/fhir/StructureDefinition/bmi'
-      OXYGEN_SAT = 'http://hl7.org/fhir/StructureDefinition/oxygensat'
-      HEAD_CIRCUMFERENCE = 'http://hl7.org/fhir/StructureDefinition/headcircum'
-      PATIENT = 'http://hl7.org/fhir/uv/ipa/StructureDefinition/ipa-patient'
-      PRACTITIONER = 'http://hl7.org/fhir/uv/ipa/StructureDefinition/ipa-practitioner'
-      PRACTITIONER_ROLE = 'http://hl7.org/fhir/uv/ipa/StructureDefinition/ipa-practitionerrole'
-      PROVENANCE = 'http://hl7.org/fhir/uv/ipa/StructureDefinition/ipa-provenance'
+      ALLERGY_INTOLERANCE = 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-allergyintolerance'
+      CARE_PLAN = 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-careplan'
+      CARE_TEAM = 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-careteam'
+      CONDITION = 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-condition'
+      IMPLANTABLE_DEVICE = 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-implantable-device'
+      DIAGNOSTIC_REPORT_NOTE = 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-diagnosticreport-note'
+      DIAGNOSTIC_REPORT_LAB = 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-diagnosticreport-lab'
+      DOCUMENT_REFERENCE = 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-documentreference'
+      ENCOUNTER = 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-encounter'
+      GOAL = 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-goal'
+      IMMUNIZATION = 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-immunization'
+      LOCATION = 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-location'
+      MEDICATION = 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-medication'
+      MEDICATION_REQUEST = 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-medicationrequest'
+      SMOKING_STATUS = 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-smokingstatus'
+      PEDIATRIC_WEIGHT_FOR_HEIGHT = 'http://hl7.org/fhir/us/core/StructureDefinition/pediatric-weight-for-height'
+      OBSERVATION_LAB = 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-observation-lab'
+      PEDIATRIC_BMI_FOR_AGE = 'http://hl7.org/fhir/us/core/StructureDefinition/pediatric-bmi-for-age'
+      PULSE_OXIMETRY = 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-pulse-oximetry'
+      HEAD_CIRCUMFERENCE = 'http://hl7.org/fhir/us/core/StructureDefinition/head-occipital-frontal-circumference-percentile'
+      ORGANIZATION = 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-organization'
+      PATIENT = 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-patient'
+      PRACTITIONER = 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-practitioner'
+      PRACTITIONER_ROLE = 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-practitionerrole'
+      PROCEDURE = 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-procedure'
+      PROVENANCE = 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-provenance'
 
       class << self
         def resources_with_multiple_profiles
-          ['Observation']
+          ['Condition', 'DiagnosticReport', 'Observation']
         end
 
         def resource_has_multiple_profiles?(resource)
@@ -30,10 +41,13 @@ module IpaTestKit
           resource = group_metadata.resource
           return resource.underscore unless resource_has_multiple_profiles?(resource)
 
-          return 'head_circumference' if group_metadata.profile_url == HEAD_CIRCUMFERENCE
+          if group_metadata.profile_url == HEAD_CIRCUMFERENCE
+            return group_metadata.reformatted_version == 'v311' ? 'head_circumference' : 'head_circumference_percentile'
+          end
 
           group_metadata.name
             .delete_prefix('ipa_')
+            .gsub('diagnosticreport', 'diagnostic_report')
             .underscore
         end
 

data/lib/ipa_test_kit/generator/provenance_revinclude_search_test_generator.rb

@@ -5,19 +5,21 @@ module IpaTestKit
   class Generator
     class ProvenanceRevincludeSearchTestGenerator
       class << self
-        def generate(ig_metadata)
+        def generate(ig_metadata, base_output_dir)
           ig_metadata.groups
-            .reject { |group| SpecialCases.exclude_resource? group.resource }
+            .reject { |group| SpecialCases.exclude_group? group }
             .select { |group| group.revincludes.include? 'Provenance:target' }
-            .each { |group| new(group, group.searches.first).generate }
+            .select { |group| group.searches.any? }
+            .each { |group| new(group, group.searches.first, base_output_dir).generate }
         end
       end
 
-      attr_accessor :group_metadata, :search_metadata
+      attr_accessor :group_metadata, :search_metadata, :base_output_dir
 
-      def initialize(group_metadata, search_metadata)
+      def initialize(group_metadata, search_metadata, base_output_dir)
         self.group_metadata = group_metadata
         self.search_metadata = search_metadata
+        self.base_output_dir = base_output_dir
       end
 
       def template
@@ -33,7 +35,7 @@ module IpaTestKit
       end
 
       def output_file_directory
-        File.join(__dir__, '..', 'generated', profile_identifier)
+        File.join(base_output_dir, profile_identifier)
       end
 
       def output_file_name
@@ -45,7 +47,7 @@ module IpaTestKit
       end
 
       def test_id
-        "ipa_010_#{profile_identifier}_#{search_identifier}_search_test"
+        "ipa_#{group_metadata.reformatted_version}_#{profile_identifier}_#{search_identifier}_search_test"
       end
 
       def search_identifier
@@ -60,6 +62,10 @@ module IpaTestKit
         "#{Naming.upper_camel_case_for_profile(group_metadata)}#{search_title}SearchTest"
       end
 
+      def module_name
+        "Ipa#{group_metadata.reformatted_version.upcase}"
+      end
+
       def resource_type
         group_metadata.resource
       end
@@ -88,6 +94,7 @@ module IpaTestKit
       end
 
       def search_param_name_string
+        binding.pry if search_metadata.nil?
         search_metadata[:names].join(' + ') + ' + revInclude:Provenance:target'
       end
 
@@ -133,10 +140,6 @@ module IpaTestKit
         first_search? && group_metadata.delayed_references.present?
       end
 
-      def possible_status_search?
-        !search_metadata[:names].include?('status') && group_metadata.search_definitions.key?(:status)
-      end
-
       def token_search_params
         @token_search_params ||=
           search_param_names.select do |name|
@@ -162,7 +165,6 @@ module IpaTestKit
           properties[:fixed_value_search] = 'true' if fixed_value_search?
           properties[:resource_type] = "'#{resource_type}'"
           properties[:search_param_names] = search_param_names_array
-          properties[:possible_status_search] = 'true' if possible_status_search?
         end
       end
 

data/lib/ipa_test_kit/generator/read_test_generator.rb

@@ -5,11 +5,11 @@ module IpaTestKit
   class Generator
     class ReadTestGenerator
       class << self
-        def generate(ig_metadata)
+        def generate(ig_metadata, base_output_dir)
           ig_metadata.groups
-            .reject { |group| SpecialCases.exclude_resource? group.resource }
+            .reject { |group| SpecialCases.exclude_group? group }
             .select { |group| read_interaction(group).present? }
-            .each { |group| new(group).generate }
+            .each { |group| new(group, base_output_dir).generate }
         end
 
         def read_interaction(group_metadata)
@@ -17,10 +17,11 @@ module IpaTestKit
         end
       end
 
-      attr_accessor :group_metadata
+      attr_accessor :group_metadata, :base_output_dir
 
-      def initialize(group_metadata)
+      def initialize(group_metadata, base_output_dir)
         self.group_metadata = group_metadata
+        self.base_output_dir = base_output_dir
       end
 
       def template
@@ -36,7 +37,7 @@ module IpaTestKit
       end
 
       def output_file_directory
-        File.join(__dir__, '..', 'generated', profile_identifier)
+        File.join(base_output_dir, profile_identifier)
       end
 
       def output_file_name
@@ -52,13 +53,17 @@ module IpaTestKit
       end
 
       def test_id
-        "ipa_010_#{profile_identifier}_read_test"
+        "ipa_#{group_metadata.reformatted_version}_#{profile_identifier}_read_test"
       end
 
       def class_name
         "#{Naming.upper_camel_case_for_profile(group_metadata)}ReadTest"
       end
 
+      def module_name
+        "Ipa#{group_metadata.reformatted_version.upcase}"
+      end
+
       def resource_type
         group_metadata.resource
       end