fhir-mongoid-models 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16a41240f3c38234ccc841170d5ee573b1698c6e0351cec0354db3deeacfb621
-  data.tar.gz: 6e69cf73af1582df6cde162f894e563d6df1f090a95468fdebc8aee62b777146
+  metadata.gz: f2d33ae7ad96a4cf04cc323c21dd2790e082a938eb10b912ac40185380d2c34b
+  data.tar.gz: 4d871aeda34008cf6743418d57eeb9ee595a63e932bc191c6987ea532b73bc10
 SHA512:
-  metadata.gz: 857ab5e0188a9fe30b46272664d4b90f7091073d00102227fa0ab9372f180053da88e2d7f2dd8a8d7b86d15b6e15929511c4dc14ae570009354990fadb27a61d
-  data.tar.gz: 2669d8ac8b70a720188550fa50c928e0606d79a01e08e8e5433ea8a8efbe831aabcc917f87dea5ac597d80fec7a74c6d0734908846ca837601dab66e10db7294
+  metadata.gz: a096a579976814b53287093e680f8bc34cee8f20703ce961f5066b69f4cb3fc373e75401e03e971a1c2dc1a46d0c14eeea45dab74b55c5fea129bd5c65fad561
+  data.tar.gz: 017b77106e6e2f576f07758d923d1227b9ec178b71cbea453131d9ad69cf320903031961a9371c4028518a2b6db71b571755e7aa819d96f338c6532b8da60b90

data/.github/workflows/rubygems-publish.yml

@@ -0,0 +1,50 @@
+name: Publish Gem
+
+on:
+  push:
+    branches:
+      - "*"
+    tags:
+      - v*
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    services:
+      mongodb:
+        image: mongo:3.4.23
+        ports:
+          - 27017:27017
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up Ruby 2.4
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.4
+
+      - name: Install bundler & bundle-audit
+        run: |
+          gem install bundler -v 2.1.4
+          gem install bundle-audit
+
+      - name: Install ruby gems
+        run: bundle install --jobs 4 --retry 3
+
+      - name: Build and test with Rake
+        env:
+          RAILS_ENV: test
+        run: |
+          bundle exec rubocop
+          bundle exec bundle-audit update && bundle exec bundle-audit check
+          bundle exec rake
+
+      - name: Release Gem
+        if: contains(github.ref, 'refs/tags/v')
+        uses: cadwallion/publish-rubygems-action@master
+        env:
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+          RUBYGEMS_API_KEY: ${{secrets.RUBYGEMS_API_KEY}}
+          RELEASE_COMMAND: rake release

data/app/models/cqm/cql_statement_dependency.rb

@@ -33,9 +33,9 @@ module CQM
   class StatementReference
     include Mongoid::Document
     embedded_in :statement_dependency
-    # embedded_in :population_set
-    # embedded_in :population_map
-    # embedded_in :stratification
+    embedded_in :population_set
+    embedded_in :population_map
+    embedded_in :stratification
 
     field :library_name, type: String
     field :statement_name, type: String

data/app/models/cqm/measure.rb

@@ -33,7 +33,6 @@ module CQM
     embeds_one :fhir_measure, class_name: 'FHIR::Measure'
     embeds_many :libraries, class_name: 'FHIR::Library'
     embeds_many :value_sets, class_name: 'FHIR::ValueSet'
-    has_one :package, class_name: 'CQM::MeasurePackage', inverse_of: :measure, dependent: :destroy
 
     # ELM/CQL Measure-logic related data
     # Field name changed from 'cql' to 'cql_libraries' because the semantics of
@@ -45,6 +44,9 @@ module CQM
 
     embeds_many :population_sets, class_name: 'CQM::PopulationSet'
 
+    # TODO: Reconsider after MAT-1628
+    field :measure_period, type: Hash
+
     def as_json(*args)
       result = Hash.new
       unless self.id.nil?
