Commit: ec8e2d8433f8701e7d8e1aa5ece72cfc317b6e64 - HotshotWebServer (hg)

Commit MetaInfo

• Revisão: ec8e2d8433f8701e7d8e1aa5ece72cfc317b6e64 (tree)
• Hora: 2019-01-29 06:03:44
• Autor: sebastian_bugiu <sebastian_ <bugiu@head...>
• Commiter: sebastian_bugiu <sebastian_

Mensagem de Log

Adding lobby support.

Mudança Sumário

• modified: src/headwayEnt/headwayEnt/Blackhole_Darksun_WebServer/Main.java
• modified: src/headwayEnt/headwayEnt/Blackhole_Darksun_WebServer/Tables/Lobby.java

Diff

diff -r bfaef692ca3f -r ec8e2d8433f8 src/headwayEnt/headwayEnt/Blackhole_Darksun_WebServer/Main.java
--- a/src/headwayEnt/headwayEnt/Blackhole_Darksun_WebServer/Main.java	Mon Jan 21 22:24:07 2019 +0200
+++ b/src/headwayEnt/headwayEnt/Blackhole_Darksun_WebServer/Main.java	Mon Jan 28 23:03:44 2019 +0200
@@ -417,14 +417,19 @@
         });
         LobbyInvitationList lobbyInvitationListRet = new LobbyInvitationList(lobbyInvitationList);
         if (lobby.getExpectedPlayerNum() == usersJoined[0]) {
-            lobby.setStatus(1);
-            final int updatedLobbyStatusNum = em.createNamedQuery(Lobby.UPDATE_LOBBY_STATUS)
-                    .setParameter("lobbyId", lobby.getId())
-                    .setParameter("lobbyStatus", lobby.getStatus())
-                    .executeUpdate();
-            if (updatedLobbyStatusNum != 1) {
+            if (lobby.getStatus() == 0) {
+                // We are ready to start the game if we are coming from the lobby.
+                lobby.setStatus(1);
 
+                final int updatedLobbyStatusNum = em.createNamedQuery(Lobby.UPDATE_LOBBY_STATUS)
+                        .setParameter("lobbyId", lobby.getId())
+                        .setParameter("lobbyStatus", lobby.getStatus())
+                        .executeUpdate();
+                if (updatedLobbyStatusNum != 1) {
+
+                }
             }
+
         }
         lobbyInvitationListRet.setLobbyStatus(lobby.getStatus());
         return createResponse(lobbyInvitationListRet);
@@ -949,7 +954,8 @@
         }
 
         // ONLY TEMPORARY FOR TESTING. IN THE END WE CAN'T DELETE THE SESSION BECAUSE SOMEBODY MAY BE ALREADY IN A SESSION ON A DIFFERENT SERVER
-        List<Session> existingSessionList = em.createNamedQuery(Session.GET_SESSION_BY_NAME).setParameter("sessionName", session.getSessionName()).getResultList();
+        List<Session> existingSessionList = em.createNamedQuery(Session.GET_SESSION_BY_NAME)
+                .setParameter("sessionName", session.getSessionName()).getResultList();
         if (!existingSessionList.isEmpty()) {
             for (Session s : existingSessionList) {
                 em.createNamedQuery(Session.DELETE_BY_NAME).setParameter("sessionName", s.getSessionName());
@@ -993,6 +999,38 @@
             return createResponse(server1);
         }
 
+        List<Lobby> lobbyList = em.createNamedQuery(Lobby.GET_LOBBY_BY_ID).setParameter("lobbyId", session.getLobbyId()).getResultList();
+        if (lobbyList.isEmpty()) {
+            Server server1 = new Server();
+            server1.setErrorCode(ErrorCodes.GET_LOBBY_STATUS_LOBBY_NOT_FOUND);
+            server1.setError(ErrorCodes.GET_LOBBY_STATUS_LOBBY_NOT_FOUND_STR);
+            return createResponse(server1);
+        }
+        if (lobbyList.size() > 1) {
+            // Shouldn't be possible.
+            Server server1 = new Server();
+            server1.setErrorCode(ErrorCodes.GET_LOBBY_STATUS_MULTIPLE_LOBBIES);
+            server1.setError(ErrorCodes.GET_LOBBY_STATUS_MULTIPLE_LOBBIES_STR);
+            return createResponse(server1);
+        }
+
+        final Lobby lobby = lobbyList.get(0);
+
+        if (lobby.getStatus() == 1) {
+            // If the session has been started by the lobby leader it means we are ready for everybody to join.
+            lobby.setStatus(2);
+
+            final int updatedLobbyStatusNum = em.createNamedQuery(Lobby.UPDATE_LOBBY_STATUS)
+                    .setParameter("lobbyId", lobby.getId())
+                    .setParameter("lobbyStatus", lobby.getStatus())
+                    .executeUpdate();
+            if (updatedLobbyStatusNum != 1) {
+
+            }
+        } else {
+            // How is this possible?
+        }
+
         Session createdSession = new Session();
         createdSession.setSessionName(session.getSessionName());
         createdSession.setMapId(selectedMapId);
@@ -1115,16 +1153,16 @@
         }
         User user = getUserByToken.getUser();
 
