move more logic into map model

This commit is contained in:
Devin Howard 2016-09-23 17:02:52 +08:00
parent 7275beb163
commit 686d80e274
2 changed files with 41 additions and 24 deletions

View file

@ -90,24 +90,13 @@ class MapsController < ApplicationController
# POST maps/:id/access # POST maps/:id/access
def access def access
userIds = params[:access] || [] user_ids = params[:access] || []
added = userIds.select do |uid|
user = User.find(uid) added = @map.add_new_collaborators(user_ids)
if user.nil? || (current_user && user == current_user) added.each do |user_id|
false MapMailer.invite_to_edit_email(@map, current_user, User.find(user_id)).deliver_later
else
!@map.collaborators.include?(user)
end
end
removed = @map.collaborators.select { |user| !userIds.include?(user.id.to_s) }.map(&:id)
added.each do |uid|
UserMap.create(user_id: uid.to_i, map_id: @map.id)
user = User.find(uid.to_i)
MapMailer.invite_to_edit_email(@map, current_user, user).deliver_later
end
removed.each do |uid|
@map.user_maps.select { |um| um.user_id == uid }.each(&:destroy)
end end
@map.remove_old_collaborators(user_ids)
respond_to do |format| respond_to do |format|
format.json do format.json do
@ -154,13 +143,7 @@ class MapsController < ApplicationController
# POST maps/:id/upload_screenshot # POST maps/:id/upload_screenshot
def screenshot def screenshot
png = Base64.decode64(params[:encoded_image]['data:image/png;base64,'.length..-1]) @map.base64_screenshot(params[:encoded_image])
StringIO.open(png) do |data|
data.class.class_eval { attr_accessor :original_filename, :content_type }
data.original_filename = 'map-' + @map.id.to_s + '-screenshot.png'
data.content_type = 'image/png'
@map.screenshot = data
end
if @map.save if @map.save
render json: { message: 'Successfully uploaded the map screenshot.' } render json: { message: 'Successfully uploaded the map screenshot.' }

View file

@ -127,4 +127,38 @@ class Map < ApplicationRecord
json['messages'] = messages.sort_by(&:created_at) json['messages'] = messages.sort_by(&:created_at)
json['stars'] = stars json['stars'] = stars
end end
def add_new_collaborators(user_ids)
added = []
users = User.where(id: user_ids)
users.each do |user|
if user && user != current_user && !collaborators.include?(user)
UserMap.create(user_id: uid.to_i, map_id: id)
user = User.find(uid.to_i)
added << user.id
end
end
added
end
def remove_old_collaborators(user_ids)
removed = []
collaborators.map(&:id).each do |user_id|
if !user_ids.include?(user_id)
user_maps.select { |um| um.user_id == user_id }.each(&:destroy)
removed << user_id
end
end
removed
end
def base64_screenshot(encoded_image)
png = Base64.decode64(encoded_image['data:image/png;base64,'.length..-1])
StringIO.open(png) do |data|
data.class.class_eval { attr_accessor :original_filename, :content_type }
data.original_filename = 'map-' + @map.id.to_s + '-screenshot.png'
data.content_type = 'image/png'
@map.screenshot = data
end
end
end end