diff --git a/dtu-auth2/lib/models/course2.rb b/dtu-auth2/lib/models/course2.rb index 5b5d41bc168a9967e39e34e9626976eafba5d071..1425f5c77effb6df16470620bf3b493173cfc192 100644 --- a/dtu-auth2/lib/models/course2.rb +++ b/dtu-auth2/lib/models/course2.rb @@ -13,7 +13,6 @@ module DTUAuth2 attr_accessor :enabled attr_accessor :askbot_enabled attr_accessor :sharelatex_enabled - attr_accessor :couchdb_url attr_accessor :sharelatex attr_accessor :populate_time @@ -27,16 +26,11 @@ module DTUAuth2 instance_values end - def self.get_coucbdb_map(couchdb_filename = File.join(CachedAuthorizationManager.instance.dtu_course_config_root, 'couchdb.yaml')) - YAML::load_file(couchdb_filename) - end - def self.get_sharelatex_map(sharelatex_filename = File.join(CachedAuthorizationManager.instance.dtu_course_config_root, 'sharelatex.yaml')) YAML::load_file(sharelatex_filename) end def self.from_yml(courses_filename = File.join(CachedAuthorizationManager.instance.dtu_course_config_root, 'courses.yaml'), - couchdb_filename = File.join(CachedAuthorizationManager.instance.dtu_course_config_root, 'couchdb.yaml'), sharelatex_filename = File.join(CachedAuthorizationManager.instance.dtu_course_config_root, 'sharelatex.yaml') ) courses = [] @@ -45,15 +39,12 @@ module DTUAuth2 Rails.logger.info 'Initializing from' Rails.logger.info "\tcampus dumper courses file: #{courses_filename.to_s} " - Rails.logger.info "\tcouchdb config file: #{couchdb_filename.to_s} " Rails.logger.info "\tsharelatex config file: #{sharelatex_filename.to_s} " @courses_filename = courses_filename - @couchdb_filename = couchdb_filename @sharelatex_filename = sharelatex_filename @course_map = YAML::load_file(@courses_filename) - @couchdb_map = self.get_coucbdb_map @couchdb_filename @sharelatex_map = self.get_sharelatex_map @sharelatex_filename admin_user = User2.system_user() @@ -62,14 +53,12 @@ module DTUAuth2 @course_map.each do |id, vals| - raise ArgumentError.new("course #{id} is missing couchdb configuration from #{@couchdb_filename}") unless @couchdb_map[id] and @couchdb_map[id]['db'] - raise ArgumentError.new("course #{id} is missing sharelatex configuration from #{@sharelatex_filename}") unless @sharelatex_map[id] Rails.logger.info 'Initializing course ' + id Rails.logger.info 'Initializing course ' + vals.ai - course = DTUAuth2::Course2.new(_id: id, enabled: vals['website_enabled'], name: vals['name'], couchdb_url: @couchdb_map[id]['db'], sharelatex: @sharelatex_map[id], populate_time: File.mtime(@courses_filename).to_i, askbot_enabled: vals['askbot_enabled'], sharelatex_enabled: vals['sharelatex_enabled']) + course = DTUAuth2::Course2.new(_id: id, enabled: vals['website_enabled'], name: vals['name'], sharelatex: @sharelatex_map[id], populate_time: File.mtime(@courses_filename).to_i, askbot_enabled: vals['askbot_enabled'], sharelatex_enabled: vals['sharelatex_enabled']) courses << course