move authentication check to userservice, add test for usercontroller, add...

move authentication check to userservice, add test for usercontroller, add login method to userservice

src/main/java/com/cloudcomputing/todo/controller/UserController.java

@@ -30,10 +30,9 @@ public class UserController {
 
     @PostMapping("/login")
     public ResponseEntity<String> login(HttpSession session, @RequestBody UserDTO user) {
-        if(customAuthenticator.authenticate(user)){
-            session.setAttribute("currentUser", user);
-            System.out.println(session.getId());
-            return ResponseEntity.ok("login successful");
+        boolean loginSuccessful = userService.login(session, user);
+        if(loginSuccessful){
+            return new ResponseEntity<>("login successful", HttpStatus.OK);
         }
 
         return new ResponseEntity<>("login failed", HttpStatus.UNAUTHORIZED);

src/main/java/com/cloudcomputing/todo/service/UserService.java

@@ -4,6 +4,8 @@ import com.cloudcomputing.todo.dto.UserDTO;
 import com.cloudcomputing.todo.entity.User;
 import com.cloudcomputing.todo.mapper.UserMapper;
 import com.cloudcomputing.todo.repository.UserRepository;
+import com.cloudcomputing.todo.util.CustomAuthenticator;
+import jakarta.servlet.http.HttpSession;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -12,9 +14,13 @@ public class UserService {
 
     @Autowired
     private UserMapper userMapper;
+
     @Autowired
     private UserRepository userRepository;
 
+    @Autowired
+    private CustomAuthenticator customAuthenticator;
+
     public UserDTO createUser(UserDTO userDTO) {
         User newUser;
 
@@ -24,6 +30,16 @@ public class UserService {
             newUser = userMapper.dtoToEntity(userDTO);
         }
 
-        return userMapper.entityToDto(userRepository.save(newUser));
+        User createdUser = userRepository.save(newUser);
+        return userMapper.entityToDto(createdUser);
+    }
+
+    public boolean login(HttpSession session, UserDTO userDTO) {
+        if(customAuthenticator.authenticate(userDTO)){
+            session.setAttribute("currentUser", userDTO);
+            return true;
+        }
+
+        return false;
     }
 }

src/test/java/com/cloudcomputing/todo/service/UserControllerTest.java

+package com.cloudcomputing.todo.service;
+
+import com.cloudcomputing.todo.dto.UserDTO;
+import com.cloudcomputing.todo.mapper.UserMapper;
+import com.cloudcomputing.todo.repository.UserRepository;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.http.MediaType;
+import org.springframework.mock.web.MockHttpSession;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.MvcResult;
+import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+@SpringBootTest
+@AutoConfigureMockMvc
+public class UserControllerTest {
+
+    @Autowired
+    private MockMvc mockMvc;
+
+    @Autowired
+    private ObjectMapper objectMapper;
+
+    @Autowired
+    private UserRepository userRepository;
+
+    @Autowired
+    private UserMapper userMapper;
+    @Autowired
+    private UserService userService;
+
+    @Test
+    public void testCreateUser() throws Exception {
+        UserDTO userToCreate = new UserDTO();
+        userToCreate.setUserName("abdu");
+        userToCreate.setPassword("abdus_secret_password");
+
+        String jsonValue = objectMapper.writeValueAsString(userToCreate);
+
+        MvcResult result = mockMvc.perform(MockMvcRequestBuilders
+                        .post("/user/signup")
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .content(jsonValue))
+                .andExpect(status().isCreated())
+                .andReturn();
+
+        UserDTO resultUser = objectMapper.readValue(result.getResponse().getContentAsString(), UserDTO.class);
+        assertEquals(userToCreate.getUserName(), resultUser.getUserName());
+    }
+
+    @Test
+    public void testLogin() throws Exception {
+        MockHttpSession session = new MockHttpSession();
+        UserDTO userToLogin = new UserDTO();
+        userToLogin.setUserName("abdu");
+        userToLogin.setPassword("abdus_secret_password");
+
+        String userJson = objectMapper.writeValueAsString(userToLogin);
+
+        MvcResult result = mockMvc.perform(MockMvcRequestBuilders
+                        .post("/user/login")
+                        .session(session)
+                        .contentType(MediaType.APPLICATION_JSON)
+                .content(userJson))
+                .andExpect(status().isOk())
+                .andReturn();
+
+        String response = result.getResponse().getContentAsString();
+        assertEquals("login successful", response);
+    }
+}

src/test/java/com/cloudcomputing/todo/service/UserServiceTest.java

 package com.cloudcomputing.todo.service;
 
 import com.cloudcomputing.todo.dto.UserDTO;
-import com.cloudcomputing.todo.entity.User;
-import com.cloudcomputing.todo.repository.UserRepository;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
-import java.util.List;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.*;
 
 @SpringBootTest
 public class UserServiceTest {
 
     @Autowired
     private UserService userService;
-    @Autowired
-    private UserRepository userRepository;
-
-    @BeforeEach
-    public void setup(){
-        User testUser_1 = new User();
-        testUser_1.setUserName("testUser_1");
-        testUser_1.setPasswordHash("");
-
-        User testUser_2 = new User();
-        testUser_2.setUserName("testUser_2");
-        testUser_2.setPasswordHash("");
-
-        User testUser_3 = new User();
-        testUser_3.setUserName("testUser_3");
-        testUser_3.setPasswordHash("");
-
-        User testUser_4 = new User();
-        testUser_4.setUserName("testUser_4");
-        testUser_4.setPasswordHash("");
-
-        userRepository.saveAll(List.of(testUser_1, testUser_2, testUser_3, testUser_4));
-    }
-
-    @AfterEach
-    public void tearDown(){
-        userRepository.deleteAll();
-    }
 
     @Test
     public void testCreateUser(){