cqm-models 0.8.3 → 0.8.4

data/lib/generate_models.rb

@@ -25,7 +25,6 @@ TYPE_LOOKUP_RB = {
   'list<QDM.ResultComponent>': 'Array',
   'list<QDM.FacilityLocation>': 'Array',
   'list<System.Code>': 'Array',
-  'QDM.Id': 'String',
   'System.Decimal': 'Float',
   'System.Time': 'Time',
   'System.Concept': 'Any'
@@ -42,11 +41,10 @@ TYPE_LOOKUP_JS = {
   'interval<System.Quantity>': 'Interval',
   'list<QDM.Component>': '[]',
   'System.String': 'String',
-  'list<QDM.Id>': '[String]',
+  'list<QDM.Id>': '[]',
   'list<QDM.ResultComponent>': '[]',
   'list<QDM.FacilityLocation>': '[]',
   'list<System.Code>': '[Code]',
-  'QDM.Id': 'String',
   'System.Decimal': 'Number',
   'System.Time': 'DateTime',
   'System.Concept': '{}'
@@ -151,7 +149,7 @@ puts 'Generating JavaScript models...'
 
 # Create JavaScript models
 template = File.read('templates/mongoose_template.js.erb')
-renderer = ERB.new(template, nil, '-')
+default_renderer = ERB.new(template, nil, '-')
 file_path = 'app/assets/javascripts/'
 file_path = 'tmp/' if IS_TEST
 extra_fields_js = [
@@ -162,19 +160,19 @@ extra_fields_js = [
   { name: 'qdmVersion', type: 'System.String' },
   { name: '_type', type: 'System.String' }
 ]
+datatype_custom_templates = {
+  Patient: 'templates/patient_template.js.erb',
+  Id: 'templates/id_template.js.erb'
+}
 datatypes.each do |datatype, attributes|
-  if datatype == 'Patient'
-    # Handle Patient as its own special case, with its own template.
-    patient_template = File.read('templates/patient_template.js.erb')
-    patient_renderer = ERB.new(patient_template, nil, '-')
-    attrs_with_extras = attributes + extra_fields_js
-    puts '  ' + file_path + datatype + '.js'
-    File.open(file_path + datatype + '.js', 'w') { |file| file.puts patient_renderer.result(binding) }
-  else
-    attrs_with_extras = attributes + extra_fields_js
-    puts '  ' + file_path + datatype + '.js'
-    File.open(file_path + datatype + '.js', 'w') { |file| file.puts renderer.result(binding) }
+  renderer = default_renderer
+  if datatype_custom_templates.key?(datatype.to_sym)
+    puts "using custom template for #{datatype}"
+    renderer = ERB.new(File.read(datatype_custom_templates[datatype.to_sym]), nil, '-')
   end
+  attrs_with_extras = attributes + extra_fields_js # this field gets used in the template
+  puts '  ' + file_path + datatype + '.js'
+  File.open(file_path + datatype + '.js', 'w') { |file| file.puts renderer.result(binding) }
 end
 
 # Create require file (if not in test mode)
@@ -240,6 +238,9 @@ Dir.glob(ruby_models_path + '*.rb').each do |file_name|
     contents.gsub!(/  field :qdmStatus, type: String\n/, '') # Don't include this field
   end
 
+  # Make relatedTo embeds_many instead of field
+  contents.gsub!(/  field :relatedTo, type: Array\n/, "  embeds_many :relatedTo, class_name: 'QDM::Id'\n")
+
   File.open(file_name, 'w') { |file| file.puts contents }
 end
 
@@ -287,11 +288,12 @@ files = Dir.glob(js_models_path + '*.js').each do |file_name|
   # Add class
   contents.gsub!(/  _type: String,\n/, "  _type: { type: String, default: '#{dc_name.camelize}' },\n")
 
-  # Component and Facility types
+  # Component, Facility, and Id types
   contents.gsub!(/facilityLocations: \[\]/, 'facilityLocations: [FacilityLocationSchema]')
   contents.gsub!(/facilityLocation: Code/, 'facilityLocation: FacilityLocationSchema')
   contents.gsub!(/components: \[\]/, 'components: [ComponentSchema]')
   contents.gsub!(/component: Code/, 'component: ComponentSchema')
+  contents.gsub!(/relatedTo: \[\]/, 'relatedTo: [IdSchema]')
 
   File.open(file_name, 'w') { |file| file.puts contents }
 end
@@ -318,8 +320,14 @@ end
 # Set embedded in for datatypes
 Dir.glob(ruby_models_path + '*.rb').each do |file_name|
   contents = File.read(file_name)
-  next if File.basename(file_name) == 'patient.rb'
-  contents.gsub!(/  include Mongoid::Document\n/, "  include Mongoid::Document\n  embedded_in :patient\n")
+  # TODO: Might be able to make this list by finding baseType="System.Any" in model info file instead of hard-coding.
+  if File.basename(file_name) == 'id.rb'
+    contents.gsub!(/  include Mongoid::Document\n/, "  include Mongoid::Document\n  embedded_in :data_element\n")
+  else
+    not_embedded_in_patient_files = ['patient.rb', 'component.rb', 'facility_location.rb']
+    next if not_embedded_in_patient_files.include?(File.basename(file_name))
+    contents.gsub!(/  include Mongoid::Document\n/, "  include Mongoid::Document\n  embedded_in :patient\n")
+  end
   File.open(file_name, 'w') { |file| file.puts contents }
 end
 
@@ -327,7 +335,7 @@ end
 Dir.glob(ruby_models_path + '*.rb').each do |file_name|
   contents = ''
   File.open(file_name).each_line.with_index do |line, index|
-    line.gsub!("\n", " < DataElement\n") if index.zero? && !file_name.include?('/patient.rb')
+    line.gsub!("\n", " < DataElement\n") if index.zero? && !file_name.include?('/patient.rb') && !file_name.include?('/id.rb')
     contents += "module QDM\n  # #{file_name}\n  #{line.gsub('QDM::', '')}" if index.zero?
     contents += '  ' unless index.zero? || line.blank?
     contents += line unless index.zero?

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cqm-models",
-  "version": "0.8.3",
+  "version": "0.8.4",
   "description": "This library contains auto generated Mongo (Mongoose.js) models that correspond to the QDM (Quality Data Model) specification.",
   "main": "app/assets/javascripts/index.js",
   "browser": {

data/templates/id_template.js.erb

@@ -0,0 +1,15 @@
+const mongoose = require('mongoose');
+
+const [Number, String] = [
+  mongoose.Schema.Types.Number,
+  mongoose.Schema.Types.String,
+];
+
+const IdSchema = mongoose.Schema({
+  <%- for attribute in attrs_with_extras -%>
+  <%= attribute[:name] %>: <%= TYPE_LOOKUP_JS[attribute[:type]] -%>,
+  <%- end %>
+}, { _id: false, id: false });
+
+module.exports.IdSchema = IdSchema;
+module.exports.Id = mongoose.model('Id', IdSchema);

data/templates/models_template.rb.erb

@@ -3,6 +3,9 @@ module QDM
 end
 require 'mongoid'
 
+# Generated models that are dependencies for base types
+require_relative 'qdm/id'
+
 # base types
 require_relative 'qdm/basetypes/code'
 require_relative 'qdm/basetypes/interval'
@@ -18,5 +21,6 @@ require_relative 'qdm/tacoma/individual_result'
 
 # Generated models
 <%- datatypes.each_key do |datatype| -%>
+<%- next if datatype.underscore == 'id' -%>
 require_relative 'qdm/<%= datatype.underscore %>'
 <%- end -%>

data/templates/mongoose_template.js.erb

@@ -6,6 +6,7 @@ const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
 <% unless datatype.downcase.include? 'component' %>const { ComponentSchema } = require('./Component');<% end %>
 <% unless datatype.downcase.include? 'facilitylocation' %>const { FacilityLocationSchema } = require('./FacilityLocation');<% end %>
+<% unless datatype.downcase == 'id' %>const { IdSchema } = require('./Id');<% end %>
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [

data/templates/patient_template.js.erb

@@ -89,15 +89,11 @@ PatientSchema.methods.getByProfile = function getByProfile(profile, isNegated =
   // If isNegated == null, return all matching data elements by type, regardless of negationRationale.
   const results = this.dataElements.filter(element => element._type === `QDM::${profile}` && (isNegated === null || !!element.negationRationale === isNegated));
   return results.map((result) => {
-    const getCodeFunction = Object.getPrototypeOf(result).getCode;
-    const codeFunction = Object.getPrototypeOf(result).code;
-    const idField = result.id;
     const removedMongooseItems = AllDataElements[profile](result).toObject();
-    // toObject() will remove all mongoose functions but also removed the getCode and code functions
-    // the execution engine requires the code and getCode functions so we have to add them back
-    removedMongooseItems.getCode = getCodeFunction;
-    removedMongooseItems.code = codeFunction;
-    removedMongooseItems.id = idField;
+    // toObject() will remove all mongoose functions but also remove the schema methods, so we add them back
+    Object.entries(Object.getPrototypeOf(result).schema.methods).forEach(([method_name, method]) => {
+      removedMongooseItems[method_name] = method;
+    });
     return removedMongooseItems;
   });
 };

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cqm-models
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors:
 - aholmes@mitre.org
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-03 00:00:00.000000000 Z
+date: 2018-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -289,6 +289,7 @@ files:
 - modelinfo/qdm-modelinfo-5.3.xml
 - package.json
 - templates/all_data_elements_template.js.erb
+- templates/id_template.js.erb
 - templates/index_template.js.erb
 - templates/models_template.rb.erb
 - templates/mongoose_template.js.erb
@@ -316,7 +317,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Mongo models that correspond to the QDM specification.