From 8d87aef40769b0b668c161bf0d67ca960998294f Mon Sep 17 00:00:00 2001 From: yajaneya Date: Thu, 23 May 2019 22:49:46 +0300 Subject: [PATCH 1/5] =?UTF-8?q?=D0=A1=D0=B4=D0=B5=D0=BB=D0=B0=D0=BD=D0=B0?= =?UTF-8?q?=20=D0=B7=D0=B0=D0=B3=D0=BB=D1=83=D1=88=D0=BA=D0=B0=20=D0=BD?= =?UTF-8?q?=D0=B0=20=D0=BF=D0=BE=D0=B8=D1=81=D0=BA=20=D0=B3=D1=80=D1=83?= =?UTF-8?q?=D0=BF=D0=BF=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client/view/ChatViewController.java | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/src/main/java/ru/geekbrains/pocket/messenger/client/view/ChatViewController.java b/src/main/java/ru/geekbrains/pocket/messenger/client/view/ChatViewController.java index a903a16b..41af944e 100644 --- a/src/main/java/ru/geekbrains/pocket/messenger/client/view/ChatViewController.java +++ b/src/main/java/ru/geekbrains/pocket/messenger/client/view/ChatViewController.java @@ -2,6 +2,7 @@ import ru.geekbrains.pocket.messenger.client.Main; import ru.geekbrains.pocket.messenger.client.controller.ClientController; +import ru.geekbrains.pocket.messenger.client.controller.GroupController; import ru.geekbrains.pocket.messenger.client.utils.Common; import ru.geekbrains.pocket.messenger.client.utils.CustomTextArea; import com.jfoenix.controls.*; @@ -36,7 +37,9 @@ import org.w3c.dom.events.EventListener; import org.w3c.dom.events.EventTarget; import ru.geekbrains.pocket.messenger.client.view.customFX.*; +import ru.geekbrains.pocket.messenger.client.model.Group; import ru.geekbrains.pocket.messenger.database.entity.Message; +import ru.geekbrains.pocket.messenger.database.entity.User; import java.awt.*; import java.io.File; @@ -112,7 +115,7 @@ public class ChatViewController implements Initializable { private JFXListView groupListView; @FXML - private JFXListView groupSearchListView; + private JFXListView groupSearchListView; @FXML private JFXListView listViewAddToGroup; @@ -153,6 +156,8 @@ public class ChatViewController implements Initializable { private ClientController clientController; + private GroupController groupService; + private String backgroundImage; private Document DOMdocument; @@ -769,6 +774,18 @@ public void handleGroupCreateButton(){ @FXML public void findContact(KeyEvent keyEvent) { + if (chats.isSelected()) { + groupSearchListView.getItems().clear(); + groupService = new GroupController(clientController); + Group findGroup = groupService.findGroup(tfSearchInput.getText()); + CFXListElement temp = new CFXListElement(); + User us = new User(); + us.setId(findGroup.getGid()); + us.setUserName(findGroup.getGroup_name()); + temp.setUser(us); + groupSearchListView.getItems().add(temp); + return; + } if (tfSearchInput.getText().length()>0) { searchObsList.clear(); contactsViewPane.setVisible(false); From 3779b542ecdd1be92dd5e07eaeb6251b635897e1 Mon Sep 17 00:00:00 2001 From: yajaneya Date: Thu, 23 May 2019 22:52:11 +0300 Subject: [PATCH 2/5] =?UTF-8?q?=D0=9E=D0=B1=D0=B5=D1=81=D0=BF=D0=B5=D1=87?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B4=D0=BE=D1=81=D1=82=D1=83=D0=BF?= =?UTF-8?q?=D0=B0=20=D0=BA=20=D0=BA=D0=BE=D0=BD=D1=81=D1=82=D1=80=D1=83?= =?UTF-8?q?=D0=BA=D1=82=D0=BE=D1=80=D1=83=20GroupController=20=D0=B8=D0=B7?= =?UTF-8?q?=20ChatViewController?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../messenger/client/controller/GroupController.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/ru/geekbrains/pocket/messenger/client/controller/GroupController.java b/src/main/java/ru/geekbrains/pocket/messenger/client/controller/GroupController.java index 8e7c1606..61b8cc17 100644 --- a/src/main/java/ru/geekbrains/pocket/messenger/client/controller/GroupController.java +++ b/src/main/java/ru/geekbrains/pocket/messenger/client/controller/GroupController.java @@ -33,7 +33,7 @@ public class GroupController { ClientController cc; - GroupController(ClientController cc) { + public GroupController(ClientController cc) { this.cc = cc; } @@ -121,4 +121,13 @@ void addUserGroup(String group_id, String new_user_id) { controllerLogger.error("HTTPSRequest.addUserGroup_error", e); } } + + public Group findGroup (String name) { + Group group = new Group(); + group.setGid("5cc5c1284149c400016581d7"); +// group.setGid("5cc5c3392d833c1640e24a5e"); + group.setGroup_name(name); + System.out.println(group.toString()); + return group; + } } From c94529d88c3b2b55ec2fc3894c8db9bd05f07a8e Mon Sep 17 00:00:00 2001 From: yajaneya Date: Wed, 12 Jun 2019 23:04:59 +0300 Subject: [PATCH 3/5] =?UTF-8?q?=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=BA=D0=B0=20=D0=BF=D0=BE=20=D0=B7=D0=B0=D0=BC=D0=B5=D1=87?= =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D1=8F=D0=BC.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client/controller/GroupController.java | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/main/java/ru/geekbrains/pocket/messenger/client/controller/GroupController.java b/src/main/java/ru/geekbrains/pocket/messenger/client/controller/GroupController.java index 61b8cc17..461f11e3 100644 --- a/src/main/java/ru/geekbrains/pocket/messenger/client/controller/GroupController.java +++ b/src/main/java/ru/geekbrains/pocket/messenger/client/controller/GroupController.java @@ -33,14 +33,15 @@ public class GroupController { ClientController cc; - public GroupController(ClientController cc) { + GroupController(ClientController cc) { this.cc = cc; } - Group getGroupInfo(String groupName){ + Group getGroupInfo(String groupId){ Group group = new Group(); try { - ServerResponse response = HTTPSRequest.getGroupInfo(groupName, token); + + ServerResponse response = HTTPSRequest.getGroupInfo(groupId, token); switch (response.getResponseCode()){ case 200: System.out.println("получение информации о группе"); @@ -122,12 +123,15 @@ void addUserGroup(String group_id, String new_user_id) { } } - public Group findGroup (String name) { - Group group = new Group(); - group.setGid("5cc5c1284149c400016581d7"); -// group.setGid("5cc5c3392d833c1640e24a5e"); - group.setGroup_name(name); + Group findGroup (String name) { + Group group; + String groupId; + groupId = "5cc5c1284149c400016581d7"; //java +// groupId = "5cc5c3392d833c1640e24a5e"; //nodejs + group = getGroupInfo(groupId); + if (group == null) group.setGroup_name(name); //заглушка до реализации поиска групп на сервере System.out.println(group.toString()); return group; } + } From cfc014d6f5c8296b6518d4cc0388d9669baf1a6d Mon Sep 17 00:00:00 2001 From: yajaneya Date: Wed, 12 Jun 2019 23:05:32 +0300 Subject: [PATCH 4/5] =?UTF-8?q?=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=BA=D0=B0=20=D0=BF=D0=BE=20=D0=B7=D0=B0=D0=BC=D0=B5=D1=87?= =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D1=8F=D0=BC...?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client/controller/ClientController.java | 2 ++ .../pocket/messenger/client/utils/HTTPSRequest.java | 2 +- .../messenger/client/view/ChatViewController.java | 12 ++++-------- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/main/java/ru/geekbrains/pocket/messenger/client/controller/ClientController.java b/src/main/java/ru/geekbrains/pocket/messenger/client/controller/ClientController.java index d3b6ff6f..e11a7183 100644 --- a/src/main/java/ru/geekbrains/pocket/messenger/client/controller/ClientController.java +++ b/src/main/java/ru/geekbrains/pocket/messenger/client/controller/ClientController.java @@ -185,4 +185,6 @@ public void resetWaitForConfirm() { public void saveToDBAndShowMessage(String s) { messageService.saveToDBAndShowMessage(s); } + + public Group findGroup (String name) { return groupService.findGroup(name); } } diff --git a/src/main/java/ru/geekbrains/pocket/messenger/client/utils/HTTPSRequest.java b/src/main/java/ru/geekbrains/pocket/messenger/client/utils/HTTPSRequest.java index cb28d606..10596279 100644 --- a/src/main/java/ru/geekbrains/pocket/messenger/client/utils/HTTPSRequest.java +++ b/src/main/java/ru/geekbrains/pocket/messenger/client/utils/HTTPSRequest.java @@ -109,7 +109,7 @@ public static ServerResponse getUserMessages(String token, String userId, int of } public static ServerResponse getGroupInfo(String id, String token) throws Exception { - HttpsURLConnection connection = getConnection("/v1/chats/" + id, "GET", token); + HttpsURLConnection connection = getConnection("/groups/%id=" + id, "GET", token); return getServerResponse(connection, null); } diff --git a/src/main/java/ru/geekbrains/pocket/messenger/client/view/ChatViewController.java b/src/main/java/ru/geekbrains/pocket/messenger/client/view/ChatViewController.java index 41af944e..df2a957f 100644 --- a/src/main/java/ru/geekbrains/pocket/messenger/client/view/ChatViewController.java +++ b/src/main/java/ru/geekbrains/pocket/messenger/client/view/ChatViewController.java @@ -40,6 +40,7 @@ import ru.geekbrains.pocket.messenger.client.model.Group; import ru.geekbrains.pocket.messenger.database.entity.Message; import ru.geekbrains.pocket.messenger.database.entity.User; +import ru.geekbrains.pocket.messenger.database.entity.UserProfile; import java.awt.*; import java.io.File; @@ -156,8 +157,6 @@ public class ChatViewController implements Initializable { private ClientController clientController; - private GroupController groupService; - private String backgroundImage; private Document DOMdocument; @@ -776,13 +775,10 @@ public void handleGroupCreateButton(){ public void findContact(KeyEvent keyEvent) { if (chats.isSelected()) { groupSearchListView.getItems().clear(); - groupService = new GroupController(clientController); - Group findGroup = groupService.findGroup(tfSearchInput.getText()); + Group findGroup = clientController.getGroupInfo(tfSearchInput.getText()); + findGroup.setGroup_name(tfSearchInput.getText()); CFXListElement temp = new CFXListElement(); - User us = new User(); - us.setId(findGroup.getGid()); - us.setUserName(findGroup.getGroup_name()); - temp.setUser(us); + temp.setUser(new User (null, new UserProfile(findGroup.getGid(), findGroup.getGroup_name(), null, null))); groupSearchListView.getItems().add(temp); return; } From b2415e5bf7a906c77dee4a4cf49f443305174562 Mon Sep 17 00:00:00 2001 From: yajaneya Date: Fri, 28 Jun 2019 21:07:08 +0300 Subject: [PATCH 5/5] =?UTF-8?q?=D0=BE=D0=B1=D0=BE=D0=B7=D0=BD=D0=B0=D1=87?= =?UTF-8?q?=D0=B8=D0=BB=20=D0=B7=D0=B0=D0=B3=D0=BB=D1=83=D1=88=D0=BA=D1=83?= =?UTF-8?q?=20=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=D0=B0=20=D0=BF=D0=BE=D0=B8?= =?UTF-8?q?=D1=81=D0=BA=D0=B0=20=D0=B3=D1=80=D1=83=D0=BF=D0=BF=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pocket/messenger/client/controller/GroupController.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/ru/geekbrains/pocket/messenger/client/controller/GroupController.java b/src/main/java/ru/geekbrains/pocket/messenger/client/controller/GroupController.java index 461f11e3..1b0a2ebd 100644 --- a/src/main/java/ru/geekbrains/pocket/messenger/client/controller/GroupController.java +++ b/src/main/java/ru/geekbrains/pocket/messenger/client/controller/GroupController.java @@ -124,13 +124,17 @@ void addUserGroup(String group_id, String new_user_id) { } Group findGroup (String name) { + + //заглушка до реализации поиска групп на сервере Group group; String groupId; groupId = "5cc5c1284149c400016581d7"; //java // groupId = "5cc5c3392d833c1640e24a5e"; //nodejs group = getGroupInfo(groupId); - if (group == null) group.setGroup_name(name); //заглушка до реализации поиска групп на сервере + if (group == null) group.setGroup_name(name); System.out.println(group.toString()); + //конец заглушки + return group; }