@@ -89,6 +91,9 @@ module CQM
       unless self.population_sets.nil?  || !self.population_sets.any?
         result['population_sets'] = self.population_sets.map{ |x| x.as_json(*args) }
       end
+      unless self.measure_period.nil?
+        result['measure_period'] = self.measure_period
+      end
       result['created_at'] = self.created_at unless self.created_at.nil?
       result['updated_at'] = self.updated_at unless self.updated_at.nil?
 
@@ -111,6 +116,7 @@ module CQM
       result['main_cql_library'] = json_hash['main_cql_library'] unless json_hash['main_cql_library'].nil?
       result['source_data_criteria'] = json_hash['source_data_criteria'].map { |var| CQM::DataElement.transform_json(var) } unless json_hash['source_data_criteria'].nil?
       result['population_sets'] = json_hash['population_sets'].map { |var| CQM::PopulationSet.transform_json(var) } unless json_hash['population_sets'].nil?
+      result['measure_period'] = json_hash['measure_period'] unless json_hash['measure_period'].nil?
       result['created_at'] = json_hash['created_at'] unless json_hash['created_at'].nil?
       result['updated_at'] = json_hash['updated_at'] unless json_hash['updated_at'].nil?
       result

data/app/models/cqm/population_set.rb

@@ -58,7 +58,6 @@ module CQM
 
     field :title, type: String
     field :stratification_id, type: String
-    field :set_id, type: String
     embeds_one :statement, class_name: 'CQM::StatementReference'
 
     def as_json(*args)
@@ -69,9 +68,6 @@ module CQM
       unless self.stratification_id.nil?
         result['stratification_id'] = self.stratification_id
       end
-      unless self.set_id.nil?
-        result['set_id'] = self.set_id
-      end
       unless self.statement.nil?
         result['statement'] = self.statement.as_json(args)
       end
@@ -83,7 +79,6 @@ module CQM
       result = target
       result['title'] = json_hash['title'] unless json_hash['title'].nil?
       result['stratification_id'] = json_hash['stratification_id'] unless json_hash['stratification_id'].nil?
-      result['set_id'] = json_hash['set_id'] unless json_hash['set_id'].nil?
       result['statement'] = CQM::StatementReference.transform_json(json_hash['statement']) unless json_hash['statement'].nil?
 
       result
@@ -96,10 +91,14 @@ module CQM
 
     embedded_in :population_set
 
+    # observationPopulation.criteria
     embeds_one :observation_function, class_name: 'CQM::StatementReference'
+
+    # Observation Identifier, observationPopulation.extension.[url]/cqfm-criteriaReference
     embeds_one :observation_parameter, class_name: 'CQM::StatementReference'
+
+    # Aggregate Method (aka Aggregate Type), observationPopulation.extension.[url]/cqfm-aggregateMethod
     field :aggregation_type, type: String
-    field :set_id, type: String
 
     def as_json(*args)
       result = Hash.new
@@ -112,9 +111,6 @@ module CQM
       unless self.aggregation_type.nil?
         result['aggregation_type'] = self.aggregation_type
       end
-      unless self.set_id.nil?
-        result['set_id'] = self.set_id
-      end
 
       result
     end
@@ -124,7 +120,6 @@ module CQM
       result['observation_function'] = CQM::StatementReference.transform_json(json_hash['observation_function']) unless json_hash['observation_function'].nil?
       result['observation_parameter'] = CQM::StatementReference.transform_json(json_hash['observation_parameter']) unless json_hash['observation_parameter'].nil?
       result['aggregation_type'] = json_hash['aggregation_type'] unless json_hash['aggregation_type'].nil?
-      result['set_id'] = json_hash['set_id'] unless json_hash['set_id'].nil?
 
       result
     end

data/app/models/fhir/resource.rb

@@ -8,6 +8,11 @@ module FHIR
     embeds_one :language, class_name: 'FHIR::PrimitiveCode'    
     field :resourceType, type: String    
     field :fhirId, type: String    
