cqm-models 0.7.5 → 0.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a275eb0bb5b371b954c33d53ad6be1c53169eeb0
-  data.tar.gz: b4c6b589f4b866f0f28f141aad406bae2518a031
+  metadata.gz: 5719a43a0d7e79b0d881d2df7d0e55603ddd5ecc
+  data.tar.gz: d62e876c02b6b0a99d50d13022487212a67e414c
 SHA512:
-  metadata.gz: 1763d6ba4dbb585eea6c9befe1d8a0bfb9bb7bc6726d2f0df931e509ae0244d212b1dc6fb212b66545a6059f17aa99deeb80d5c424a43f5fc6584934e1f23e09
-  data.tar.gz: cb7ef1d12c8a4e4a361058c563f79adc5b76f39db33ffc8e4cd11be19f35041af739978f2a8a5e8809112871342110b4bc3c8b9676521d1443470408eb75d4a3
+  metadata.gz: 8bf239fcba90769d346d67834f7242ff85ba2e62ea4f0def666aa5f6a1c9bbdb03550fbba2542628a8532f351367a8edca884b562d66ee61e982ab0e492badc6
+  data.tar.gz: 958e5fe5c4e250e501bbf459158c2bb20cd92be577f8c4cacb14274db4971ab80a39b46dd0c031b64a29081a41dea143b2bfe27a7e6ed5ea9897ecde3e8f5f0d

data/app/assets/javascripts/AssessmentPerformed.js

@@ -4,6 +4,7 @@ const Code = require('./basetypes/Code');
 const Interval = require('./basetypes/Interval');
 const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
