From f26e40a0f119844b5aedf4a0e6cfc66730f7567b Mon Sep 17 00:00:00 2001 From: Lucas Slunt <100328965+LucasSlunt@users.noreply.github.com> Date: Fri, 28 Mar 2025 14:28:56 -0700 Subject: [PATCH 1/7] removed unnecessary imports --- .../example/task_manager/controller/AdminController.java | 4 ---- .../com/example/task_manager/service/AdminService.java | 3 --- .../example/task_manager/service/TeamMemberService.java | 4 ++-- .../com/example/task_manager/service/TeamService.java | 9 ++++----- .../example/task_manager/DTO_tests/AuthInfoDTOTest.java | 1 - .../controller_tests/AdminControllerTest.java | 3 --- .../controller_tests/NotificationControllerTest.java | 4 ---- .../controller_tests/TaskControllerTest.java | 4 ---- .../controller_tests/TeamControllerTest.java | 2 -- .../controller_tests/TeamMemberControllerTest.java | 3 --- 10 files changed, 6 insertions(+), 31 deletions(-) diff --git a/backend/task-manager/src/main/java/com/example/task_manager/controller/AdminController.java b/backend/task-manager/src/main/java/com/example/task_manager/controller/AdminController.java index f813c5b1..9c60b9de 100644 --- a/backend/task-manager/src/main/java/com/example/task_manager/controller/AdminController.java +++ b/backend/task-manager/src/main/java/com/example/task_manager/controller/AdminController.java @@ -7,7 +7,6 @@ import com.example.task_manager.DTO.TeamMemberDTO; import com.example.task_manager.DTO.UpdateEmailRequestDTO; import com.example.task_manager.DTO.UpdateNameRequestDTO; -import com.example.task_manager.entity.Admin; import com.example.task_manager.repository.AdminRepository; import com.example.task_manager.repository.AuthInfoRepository; import com.example.task_manager.service.AdminService; @@ -17,9 +16,6 @@ import java.util.List; import java.util.NoSuchElementException; -import java.util.Optional; - -import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler; import com.example.task_manager.DTO.TeamMemberWithTeamLeadDTO; diff --git a/backend/task-manager/src/main/java/com/example/task_manager/service/AdminService.java b/backend/task-manager/src/main/java/com/example/task_manager/service/AdminService.java index 8a95cf09..afdaa80b 100644 --- a/backend/task-manager/src/main/java/com/example/task_manager/service/AdminService.java +++ b/backend/task-manager/src/main/java/com/example/task_manager/service/AdminService.java @@ -1,12 +1,9 @@ package com.example.task_manager.service; -import java.util.ArrayList; -import java.util.HashSet; import java.util.List; import java.util.Set; import java.util.stream.Collectors; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.example.task_manager.DTO.AdminDTO; diff --git a/backend/task-manager/src/main/java/com/example/task_manager/service/TeamMemberService.java b/backend/task-manager/src/main/java/com/example/task_manager/service/TeamMemberService.java index edf13fcf..93a8a911 100644 --- a/backend/task-manager/src/main/java/com/example/task_manager/service/TeamMemberService.java +++ b/backend/task-manager/src/main/java/com/example/task_manager/service/TeamMemberService.java @@ -282,8 +282,8 @@ public void resetPassword(int teamMemberId, String newPassword) { .orElseThrow(() -> new RuntimeException("Team Member not found with ID: " + teamMemberId)); //create new salt and new password - String newSalt = authInfoService.generateSalt(); - String newHashedPassword = authInfoService.hashPassword(newPassword, newSalt); + String newSalt = AuthInfoService.generateSalt(); + String newHashedPassword = AuthInfoService.hashPassword(newPassword, newSalt); //set the new salt and hashed password teamMember.getAuthInfo().setSalt(newSalt); diff --git a/backend/task-manager/src/main/java/com/example/task_manager/service/TeamService.java b/backend/task-manager/src/main/java/com/example/task_manager/service/TeamService.java index 8c2db6b3..3be81828 100644 --- a/backend/task-manager/src/main/java/com/example/task_manager/service/TeamService.java +++ b/backend/task-manager/src/main/java/com/example/task_manager/service/TeamService.java @@ -18,7 +18,6 @@ import com.example.task_manager.repository.TaskRepository; import com.example.task_manager.repository.TeamMemberRepository; import com.example.task_manager.repository.TeamRepository; -import com.sun.source.util.TaskListener; import jakarta.transaction.Transactional; @@ -144,7 +143,7 @@ public List getTeamTasks(int teamId) { /* * Converts a Task entity to a TaskDTO entity */ - private TaskDTO convertToDTO(Task task) { + public TaskDTO convertToDTO(Task task) { List members = task.getAssignedMembers().stream() .map(IsAssigned::getTeamMember) .map(member -> new TeamMemberDTO( @@ -171,7 +170,7 @@ private TaskDTO convertToDTO(Task task) { /** * Converts a Team entity to a TeamDTO. */ - private TeamDTO convertToDTO(Team team) { + public TeamDTO convertToDTO(Team team) { return new TeamDTO( team.getTeamId(), team.getTeamName(), @@ -182,7 +181,7 @@ private TeamDTO convertToDTO(Team team) { /** * Converts a TeamMember entity to a TeamMemberDTO. */ - private TeamMemberDTO convertToDTO(TeamMember teamMember) { + public TeamMemberDTO convertToDTO(TeamMember teamMember) { return new TeamMemberDTO( teamMember.getAccountId(), teamMember.getUserName(), @@ -190,7 +189,7 @@ private TeamMemberDTO convertToDTO(TeamMember teamMember) { teamMember.getRole()); } - private TeamMemberInTeamDTO convertToDTO(TeamMember teamMember, boolean isTeamLead) { + public TeamMemberInTeamDTO convertToDTO(TeamMember teamMember, boolean isTeamLead) { return new TeamMemberInTeamDTO( teamMember.getAccountId(), teamMember.getUserName(), diff --git a/backend/task-manager/src/test/java/com/example/task_manager/DTO_tests/AuthInfoDTOTest.java b/backend/task-manager/src/test/java/com/example/task_manager/DTO_tests/AuthInfoDTOTest.java index f14a52ff..2acbfeed 100644 --- a/backend/task-manager/src/test/java/com/example/task_manager/DTO_tests/AuthInfoDTOTest.java +++ b/backend/task-manager/src/test/java/com/example/task_manager/DTO_tests/AuthInfoDTOTest.java @@ -2,7 +2,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; import org.junit.jupiter.api.Test; diff --git a/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/AdminControllerTest.java b/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/AdminControllerTest.java index b4800d49..55defae1 100644 --- a/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/AdminControllerTest.java +++ b/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/AdminControllerTest.java @@ -13,17 +13,14 @@ import com.example.task_manager.DTO.ChangeRoleRequestDTO; import com.example.task_manager.DTO.TeamDTO; import com.example.task_manager.DTO.TeamMemberDTO; -import com.example.task_manager.controller.AdminController; import com.example.task_manager.enums.RoleType; import com.example.task_manager.repository.AdminRepository; import com.example.task_manager.repository.TeamMemberRepository; import com.example.task_manager.service.AdminService; import org.junit.jupiter.api.Test; -import org.mockito.InjectMocks; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; -import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.http.MediaType; diff --git a/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/NotificationControllerTest.java b/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/NotificationControllerTest.java index 97391c86..1a4ec061 100644 --- a/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/NotificationControllerTest.java +++ b/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/NotificationControllerTest.java @@ -9,7 +9,6 @@ import com.example.task_manager.controller.NotificationController; import com.example.task_manager.enums.NotificationType; import com.example.task_manager.service.NotificationService; -import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.Test; import org.mockito.InjectMocks; @@ -36,9 +35,6 @@ public class NotificationControllerTest { @InjectMocks private NotificationController notificationController; - @Autowired - private ObjectMapper objectMapper; - /** * Test Get Unread Notifications */ diff --git a/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/TaskControllerTest.java b/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/TaskControllerTest.java index 7a2b6a1d..c40cd4a7 100644 --- a/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/TaskControllerTest.java +++ b/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/TaskControllerTest.java @@ -1,15 +1,11 @@ package com.example.task_manager.controller_tests; import com.example.task_manager.controller.TaskController; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; import org.springframework.test.context.ActiveProfiles; -import org.springframework.test.web.servlet.MockMvc; @WebMvcTest(TaskController.class) @ActiveProfiles("test") public class TaskControllerTest { - @Autowired - private MockMvc mockMvc; } diff --git a/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/TeamControllerTest.java b/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/TeamControllerTest.java index 8b2ef5d2..a43e7db0 100644 --- a/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/TeamControllerTest.java +++ b/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/TeamControllerTest.java @@ -10,7 +10,6 @@ import com.example.task_manager.DTO.TaskDTO; import com.example.task_manager.DTO.TeamDTO; -import com.example.task_manager.DTO.TeamMemberDTO; import com.example.task_manager.DTO.TeamRequestDTO; import com.example.task_manager.controller.TeamController; import com.example.task_manager.enums.RoleType; @@ -32,7 +31,6 @@ import java.util.List; import com.example.task_manager.DTO.TeamMemberInTeamDTO; -import com.example.task_manager.entity.TeamMember; @WebMvcTest(TeamController.class) @ActiveProfiles("test") diff --git a/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/TeamMemberControllerTest.java b/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/TeamMemberControllerTest.java index c33d1840..9dd76479 100644 --- a/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/TeamMemberControllerTest.java +++ b/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/TeamMemberControllerTest.java @@ -1,7 +1,5 @@ package com.example.task_manager.controller_tests; -import java.awt.PageAttributes; - import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.*; @@ -14,7 +12,6 @@ import com.example.task_manager.DTO.TeamDTO; import com.example.task_manager.DTO.IsAssignedDTO; import com.example.task_manager.controller.TeamMemberController; -import com.example.task_manager.entity.TeamMember; import com.example.task_manager.service.TeamMemberService; import com.fasterxml.jackson.databind.ObjectMapper; From f4312763bd40a37a8aabc5f1b497a8969e9955dd Mon Sep 17 00:00:00 2001 From: Lucas Slunt <100328965+LucasSlunt@users.noreply.github.com> Date: Fri, 28 Mar 2025 15:49:03 -0700 Subject: [PATCH 2/7] Replaced deprecated annotations --- .../task_manager/controller/AdminController.java | 10 +--------- .../controller_tests/AdminControllerTest.java | 8 ++++---- .../controller_tests/AuthInfoControllerTest.java | 4 ++-- .../controller_tests/IsAssignedControllerTest.java | 4 ++-- .../controller_tests/IsMemberOfControllerTest.java | 4 ++-- .../controller_tests/NotificationControllerTest.java | 4 ++-- .../controller_tests/TeamControllerTest.java | 4 ++-- .../controller_tests/TeamMemberControllerTest.java | 4 ++-- 8 files changed, 17 insertions(+), 25 deletions(-) diff --git a/backend/task-manager/src/main/java/com/example/task_manager/controller/AdminController.java b/backend/task-manager/src/main/java/com/example/task_manager/controller/AdminController.java index 9c60b9de..cb3687ed 100644 --- a/backend/task-manager/src/main/java/com/example/task_manager/controller/AdminController.java +++ b/backend/task-manager/src/main/java/com/example/task_manager/controller/AdminController.java @@ -26,17 +26,9 @@ public class AdminController { private final AdminService adminService; - private final AuthInfoRepository authInfoRepository; - - private final AuthController authController; - - private final AdminRepository adminRepository; - public AdminController(AdminService adminService, AdminRepository adminRepository, AuthController authController, AuthInfoRepository authInfoRepository) { this.adminService = adminService; - this.adminRepository = adminRepository; - this.authController = authController; - this.authInfoRepository = authInfoRepository; + } // Create Admin entity diff --git a/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/AdminControllerTest.java b/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/AdminControllerTest.java index 55defae1..860149f1 100644 --- a/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/AdminControllerTest.java +++ b/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/AdminControllerTest.java @@ -22,9 +22,9 @@ 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.boot.test.mock.mockito.MockBean; import org.springframework.http.MediaType; import org.springframework.test.context.ActiveProfiles; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.test.web.servlet.MockMvc; import com.example.task_manager.DTO.TeamMemberWithTeamLeadDTO; @@ -40,13 +40,13 @@ public class AdminControllerTest { @Autowired private MockMvc mockMvc; - @MockBean + @MockitoBean private AdminService adminService; - @MockBean + @MockitoBean private AdminRepository adminRepository; - @MockBean + @MockitoBean private TeamMemberRepository teamMemberRepository; @Autowired diff --git a/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/AuthInfoControllerTest.java b/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/AuthInfoControllerTest.java index 896d380e..35c1f7cd 100644 --- a/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/AuthInfoControllerTest.java +++ b/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/AuthInfoControllerTest.java @@ -13,8 +13,8 @@ import org.mockito.InjectMocks; 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.test.context.ActiveProfiles; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.test.web.servlet.MockMvc; @WebMvcTest(AuthController.class) @@ -24,7 +24,7 @@ public class AuthInfoControllerTest { @Autowired private MockMvc mockMvc; - @MockBean + @MockitoBean private AuthInfoService authInfoService; @InjectMocks diff --git a/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/IsAssignedControllerTest.java b/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/IsAssignedControllerTest.java index bd018f64..222cc5da 100644 --- a/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/IsAssignedControllerTest.java +++ b/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/IsAssignedControllerTest.java @@ -11,8 +11,8 @@ import org.mockito.InjectMocks; 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.test.context.ActiveProfiles; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.test.web.servlet.MockMvc; @WebMvcTest(IsAssignedController.class) @@ -22,7 +22,7 @@ public class IsAssignedControllerTest { @Autowired private MockMvc mockMvc; - @MockBean + @MockitoBean private IsAssignedService isAssignedService; @InjectMocks diff --git a/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/IsMemberOfControllerTest.java b/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/IsMemberOfControllerTest.java index 3a3d84cb..8e85cd0e 100644 --- a/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/IsMemberOfControllerTest.java +++ b/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/IsMemberOfControllerTest.java @@ -12,8 +12,8 @@ import org.mockito.InjectMocks; 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.test.context.ActiveProfiles; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.test.web.servlet.MockMvc; @WebMvcTest(IsMemberOfController.class) @@ -23,7 +23,7 @@ public class IsMemberOfControllerTest { @Autowired private MockMvc mockMvc; - @MockBean + @MockitoBean private IsMemberOfService isMemberOfService; @InjectMocks diff --git a/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/NotificationControllerTest.java b/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/NotificationControllerTest.java index 1a4ec061..3dced762 100644 --- a/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/NotificationControllerTest.java +++ b/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/NotificationControllerTest.java @@ -14,8 +14,8 @@ import org.mockito.InjectMocks; 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.test.context.ActiveProfiles; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.test.web.servlet.MockMvc; import java.time.LocalDateTime; @@ -29,7 +29,7 @@ public class NotificationControllerTest { @Autowired private MockMvc mockMvc; - @MockBean + @MockitoBean private NotificationService notificationService; @InjectMocks diff --git a/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/TeamControllerTest.java b/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/TeamControllerTest.java index a43e7db0..8e09fabf 100644 --- a/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/TeamControllerTest.java +++ b/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/TeamControllerTest.java @@ -21,9 +21,9 @@ import org.mockito.InjectMocks; 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.MediaType; import org.springframework.test.context.ActiveProfiles; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.test.web.servlet.MockMvc; import java.util.Arrays; @@ -39,7 +39,7 @@ public class TeamControllerTest { @Autowired private MockMvc mockMvc; - @MockBean + @MockitoBean private TeamService teamService; @InjectMocks diff --git a/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/TeamMemberControllerTest.java b/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/TeamMemberControllerTest.java index 9dd76479..7b49c148 100644 --- a/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/TeamMemberControllerTest.java +++ b/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/TeamMemberControllerTest.java @@ -19,9 +19,9 @@ import org.mockito.InjectMocks; 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.MediaType; import org.springframework.test.context.ActiveProfiles; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.MvcResult; import com.example.task_manager.enums.TaskPriority; @@ -37,7 +37,7 @@ public class TeamMemberControllerTest { @Autowired private MockMvc mockMvc; - @MockBean + @MockitoBean private TeamMemberService teamMemberService; @InjectMocks From ad5b6b82f2e41c8dca3a6046f11f1446150473a8 Mon Sep 17 00:00:00 2001 From: Lucas Slunt <100328965+LucasSlunt@users.noreply.github.com> Date: Fri, 28 Mar 2025 15:59:49 -0700 Subject: [PATCH 3/7] simplified json --- .../controller_tests/TeamMemberControllerTest.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/TeamMemberControllerTest.java b/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/TeamMemberControllerTest.java index 7b49c148..09811878 100644 --- a/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/TeamMemberControllerTest.java +++ b/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/TeamMemberControllerTest.java @@ -180,10 +180,7 @@ void testResetPassword() throws Exception { int teamMemberId = 1; String newPassword = "trustmethisissecure"; - String request = objectMapper.writeValueAsString(new Object() { - public final String newPassword = "BrainStew_GreenDay"; - }); - + String request = "{\"newPassword\":\"BrainStew_GreenDay\"}"; doNothing().when(teamMemberService).resetPassword(teamMemberId, newPassword); mockMvc.perform(post("/api/tasks/team-members/{teamMemberId}/reset-password", teamMemberId) @@ -200,12 +197,10 @@ void testGetTeamsForMember() throws Exception { when(teamMemberService.getTeamsForMember(1)).thenReturn(mockTeams); - MvcResult result = mockMvc.perform(get("/api/tasks/1/teams")) + mockMvc.perform(get("/api/tasks/1/teams")) .andDo(print()) .andExpect(status().isOk()) .andReturn(); - - // System.out.println("Response: " + result.getResponse().getContentAsString()); } @Test From f6bad26651d304b16a33f3204f5b1d79195a1d2d Mon Sep 17 00:00:00 2001 From: Lucas Slunt <100328965+LucasSlunt@users.noreply.github.com> Date: Fri, 28 Mar 2025 16:03:35 -0700 Subject: [PATCH 4/7] Removed unnecessary assignments --- .../com/example/task_manager/service/NotificationService.java | 4 ++-- .../java/com/example/task_manager/service/TeamService.java | 2 +- .../controller_tests/TeamMemberControllerTest.java | 3 +-- .../repository_tests/IsAssignedRepositoryTest.java | 4 ++-- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/backend/task-manager/src/main/java/com/example/task_manager/service/NotificationService.java b/backend/task-manager/src/main/java/com/example/task_manager/service/NotificationService.java index 09d972fe..50ced310 100644 --- a/backend/task-manager/src/main/java/com/example/task_manager/service/NotificationService.java +++ b/backend/task-manager/src/main/java/com/example/task_manager/service/NotificationService.java @@ -143,7 +143,7 @@ public void notifyTeamUnassignment(TeamMember teamMember, Team team) { //get unread notifications for a team member public List getUnreadNotifications(int teamMemberId) { - TeamMember teamMember = teamMemberRepository.findById(teamMemberId) + teamMemberRepository.findById(teamMemberId) .orElseThrow(() -> new RuntimeException("TeamMember not found")); return notifRepository.findByTeamMemberIdAndIsReadFalse(teamMemberId) @@ -154,7 +154,7 @@ public List getUnreadNotifications(int teamMemberId) { //get read notifications for a team member public List getReadNotifications(int teamMemberId) { - TeamMember teamMember = teamMemberRepository.findById(teamMemberId) + teamMemberRepository.findById(teamMemberId) .orElseThrow(() -> new RuntimeException("TeamMember not found")); return notifRepository.findByTeamMemberIdAndIsReadTrue(teamMemberId) diff --git a/backend/task-manager/src/main/java/com/example/task_manager/service/TeamService.java b/backend/task-manager/src/main/java/com/example/task_manager/service/TeamService.java index 3be81828..d352c2e9 100644 --- a/backend/task-manager/src/main/java/com/example/task_manager/service/TeamService.java +++ b/backend/task-manager/src/main/java/com/example/task_manager/service/TeamService.java @@ -132,7 +132,7 @@ public List getTeamMembers(int teamId) { * Returns all tasks attached to a team */ public List getTeamTasks(int teamId) { - Team team = teamRepository.findById(teamId) + teamRepository.findById(teamId) .orElseThrow(() -> new RuntimeException("Team not found with ID: " + teamId)); return taskRepository.findByTeam_TeamId(teamId).stream() diff --git a/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/TeamMemberControllerTest.java b/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/TeamMemberControllerTest.java index 09811878..520b530a 100644 --- a/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/TeamMemberControllerTest.java +++ b/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/TeamMemberControllerTest.java @@ -23,7 +23,6 @@ import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.test.web.servlet.MockMvc; -import org.springframework.test.web.servlet.MvcResult; import com.example.task_manager.enums.TaskPriority; import java.time.LocalDate; @@ -211,7 +210,7 @@ void testGetAssignedTasks() throws Exception { when(teamMemberService.getAssignedTasks(1)).thenReturn(mockTasks); - MvcResult result = mockMvc.perform(get("/api/tasks/1/tasks")) + mockMvc.perform(get("/api/tasks/1/tasks")) .andExpect(status().isOk()) .andExpect(jsonPath("$[0].priority").value("MEDIUM")) .andExpect(jsonPath("$[1].priority").value("MEDIUM")) diff --git a/backend/task-manager/src/test/java/com/example/task_manager/repository_tests/IsAssignedRepositoryTest.java b/backend/task-manager/src/test/java/com/example/task_manager/repository_tests/IsAssignedRepositoryTest.java index a6023f51..e38188ba 100644 --- a/backend/task-manager/src/test/java/com/example/task_manager/repository_tests/IsAssignedRepositoryTest.java +++ b/backend/task-manager/src/test/java/com/example/task_manager/repository_tests/IsAssignedRepositoryTest.java @@ -53,7 +53,7 @@ void testExistsByTeamMemberAndTask() { Team team = createAndPersistUniqueTeam(); TeamMember teamMember = createAndPersistUniqueTeamMember(); Task task = createAndSaveUniqueTask(team); - IsAssigned assignment = createAndSaveUniqueAssignment(task, teamMember, team); + createAndSaveUniqueAssignment(task, teamMember, team); boolean exists = isAssignedRepository.existsByTeamMember_AccountIdAndTask_TaskId(teamMember.getAccountId(), task.getTaskId()); @@ -65,7 +65,7 @@ void testFindAssignmentsByTeamMember() { Team team = createAndPersistUniqueTeam(); Task task = createAndSaveUniqueTask(team); TeamMember teamMember = createAndPersistUniqueTeamMember(); - IsAssigned assignment = createAndSaveUniqueAssignment(task, teamMember, team); + createAndSaveUniqueAssignment(task, teamMember, team); Collection assignments = isAssignedRepository.findByTeamMember_AccountId(teamMember.getAccountId()); From a03802a13316ece14bf9beca55f8157aaa04f0d6 Mon Sep 17 00:00:00 2001 From: Lucas Slunt <100328965+LucasSlunt@users.noreply.github.com> Date: Fri, 28 Mar 2025 16:10:07 -0700 Subject: [PATCH 5/7] removed duplicate test removed TODO for testChangePassword, which is functionally the same as testResetPassword. --- .../controller_tests/TeamMemberControllerTest.java | 8 -------- 1 file changed, 8 deletions(-) diff --git a/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/TeamMemberControllerTest.java b/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/TeamMemberControllerTest.java index 520b530a..7ceefe18 100644 --- a/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/TeamMemberControllerTest.java +++ b/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/TeamMemberControllerTest.java @@ -165,14 +165,6 @@ void testAssignToTask() throws Exception { // .andExpect(jsonPath("$.taskId").value(taskId)) // .andExpect(status().isOk()); // } - - /** - * Placeholder: Change Password - */ - @Test - void testChangePassword() throws Exception { - // TODO: Implement Change Password Test - } @Test void testResetPassword() throws Exception { From 5e7ba57852acf3d8ea0634bfe361d8a013a76b18 Mon Sep 17 00:00:00 2001 From: Lucas Slunt <100328965+LucasSlunt@users.noreply.github.com> Date: Fri, 28 Mar 2025 20:06:19 -0700 Subject: [PATCH 6/7] Re-removed imports from merge --- .../task_manager/controller/AdminController.java | 14 -------------- .../controller/TeamMemberController.java | 2 -- .../AdminAccountControllerTest.java | 4 ++-- .../NotificationControllerTest.java | 1 + .../controller_tests/TaskControllerTest.java | 6 ++++-- .../controller_tests/TeamControllerTest.java | 2 +- .../TeamMemberAccountControllerTest.java | 5 +++-- .../controller_tests/TeamMemberControllerTest.java | 11 ++--------- 8 files changed, 13 insertions(+), 32 deletions(-) diff --git a/backend/task-manager/src/main/java/com/example/task_manager/controller/AdminController.java b/backend/task-manager/src/main/java/com/example/task_manager/controller/AdminController.java index 6244e920..54056f34 100644 --- a/backend/task-manager/src/main/java/com/example/task_manager/controller/AdminController.java +++ b/backend/task-manager/src/main/java/com/example/task_manager/controller/AdminController.java @@ -2,14 +2,6 @@ import com.example.task_manager.DTO.AdminDTO; import com.example.task_manager.DTO.ChangeRoleRequestDTO; - -import com.example.task_manager.DTO.TeamDTO; -import com.example.task_manager.DTO.TeamMemberDTO; -import com.example.task_manager.DTO.UpdateEmailRequestDTO; -import com.example.task_manager.DTO.UpdateNameRequestDTO; -import com.example.task_manager.repository.AdminRepository; -import com.example.task_manager.repository.AuthInfoRepository; - import com.example.task_manager.DTO.ResetPasswordRequestDTO; import com.example.task_manager.service.AdminService; @@ -19,12 +11,6 @@ import org.springframework.web.bind.annotation.*; import java.util.List; - -import java.util.NoSuchElementException; - -import com.example.task_manager.DTO.TeamMemberWithTeamLeadDTO; - - @RestController @RequestMapping("/api/admins/actions") public class AdminController { diff --git a/backend/task-manager/src/main/java/com/example/task_manager/controller/TeamMemberController.java b/backend/task-manager/src/main/java/com/example/task_manager/controller/TeamMemberController.java index bcdd1003..5c798f6f 100644 --- a/backend/task-manager/src/main/java/com/example/task_manager/controller/TeamMemberController.java +++ b/backend/task-manager/src/main/java/com/example/task_manager/controller/TeamMemberController.java @@ -5,8 +5,6 @@ import com.example.task_manager.DTO.TaskDTO; import com.example.task_manager.DTO.TeamDTO; import com.example.task_manager.service.TeamMemberService; -import com.example.task_manager.service.AdminService; - import java.util.List; import org.springframework.http.ResponseEntity; diff --git a/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/AdminAccountControllerTest.java b/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/AdminAccountControllerTest.java index 5affe0d7..43a9413c 100644 --- a/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/AdminAccountControllerTest.java +++ b/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/AdminAccountControllerTest.java @@ -14,9 +14,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; -import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.http.MediaType; import org.springframework.test.context.ActiveProfiles; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.test.web.servlet.MockMvc; import com.example.task_manager.DTO.UpdateEmailRequestDTO; @@ -31,7 +31,7 @@ public class AdminAccountControllerTest { @Autowired private MockMvc mockMvc; - @MockBean + @MockitoBean private AdminService adminService; @Autowired diff --git a/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/NotificationControllerTest.java b/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/NotificationControllerTest.java index 0708cfaa..4c7d9117 100644 --- a/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/NotificationControllerTest.java +++ b/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/NotificationControllerTest.java @@ -11,6 +11,7 @@ import com.example.task_manager.service.NotificationService; import org.junit.jupiter.api.Test; +import org.mockito.InjectMocks; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; import org.springframework.test.context.ActiveProfiles; diff --git a/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/TaskControllerTest.java b/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/TaskControllerTest.java index f889a13c..247e72b0 100644 --- a/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/TaskControllerTest.java +++ b/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/TaskControllerTest.java @@ -14,9 +14,11 @@ import org.junit.jupiter.api.Test; 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.MediaType; import org.springframework.test.context.ActiveProfiles; +import org.springframework.test.web.servlet.MockMvc; +import org.springframework.test.context.bean.override.mockito.MockitoBean; + import com.example.task_manager.enums.TaskPriority; @@ -32,7 +34,7 @@ public class TaskControllerTest { @Autowired private MockMvc mockMvc; - @MockBean + @MockitoBean private TeamMemberService teamMemberService; @Autowired diff --git a/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/TeamControllerTest.java b/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/TeamControllerTest.java index c5ff3b83..d711dc79 100644 --- a/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/TeamControllerTest.java +++ b/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/TeamControllerTest.java @@ -42,7 +42,7 @@ public class TeamControllerTest { @MockitoBean private TeamService teamService; - @MockBean + @MockitoBean private AdminService adminService; @Autowired diff --git a/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/TeamMemberAccountControllerTest.java b/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/TeamMemberAccountControllerTest.java index 0657d787..c80293d6 100644 --- a/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/TeamMemberAccountControllerTest.java +++ b/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/TeamMemberAccountControllerTest.java @@ -13,10 +13,11 @@ import org.junit.jupiter.api.Test; 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.MediaType; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.web.servlet.MockMvc; +import org.springframework.test.context.bean.override.mockito.MockitoBean; + import com.example.task_manager.DTO.UpdateEmailRequestDTO; import com.example.task_manager.DTO.UpdateNameRequestDTO; @@ -29,7 +30,7 @@ public class TeamMemberAccountControllerTest { @Autowired private MockMvc mockMvc; - @MockBean + @MockitoBean private AdminService adminService; @Autowired diff --git a/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/TeamMemberControllerTest.java b/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/TeamMemberControllerTest.java index a165fa94..714e61a9 100644 --- a/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/TeamMemberControllerTest.java +++ b/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/TeamMemberControllerTest.java @@ -1,7 +1,5 @@ package com.example.task_manager.controller_tests; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.*; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; @@ -12,14 +10,12 @@ import com.example.task_manager.DTO.IsAssignedDTO; import com.example.task_manager.controller.TeamMemberController; import com.example.task_manager.service.TeamMemberService; -import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.Test; import org.mockito.InjectMocks; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; import org.springframework.http.MediaType; -import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.test.web.servlet.MockMvc; @@ -42,9 +38,6 @@ public class TeamMemberControllerTest { @InjectMocks private TeamMemberController teamMemberController; - @Autowired - private ObjectMapper objectMapper; - /** * Test Assign Member to Task */ @@ -106,7 +99,7 @@ void testGetTeamsForMember() throws Exception { new TeamDTO(2, "Team 2", 1)); when(teamMemberService.getTeamsForMember(1)).thenReturn(mockTeams); - MvcResult result = mockMvc.perform(get("/api/members/actions/1/teams")) + mockMvc.perform(get("/api/members/actions/1/teams")) .andDo(print()) .andExpect(status().isOk()) .andReturn(); @@ -119,7 +112,7 @@ void testGetAssignedTasks() throws Exception { new TaskDTO(2, "Task Title 2", "Task 2 description", true, "Closed", LocalDate.now(), null, 1, null, TaskPriority.MEDIUM)); when(teamMemberService.getAssignedTasks(1)).thenReturn(mockTasks); - MvcResult result = mockMvc.perform(get("/api/members/actions/1/tasks")) + mockMvc.perform(get("/api/members/actions/1/tasks")) .andExpect(status().isOk()) .andExpect(jsonPath("$[0].priority").value("MEDIUM")) .andExpect(jsonPath("$[1].priority").value("MEDIUM")) From a64b779cce4cb27912ded2c2381297ad236d0fe4 Mon Sep 17 00:00:00 2001 From: Lucas Slunt <100328965+LucasSlunt@users.noreply.github.com> Date: Fri, 28 Mar 2025 20:18:10 -0700 Subject: [PATCH 7/7] Removed merge artifacts --- backend/task-manager/pom.xml | 4 ++-- .../TeamMemberControllerTest.java | 15 --------------- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/backend/task-manager/pom.xml b/backend/task-manager/pom.xml index cf05df18..fd73e74a 100644 --- a/backend/task-manager/pom.xml +++ b/backend/task-manager/pom.xml @@ -17,7 +17,7 @@ - + @@ -27,7 +27,7 @@ - 21 + 17 ${DBPASSWORDFROMYML} ${DBUSERNAMEFROMYML} diff --git a/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/TeamMemberControllerTest.java b/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/TeamMemberControllerTest.java index 714e61a9..0e9782f7 100644 --- a/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/TeamMemberControllerTest.java +++ b/backend/task-manager/src/test/java/com/example/task_manager/controller_tests/TeamMemberControllerTest.java @@ -15,7 +15,6 @@ import org.mockito.InjectMocks; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; -import org.springframework.http.MediaType; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.test.web.servlet.MockMvc; @@ -77,20 +76,6 @@ void testAssignToTask() throws Exception { // .andExpect(jsonPath("$.taskId").value(taskId)) // .andExpect(status().isOk()); // } - - @Test - void testResetPassword() throws Exception { - int teamMemberId = 1; - String newPassword = "trustmethisissecure"; - - String request = "{\"newPassword\":\"BrainStew_GreenDay\"}"; - doNothing().when(teamMemberService).resetPassword(teamMemberId, newPassword); - - mockMvc.perform(post("/api/tasks/team-members/{teamMemberId}/reset-password", teamMemberId) - .contentType(MediaType.APPLICATION_JSON) - .content(request)) - .andExpect(status().isNoContent()); - } @Test void testGetTeamsForMember() throws Exception {