+
+    def initialize(attrs = nil)
+      super(attrs)
+      self.resourceType = self.class.name.split("::")[1].to_s
+    end   
     
     def as_json(*args)
       result = Hash.new      

data/fhir-mongoid-models.gemspec

@@ -3,9 +3,9 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name = 'fhir-mongoid-models'
-  spec.version = '0.0.1'
-  spec.authors = %w[Andrew Bird Ashok Dongare Joseph Kotanchik Rohit Kandimalla Serhii Ilin]
-  spec.email = %w[andrew.bird@semanticbits.com ashok.dongare@semanticbits.com joseph.kotanchik@semanticbits.com rohit.kandimalla@semanticbits.com serhii.ilin@semanticbits.com]
+  spec.version = '0.0.2'
+  spec.authors = ['Andrew Bird', 'Ashok Dongare', 'Joseph Kotanchik', 'Serhii Ilin', 'Matthew Gifford', 'Daniel Mee']
+  spec.email = %w[andrew.bird@semanticbits.com ashok.dongare@semanticbits.com joseph.kotanchik@semanticbits.com serhii.ilin@semanticbits.com matthew.gifford@semanticbits.com daniel.mee@semanticbits.com]
 
   spec.summary = 'Mongo models that correspond to the FHIR specification.'
   spec.description = 'This library contains auto generated Mongo (Mongoid) models that correspond to the FHIR specification.'

data/lib/fhir/mongoid/models.rb

@@ -1,7 +1,6 @@
 require_relative '../../../app/models/models'
 require_relative '../../../app/models/cqm/patient'
 require_relative '../../../app/models/cqm/measure'
-require_relative '../../../app/models/cqm/measure_package'
 require_relative '../../../app/models/cqm/logic_library'
 require_relative '../../../app/models/cqm/cql_statement_dependency'
 require_relative '../../../app/models/cqm/population_set'

metadata

@@ -1,23 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: fhir-mongoid-models
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
-- Andrew
-- Bird
-- Ashok
-- Dongare
-- Joseph
-- Kotanchik
-- Rohit
-- Kandimalla
-- Serhii
-- Ilin
-autorequire:
+- Andrew Bird
+- Ashok Dongare
+- Joseph Kotanchik
+- Serhii Ilin
+- Matthew Gifford
+- Daniel Mee
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-17 00:00:00.000000000 Z
+date: 2020-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -123,8 +119,9 @@ email:
 - andrew.bird@semanticbits.com
 - ashok.dongare@semanticbits.com
 - joseph.kotanchik@semanticbits.com
-- rohit.kandimalla@semanticbits.com
 - serhii.ilin@semanticbits.com
+- matthew.gifford@semanticbits.com
+- daniel.mee@semanticbits.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -132,6 +129,7 @@ files:
 - ".editorconfig"
 - ".github/CODEOWNERS"
 - ".github/workflows/build.yml"
+- ".github/workflows/rubygems-publish.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -143,7 +141,6 @@ files:
 - app/models/cqm/data_element.rb
 - app/models/cqm/logic_library.rb
 - app/models/cqm/measure.rb
-- app/models/cqm/measure_package.rb
 - app/models/cqm/patient.rb
 - app/models/cqm/population_set.rb
 - app/models/fhir/account.rb
@@ -1093,7 +1090,7 @@ files:
 homepage: https://github.com/MeasureAuthoringTool/fhir-mongoid-models
 licenses: []
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -1108,8 +1105,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
-signing_key:
+rubygems_version: 3.0.6
+signing_key: 
 specification_version: 4
 summary: Mongo models that correspond to the FHIR specification.
 test_files: []

data/app/models/cqm/measure_package.rb

@@ -1,10 +0,0 @@
-module CQM
-  # MeasurePackage stores the uploaded file for a given Measure
-  class MeasurePackage
-    include Mongoid::Document
-    include Mongoid::Timestamps
-
-    field :file, type: BSON::Binary
-    belongs_to :measure, class_name: 'CQM::Measure', inverse_of: :package
-  end
-end