+const { ComponentSchema } = require('./Component');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [
@@ -17,7 +18,7 @@ const AssessmentPerformedSchema = DataElementSchema({
   reason: Code,
   method: Code,
   result: Any,
-  components: [],
+  components: [ComponentSchema],
   relatedTo: [String],
   hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.3.117' },
   category: { type: String, default: 'assessment' },

data/app/assets/javascripts/DiagnosticStudyPerformed.js

@@ -4,6 +4,7 @@ const Code = require('./basetypes/Code');
 const Interval = require('./basetypes/Interval');
 const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
+const { ComponentSchema } = require('./Component');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [
@@ -21,7 +22,7 @@ const DiagnosticStudyPerformedSchema = DataElementSchema({
   method: Code,
   facilityLocation: Code,
   negationRationale: Code,
-  components: [],
+  components: [ComponentSchema],
   hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.3.23' },
   category: { type: String, default: 'diagnostic_study' },
   qdmStatus: { type: String, default: 'performed' },

data/app/assets/javascripts/EncounterPerformed.js

@@ -4,6 +4,7 @@ const Code = require('./basetypes/Code');
 const Interval = require('./basetypes/Interval');
 const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
+const { FacilityLocationSchema } = require('./FacilityLocation');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [
@@ -16,7 +17,7 @@ const EncounterPerformedSchema = DataElementSchema({
   admissionSource: Code,
   relevantPeriod: Interval,
   dischargeDisposition: Code,
-  facilityLocations: [],
+  facilityLocations: [FacilityLocationSchema],
   diagnoses: [Code],
   principalDiagnosis: Code,
   negationRationale: Code,

data/app/assets/javascripts/LaboratoryTestPerformed.js

@@ -4,6 +4,7 @@ const Code = require('./basetypes/Code');
 const Interval = require('./basetypes/Interval');
 const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
+const { ComponentSchema } = require('./Component');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [
@@ -21,7 +22,7 @@ const LaboratoryTestPerformedSchema = DataElementSchema({
   reason: Code,
   referenceRange: Interval,
   negationRationale: Code,
-  components: [],
+  components: [ComponentSchema],
   hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.3.42' },
   category: { type: String, default: 'laboratory_test' },
   qdmStatus: { type: String, default: 'performed' },

data/app/assets/javascripts/PhysicalExamPerformed.js

@@ -4,6 +4,7 @@ const Code = require('./basetypes/Code');
 const Interval = require('./basetypes/Interval');
 const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
+const { ComponentSchema } = require('./Component');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [
@@ -19,7 +20,7 @@ const PhysicalExamPerformedSchema = DataElementSchema({
   result: Any,
   anatomicalLocationSite: Code,
   negationRationale: Code,
-  components: [],
+  components: [ComponentSchema],
   hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.3.62' },
   category: { type: String, default: 'physical_exam' },
   qdmStatus: { type: String, default: 'performed' },

data/app/assets/javascripts/ProcedurePerformed.js

@@ -6,6 +6,8 @@ const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
 const Any = require('./basetypes/Any');
 
+const { ComponentSchema } = require('./Component');
+
 const [Number, String] = [
   mongoose.Schema.Types.Number,
   mongoose.Schema.Types.String,
@@ -23,7 +25,7 @@ const ProcedurePerformedSchema = DataElementSchema({
   ordinality: Code,
   incisionDatetime: DateTime,
   negationRationale: Code,
-  components: [],
+  components: [ComponentSchema],
   hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.3.67' },
   category: { type: String, default: 'procedure' },
   qdmStatus: { type: String, default: 'performed' },

data/app/models/qdm/basetypes/code.rb

@@ -14,7 +14,7 @@ module QDM
 
     # Converts an object of this instance into a database friendly value.
     def mongoize
-      { code: @code, codeSystem: @codeSystem, descriptor: @descriptor, codeSystemOid: @codeSystemOid, version: @version }
+      { code: @code, codeSystem: @codeSystem, descriptor: @descriptor, codeSystemOid: @codeSystemOid, version: @version, _type: 'QDM::Code' }
     end
 
     class << self

data/app/models/qdm/basetypes/data_element.rb

@@ -34,9 +34,52 @@ module QDM
       _id
     end
 
+    def mongoize
+      json_representation = {}
+      attribute_names.each do |field|
+        json_representation[field] = send(field).mongoize
+      end
+      json_representation
+    end
+
     # Include '_type' in any JSON output. This is necessary for deserialization.
     def to_json(options = nil)
       serializable_hash(methods: :_type).to_json(options)
     end
+
+    class << self
+      # Get the object as it was stored in the database, and instantiate
+      # this custom class from it.
+      #
+      def demongoize(object)
+        return nil unless object
+        object = object.symbolize_keys
+        if object.is_a?(Hash)
+          data_element = QDM::DataElement.new
+          data_element.attribute_names.each do |field|
+            data_element.send(field + '=', object[field.to_sym])
+          end
+          data_element
+        else object
+        end
+      end
+
+      # Takes any possible object and converts it to how it would be
+      # stored in the database.
+      def mongoize(object)
+        case object
+        when nil then nil
+        when QDM::DataElement then object.mongoize
+        when Hash
+          object = object.symbolize_keys
+          data_element = QDM::DataElement.new
+          data_element.attribute_names.each do |field|
+            data_element.send(field + '=', object[field.to_sym])
+          end
+          data_element.mongoize
+        else object
+        end
+      end
+    end
   end
 end

data/app/models/qdm/basetypes/interval.rb

@@ -13,7 +13,7 @@ module QDM
 
     # Converts an object of this instance into a database friendly value.
     def mongoize
-      { low: @low, high: @high, lowClosed: @lowClosed, highClosed: @highClosed }
+      { low: @low, high: @high, lowClosed: @lowClosed, highClosed: @highClosed, _type: 'QDM::Interval' }
     end
 
     class << self

data/app/models/qdm/basetypes/quantity.rb

@@ -11,7 +11,7 @@ module QDM
 
     # Converts an object of this instance into a database friendly value.
     def mongoize
-      { value: @value, unit: @unit }
+      { value: @value, unit: @unit, _type: 'QDM::Quantity' }
     end
 
     class << self

data/cqm-models.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'cqm-models'
-  spec.version       = '0.7.5'
+  spec.version       = '0.7.6'
   spec.authors       = ['aholmes@mitre.org', 'mokeefe@mitre.org', 'lades@mitre.org']
 
   spec.summary       = 'Mongo models that correspond to the QDM specification.'

data/dist/index.js

@@ -187,6 +187,7 @@ const Code = require('./basetypes/Code');
 const Interval = require('./basetypes/Interval');
 const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
+const { ComponentSchema } = require('./Component');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [
@@ -200,7 +201,7 @@ const AssessmentPerformedSchema = DataElementSchema({
   reason: Code,
   method: Code,
   result: Any,
-  components: [],
+  components: [ComponentSchema],
   relatedTo: [String],
   hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.3.117' },
   category: { type: String, default: 'assessment' },
@@ -213,7 +214,7 @@ const AssessmentPerformedSchema = DataElementSchema({
 module.exports.AssessmentPerformedSchema = AssessmentPerformedSchema;
 module.exports.AssessmentPerformed = mongoose.model('AssessmentPerformed', AssessmentPerformedSchema);
 
-},{"./basetypes/Any":67,"./basetypes/Code":68,"./basetypes/DataElement":69,"./basetypes/DateTime":70,"./basetypes/Interval":71,"./basetypes/Quantity":72,"mongoose":401}],5:[function(require,module,exports){
+},{"./Component":10,"./basetypes/Any":67,"./basetypes/Code":68,"./basetypes/DataElement":69,"./basetypes/DateTime":70,"./basetypes/Interval":71,"./basetypes/Quantity":72,"mongoose":401}],5:[function(require,module,exports){
 const mongoose = require('mongoose');
 const { DataElementSchema } = require('./basetypes/DataElement');
 const Code = require('./basetypes/Code');
@@ -556,6 +557,7 @@ const Code = require('./basetypes/Code');
 const Interval = require('./basetypes/Interval');
 const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
+const { ComponentSchema } = require('./Component');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [
@@ -573,7 +575,7 @@ const DiagnosticStudyPerformedSchema = DataElementSchema({
   method: Code,
   facilityLocation: Code,
   negationRationale: Code,
-  components: [],
+  components: [ComponentSchema],
   hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.3.23' },
   category: { type: String, default: 'diagnostic_study' },
   qdmStatus: { type: String, default: 'performed' },
@@ -585,7 +587,7 @@ const DiagnosticStudyPerformedSchema = DataElementSchema({
 module.exports.DiagnosticStudyPerformedSchema = DiagnosticStudyPerformedSchema;
 module.exports.DiagnosticStudyPerformed = mongoose.model('DiagnosticStudyPerformed', DiagnosticStudyPerformedSchema);
 
-},{"./basetypes/Any":67,"./basetypes/Code":68,"./basetypes/DataElement":69,"./basetypes/DateTime":70,"./basetypes/Interval":71,"./basetypes/Quantity":72,"mongoose":401}],18:[function(require,module,exports){
+},{"./Component":10,"./basetypes/Any":67,"./basetypes/Code":68,"./basetypes/DataElement":69,"./basetypes/DateTime":70,"./basetypes/Interval":71,"./basetypes/Quantity":72,"mongoose":401}],18:[function(require,module,exports){
 const mongoose = require('mongoose');
 const { DataElementSchema } = require('./basetypes/DataElement');
 const Code = require('./basetypes/Code');
@@ -652,6 +654,7 @@ const Code = require('./basetypes/Code');
 const Interval = require('./basetypes/Interval');
 const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
+const { FacilityLocationSchema } = require('./FacilityLocation');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [
@@ -664,7 +667,7 @@ const EncounterPerformedSchema = DataElementSchema({
   admissionSource: Code,
   relevantPeriod: Interval,
   dischargeDisposition: Code,
-  facilityLocations: [],
+  facilityLocations: [FacilityLocationSchema],
   diagnoses: [Code],
   principalDiagnosis: Code,
   negationRationale: Code,
@@ -680,7 +683,7 @@ const EncounterPerformedSchema = DataElementSchema({
 module.exports.EncounterPerformedSchema = EncounterPerformedSchema;
 module.exports.EncounterPerformed = mongoose.model('EncounterPerformed', EncounterPerformedSchema);
 
-},{"./basetypes/Any":67,"./basetypes/Code":68,"./basetypes/DataElement":69,"./basetypes/DateTime":70,"./basetypes/Interval":71,"./basetypes/Quantity":72,"mongoose":401}],21:[function(require,module,exports){
+},{"./FacilityLocation":22,"./basetypes/Any":67,"./basetypes/Code":68,"./basetypes/DataElement":69,"./basetypes/DateTime":70,"./basetypes/Interval":71,"./basetypes/Quantity":72,"mongoose":401}],21:[function(require,module,exports){
 const mongoose = require('mongoose');
 const { DataElementSchema } = require('./basetypes/DataElement');
 const Code = require('./basetypes/Code');
@@ -981,6 +984,7 @@ const Code = require('./basetypes/Code');
 const Interval = require('./basetypes/Interval');
 const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
+const { ComponentSchema } = require('./Component');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [
@@ -998,7 +1002,7 @@ const LaboratoryTestPerformedSchema = DataElementSchema({
   reason: Code,
   referenceRange: Interval,
   negationRationale: Code,
-  components: [],
+  components: [ComponentSchema],
   hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.3.42' },
   category: { type: String, default: 'laboratory_test' },
   qdmStatus: { type: String, default: 'performed' },
@@ -1010,7 +1014,7 @@ const LaboratoryTestPerformedSchema = DataElementSchema({
 module.exports.LaboratoryTestPerformedSchema = LaboratoryTestPerformedSchema;
 module.exports.LaboratoryTestPerformed = mongoose.model('LaboratoryTestPerformed', LaboratoryTestPerformedSchema);
 
-},{"./basetypes/Any":67,"./basetypes/Code":68,"./basetypes/DataElement":69,"./basetypes/DateTime":70,"./basetypes/Interval":71,"./basetypes/Quantity":72,"mongoose":401}],32:[function(require,module,exports){
+},{"./Component":10,"./basetypes/Any":67,"./basetypes/Code":68,"./basetypes/DataElement":69,"./basetypes/DateTime":70,"./basetypes/Interval":71,"./basetypes/Quantity":72,"mongoose":401}],32:[function(require,module,exports){
 const mongoose = require('mongoose');
 const { DataElementSchema } = require('./basetypes/DataElement');
 const Code = require('./basetypes/Code');
@@ -1864,6 +1868,7 @@ const Code = require('./basetypes/Code');
 const Interval = require('./basetypes/Interval');
 const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
+const { ComponentSchema } = require('./Component');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [
@@ -1879,7 +1884,7 @@ const PhysicalExamPerformedSchema = DataElementSchema({
   result: Any,
   anatomicalLocationSite: Code,
   negationRationale: Code,
-  components: [],
+  components: [ComponentSchema],
   hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.3.62' },
   category: { type: String, default: 'physical_exam' },
   qdmStatus: { type: String, default: 'performed' },
@@ -1891,7 +1896,7 @@ const PhysicalExamPerformedSchema = DataElementSchema({
 module.exports.PhysicalExamPerformedSchema = PhysicalExamPerformedSchema;
 module.exports.PhysicalExamPerformed = mongoose.model('PhysicalExamPerformed', PhysicalExamPerformedSchema);
 
-},{"./basetypes/Any":67,"./basetypes/Code":68,"./basetypes/DataElement":69,"./basetypes/DateTime":70,"./basetypes/Interval":71,"./basetypes/Quantity":72,"mongoose":401}],53:[function(require,module,exports){
+},{"./Component":10,"./basetypes/Any":67,"./basetypes/Code":68,"./basetypes/DataElement":69,"./basetypes/DateTime":70,"./basetypes/Interval":71,"./basetypes/Quantity":72,"mongoose":401}],53:[function(require,module,exports){
 const mongoose = require('mongoose');
 const { DataElementSchema } = require('./basetypes/DataElement');
 const Code = require('./basetypes/Code');
@@ -1964,6 +1969,8 @@ const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
 const Any = require('./basetypes/Any');
 
+const { ComponentSchema } = require('./Component');
+
 const [Number, String] = [
   mongoose.Schema.Types.Number,
   mongoose.Schema.Types.String,
@@ -1981,7 +1988,7 @@ const ProcedurePerformedSchema = DataElementSchema({
   ordinality: Code,
   incisionDatetime: DateTime,
   negationRationale: Code,
-  components: [],
+  components: [ComponentSchema],
   hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.3.67' },
   category: { type: String, default: 'procedure' },
   qdmStatus: { type: String, default: 'performed' },
@@ -1993,7 +2000,7 @@ const ProcedurePerformedSchema = DataElementSchema({
 module.exports.ProcedurePerformedSchema = ProcedurePerformedSchema;
 module.exports.ProcedurePerformed = mongoose.model('ProcedurePerformed', ProcedurePerformedSchema);
 
-},{"./basetypes/Any":67,"./basetypes/Code":68,"./basetypes/DataElement":69,"./basetypes/DateTime":70,"./basetypes/Interval":71,"./basetypes/Quantity":72,"mongoose":401}],56:[function(require,module,exports){
+},{"./Component":10,"./basetypes/Any":67,"./basetypes/Code":68,"./basetypes/DataElement":69,"./basetypes/DateTime":70,"./basetypes/Interval":71,"./basetypes/Quantity":72,"mongoose":401}],56:[function(require,module,exports){
 const mongoose = require('mongoose');
 const { DataElementSchema } = require('./basetypes/DataElement');
 const Code = require('./basetypes/Code');

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cqm-models",
-  "version": "0.7.5",
+  "version": "0.7.6",
   "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": {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cqm-models
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.7.6
 platform: ruby
 authors:
 - aholmes@mitre.org
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-18 00:00:00.000000000 Z
+date: 2018-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler