Skip to content
Snippets Groups Projects
Commit f0ba72aa authored by Martin Staehr's avatar Martin Staehr
Browse files

#40 fix: fixing bugs(typo, sql query) in groupDAO

parent 71ed339c
No related branches found
No related tags found
No related merge requests found
...@@ -13,6 +13,7 @@ import java.util.ArrayList; ...@@ -13,6 +13,7 @@ import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Objects;
@ManagedBean @ManagedBean
@Resource @Resource
...@@ -41,7 +42,7 @@ public class GroupDAO { ...@@ -41,7 +42,7 @@ public class GroupDAO {
public void update(Group group) { public void update(Group group) {
connect.connect(); connect.connect();
String mysqlRequest = "UPDATE group SET projectId=?,chatRoomid=?"; String mysqlRequest = "UPDATE groups SET projectId=?,chatRoomid=?";
connect.issueUpdateStatement(mysqlRequest, group.getProjectId(), group.getChatRoomId()); connect.issueUpdateStatement(mysqlRequest, group.getProjectId(), group.getChatRoomId());
connect.close(); connect.close();
// TODO: implement update of groupuser if needed later (if member list need to be updated) // TODO: implement update of groupuser if needed later (if member list need to be updated)
...@@ -64,10 +65,14 @@ public class GroupDAO { ...@@ -64,10 +65,14 @@ public class GroupDAO {
public List<Group> getGroupsByProjectId(String projectId) { public List<Group> getGroupsByProjectId(String projectId) {
connect.connect(); connect.connect();
String mysqlRequest = "SELECT * FROM groups g " + String mysqlRequest = "SELECT * FROM groups g " +
"JOIN groupuser gu ON g.id=gu.groupId " + "JOIN users u ON gu.userEmail=u.email" + "JOIN groupuser gu ON g.id=gu.groupId " + "JOIN users u ON gu.userEmail=u.email " +
"where g.projectId = ?"; "where g.projectId = ?";
VereinfachtesResultSet vereinfachtesResultSet = VereinfachtesResultSet vereinfachtesResultSet =
connect.issueSelectStatement(mysqlRequest, projectId); connect.issueSelectStatement(mysqlRequest, projectId);
if (Objects.isNull(vereinfachtesResultSet)) {
connect.close();
return Collections.emptyList();
}
HashMap<Integer, Group> groupHashMap = new HashMap<>(); HashMap<Integer, Group> groupHashMap = new HashMap<>();
while (vereinfachtesResultSet.next()) { while (vereinfachtesResultSet.next()) {
fillGroupFromResultSet(vereinfachtesResultSet, groupHashMap); fillGroupFromResultSet(vereinfachtesResultSet, groupHashMap);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment