From 0f5b98221ae3c6381b03e7044003ca546d49240b Mon Sep 17 00:00:00 2001
From: Martin Edenhofer <me@edenhofer.de>
Date: Mon, 1 Dec 2014 11:03:26 +0100
Subject: [PATCH] Fixed pushing of objects with associations (did not push
 associations).

---
 lib/sessions/backend/collections/base.rb | 21 ++++++++++++------
 test/unit/session_collections_test.rb    | 28 ++++++++++++++++++++----
 2 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/lib/sessions/backend/collections/base.rb b/lib/sessions/backend/collections/base.rb
index 94c59712b..7491a2951 100644
--- a/lib/sessions/backend/collections/base.rb
+++ b/lib/sessions/backend/collections/base.rb
@@ -84,34 +84,41 @@ class Sessions::Backend::Collections::Base
     Sessions::CacheIn.set( self.client_key, true, { :expires_in => 10.seconds } )
 
     return if !self.changed?
-    data = self.load
+    items = self.load
 
-    return if !data||data.empty?
+    return if !items||items.empty?
+
+    # get relations of data
+    all   = []
+    items.each {|item|
+      all.push item.attributes_with_associations
+    }
+    all = items
 
     # collect assets
     assets = {}
-    data.each {|item|
+    items.each {|item|
       assets = item.assets(assets)
     }
     if !@client
       return {
         :collection => {
-          data.first.class.to_app_model => data,
+          items.first.class.to_app_model => all,
         },
         :assets => assets,
       }
     end
-    @client.log 'notify', "push assets for push_collection #{ data.first.class.to_s } for user #{ @user.id }"
+    @client.log 'notify', "push assets for push_collection #{ items.first.class.to_s } for user #{ @user.id }"
     @client.send({
       :data   => assets,
       :event  => [ 'loadAssets' ],
     })
 
-    @client.log 'notify', "push push_collection #{ data.first.class.to_s } for user #{ @user.id }"
+    @client.log 'notify', "push push_collection #{ items.first.class.to_s } for user #{ @user.id }"
     @client.send({
       :event  => 'resetCollection',
       :data   => {
-        data.first.class.to_app_model => data,
+        items.first.class.to_app_model => all,
       },
     })
   end
diff --git a/test/unit/session_collections_test.rb b/test/unit/session_collections_test.rb
index a5981c14c..e4ab037f5 100644
--- a/test/unit/session_collections_test.rb
+++ b/test/unit/session_collections_test.rb
@@ -109,13 +109,13 @@ class SessionCollectionsTest < ActiveSupport::TestCase
     assert( check_if_collection_exists(result3, :Group), "check collections - after touch" )
 
     # change collection
-    org = Organization.create( :name => 'SomeOrg::' + rand(999999).to_s, :active => true )
+    org = Organization.create( :name => 'SomeOrg::' + rand(999999).to_s, :active => true, :member_ids => [customer1.id] )
     sleep 16
 
     # get whole collections
     result1 = collection_client1.push
     assert( result1, "check collections - after create" )
-    assert( check_if_collection_exists(result1, :Organization), "check collections - after create" )
+    assert( check_if_collection_exists(result1, :Organization, { :id => org.id, :member_ids => [customer1.id] } ), "check collections - after create with attributes" )
     sleep 0.5
     result2 = collection_client2.push
     assert( result2, "check collections - after create" )
@@ -137,9 +137,29 @@ class SessionCollectionsTest < ActiveSupport::TestCase
     assert( result3.empty?, "check collections - recall" )
   end
 
-  def check_if_collection_exists(results, collection)
+  def check_if_collection_exists(results, collection, attributes = nil)
     results.each {|result|
-      return true if result && result[:collection] && result[:collection][collection]
+      next if !result
+      if result[:collection] && result[:collection][collection]
+
+        # check just if collection exists
+        if !attributes
+          return true
+        end
+
+        # check if objetc with attributes in collection exists
+        result[:collection][collection].each {|item|
+          match_all = true
+          attributes.each {|key, value|
+            if item.attributes_with_associations[ key.to_s ] != value
+              match_all = false
+            end
+          }
+          if match_all
+            return true
+          end
+        }
+      end
     }
     nil
   end