-        List<LobbyInvitation> lobbyInvitationList = em.createNamedQuery(LobbyInvitation.GET_LOBBY_INVITATIONS_BY_LOBBY_ID_AND_INVITED_USER_ID)
+        List<LobbyInvitation> currentPlayerLobbyInvitationList = em.createNamedQuery(LobbyInvitation.GET_LOBBY_INVITATIONS_BY_LOBBY_ID_AND_INVITED_USER_ID)
                 .setParameter("lobbyId", session.getLobbyId())
                 .setParameter("userId", user.getId()).getResultList();
-        if (lobbyInvitationList.isEmpty()) {
+        if (currentPlayerLobbyInvitationList.isEmpty()) {
             Lobby server = new Lobby();
             server.setErrorCode(ErrorCodes.JOIN_SESSION_CANNOT_FIND_INVITATION);
             server.setError(ErrorCodes.JOIN_SESSION_CANNOT_FIND_INVITATION_STR);
             return createResponse(server);
         }
-        final LobbyInvitation lobbyInvitation = lobbyInvitationList.get(0);
+        final LobbyInvitation lobbyInvitation = currentPlayerLobbyInvitationList.get(0);
 
         List<Session> sessionList = em.createNamedQuery(Session.GET_SESSION_BY_LOBBY_ID)
                 .setParameter("lobbyId", lobbyInvitation.getLobbyId()).getResultList();//em.createNamedQuery(Session.GET_SESSION_BY_NAME_ACTIVE).setParameter("sessionName", session.getSessionName()).getResultList();
@@ -1198,6 +1236,56 @@
 
         server.setMapId(usedSession.getMapId());
         server.setSpawnPoint(sessionUserSpawnPoint.getSpawnPoint());
+
+        // If everybody joined we must make the lobby show that it's in game.
+        List<Lobby> lobbyList = em.createNamedQuery(Lobby.GET_LOBBY_BY_ID).setParameter("lobbyId", session.getLobbyId()).getResultList();
+        if (lobbyList.isEmpty()) {
+            Server server1 = new Server();
+            server1.setErrorCode(ErrorCodes.GET_LOBBY_STATUS_LOBBY_NOT_FOUND);
+            server1.setError(ErrorCodes.GET_LOBBY_STATUS_LOBBY_NOT_FOUND_STR);
+            return createResponse(server1);
+        }
+        if (lobbyList.size() > 1) {
+            // Shouldn't be possible.
+            Server server1 = new Server();
+            server1.setErrorCode(ErrorCodes.GET_LOBBY_STATUS_MULTIPLE_LOBBIES);
+            server1.setError(ErrorCodes.GET_LOBBY_STATUS_MULTIPLE_LOBBIES_STR);
+            return createResponse(server1);
+        }
+
+        final Lobby lobby = lobbyList.get(0);
+
+        List<LobbyInvitation> lobbyInvitationList = em.createNamedQuery(LobbyInvitation.GET_LOBBY_INVITATIONS_BY_LOBBY_ID)
+                .setParameter("lobbyId", lobby.getId()).getResultList();
+        if (lobbyInvitationList.isEmpty()) {
+            // Is this possible?
+            Server server1 = new Server();
+            server1.setErrorCode(ErrorCodes.GET_LOBBY_STATUS_NOBODY_INVITED);
+            server1.setError(ErrorCodes.GET_LOBBY_STATUS_NOBODY_INVITED_STR);
+            return createResponse(server1);
+        }
+        final int[] usersJoined = {0};
+        lobbyInvitationList.forEach(lobbyInvitation1 -> {
+            if (lobbyInvitation1.getUserJoined() == 1) {
+                ++usersJoined[0];
+            }
+        });
+        if (lobby.getStatus() == 2 && usersJoined[0] == lobby.getExpectedPlayerNum() &&
+                usedSession.getUserNum() == lobby.getExpectedPlayerNum() + 1) { // +1 for the player who started the lobby.
+            // If the session has been started by the lobby leader it means we are ready for everybody to join.
+            lobby.setStatus(3);
+
+            final int updatedLobbyStatusNum = em.createNamedQuery(Lobby.UPDATE_LOBBY_STATUS)
+                    .setParameter("lobbyId", lobby.getId())
+                    .setParameter("lobbyStatus", lobby.getStatus())
+                    .executeUpdate();
+            if (updatedLobbyStatusNum != 1) {
+
+            }
+        } else {
+            // How is this possible?
+        }
+
         return createResponse(server);
     }
 

diff -r bfaef692ca3f -r ec8e2d8433f8 src/headwayEnt/headwayEnt/Blackhole_Darksun_WebServer/Tables/Lobby.java
--- a/src/headwayEnt/headwayEnt/Blackhole_Darksun_WebServer/Tables/Lobby.java	Mon Jan 21 22:24:07 2019 +0200
+++ b/src/headwayEnt/headwayEnt/Blackhole_Darksun_WebServer/Tables/Lobby.java	Mon Jan 28 23:03:44 2019 +0200
@@ -26,7 +26,7 @@
     @Column(name = "lobby_invitations")
     private long lobbyInvitations;
     @Column(name = "status")
-    private int status; // 0 - lobby created 1 - ready to start 2 - in game 3 - lobby closed.
+    private int status; // 0 - lobby created 1 - ready to start server 2 - ready to join 3 - in game 4 - lobby closed.
     @Column(name = "expected_player_num")
     private int expectedPlayerNum;
     @Column(name = "joined_player_num")