From 70680a7e3fc08441f12fbf804a337de6aa07e0fa Mon Sep 17 00:00:00 2001
From: Jung Seungho <shonest.jung@samsung.com>
Date: Tue, 16 Aug 2016 09:53:56 +0900
Subject: [PATCH] Add device to private group, when user sign up.

1. change getGroup method private to public.
2. add device method, when store UserTokenInfo.

Change-Id: I1994770ef484ff0bdfd2c906f19bd91d1c9e3f48
Signed-off-by: Jung Seungho <shonest.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10473
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Eunok Shin <eunok.shin@samsung.com>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
---
 .../cloud/accountserver/resources/account/AccountManager.java  | 10 ++++++++--
 .../cloud/accountserver/resources/acl/group/GroupManager.java  |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/cloud/account/src/main/java/org/iotivity/cloud/accountserver/resources/account/AccountManager.java b/cloud/account/src/main/java/org/iotivity/cloud/accountserver/resources/account/AccountManager.java
index 683a594..24d31c9 100644
--- a/cloud/account/src/main/java/org/iotivity/cloud/accountserver/resources/account/AccountManager.java
+++ b/cloud/account/src/main/java/org/iotivity/cloud/accountserver/resources/account/AccountManager.java
@@ -29,6 +29,7 @@ import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -87,7 +88,8 @@ public class AccountManager {
         // check uuid
         userUuid = findUuid(userInfo.getUserid(), authProvider);
 
-        storeUserTokenInfo(userUuid, userInfo, tokenInfo);
+        storeUserTokenInfo(userUuid, userInfo, tokenInfo, did);
+
         // make response
         HashMap<String, Object> response = makeSignUpResponse(tokenInfo);
 
@@ -95,7 +97,7 @@ public class AccountManager {
     }
 
     private void storeUserTokenInfo(String userUuid, UserTable userInfo,
-            TokenTable tokenInfo) {
+            TokenTable tokenInfo, String did) {
         // store db
         if (userUuid == null) {
             userUuid = generateUuid();
@@ -107,6 +109,10 @@ public class AccountManager {
             // make my private group
             GroupResource.getInstance().createGroup(userInfo.getUuid(),
                     Constants.REQ_GTYPE_PRIVATE);
+
+            // add my device to private group
+            GroupResource.getInstance().getGroup(userInfo.getUuid())
+                    .addDevice(new HashSet<String>(Arrays.asList(did)));
         }
         tokenInfo.setUuid(userUuid);
         AccountDBManager.getInstance().insertAndReplaceRecord(
diff --git a/cloud/account/src/main/java/org/iotivity/cloud/accountserver/resources/acl/group/GroupManager.java b/cloud/account/src/main/java/org/iotivity/cloud/accountserver/resources/acl/group/GroupManager.java
index f0d189f..d686684 100644
--- a/cloud/account/src/main/java/org/iotivity/cloud/accountserver/resources/acl/group/GroupManager.java
+++ b/cloud/account/src/main/java/org/iotivity/cloud/accountserver/resources/acl/group/GroupManager.java
@@ -158,7 +158,7 @@ public class GroupManager {
         return getGroup(gid).removeSubscriber(mid);
     }
 
-    private Group getGroup(String gid) {
+    public Group getGroup(String gid) {
 
         return mGroups.get(gid);
     }
-- 
2.7.4