Fix initializing logic of remote scene list

- modify initialization of existing remote scenes
(get scene information from member resource -> from collection resource)

Change-Id: I0dfde1199950ef799ba620ed392608eeb5ae4a35
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5219
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

diff --git a/service/scene-manager/include/RemoteSceneCollection.h b/service/scene-manager/include/RemoteSceneCollection.h
index f09d90d..f4b7436 100644 (file)
--- a/service/scene-manager/include/RemoteSceneCollection.h
+++ b/service/scene-manager/include/RemoteSceneCollection.h
@@ -68,7 +68,9 @@ namespace OIC
                     std::shared_ptr< SceneCollectionResourceRequestor >,
                     const std::string &id, const std::string &name);
 
-                void initializeRemoteSceneCollection(const std::vector< RCSResourceAttributes > &,
+                void addExistingRemoteScenes(const std::vector< std::string > &);
+
+                void initializeRemoteScenes(const std::vector< RCSResourceAttributes > &,
                                                      const std::string &);
 
                 RemoteScene::Ptr createRemoteSceneInstance(const std::string &);

diff --git a/service/scene-manager/src/RemoteSceneCollection.cpp b/service/scene-manager/src/RemoteSceneCollection.cpp
index de932a5..79642a0 100644 (file)
--- a/service/scene-manager/src/RemoteSceneCollection.cpp
+++ b/service/scene-manager/src/RemoteSceneCollection.cpp
@@ -47,7 +47,7 @@ namespace OIC
             {
                 throw RCSInvalidParameterException("Scene name is an empty string");
             }
-            
+
             SceneCollectionResourceRequestor::InternalSceneRequestCallback internalCB
                 = std::bind(&RemoteSceneCollection::onSceneAddedRemoved, this,
                             std::placeholders::_1, std::placeholders::_2,
@@ -100,7 +100,15 @@ namespace OIC
             return m_id;
         }
 
-        void RemoteSceneCollection::initializeRemoteSceneCollection(
+        void RemoteSceneCollection::addExistingRemoteScenes(const std::vector< std::string > &scenes)
+        {
+            for (const auto &scenename : scenes)
+            {
+                createRemoteSceneInstance(scenename);
+            }
+        }
+
+        void RemoteSceneCollection::initializeRemoteScenes(
             const std::vector< RCSResourceAttributes > &MemberReps, const std::string &host)
         {
             try
@@ -118,14 +126,9 @@ namespace OIC
                         RemoteScene::Ptr pRemoteScene = nullptr;
 
                         auto remoteScene = m_remoteScenes.find(sceneName);
-                        if (remoteScene == m_remoteScenes.end())
-                        {
-                            pRemoteScene = createRemoteSceneInstance(sceneName);
-                        }
-                        else
-                        {
-                            pRemoteScene = m_remoteScenes.at(sceneName);
-                        }
+                        if (remoteScene == m_remoteScenes.end()) return;
+
+                        pRemoteScene = m_remoteScenes.at(sceneName);
 
                         std::string targetHref
                             = attrs.at(SCENE_KEY_PAYLOAD_LINK).get< RCSResourceAttributes >().
@@ -155,7 +158,7 @@ namespace OIC
             RemoteScene::Ptr pNewRemoteScene(new RemoteScene(name, m_requestor));
 
             m_remoteScenes[name] = pNewRemoteScene;
-            
+
             return pNewRemoteScene;
         }
 

diff --git a/service/scene-manager/src/RemoteSceneList.cpp b/service/scene-manager/src/RemoteSceneList.cpp
index 8802bdc..54378d9 100644 (file)
--- a/service/scene-manager/src/RemoteSceneList.cpp
+++ b/service/scene-manager/src/RemoteSceneList.cpp
@@ -144,7 +144,10 @@ namespace OIC
                                     collection.at(SCENE_KEY_ID).get< std::string >(),
                                     collection.at(SCENE_KEY_NAME).get< std::string >());
 
-                    newCollection->initializeRemoteSceneCollection(itr.second, host);
+                    newCollection->addExistingRemoteScenes(
+                        collection.at(SCENE_KEY_SCENEVALUES).get< std::vector< std::string > >());
+
+                    newCollection->initializeRemoteScenes(itr.second, host);
                 }
             }
             catch (const std::exception &e)
@@ -360,7 +363,7 @@ namespace OIC
                 });
 
                 collection->
-                    initializeRemoteSceneCollection(childrenAttr, host);
+                    initializeRemoteScenes(childrenAttr, host);
             }
             else
             {