Skip to content
Snippets Groups Projects
Commit 4d41e061 authored by Iain Bryson's avatar Iain Bryson
Browse files

Fix groups_by_course bug — have it include the actual group objects. Add more logging.

parent 632b880e
Branches
No related tags found
No related merge requests found
...@@ -19,7 +19,7 @@ PATH ...@@ -19,7 +19,7 @@ PATH
remote: . remote: .
specs: specs:
dtu-auth (0.0.0) dtu-auth (0.0.0)
dtu-core (0.0.2) dtu-core (0.0.5)
dtu-auth dtu-auth
dtu-auth2 dtu-auth2
dtu-file-management dtu-file-management
......
...@@ -62,11 +62,13 @@ module DTUAuth2 ...@@ -62,11 +62,13 @@ module DTUAuth2
am.users.keys.each { |user_id| $redis.set("user$" + user_id, am.users[user_id].to_json) } am.users.keys.each { |user_id| $redis.set("user$" + user_id, am.users[user_id].to_json) }
groups_by_user = {} groups_by_user = {}
groups_by_course = {}
_user_roles.flatten.each do |role| _user_roles.flatten.each do |role|
am.user_roles[role.user_id] = {} unless am.user_roles.has_key? role.user_id am.user_roles[role.user_id] = {} unless am.user_roles.has_key? role.user_id
groups_by_user[role.user_id] = [] unless groups_by_user.has_key? role.user_id groups_by_user[role.user_id] = [] unless groups_by_user.has_key? role.user_id
am.groups[role.course_id] = [] unless am.groups.has_key? role.course_id am.groups[role.course_id] = [] unless am.groups.has_key? role.course_id
groups_by_course[role.course_id] = [] unless groups_by_course.has_key? role.course_id
am.user_roles[role.user_id][role.course_id] = {} unless am.user_roles[role.user_id].has_key? role.course_id am.user_roles[role.user_id][role.course_id] = {} unless am.user_roles[role.user_id].has_key? role.course_id
...@@ -76,6 +78,7 @@ module DTUAuth2 ...@@ -76,6 +78,7 @@ module DTUAuth2
am.groups[role.course_id] << role.group am.groups[role.course_id] << role.group
groups_by_user[role.user_id] << role groups_by_user[role.user_id] << role
groups_by_course[role.course_id] << role
end end
groups.each do |k,v| groups.each do |k,v|
...@@ -86,8 +89,8 @@ module DTUAuth2 ...@@ -86,8 +89,8 @@ module DTUAuth2
$redis.set("user_role_by_user$" + user_id, g.uniq.to_json) $redis.set("user_role_by_user$" + user_id, g.uniq.to_json)
end end
groups.each do |group_id, g| groups_by_course.each do |course_id, g|
$redis.set("user_role_by_course$" + group_id, g.uniq.to_json) $redis.set("user_role_by_course$" + course_id, g.to_json)
end end
# Rails.logger.debug "Users #{am.users.ai}" # Rails.logger.debug "Users #{am.users.ai}"
......
File added
...@@ -6,7 +6,7 @@ require "dtu-core/version" ...@@ -6,7 +6,7 @@ require "dtu-core/version"
# Describe your gem and declare its dependencies: # Describe your gem and declare its dependencies:
Gem::Specification.new do |s| Gem::Specification.new do |s|
s.name = "dtu-core" s.name = "dtu-core"
s.version = "0.0.4" s.version = "0.0.5"
s.authors = ["Iain Bryson"] s.authors = ["Iain Bryson"]
s.email = ["iain@iain-bryson.ca"] s.email = ["iain@iain-bryson.ca"]
s.homepage = "https://github.com/dtu-compute/dtu-core.git" s.homepage = "https://github.com/dtu-compute/dtu-core.git"
......
...@@ -18,9 +18,16 @@ desc "Populate the redis cache" ...@@ -18,9 +18,16 @@ desc "Populate the redis cache"
task :populate => [:to_stdout, :environment] do task :populate => [:to_stdout, :environment] do
Rails.logger.info Rails.configuration.dtu_data Rails.logger.info Rails.configuration.dtu_data
DTUAuth2::populate Rails.configuration.dtu_data[:root_path] DTUAuth2::populate Rails.configuration.dtu_data[:root_path]
puts "\n\n\n COURSE LIST (from redis) \n\n\n"
ap DTUAuth2::CachedAuthorizationManager.course_list ap DTUAuth2::CachedAuthorizationManager.course_list
DTUAuth2::CachedAuthorizationManager.course_list.each do |course|
puts "\n\n\n GROUPS FOR #{course} (from redis) \n\n\n"
ap DTUAuth2::CachedAuthorizationManager.groups_by_course course
end
puts "\n\n\n USER LIST (from redis) \n\n\n"
ap DTUAuth2::CachedAuthorizationManager.user_list ap DTUAuth2::CachedAuthorizationManager.user_list
DTUAuth2::CachedAuthorizationManager.user_list.each do |user| DTUAuth2::CachedAuthorizationManager.user_list.each do |user|
puts "\n\n\n GROUPS FOR #{user} (from redis) \n\n\n"
ap DTUAuth2::CachedAuthorizationManager.groups_by_user user ap DTUAuth2::CachedAuthorizationManager.groups_by_user user
end end
end end
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment