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/controller/GroupController.java b/src/main/java/ru/geekbrains/pocket/messenger/client/controller/GroupController.java index 8e7c1606..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 @@ -37,10 +37,11 @@ public class GroupController { 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("получение информации о группе"); @@ -121,4 +122,20 @@ void addUserGroup(String group_id, String new_user_id) { controllerLogger.error("HTTPSRequest.addUserGroup_error", e); } } + + 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; + } + } 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 a903a16b..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 @@ -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,10 @@ 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 ru.geekbrains.pocket.messenger.database.entity.UserProfile; import java.awt.*; import java.io.File; @@ -112,7 +116,7 @@ public class ChatViewController implements Initializable { private JFXListView groupListView; @FXML - private JFXListView groupSearchListView; + private JFXListView groupSearchListView; @FXML private JFXListView listViewAddToGroup; @@ -769,6 +773,15 @@ public void handleGroupCreateButton(){ @FXML public void findContact(KeyEvent keyEvent) { + if (chats.isSelected()) { + groupSearchListView.getItems().clear(); + Group findGroup = clientController.getGroupInfo(tfSearchInput.getText()); + findGroup.setGroup_name(tfSearchInput.getText()); + CFXListElement temp = new CFXListElement(); + temp.setUser(new User (null, new UserProfile(findGroup.getGid(), findGroup.getGroup_name(), null, null))); + groupSearchListView.getItems().add(temp); + return; + } if (tfSearchInput.getText().length()>0) { searchObsList.clear(); contactsViewPane.setVisible(false);