Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
A
abook_check
  • Overview
    • Overview
    • Details
    • Activity
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Issues 0
    • Issues 0
    • List
    • Board
    • Labels
    • Milestones
  • Merge Requests 0
    • Merge Requests 0
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • abook_android
  • abook_check
  • Merge Requests
  • !93

Merged
Opened Feb 24, 2021 by Lee Munkyeong@lee-mk 3 of 3 tasks completed3/3 tasks
  • Report abuse
Report abuse

Features/abcomm sp3 contact ui

LGTMの場合、チェックしてください。

  • @kim-p
  • @kang-dh
  • @lee-dh
Edited Mar 17, 2021 by Lee Munkyeong
  • Discussion 17
  • Commits 16
  • Changes 29
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Kang Donghun
    @kang-dh started a discussion on the diff Feb 24, 2021
    Resolved by Lee Munkyeong Feb 25, 2021
    ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/type/AcmsApis.java
    171 171 public static final String ChatApiUrlFormat = "%s/%s/chatapi/%s/";
    172 172 public static final String ApiGetChatPushData = "push";
    173 173 public static final String ApigetChatRooms = "room";
    174 public static final String ApigetUser = "user";
    175 public static final String ApigetMessage = "message";
    174 176
    175 177 public static final class Cmds {
    176 178 public static final String getRoomList = "5";
    179 public static final String getMyInfo = "9";
    180 public static final String getGroupInfo = "10";
    181 public static final String createRoom = "2";
    182 public static final String getMessages = "2";
    • Kang Donghun @kang-dh commented Feb 24, 2021
      Developer

      createRoomと同じなので、変更する必要がありそうです。

      Edited Feb 25, 2021
      createRoomと同じなので、変更する必要がありそうです。
    Please register or sign in to reply
  • Lee Daehyun
    @lee-dh started a discussion on an old version of the diff Feb 24, 2021
    Resolved by Lee Munkyeong Feb 25, 2021
    ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/CommunicationLogic.java
    147 if (!groupIds.equals("")) {
    148 groupIds = groupIds + ",";
    149 }
    150 groupIds = groupIds + myGroup.groupId;
    151 }
    152 return groupIds;
    153 }
    154
    155 public String getFavoriteUsers() {
    156
    157 List<ShopMemberDto> favoriteUsers = shopMemberDao.getfavoriteUserList();
    158
    159 JSONArray resultJsonArray = new JSONArray();
    160 for (ShopMemberDto favoriteUser : favoriteUsers) {
    161 Map<String, Object> favoriteUserMap = new HashMap<String, Object>();
    162 favoriteUserMap.put("shopMemberId",favoriteUser.shopMemberId);
    • Lee Daehyun @lee-dh commented Feb 24, 2021
      Developer

      インデントを合わしてください

      Edited Feb 25, 2021
      インデントを合わしてください
    • Lee Munkyeong @lee-mk

      changed this line in version 3 of the diff

      Feb 25, 2021

      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/93/diffs?diff_id=5289&start_sha=02678fc5853f580db8c11f91e24dadd1af7e9868#9dade916e7e6e24d1df91b7df12a428931b7a74c_162_162)
      Toggle commit list
    Please register or sign in to reply
  • Lee Daehyun
    @lee-dh started a discussion on an old version of the diff Feb 24, 2021
    Resolved by Lee Munkyeong Feb 25, 2021
    ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/CommunicationLogic.java
    165 JSONObject jsonObject = new JSONObject(favoriteUserMap);
    166 resultJsonArray.put(jsonObject);
    167 }
    168
    169 String favoriteUsersStr = resultJsonArray.toString();
    170 return favoriteUsersStr;
    171 }
    172
    173 public String getFavoriteGroups() {
    174
    175 List<GroupDto> favoriteGroups = groupDao.getFavoriteGroup();
    176
    177 JSONArray resultJsonArray = new JSONArray();
    178 for (GroupDto favoriteGroup : favoriteGroups) {
    179 Map<String, Object> favoriteGroupMap = new HashMap<String, Object>();
    180 favoriteGroupMap.put("groupName",favoriteGroup.groupName);
    • Lee Daehyun @lee-dh commented Feb 24, 2021
      Developer

      インデントを合わしてください

      Edited Feb 25, 2021
      インデントを合わしてください
    • Lee Munkyeong @lee-mk

      changed this line in version 3 of the diff

      Feb 25, 2021

      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/93/diffs?diff_id=5289&start_sha=02678fc5853f580db8c11f91e24dadd1af7e9868#9dade916e7e6e24d1df91b7df12a428931b7a74c_180_180)
      Toggle commit list
    Please register or sign in to reply
  • Lee Daehyun
    @lee-dh started a discussion on an old version of the diff Feb 24, 2021
    Resolved by Lee Munkyeong Feb 25, 2021
    ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/CommunicationLogic.java
    227 }
    228 shopMemberDao.insertShopMember(shopMemberDtoList);
    229 }
    230
    231 public void updateGroup(List<GroupDto> GroupList) {
    232
    233 List<GroupDto> existGroupList = groupDao.getAllGroups();
    234 ArrayList<GroupDto> insertGroupList = new ArrayList<GroupDto>();
    235 ArrayList<GroupDto> deleteGroupList = new ArrayList<GroupDto>();
    236 ArrayList<GroupDto> updateGroupList = new ArrayList<GroupDto>();
    237 for (GroupDto groupDto : GroupList) {
    238 if (groupDto.delFlg == 1) {
    239 deleteGroupList.add(groupDto);
    240 continue;
    241 }
    242 if ( groupDao.getGroup(groupDto.groupId) == null ) {
    • Lee Daehyun @lee-dh commented Feb 24, 2021
      Developer

      スペースを削除してください

      Edited Feb 25, 2021
      スペースを削除してください
    • Lee Munkyeong @lee-mk

      changed this line in version 3 of the diff

      Feb 25, 2021

      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/93/diffs?diff_id=5289&start_sha=02678fc5853f580db8c11f91e24dadd1af7e9868#9dade916e7e6e24d1df91b7df12a428931b7a74c_244_244)
      Toggle commit list
    Please register or sign in to reply
  • Lee Daehyun @lee-dh

    assigned to @lee-mk

    Feb 24, 2021

    assigned to @lee-mk

    assigned to @lee-mk
    Toggle commit list
  • Lee Munkyeong @lee-mk

    added 1 commit

    • 02678fc5 - プロフィールカード関連実装

    Compare with previous version

    Feb 25, 2021

    added 1 commit

    • 02678fc5 - プロフィールカード関連実装

    Compare with previous version

    added 1 commit * 02678fc5 - プロフィールカード関連実装 [Compare with previous version](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/93/diffs?diff_id=5288&start_sha=31f795906530861c10c284458ce86ea07c72893b)
    Toggle commit list
  • Lee Munkyeong @lee-mk

    resolved all discussions

    Feb 25, 2021

    resolved all discussions

    resolved all discussions
    Toggle commit list
  • Lee Munkyeong @lee-mk

    added 1 commit

    • 71204431 - コードレビュー対応

    Compare with previous version

    Feb 25, 2021

    added 1 commit

    • 71204431 - コードレビュー対応

    Compare with previous version

    added 1 commit * 71204431 - コードレビュー対応 [Compare with previous version](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/93/diffs?diff_id=5289&start_sha=02678fc5853f580db8c11f91e24dadd1af7e9868)
    Toggle commit list
  • Lee Munkyeong @lee-mk

    assigned to @lee-dh

    Feb 25, 2021

    assigned to @lee-dh

    assigned to @lee-dh
    Toggle commit list
  • Lee Daehyun @lee-dh

    marked the task @lee-dh as completed

    Feb 26, 2021

    marked the task @lee-dh as completed

    marked the task **@lee-dh** as completed
    Toggle commit list
  • Lee Daehyun @lee-dh

    assigned to @lee-mk

    Feb 26, 2021

    assigned to @lee-mk

    assigned to @lee-mk
    Toggle commit list
  • Lee Munkyeong @lee-mk

    assigned to @kang-dh

    Feb 26, 2021

    assigned to @kang-dh

    assigned to @kang-dh
    Toggle commit list
  • Jung Kwangkyu
    @jung-k started a discussion on an old version of the diff Feb 26, 2021
    Resolved by Lee Munkyeong Mar 04, 2021
    ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/json/CreatedRoomJSON.java 0 → 100644
    35 protected void parse(JSONObject json) throws JSONValidationException {
    36
    37 // ルーム一覧情報を取得
    38 if (!json.has(Body)) { return; }
    39
    40 JSONObject createdRoomJson = json.getJSONObject(Body).getJSONObject(CHAT_ROOM_INFO);
    41 if (createdRoomJson == null) { return; }
    42
    43 JSONArray groupListJsonArray = createdRoomJson.getJSONArray(ATTEND_USERS);
    44
    45 chatRoomDto = new ChatRoomDto();
    46 chatRoomDto.userCount = groupListJsonArray.length();
    47 chatRoomDto.chatRoomId = createdRoomJson.getInt(ROOM_ID);
    48 chatRoomDto.chatRoomName = createdRoomJson.getString(ROOM_NAME);
    49 chatRoomDto.type = createdRoomJson.getInt(ROOM_TYPE);
    50 chatRoomDto.unreadCount = 0;
    • Jung Kwangkyu @jung-k commented Feb 26, 2021
      Master

      0が初期値であればDTOで宣言してもよいと思います。

      Edited Mar 04, 2021
      0が初期値であればDTOで宣言してもよいと思います。
    • Lee Munkyeong @lee-mk

      changed this line in version 4 of the diff

      Mar 04, 2021

      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/93/diffs?diff_id=5345&start_sha=712044318ff519420eb2ed2cfa931f1b86e2fb52#460d0869980d1acdf9058f324fb31e98d9bcdfa6_50_37)
      Toggle commit list
    Please register or sign in to reply
  • Jung Kwangkyu
    @jung-k started a discussion on an old version of the diff Feb 26, 2021
    Resolved by Lee Munkyeong Mar 04, 2021
    ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/json/MessageInfoListJSON.java 0 → 100644
    1 package jp.agentec.abook.abv.bl.acms.client.json;
    2
    3 import org.json.adf.JSONArray;
    4 import org.json.adf.JSONObject;
    5
    6 import java.util.ArrayList;
    7 import java.util.HashMap;
    8
    9 import jp.agentec.abook.abv.bl.common.exception.AcmsException;
    10 import jp.agentec.abook.abv.bl.common.exception.JSONValidationException;
    11 import jp.agentec.abook.abv.bl.dto.ChatMessageDto;
    12 import jp.agentec.abook.abv.bl.dto.ShopMemberDto;
    13 import jp.agentec.adf.util.DateTimeUtil;
    14
    15 public class MessageInfoListJSON extends AcmsCommonJSON {
    16 private static final String Body = "body";
    • Jung Kwangkyu @jung-k commented Feb 26, 2021
      Master

      複数個所で使うんであれば共通定数にした方が良いと思います。

      Edited Mar 04, 2021
      複数個所で使うんであれば共通定数にした方が良いと思います。
    • Lee Munkyeong @lee-mk

      changed this line in version 5 of the diff

      Mar 04, 2021

      changed this line in version 5 of the diff

      changed this line in [version 5 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/93/diffs?diff_id=5346&start_sha=1d61462f1bb185ee0b340deaddbc381df8d98f00#399b5a371af5fd1a755281e07c943013093e5388_16_17)
      Toggle commit list
    Please register or sign in to reply
  • Kim Peace
    @kim-p started a discussion on an old version of the diff Feb 26, 2021
    Resolved by Lee Munkyeong Mar 04, 2021
    ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/AcmsClient.java
    534 542 * @throws AcmsException
    535 543 */
    536 544 public RoomListJSON getRoomList(String sid) throws NetworkDisconnectedException, AcmsException {
    537 HttpResponse response = send(AcmsApis.ApigetChatRooms, new AcmsParameters(sid,AcmsApis.Cmds.getRoomList));
    545 HttpResponse response = send(AcmsApis.ApigetChatRooms, new AcmsParameters(sid,AcmsApis.RoomCmds.getRoomList));
    • Kim Peace @kim-p commented Feb 26, 2021
      Master

      [nits] ,の後ろにはスペースを空けて下さい。

      Edited Mar 04, 2021
      [nits] `,`の後ろにはスペースを空けて下さい。
    • Lee Munkyeong @lee-mk

      changed this line in version 4 of the diff

      Mar 04, 2021

      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/93/diffs?diff_id=5345&start_sha=712044318ff519420eb2ed2cfa931f1b86e2fb52#74ad805ec861e8408cbfceb209c074349b790586_545_545)
      Toggle commit list
    Please register or sign in to reply
  • Kim Peace
    @kim-p started a discussion on an old version of the diff Feb 26, 2021
    Resolved by Lee Munkyeong Mar 04, 2021
    ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/json/CreatedRoomJSON.java 0 → 100644
    2
    3 import org.json.adf.JSONArray;
    4 import org.json.adf.JSONObject;
    5
    6 import java.util.ArrayList;
    7
    8 import jp.agentec.abook.abv.bl.common.exception.AcmsException;
    9 import jp.agentec.abook.abv.bl.common.exception.JSONValidationException;
    10 import jp.agentec.abook.abv.bl.dto.ChatRoomDto;
    11 import jp.agentec.abook.abv.bl.dto.GroupDto;
    12 import jp.agentec.abook.abv.bl.dto.ShopMemberDto;
    13
    14 public class CreatedRoomJSON extends AcmsCommonJSON {
    15 private static final String Body = "body";
    16
    17 private static final String CHAT_ROOM_INFO = "chatRoomInfo";
    • Kim Peace @kim-p commented Feb 26, 2021
      Master

      [nits] jsonのkeyを宣言しているように見えます。そうであれば、変数の前にKEY_をつけて下さい。もうしくはinterfaceとかで結び合わせてもいいと思います。

      private static final String KEY_CHAT_ROOM_INFO = "chatRoomInfo";
      // もしくは
      interface KEY {
          private static final String CHAT_ROOM_INFO = "chatRoomInfo";
          ...
      }
      // 使用時
      KEY.CHAT_ROOM_INFO
      Edited Mar 04, 2021
      [nits] jsonのkeyを宣言しているように見えます。そうであれば、変数の前に`KEY_`をつけて下さい。もうしくはinterfaceとかで結び合わせてもいいと思います。 ```java private static final String KEY_CHAT_ROOM_INFO = "chatRoomInfo"; // もしくは interface KEY { private static final String CHAT_ROOM_INFO = "chatRoomInfo"; ... } // 使用時 KEY.CHAT_ROOM_INFO ```
    • Lee Munkyeong @lee-mk

      changed this line in version 4 of the diff

      Mar 04, 2021

      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/93/diffs?diff_id=5345&start_sha=712044318ff519420eb2ed2cfa931f1b86e2fb52#460d0869980d1acdf9058f324fb31e98d9bcdfa6_17_16)
      Toggle commit list
    Please register or sign in to reply
  • Kang Donghun
    @kang-dh started a discussion on the diff Mar 03, 2021
    Resolved by Lee Munkyeong Mar 04, 2021
    ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/AcmsClient.java
    559 public MyInfoJSON getMyInfo(String sid) throws NetworkDisconnectedException, AcmsException {
    560 HttpResponse response = send(AcmsApis.ApigetUser, new AcmsParameters(sid,AcmsApis.UserCmds.getMyInfo));
    561 MyInfoJSON json = new MyInfoJSON(response.httpResponseBody);
    562 return json;
    563 }
    564
    565 public MyInfoJSON getNameCard(String sid,String shopMemberId) throws NetworkDisconnectedException, AcmsException {
    566 HttpResponse response = send(AcmsApis.ApigetUser, new GetNameCardParameters(sid,AcmsApis.UserCmds.getNameCard,shopMemberId));
    567 MyInfoJSON json = new MyInfoJSON(response.httpResponseBody);
    568 return json;
    569 }
    570
    571 /**
    572 * 全てのグループ更新。
    573 *
    574 * @param sid
    • Kang Donghun @kang-dh commented Mar 03, 2021
      Developer

      [nits]parameterを入力してください。

      Edited Mar 04, 2021 by Kang Donghun
      [nits]parameterを入力してください。
    Please register or sign in to reply
  • Kang Donghun
    @kang-dh started a discussion on an old version of the diff Mar 03, 2021
    Resolved by Lee Munkyeong Mar 04, 2021
    ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/AcmsClient.java
    564
    565 public MyInfoJSON getNameCard(String sid,String shopMemberId) throws NetworkDisconnectedException, AcmsException {
    566 HttpResponse response = send(AcmsApis.ApigetUser, new GetNameCardParameters(sid,AcmsApis.UserCmds.getNameCard,shopMemberId));
    567 MyInfoJSON json = new MyInfoJSON(response.httpResponseBody);
    568 return json;
    569 }
    570
    571 /**
    572 * 全てのグループ更新。
    573 *
    574 * @param sid
    575 * @return
    576 * @throws NetworkDisconnectedException
    577 * @throws AcmsException
    578 */
    579 public GroupListJSON getGroupInfo(String sid,String groupId,String updatedDate) throws NetworkDisconnectedException, AcmsException {
    • Kang Donghun @kang-dh commented Mar 03, 2021
      Developer

      [nits] ,の後ろにはスペースを空けて下さい。

      Edited Mar 04, 2021
      [nits] `,`の後ろにはスペースを空けて下さい。
    • Lee Munkyeong @lee-mk

      changed this line in version 6 of the diff

      Mar 05, 2021

      changed this line in version 6 of the diff

      changed this line in [version 6 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/93/diffs?diff_id=5386&start_sha=ec9b0c65caa4a192f53405d065d7bfbc39a415c8#74ad805ec861e8408cbfceb209c074349b790586_589_589)
      Toggle commit list
    Please register or sign in to reply
  • Kang Donghun
    @kang-dh started a discussion on an old version of the diff Mar 03, 2021
    Resolved by Lee Munkyeong Mar 04, 2021
    ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/json/MyInfoJSON.java 0 → 100644
    31 protected void parse(JSONObject json) throws JSONValidationException {
    32
    33 if (!json.has(BODY)) { return; }
    34
    35 JSONObject MyInfoJson = json.getJSONObject(BODY);
    36 if (MyInfoJson == null) { return; }
    37
    38 shopMemberDto = new ShopMemberDto();
    39 ArrayList<Integer> groupIdList = new ArrayList<Integer>();
    40 JSONArray groupIdJsonArray = (JSONArray) MyInfoJson.get(GROUP_ID_LIST);
    41 for (int i = 0; i < groupIdJsonArray.length(); i++) {
    42 groupIdList.add(groupIdJsonArray.getInt(i));
    43 }
    44 shopMemberDto.groupIdList = groupIdList;
    45 shopMemberDto.selfFlg = SELF_FLG_ON;
    46 shopMemberDto.favoriteRegisterDate = null;
    • Kang Donghun @kang-dh commented Mar 03, 2021
      Developer

      [nits]nullが初期値であればDTOで宣言してもよいと思います。

      Edited Mar 04, 2021
      [nits]nullが初期値であればDTOで宣言してもよいと思います。
    • Lee Munkyeong @lee-mk

      changed this line in version 4 of the diff

      Mar 04, 2021

      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/93/diffs?diff_id=5345&start_sha=712044318ff519420eb2ed2cfa931f1b86e2fb52#6b7ed4cb8150aaa50fcdf5c0143c3ed793cc7dea_46_36)
      Toggle commit list
    Please register or sign in to reply
  • Kang Donghun @kang-dh

    assigned to @lee-mk

    Mar 03, 2021

    assigned to @lee-mk

    assigned to @lee-mk
    Toggle commit list
  • Kim Peace
    @kim-p started a discussion on an old version of the diff Mar 04, 2021
    Resolved by Lee Munkyeong Mar 04, 2021
    ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/AcmsClient.java
    579 public GroupListJSON getGroupInfo(String sid,String groupId,String updatedDate) throws NetworkDisconnectedException, AcmsException {
    580 HttpResponse response = send(AcmsApis.ApigetUser, new GetGroupInfoParameters(sid,AcmsApis.UserCmds.getGroupInfo,groupId,updatedDate));
    581 GroupListJSON json = new GroupListJSON(response.httpResponseBody);
    582 return json;
    583 }
    584
    585 /**
    586 * ルーム作成。
    587 *
    588 * @param sid
    589 * @return
    590 * @throws NetworkDisconnectedException
    591 * @throws AcmsException
    592 */
    593 public CreatedRoomJSON createRoom(String sid, String roomType, String inviteMemberIds, String newRoomName) throws NetworkDisconnectedException, AcmsException {
    594 HttpResponse response = send(AcmsApis.ApigetChatRooms, new CreateRoomParameters(sid,AcmsApis.RoomCmds.createRoom,roomType,inviteMemberIds,newRoomName));
    • Kim Peace @kim-p commented Mar 04, 2021
      Master

      [nits] ,の後はスペースを空けて下さい。

      Edited Mar 04, 2021
      [nits] `,`の後はスペースを空けて下さい。
    • Lee Munkyeong @lee-mk

      changed this line in version 4 of the diff

      Mar 04, 2021

      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/93/diffs?diff_id=5345&start_sha=712044318ff519420eb2ed2cfa931f1b86e2fb52#74ad805ec861e8408cbfceb209c074349b790586_594_607)
      Toggle commit list
    Please register or sign in to reply
  • Lee Munkyeong @lee-mk

    added 1 commit

    • 1d61462f - コードレビューコメント対応。

    Compare with previous version

    Mar 04, 2021

    added 1 commit

    • 1d61462f - コードレビューコメント対応。

    Compare with previous version

    added 1 commit * 1d61462f - コードレビューコメント対応。 [Compare with previous version](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/93/diffs?diff_id=5345&start_sha=712044318ff519420eb2ed2cfa931f1b86e2fb52)
    Toggle commit list
  • Lee Munkyeong @lee-mk

    added 1 commit

    • ec9b0c65 - コードレビューコメント対応。

    Compare with previous version

    Mar 04, 2021

    added 1 commit

    • ec9b0c65 - コードレビューコメント対応。

    Compare with previous version

    added 1 commit * ec9b0c65 - コードレビューコメント対応。 [Compare with previous version](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/93/diffs?diff_id=5346&start_sha=1d61462f1bb185ee0b340deaddbc381df8d98f00)
    Toggle commit list
  • Lee Munkyeong @lee-mk

    resolved all discussions

    Mar 04, 2021

    resolved all discussions

    resolved all discussions
    Toggle commit list
  • Lee Munkyeong @lee-mk

    assigned to @kang-dh

    Mar 04, 2021

    assigned to @kang-dh

    assigned to @kang-dh
    Toggle commit list
  • Kang Donghun @kang-dh

    marked the task @kang-dh as completed

    Mar 04, 2021

    marked the task @kang-dh as completed

    marked the task **@kang-dh** as completed
    Toggle commit list
  • Kang Donghun @kang-dh

    assigned to @lee-mk

    Mar 04, 2021

    assigned to @lee-mk

    assigned to @lee-mk
    Toggle commit list
  • Kang Donghun
    @kang-dh started a discussion on an old version of the diff Mar 04, 2021
    Resolved by Lee Munkyeong Mar 12, 2021
    ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/AcmsClient.java
    558 public MyInfoJSON getMyInfo(String sid) throws NetworkDisconnectedException, AcmsException {
    559 HttpResponse response = send(AcmsApis.ApigetUser, new AcmsParameters(sid, AcmsApis.UserCmds.getMyInfo));
    560 MyInfoJSON json = new MyInfoJSON(response.httpResponseBody);
    561 return json;
    562 }
    563
    564 /**
    565 * サーバよりネームカード情報取得。
    566 *
    567 * @param sid
    568 * @param shopMemberId
    569 * @return
    570 * @throws NetworkDisconnectedException
    571 * @throws AcmsException
    572 */
    573 public MyInfoJSON getNameCard(String sid,String shopMemberId) throws NetworkDisconnectedException, AcmsException {
    • Kang Donghun @kang-dh commented Mar 04, 2021
      Developer

      [nits] ,の後ろにはスペースを空けて下さい。

      Edited Mar 12, 2021
      [nits] `,`の後ろにはスペースを空けて下さい。
    • Lee Munkyeong @lee-mk

      changed this line in version 6 of the diff

      Mar 05, 2021

      changed this line in version 6 of the diff

      changed this line in [version 6 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/93/diffs?diff_id=5386&start_sha=ec9b0c65caa4a192f53405d065d7bfbc39a415c8#74ad805ec861e8408cbfceb209c074349b790586_573_573)
      Toggle commit list
    Please register or sign in to reply
  • Kang Donghun
    @kang-dh started a discussion on an old version of the diff Mar 04, 2021
    Resolved by Lee Munkyeong Mar 12, 2021
    ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/AcmsClient.java
    607 HttpResponse response = send(AcmsApis.ApigetChatRooms, new CreateRoomParameters(sid, AcmsApis.RoomCmds.createRoom, roomType, inviteMemberIds, newRoomName));
    608 CreatedRoomJSON json = new CreatedRoomJSON(response.httpResponseBody);
    609 return json;
    610 }
    611
    612 /**
    613 * ルーム作成。
    614 *
    615 * @param sid
    616 * @param roomId
    617 * @return
    618 * @throws NetworkDisconnectedException
    619 * @throws AcmsException
    620 */
    621 public MessageInfoListJSON getMessages(String sid, String roomId) throws NetworkDisconnectedException, AcmsException {
    622 HttpResponse response = send(AcmsApis.ApigetMessage, new GetMessagesParameters(sid, AcmsApis.MessageCmds.getMessages, roomId,"0"));
    • Kang Donghun @kang-dh commented Mar 04, 2021
      Developer

      [nits] ,の後ろにはスペースを空けて下さい。

      Edited Mar 12, 2021
      [nits] `,`の後ろにはスペースを空けて下さい。
    • Lee Munkyeong @lee-mk

      changed this line in version 7 of the diff

      Mar 12, 2021

      changed this line in version 7 of the diff

      changed this line in [version 7 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/93/diffs?diff_id=5434&start_sha=de8abff4d467cc328e02285421b461ad52c4c82e#74ad805ec861e8408cbfceb209c074349b790586_622_622)
      Toggle commit list
    Please register or sign in to reply
  • Kang Donghun
    @kang-dh started a discussion on the diff Mar 04, 2021
    Resolved by Lee Munkyeong Mar 12, 2021
    ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/parameters/GetGroupInfoParameters.java 0 → 100644
    3 import jp.agentec.adf.net.http.HttpParameterObject;
    4
    5 /**
    6 * ACMSのAPIに渡す共通的なパラメータを格納します。ACMSのAPIのパラメータ用クラスを作成するときはこのクラスを継承してください。<br>
    7 * ただし、このクラスはログイン状態の確認用として使われる {@link GetGroupInfoParameters#sid} を持っているため、ログイン用のパラメータ {@link MobileLoginParameters} は、このクラスを継承する必要はありません。
    8 * @author Taejin Hong
    9 * @version 1.0.0
    10 */
    11 public class GetGroupInfoParameters extends HttpParameterObject {
    12 /**
    13 * セッションID
    14 * @since 1.0.0
    15 */
    16 private String sid;
    17 private String cmd;
    18 private String groupIds;
    • Kang Donghun @kang-dh commented Mar 04, 2021
      Developer

      [nits] リストではないみたいのでgroupIds -> groupIdで修正するのがいいと思います。

      Edited Mar 12, 2021
      [nits] リストではないみたいので`groupIds` -> `groupId`で修正するのがいいと思います。
    • Lee Munkyeong @lee-mk commented Mar 05, 2021
      Developer

      こちらはサーバ側にグループIDのリストをSTRING形式で送るので groupIdsにしました。

      Edited Mar 05, 2021
      こちらはサーバ側にグループIDのリストをSTRING形式で送るので groupIdsにしました。
    Please register or sign in to reply
  • Kang Donghun
    @kang-dh started a discussion on an old version of the diff Mar 04, 2021
    Resolved by Lee Munkyeong Mar 12, 2021
    ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/ShopMemberDao.java
    70 } catch (Exception e) {
    71 rollback();
    72 Logger.e("insertShopMember failed.", e);
    73 throw new RuntimeException(e);
    74 } finally {
    75 }
    76 }
    77
    78 public void insertShopMember(List<ShopMemberDto> dtoList) {
    79 try {
    80 beginTransaction();
    81 for (ShopMemberDto dto : dtoList) {
    82 insert("insert or replace into m_shop_member (shop_member_id, shop_member_name, profile_url, favorite_register_date, self_flg) values (?,?,?,?,?)", dto.getInsertValues());
    83 if (dto.groupIdList == null) { continue; }
    84 for (Integer groupId : dto.groupIdList) {
    85 insert("insert or replace into r_shop_member_group (shop_member_id, group_id) values ("+dto.shopMemberId+",?)", dto.getGroupIds());
    • Kang Donghun @kang-dh commented Mar 04, 2021
      Developer

      [nits]二つ以上のグループに入ってるとエラーが発生しましたので、ご確認お願い致します。

      Edited Mar 12, 2021
      [nits]二つ以上のグループに入ってるとエラーが発生しましたので、ご確認お願い致します。
    • Lee Munkyeong @lee-mk

      changed this line in version 6 of the diff

      Mar 05, 2021

      changed this line in version 6 of the diff

      changed this line in [version 6 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/93/diffs?diff_id=5386&start_sha=ec9b0c65caa4a192f53405d065d7bfbc39a415c8#4a61023828aacb667872f22fb56ab7198728afef_85_85)
      Toggle commit list
    Please register or sign in to reply
  • Kang Donghun @kang-dh

    marked the task @kang-dh as incomplete

    Mar 04, 2021

    marked the task @kang-dh as incomplete

    marked the task **@kang-dh** as incomplete
    Toggle commit list
  • Lee Munkyeong @lee-mk

    added 2 commits

    • c0a58918 - コードレビュー対応。
    • de8abff4 - Merge branch 'features/abcomm_sp3_contactUI' of…

    Compare with previous version

    Mar 05, 2021

    added 2 commits

    • c0a58918 - コードレビュー対応。
    • de8abff4 - Merge branch 'features/abcomm_sp3_contactUI' of…

    Compare with previous version

    added 2 commits * c0a58918 - コードレビュー対応。 * de8abff4 - Merge branch &#x27;features&#x2F;abcomm_sp3_contactUI&#x27; of… [Compare with previous version](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/93/diffs?diff_id=5386&start_sha=ec9b0c65caa4a192f53405d065d7bfbc39a415c8)
    Toggle commit list
  • Lee Munkyeong @lee-mk

    added 1 commit

    • 74d0da9c - コードレビュー対応

    Compare with previous version

    Mar 12, 2021

    added 1 commit

    • 74d0da9c - コードレビュー対応

    Compare with previous version

    added 1 commit * 74d0da9c - コードレビュー対応 [Compare with previous version](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/93/diffs?diff_id=5434&start_sha=de8abff4d467cc328e02285421b461ad52c4c82e)
    Toggle commit list
  • Lee Munkyeong @lee-mk

    assigned to @kang-dh

    Mar 12, 2021

    assigned to @kang-dh

    assigned to @kang-dh
    Toggle commit list
  • Kang Donghun @kang-dh

    marked the task @kang-dh as completed

    Mar 12, 2021

    marked the task @kang-dh as completed

    marked the task **@kang-dh** as completed
    Toggle commit list
  • Kang Donghun @kang-dh

    assigned to @lee-mk

    Mar 12, 2021

    assigned to @lee-mk

    assigned to @lee-mk
    Toggle commit list
  • Lee Munkyeong @lee-mk

    marked the task @kim-p as completed

    Mar 12, 2021

    marked the task @kim-p as completed

    marked the task **@kim-p** as completed
    Toggle commit list
  • Lee Munkyeong @lee-mk

    marked the task @kim-p as incomplete

    Mar 12, 2021

    marked the task @kim-p as incomplete

    marked the task **@kim-p** as incomplete
    Toggle commit list
  • Lee Munkyeong @lee-mk

    assigned to @kim-p

    Mar 12, 2021

    assigned to @kim-p

    assigned to @kim-p
    Toggle commit list
  • Lee Munkyeong @lee-mk

    resolved all discussions

    Mar 12, 2021

    resolved all discussions

    resolved all discussions
    Toggle commit list
  • Kim Peace @kim-p

    marked the task @kim-p as completed

    Mar 12, 2021

    marked the task @kim-p as completed

    marked the task **@kim-p** as completed
    Toggle commit list
  • Kim Peace @kim-p

    assigned to @lee-mk

    Mar 12, 2021

    assigned to @lee-mk

    assigned to @lee-mk
    Toggle commit list
  • Lee Munkyeong @lee-mk

    assigned to @jung-k

    Mar 15, 2021

    assigned to @jung-k

    assigned to @jung-k
    Toggle commit list
  • Lee Munkyeong @lee-mk

    changed the description

    Mar 17, 2021

    changed the description

    changed the description
    Toggle commit list
  • Lee Munkyeong @lee-mk

    assigned to @lee-mk

    Mar 17, 2021

    assigned to @lee-mk

    assigned to @lee-mk
    Toggle commit list
  • Lee Munkyeong @lee-mk

    merged

    Mar 17, 2021

    merged

    merged
    Toggle commit list
  • Lee Munkyeong @lee-mk

    mentioned in commit c10ae0b2

    Mar 17, 2021

    mentioned in commit c10ae0b2

    mentioned in commit c10ae0b2d42e8430c0e13fca25e2893d4741187c
    Toggle commit list
  • Write
  • Preview
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment
Lee Munkyeong
Assignee
Lee Munkyeong @lee-mk
Assign to
None
Milestone
None
Assign milestone
Time tracking
5
5 participants
Reference: abook_android/abook_check!93
×

Revert this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.
×

Cherry-pick this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.