Revize f158aab6

#10244 push zapomenutých změn

src/main/java/cz/zcu/fav/kiv/antipatterndetectionapp/v2/controller/UserController.java

@@ -3 +3 @@
 import cz.zcu.fav.kiv.antipatterndetectionapp.v2.dials.UserModelStatusCodes;
 import cz.zcu.fav.kiv.antipatterndetectionapp.v2.model.User;
 import cz.zcu.fav.kiv.antipatterndetectionapp.v2.service.UserService;
+import cz.zcu.fav.kiv.antipatterndetectionapp.v2.utils.JSONBuilder;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
+
 /**
  * Controller for providing basic support for user management
  * @version 1.0

src/main/java/cz/zcu/fav/kiv/antipatterndetectionapp/v2/model/User.java

@@ -79 +79 @@
         return email;
     }
 
+    /**
+     * Getter of password
+     * @return  password of the user
+     */
+    public String getPassword() { return password; }
+
     /**
      * Getter for email constraint
      * @return  email constraint

src/main/java/cz/zcu/fav/kiv/antipatterndetectionapp/v2/service/UserServiceImpl.java

@@ -50 +50 @@
             return UserModelStatusCodes.HASH_FAILED;
         }
         //save the user
-        User u = userRepository.save(user);
-
+        User u = userRepository.save(new User(name, email, passwordHash));
+        //database insert failed for some reason
+        if(u == null)
+            return UserModelStatusCodes.USER_CREATION_FAILED;
         //TODO request to OAuth for token - send user info to the oauth app for token
         //return okay status code, the user was created
         return UserModelStatusCodes.USER_CREATED;

src/test/java/cz/zcu/fav/kiv/antipatterndetectionapp/v2/controller/UserControllerTest.java

@@ -9 +9 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.mock.web.MockHttpServletResponse;
 import org.springframework.security.test.context.support.WithMockUser;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.web.servlet.MockMvc;

src/test/java/cz/zcu/fav/kiv/antipatterndetectionapp/v2/service/UserServiceImpTest.java

@@ -1 +1 @@
 package cz.zcu.fav.kiv.antipatterndetectionapp.v2.service;
 
+import cz.zcu.fav.kiv.antipatterndetectionapp.v2.dials.UserModelStatusCodes;
 import cz.zcu.fav.kiv.antipatterndetectionapp.v2.model.User;
 import cz.zcu.fav.kiv.antipatterndetectionapp.v2.repository.UserRepository;
 import org.junit.jupiter.api.BeforeAll;
@@ -52 +53 @@
     /**
      * Mocked User
      */
