-
Lee Munkyeong @lee-mk
added 6 commits
-
47e48b13...c10ae0b2 - 5 commits from branch
features/abcomm_sp5
- 8579b74d - Merge branch 'features/abcomm_sp5' into 'features/abcomm_sp5_group_search_UI'
added 6 commits
-
47e48b13...c10ae0b2 - 5 commits from branch
features/abcomm_sp5
- 8579b74d - Merge branch 'features/abcomm_sp5' into 'features/abcomm_sp5_group_search_UI'
added 6 commits * 47e48b13...c10ae0b2 - 5 commits from branch `features/abcomm_sp5` * 8579b74d - Merge branch 'features/abcomm_sp5' into 'features/abcomm_sp5_group_search_UI' [Compare with previous version](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/94/diffs?diff_id=5532&start_sha=47e48b1395300f02bed0907364b6fec5fccd09b6)Toggle commit list -
47e48b13...c10ae0b2 - 5 commits from branch
-
6 6 7 7 public interface ABookCommConstants { 8 8 9 String TAG ="ABookComm"; -
Lee Daehyun @lee-dh commentedDeveloper
[nit]
="
スペースをしてください[nit]`="`スペースをしてください -
Lee Munkyeong @lee-mk
changed this line in version 3 of the diff
changed this line in version 3 of the diff
changed this line in [version 3 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/94/diffs?diff_id=5537&start_sha=8579b74d2194cce34e55f535950ead79a2f7d4a7#d7cb729fc160d94ec42521a6742049033fb46a9f_9_9)Toggle commit list
Please register or sign in to reply -
-
914 boolean result = AcmsClient.getInstance(ABVEnvironment.getInstance().networkAdapter).deleteFavoriteUser(sid,Integer.parseInt(shopMemberId)); 915 if (result) { 916 List<Integer> deleteFavoriteList = new ArrayList<Integer>(); 917 deleteFavoriteList.add(Integer.parseInt(shopMemberId)); 918 communicationLogic.deleteavoriteUser(deleteFavoriteList); 919 } 920 return result; 921 } 922 923 private boolean insertFavoriteGroup(String groupId) throws NetworkDisconnectedException, AcmsException { 924 boolean result = AcmsClient.getInstance(ABVEnvironment.getInstance().networkAdapter).insertFavoriteGroup(sid,Integer.parseInt(groupId)); 925 return result; 926 } 927 928 private boolean deleteFavoriteGroup(String groupId) throws NetworkDisconnectedException, AcmsException { 929 boolean result = AcmsClient.getInstance(ABVEnvironment.getInstance().networkAdapter).deleteFavoriteGroup(sid,Integer.parseInt(groupId)); -
Lee Daehyun @lee-dh commentedDeveloper
[nit]
sid,Integer.parseInt(groupId)
のインデントが合わしてください[nit]`sid,Integer.parseInt(groupId)`のインデントが合わしてください -
Lee Munkyeong @lee-mk
changed this line in version 3 of the diff
changed this line in version 3 of the diff
changed this line in [version 3 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/94/diffs?diff_id=5537&start_sha=8579b74d2194cce34e55f535950ead79a2f7d4a7#13bb3577d9f8893bdbdac5e5e2d0bdfd8d98dc92_929_929)Toggle commit list
-
-
Lee Daehyun @lee-dh
marked the task @lee-dh as completed
-
Lee Daehyun @lee-dh
assigned to @lee-mk
-
Lee Munkyeong @lee-mk
added 1 commit
- ec675abc - コードレビュー対応。
added 1 commit * ec675abc - コードレビュー対応。 [Compare with previous version](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/94/diffs?diff_id=5537&start_sha=8579b74d2194cce34e55f535950ead79a2f7d4a7)Toggle commit list -
Lee Munkyeong @lee-mk
assigned to @kim-p
-
Lee Munkyeong @lee-mk
resolved all discussions
resolved all discussions
resolved all discussionsToggle commit list -
Kang Donghun @kang-dh
marked the task @kang-dh as completed
-
112 113 } 113 114 } 114 115 116 public void insertChatRoomUsers(List<Integer> attendUsers, Integer chatRoomId) { 117 for (Integer attendUserId : attendUsers) { -
Kim Peace @kim-p commentedMaster
[nits] indent?
[nits] indent? -
Lee Munkyeong @lee-mk
changed this line in version 4 of the diff
changed this line in version 4 of the diff
changed this line in [version 4 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/94/diffs?diff_id=5542&start_sha=ec675abc431126d50dc1e4ce2bf2062d6dd732d2#e4c3c5d3d74379e82cffff6c51c0fa3d5ad85bed_117_117)Toggle commit list
-
-
528 549 list = rawQueryGetDtoList("select * from m_group mg where (mg.parent_group_id = ?)", new String[]{""+ parentId}, GroupDto.class); 529 550 return list; 530 551 } 531 552 553 public GroupDto getRootGroup() { 554 return rawQueryGetDto("select * from m_group mg where (mg.parent_group_id = 0)",null, GroupDto.class); 555 } 556 557 public GroupDto getParentGroup(Integer childGroupId) { 558 return rawQueryGetDto("select parent.* from m_group parent inner join m_group child on child.parent_group_id = parent.group_id where child.group_id = ?",new String[]{""+ childGroupId}, GroupDto.class); -
Kim Peace @kim-p commentedMaster
[nits]
,
の後はスペースを空けてください。[nits] `,`の後はスペースを空けてください。 -
Lee Munkyeong @lee-mk
changed this line in version 4 of the diff
changed this line in version 4 of the diff
changed this line in [version 4 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/94/diffs?diff_id=5542&start_sha=ec675abc431126d50dc1e4ce2bf2062d6dd732d2#41568e3efb70aba10829a16122bf6356ba16aeeb_558_558)Toggle commit list
-
-
113 101 return messageListStr; 114 102 } 115 103 104 public String getNameCardInfo(Integer shopMemberId) { 105 JSONObject resultJson = new JSONObject(); 106 ShopMemberDto shopMemberDto = shopMemberDao.getShopMember(shopMemberId); 107 List<String> groupPathList = groupDao.getUserGroupPathList(shopMemberId); 108 resultJson.put(ABookCommConstants.KEY.SHOP_MEMBER_ID, shopMemberDto.shopMemberId); 109 resultJson.put(ABookCommConstants.KEY.SHOP_MEMBER_NAME, shopMemberDto.shopMemberName); 110 resultJson.put(ABookCommConstants.KEY.PROFILE_URL, shopMemberDto.profileUrl); 111 resultJson.put(ABookCommConstants.KEY.GROUP_PATH_LIST, groupPathList); 112 if (StringUtil.isNullOrEmpty(shopMemberDto.favoriteRegisterDate)) { -
Kim Peace @kim-p commentedMaster
[want]
// from if (StringUtil.isNullOrEmpty(shopMemberDto.favoriteRegisterDate)) { resultJson.put(ABookCommConstants.KEY.IS_FAVORITE, false); } else { resultJson.put(ABookCommConstants.KEY.IS_FAVORITE, true); } // to Bool hasRegisteredDate = StringUtil.isNullOrEmpty(shopMemberDto.favoriteRegisterDate) == false; resultJson.put(ABookCommConstants.KEY.IS_FAVORITE, hasRegisteredDate);
[want] ```java // from if (StringUtil.isNullOrEmpty(shopMemberDto.favoriteRegisterDate)) { resultJson.put(ABookCommConstants.KEY.IS_FAVORITE, false); } else { resultJson.put(ABookCommConstants.KEY.IS_FAVORITE, true); } // to Bool hasRegisteredDate = StringUtil.isNullOrEmpty(shopMemberDto.favoriteRegisterDate) == false; resultJson.put(ABookCommConstants.KEY.IS_FAVORITE, hasRegisteredDate); ``` -
Lee Munkyeong @lee-mk
changed this line in version 4 of the diff
changed this line in version 4 of the diff
changed this line in [version 4 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/94/diffs?diff_id=5542&start_sha=ec675abc431126d50dc1e4ce2bf2062d6dd732d2#9dade916e7e6e24d1df91b7df12a428931b7a74c_112_112)Toggle commit list
-
-
195 293 196 294 //パラメータグループIDが0であれば自分のグループ情報を取得。 197 295 GroupDto myGroup = groupDao.getUserGroups().get(0); 296 GroupDto rootGroup = groupDao.getRootGroup(); 297 198 298 Integer targetGroupId; 199 299 if (groupId == 0) { 200 targetGroupId = myGroup.groupId; 300 targetGroupId = rootGroup.groupId; 201 301 } else { 202 302 targetGroupId = groupId; 203 303 } 204 304 305 GroupDto parentGroup = groupDao.getParentGroup(targetGroupId); 306 if (parentGroup != null) { 307 groupSearchData.put(ABookCommConstants.KEY.PARENT_GROUP_ID,parentGroup.groupId); -
Kim Peace @kim-p commentedMaster
[nits]
,
の後にはスペースを空けてください。[nits] `,`の後にはスペースを空けてください。 -
Lee Munkyeong @lee-mk
changed this line in version 4 of the diff
changed this line in version 4 of the diff
changed this line in [version 4 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/94/diffs?diff_id=5542&start_sha=ec675abc431126d50dc1e4ce2bf2062d6dd732d2#9dade916e7e6e24d1df91b7df12a428931b7a74c_307_304)Toggle commit list
-
-
816 @JavascriptInterface 817 public String getNameCardData(String shopMemberId) { 818 String nameCardStr = communicationLogic.getNameCardInfo(Integer.parseInt(shopMemberId)); 819 return nameCardStr; 820 } 821 822 @JavascriptInterface 823 public String getFavoriteGroupsList() { 824 String favoriteGroupsListStr = communicationLogic.getFavoriteGroups(); 825 return favoriteGroupsListStr; 826 } 827 828 @JavascriptInterface 829 public void addFavoriteUser(String shopMemberId) throws NetworkDisconnectedException, AcmsException { 830 boolean result = insertFavoriteUser(shopMemberId); 831 if (result) { -
Kim Peace @kim-p commentedMaster
[nits]
// not preferred if (condition) { body } // preferred if (!condition) { return; } body
[nits] ```java // not preferred if (condition) { body } // preferred if (!condition) { return; } body ``` -
Lee Munkyeong @lee-mk
changed this line in version 4 of the diff
changed this line in version 4 of the diff
changed this line in [version 4 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/94/diffs?diff_id=5542&start_sha=ec675abc431126d50dc1e4ce2bf2062d6dd732d2#13bb3577d9f8893bdbdac5e5e2d0bdfd8d98dc92_831_831)Toggle commit list
-
-
801 901 } 802 902 803 903 private void updateUserInfoFromServer(String shopMemberId) throws NetworkDisconnectedException, AcmsException { 804 MyInfoJSON resultJson = AcmsClient.getInstance(ABVEnvironment.getInstance().networkAdapter).getNameCard(sid,shopMemberId); 904 MyInfoJSON resultJson = AcmsClient.getInstance(ABVEnvironment.getInstance().networkAdapter).getNameCard(sid, shopMemberId); 805 905 communicationLogic.insertShopMember(resultJson.shopMemberDto); 806 906 } 807 907 908 private boolean insertFavoriteUser(String shopMemberId) throws NetworkDisconnectedException, AcmsException { 909 boolean result = AcmsClient.getInstance(ABVEnvironment.getInstance().networkAdapter).insertFavoriteUser(sid, Integer.parseInt(shopMemberId)); -
Kim Peace @kim-p commentedMaster
[nits] 行が長いので適切に改行してください。
[nits] 行が長いので適切に改行してください。 -
Lee Munkyeong @lee-mk
changed this line in version 4 of the diff
changed this line in version 4 of the diff
changed this line in [version 4 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/94/diffs?diff_id=5542&start_sha=ec675abc431126d50dc1e4ce2bf2062d6dd732d2#13bb3577d9f8893bdbdac5e5e2d0bdfd8d98dc92_909_909)Toggle commit list
-
-
801 901 } 802 902 803 903 private void updateUserInfoFromServer(String shopMemberId) throws NetworkDisconnectedException, AcmsException { 804 MyInfoJSON resultJson = AcmsClient.getInstance(ABVEnvironment.getInstance().networkAdapter).getNameCard(sid,shopMemberId); 904 MyInfoJSON resultJson = AcmsClient.getInstance(ABVEnvironment.getInstance().networkAdapter).getNameCard(sid, shopMemberId); -
Kim Peace @kim-p commentedMaster
[nits] 行が長いので適切に改行してください。
[nits] 行が長いので適切に改行してください。 -
Lee Munkyeong @lee-mk
changed this line in version 4 of the diff
changed this line in version 4 of the diff
changed this line in [version 4 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/94/diffs?diff_id=5542&start_sha=ec675abc431126d50dc1e4ce2bf2062d6dd732d2#13bb3577d9f8893bdbdac5e5e2d0bdfd8d98dc92_904_903)Toggle commit list
-
-
801 901 } 802 902 803 903 private void updateUserInfoFromServer(String shopMemberId) throws NetworkDisconnectedException, AcmsException { 804 MyInfoJSON resultJson = AcmsClient.getInstance(ABVEnvironment.getInstance().networkAdapter).getNameCard(sid,shopMemberId); 904 MyInfoJSON resultJson = AcmsClient.getInstance(ABVEnvironment.getInstance().networkAdapter).getNameCard(sid, shopMemberId); 805 905 communicationLogic.insertShopMember(resultJson.shopMemberDto); 806 906 } 807 907 908 private boolean insertFavoriteUser(String shopMemberId) throws NetworkDisconnectedException, AcmsException { 909 boolean result = AcmsClient.getInstance(ABVEnvironment.getInstance().networkAdapter).insertFavoriteUser(sid, Integer.parseInt(shopMemberId)); 910 return result; 911 } 912 913 private boolean deleteFavoriteUser(String shopMemberId) throws NetworkDisconnectedException, AcmsException { 914 boolean result = AcmsClient.getInstance(ABVEnvironment.getInstance().networkAdapter).deleteFavoriteUser(sid, Integer.parseInt(shopMemberId)); -
Kim Peace @kim-p commentedMaster
[nits] 行が長いので適切に改行してください。
[nits] 行が長いので適切に改行してください。 -
Lee Munkyeong @lee-mk
changed this line in version 4 of the diff
changed this line in version 4 of the diff
changed this line in [version 4 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/94/diffs?diff_id=5542&start_sha=ec675abc431126d50dc1e4ce2bf2062d6dd732d2#13bb3577d9f8893bdbdac5e5e2d0bdfd8d98dc92_914_915)Toggle commit list
-
-
909 boolean result = AcmsClient.getInstance(ABVEnvironment.getInstance().networkAdapter).insertFavoriteUser(sid, Integer.parseInt(shopMemberId)); 910 return result; 911 } 912 913 private boolean deleteFavoriteUser(String shopMemberId) throws NetworkDisconnectedException, AcmsException { 914 boolean result = AcmsClient.getInstance(ABVEnvironment.getInstance().networkAdapter).deleteFavoriteUser(sid, Integer.parseInt(shopMemberId)); 915 if (result) { 916 List<Integer> deleteFavoriteList = new ArrayList<Integer>(); 917 deleteFavoriteList.add(Integer.parseInt(shopMemberId)); 918 communicationLogic.deleteavoriteUser(deleteFavoriteList); 919 } 920 return result; 921 } 922 923 private boolean insertFavoriteGroup(String groupId) throws NetworkDisconnectedException, AcmsException { 924 boolean result = AcmsClient.getInstance(ABVEnvironment.getInstance().networkAdapter).insertFavoriteGroup(sid, Integer.parseInt(groupId)); -
Kim Peace @kim-p commentedMaster
[nits] 行が長いので適切に改行してください。
[nits] 行が長いので適切に改行してください。 -
Lee Munkyeong @lee-mk
changed this line in version 4 of the diff
changed this line in version 4 of the diff
changed this line in [version 4 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/94/diffs?diff_id=5542&start_sha=ec675abc431126d50dc1e4ce2bf2062d6dd732d2#13bb3577d9f8893bdbdac5e5e2d0bdfd8d98dc92_924_926)Toggle commit list
-
-
810 communicationLogic.updateGroup(resultJson.groupList); 939 ArrayList<String> checkSumList = new ArrayList<String>(); 940 SharedPreferences pref = getSharedPreferences(ABookCommConstants.TAG,MODE_PRIVATE); 941 942 for (String groupId : groupIds.split(",")) { 943 checkSumList.add(pref.getString(groupId,DEFAULT_CHECKSUM)); 944 } 945 946 String checkSumListStr = StringUtil.join(",",checkSumList); 947 GroupListJSON resultJson = AcmsClient.getInstance(ABVEnvironment.getInstance().networkAdapter).getGroupInfo(sid, groupIds, checkSumListStr); 948 949 if (CollectionUtil.isNotEmpty(resultJson.groupList)) { 950 SharedPreferences.Editor editor = pref.edit(); 951 communicationLogic.updateGroup(resultJson.groupList); 952 if (groupIds.equals(ABookCommConstants.FLAG.GROUP_REQUEST_ALL.toString())) { 953 editor.putString(ABookCommConstants.FLAG.GROUP_REQUEST_ALL.toString(),resultJson.allGroupLastUpdateDate); -
Kim Peace @kim-p commentedMaster
[nits]
,
の後はスペースを空けてください。[nits] `,`の後はスペースを空けてください。 -
Lee Munkyeong @lee-mk
changed this line in version 4 of the diff
changed this line in version 4 of the diff
changed this line in [version 4 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/94/diffs?diff_id=5542&start_sha=ec675abc431126d50dc1e4ce2bf2062d6dd732d2#13bb3577d9f8893bdbdac5e5e2d0bdfd8d98dc92_953_958)Toggle commit list
-
-
Kim Peace @kim-p
assigned to @lee-mk
-
Lee Munkyeong @lee-mk
added 1 commit
- 9816e8e3 - コードレビュー対応。
added 1 commit * 9816e8e3 - コードレビュー対応。 [Compare with previous version](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/94/diffs?diff_id=5542&start_sha=ec675abc431126d50dc1e4ce2bf2062d6dd732d2)Toggle commit list -
Lee Munkyeong @lee-mk
assigned to @kim-p
-
Lee Munkyeong @lee-mk
resolved all discussions
resolved all discussions
resolved all discussionsToggle commit list -
Kim Peace @kim-p
marked the task @kim-p as completed
-
Kim Peace @kim-p
assigned to @lee-mk
-
Lee Munkyeong @lee-mk
merged
merged
mergedToggle commit list -
Lee Munkyeong @lee-mk
mentioned in commit 8d3bc5b8
mentioned in commit 8d3bc5b8
mentioned in commit 8d3bc5b8f94dc6337183a75babfd8f455a8c7200Toggle commit list