Commit: ffe2678929201cd2bf4ab3f068a489bc6ee18e78 - HotshotWebServer (hg)

Commit MetaInfo

• Revisão: ffe2678929201cd2bf4ab3f068a489bc6ee18e78 (tree)
• Hora: 2019-01-17 05:33:19
• 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/ErrorCodes.java
• modified: src/headwayEnt/headwayEnt/Blackhole_Darksun_WebServer/Main.java
• modified: src/test/java/Blackhole_Darksun_WebServer/MainTest.java

Diff

diff -r 3108183fea89 -r ffe267892920 src/headwayEnt/headwayEnt/Blackhole_Darksun_WebServer/ErrorCodes.java
--- a/src/headwayEnt/headwayEnt/Blackhole_Darksun_WebServer/ErrorCodes.java	Tue Jan 15 22:50:18 2019 +0200
+++ b/src/headwayEnt/headwayEnt/Blackhole_Darksun_WebServer/ErrorCodes.java	Wed Jan 16 22:33:19 2019 +0200
@@ -157,4 +157,10 @@
 
     public static final int CREATE_LOBBY_TOO_MANY_INVITATIONS = 51;
     public static final String CREATE_LOBBY_TOO_MANY_INVITATIONS_STR = "Too many invitations";
+
+    public static final int CREATE_SERVER_ALREADY_EXISTS = 52;
+    public static final String CREATE_SERVER_ALREADY_EXISTS_STR = "Server has been already registered";
+
+    public static final int CREATE_SERVER_CANNOT_FIND_SERVER_ID = 53;
+    public static final String CREATE_SERVER_CANNOT_FIND_SERVER_ID_STR = "Cannot find server id";
 }

diff -r 3108183fea89 -r ffe267892920 src/headwayEnt/headwayEnt/Blackhole_Darksun_WebServer/Main.java
--- a/src/headwayEnt/headwayEnt/Blackhole_Darksun_WebServer/Main.java	Tue Jan 15 22:50:18 2019 +0200
+++ b/src/headwayEnt/headwayEnt/Blackhole_Darksun_WebServer/Main.java	Wed Jan 16 22:33:19 2019 +0200
@@ -707,19 +707,45 @@
     @Produces({"application/json", "text/plain"})
     public Response createServer(@Context HttpServletRequest requestContext, Server server) {
         String clientIP = requestContext.getRemoteAddr();
-        List<Server> serverList = em.createNamedQuery(Server.GET_SERVER_BY_NAME_AND_IP)
-                .setParameter("serverName", server.getServerName())
-                .setParameter("serverIp", server.getIp())
-                .getResultList();
-//        if (!serverList.isEmpty()) {
-//            server.setError("Server name already exists");
-//            return createResponse(server);
+        // We get the actual ip not the one that might be from the local DHCP of the server.
+        server.setIp(clientIP);
+        if (server.getId() == 0) {
+            // This is a new server. Still check if it was just a reinstallation.
+            List<Server> serverList = em.createNamedQuery(Server.GET_SERVER_BY_NAME_AND_IP)
+                    .setParameter("serverName", server.getServerName())
+                    .setParameter("serverIp", server.getIp())
+                    .getResultList();
+            if (serverList.size() > 1) {
+                server.setErrorCode(ErrorCodes.CREATE_SERVER_ALREADY_EXISTS);
+                server.setError(ErrorCodes.CREATE_SERVER_ALREADY_EXISTS_STR);
+                return createResponse(server);
+            } else if (serverList.size() == 1) {
+                // Renew the id.
+                server.setId(serverList.get(0).getId());
+                return createResponse(server);
+            } else {
+                em.persist(server);
+                em.flush();
+                return createResponse(server);
+            }
+        } else {
+            final List<Server> serverList = em.createNamedQuery(Server.GET_SERVER_BY_ID)
+                    .setParameter("serverId", server.getId()).getResultList();
+            if (serverList.isEmpty()) {
+                server.setErrorCode(ErrorCodes.CREATE_SERVER_CANNOT_FIND_SERVER_ID);
+                server.setError(ErrorCodes.CREATE_SERVER_CANNOT_FIND_SERVER_ID_STR);
+                return createResponse(server);
+            }
+            final Server selectedServer = serverList.get(0);
+            // Check that the server is the same with the one from the database?
+            return createResponse(server);
+        }
+
+
+//        if (serverList.isEmpty()) {
+//            em.persist(server);
 //        }
-        server.setIp(clientIP);
-        if (serverList.isEmpty()) {
-            em.persist(server);
-        }
-        return createResponse(server);
+//        return createResponse(server);
     }
 
     @POST

diff -r 3108183fea89 -r ffe267892920 src/test/java/Blackhole_Darksun_WebServer/MainTest.java
--- a/src/test/java/Blackhole_Darksun_WebServer/MainTest.java	Tue Jan 15 22:50:18 2019 +0200
+++ b/src/test/java/Blackhole_Darksun_WebServer/MainTest.java	Wed Jan 16 22:33:19 2019 +0200
@@ -322,7 +322,7 @@
     public void testCreateServer() throws Exception {
         Server server = new Server();
         server.setServerName("mainServer");
-//        server.setIp("127.0.0.1");
+        server.setIp("127.0.0.1");
         server.setServerLoad(0);
         server.setSessionNum(0);
         server.setUserNum(0);