-    private final User mockUser = new User("test", "[e-mail]");
+    private final User mockUser = new User("test", "[e-mail]", "Ahoj99");
 
     /**
      * Testing registration implementation
@@ -66 +67 @@
                 "ddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd" +
                 "ddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd" +
                 "dddddddddddhfbsdjfhbsdjhbjckvxjhbvjhfbsjhbdjhsbvhbsckjhvbsdhfbsdjhvbjxhcbvhbjhvbxcv", "[e-mail]");
-        int foundCode = userService.registerUser(MUser);
+        UserModelStatusCodes foundCode = userService.registerUser(MUser);
 
-        assertEquals(foundCode, 0);
+        assertEquals(foundCode, UserModelStatusCodes.INVALID_USER_ARGUMENTS);
     }
 
     /**
@@ -82 +83 @@
                 "dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd" +
                 "dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd" +
                 "ddddddddddddddddddddddddddddddd[e-mail]");
-        int foundCode = userService.registerUser(MUser);
+        UserModelStatusCodes foundCode = userService.registerUser(MUser);
 
-        assertEquals(foundCode, 0);
+        assertEquals(foundCode, UserModelStatusCodes.INVALID_USER_ARGUMENTS);
     }
 
     /**
@@ -104 +105 @@
                 "dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd" +
                 "dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd" +
                 "ddddddddddddddddddddddddddddddd[e-mail]");
-        int foundCode = userService.registerUser(MUser);
+        UserModelStatusCodes foundCode = userService.registerUser(MUser);
 
-        assertEquals(foundCode, 0);
+        assertEquals(foundCode, UserModelStatusCodes.INVALID_USER_ARGUMENTS);
+    }
+
+    @Test
+    public void whenUserNULLName_thenReturnMSG() {
+        User MUser = new User(null, "[e-mail]", "Ahoj99");
+        UserModelStatusCodes foundCode = userService.registerUser(MUser);
+
+        assertEquals(foundCode, UserModelStatusCodes.INVALID_USER_ARGUMENTS);
+    }
+
+    @Test
+    public void whenUserNULLEmail_thenReturnMSG() {
+        User MUser = new User("tt", null, "Ahoj99");
+        UserModelStatusCodes foundCode = userService.registerUser(MUser);
+
+        assertEquals(foundCode, UserModelStatusCodes.INVALID_USER_ARGUMENTS);
+    }
+
+    @Test
+    public void whenUserNULLPassword_thenReturnMSG() {
+        User MUser = new User("tt", "[e-mail]", null);
+        UserModelStatusCodes foundCode = userService.registerUser(MUser);
+
+        assertEquals(foundCode, UserModelStatusCodes.INVALID_USER_ARGUMENTS);
+    }
+
+    @Test
+    public void whenUserNULLNameEmail_thenReturnMSG() {
+        User MUser = new User(null, null, "Ahoj99");
+        UserModelStatusCodes foundCode = userService.registerUser(MUser);
+
+        assertEquals(foundCode, UserModelStatusCodes.INVALID_USER_ARGUMENTS);
+    }
+
+    @Test
+    public void whenUserNULLNamePassword_thenReturnMSG() {
+        User MUser = new User(null, "[e-mail]", null);
+        UserModelStatusCodes foundCode = userService.registerUser(MUser);
+
+        assertEquals(foundCode, UserModelStatusCodes.INVALID_USER_ARGUMENTS);
+    }
+
+    @Test
+    public void whenUserNULLEmailPassword_thenReturnMSG() {
+        User MUser = new User("tt", null, null);
+        UserModelStatusCodes foundCode = userService.registerUser(MUser);
+
+        assertEquals(foundCode, UserModelStatusCodes.INVALID_USER_ARGUMENTS);
+    }
+
+    @Test
+    public void whenUserNULLNameEmailPassword_thenReturnMSG() {
+        User MUser = new User(null, null, null);
+        UserModelStatusCodes foundCode = userService.registerUser(MUser);
+
+        assertEquals(foundCode, UserModelStatusCodes.INVALID_USER_ARGUMENTS);
     }
 
     /**
@@ -115 +172 @@
      */
     @Test
     public void whenUserIsNotRegistered_thenRegisterHim() {
-        Mockito.when(userRepository.findByName("neni_v_DB")).thenReturn(null);
+        Mockito.when(userRepository.save(any())).thenReturn(mockUser);
 
-        int foundCode = userService.registerUser(mockUser);
+        UserModelStatusCodes foundCode = userService.registerUser(mockUser);
 
-        assertEquals(foundCode, 1);
+        assertEquals(foundCode, UserModelStatusCodes.USER_CREATED);
     }
 
     /**
@@ -130 +187 @@
     public void whenUserIsRegistered_thenSendMSG() {
         Mockito.when(userRepository.findByName(mockUser.getName())).thenReturn(mockUser);
 
-        int foundCode = userService.registerUser(mockUser);
+        UserModelStatusCodes foundCode = userService.registerUser(mockUser);
 
-        assertEquals(foundCode, -1);
+        assertEquals(foundCode, UserModelStatusCodes.USER_EXISTS);
     }
 
     /**
@@ -145 +202 @@
         Mockito.when(userRepository.findByName(mockUser.getName())).thenReturn(mockUser);
 
         String name = "test";
-        int foundCode = userService.loginUser(new User(name, ""));
+        UserModelStatusCodes foundCode = userService.loginUser(new User(name, ""));
 
-        assertEquals(foundCode, 1);
+        assertEquals(foundCode, UserModelStatusCodes.USER_LOGGED_IN);
     }
 
     /**
@@ -160 +217 @@
         //Mockito.when(userRepository.findByName(mockUser.getName())).thenReturn(mockUser);
 
         String name = "notest";
-        int foundCode = userService.loginUser(new User(name, ""));
+        UserModelStatusCodes foundCode = userService.loginUser(new User(name, ""));
 
-        assertEquals(foundCode, 0);
+        assertEquals(foundCode, UserModelStatusCodes.USER_LOGIN_FAILED);
     }
 
 }