From c76de5b1d5cb18add72499ff41d72ae74bbaf4e7 Mon Sep 17 00:00:00 2001
From: Devin Howard <devin@callysto.com>
Date: Sat, 24 Sep 2016 12:54:14 +0800
Subject: [PATCH] refactor map model a bit and fix bugs

---
 app/models/map.rb | 52 ++++++++++++++++++++---------------------------
 1 file changed, 22 insertions(+), 30 deletions(-)

diff --git a/app/models/map.rb b/app/models/map.rb
index ab3f3eb1..0cab398d 100644
--- a/app/models/map.rb
+++ b/app/models/map.rb
@@ -111,45 +111,37 @@ class Map < ApplicationRecord
 
   # user param helps determine what records are visible
   def contains(user)
-    allmappers = contributors
-    allcollaborators = editors
-    alltopics = Pundit.policy_scope(user, topics).to_a
-    allsynapses = Pundit.policy_scope(user, synapses).to_a
-    allmappings = Pundit.policy_scope(user, mappings).to_a
-
-    json = {}
-    json['map'] = self
-    json['topics'] = alltopics
-    json['synapses'] = allsynapses
-    json['mappings'] = allmappings
-    json['mappers'] = allmappers
-    json['collaborators'] = allcollaborators
-    json['messages'] = messages.sort_by(&:created_at)
-    json['stars'] = stars
+    {
+      map: self,
+      topics: Pundit.policy_scope(user, topics).to_a,
+      synapses: Pundit.policy_scope(user, synapses).to_a,
+      mappings: Pundit.policy_scope(user, mappings).to_a,
+      mappers: contributors,
+      collaborators: editors,
+      messages: messages.sort_by(&:created_at),
+      stars: stars
+    }
   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
+    current_collaborators = collaborators + [user]
+    added = users.map do |new_user|
+      next nil if current_collaborators.include?(new_user)
+      UserMap.create(user_id: new_user.id, map_id: id)
+      new_user.id
     end
-    added
+    added.compact
   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
+    current_collaborators = collaborators + [user]
+    removed = current_collaborators.map(&:id).map do |old_user_id|
+      next nil if user_ids.include?(old_user_id)
+      user_maps.where(user_id: old_user_id).find_each(&:destroy)
+      old_user_id
     end
-    removed
+    removed.compact
   end
 
   def base64_screenshot(encoded_image)