Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions backend/task-manager/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<licenses>
<license/>
</licenses>
<developers>
<developers>
<developer/>
</developers>
<scm>
Expand All @@ -27,7 +27,7 @@
<url/>
</scm>
<properties>
<java.version>21</java.version>
<java.version>17</java.version>
<DBPASSWORD>${DBPASSWORDFROMYML}</DBPASSWORD>
<DBUSERNAME>${DBUSERNAMEFROMYML}</DBUSERNAME>
</properties>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
import com.example.task_manager.DTO.AdminDTO;
import com.example.task_manager.DTO.ChangeRoleRequestDTO;
import com.example.task_manager.DTO.ResetPasswordRequestDTO;

import com.example.task_manager.service.AdminService;
import com.example.task_manager.service.TeamMemberService;

import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;

import java.util.List;

@RestController
@RequestMapping("/api/admins/actions")
public class AdminController {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ public void notifyTeamUnassignment(TeamMember teamMember, Team team) {

//get unread notifications for a team member
public List<NotificationDTO> getUnreadNotifications(int teamMemberId) {
TeamMember teamMember = teamMemberRepository.findById(teamMemberId)
teamMemberRepository.findById(teamMemberId)
.orElseThrow(() -> new RuntimeException("TeamMember not found"));

return notifRepository.findByTeamMemberIdAndIsReadFalse(teamMemberId)
Expand All @@ -154,7 +154,7 @@ public List<NotificationDTO> getUnreadNotifications(int teamMemberId) {

//get read notifications for a team member
public List<NotificationDTO> getReadNotifications(int teamMemberId) {
TeamMember teamMember = teamMemberRepository.findById(teamMemberId)
teamMemberRepository.findById(teamMemberId)
.orElseThrow(() -> new RuntimeException("TeamMember not found"));

return notifRepository.findByTeamMemberIdAndIsReadTrue(teamMemberId)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -133,7 +132,7 @@ public List<TeamMemberInTeamDTO> getTeamMembers(int teamId) {
* Returns all tasks attached to a team
*/
public List<TaskDTO> 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()
Expand All @@ -144,7 +143,7 @@ public List<TaskDTO> getTeamTasks(int teamId) {
/*
* Converts a Task entity to a TaskDTO entity
*/
private TaskDTO convertToDTO(Task task) {
public TaskDTO convertToDTO(Task task) {
List<TeamMemberDTO> members = task.getAssignedMembers().stream()
.map(IsAssigned::getTeamMember)
.map(member -> new TeamMemberDTO(
Expand All @@ -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(),
Expand All @@ -182,15 +181,15 @@ 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(),
teamMember.getUserEmail(),
teamMember.getRole());
}

private TeamMemberInTeamDTO convertToDTO(TeamMember teamMember, boolean isTeamLead) {
public TeamMemberInTeamDTO convertToDTO(TeamMember teamMember, boolean isTeamLead) {
return new TeamMemberInTeamDTO(
teamMember.getAccountId(),
teamMember.getUserName(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -31,7 +31,7 @@ public class AdminAccountControllerTest {
@Autowired
private MockMvc mockMvc;

@MockBean
@MockitoBean
private AdminService adminService;

@Autowired
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,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.fasterxml.jackson.databind.ObjectMapper;

Expand All @@ -34,13 +34,13 @@ public class AdminControllerTest {
@Autowired
private MockMvc mockMvc;

@MockBean
@MockitoBean
private AdminService adminService;

@MockBean
@MockitoBean
private AdminRepository adminRepository;

@MockBean
@MockitoBean
private TeamMemberRepository teamMemberRepository;

@Autowired
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
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.test.context.ActiveProfiles;
import org.springframework.test.context.bean.override.mockito.MockitoBean;
import org.springframework.test.web.servlet.MockMvc;

@WebMvcTest(AuthController.class)
Expand All @@ -23,7 +23,7 @@ public class AuthInfoControllerTest {
@Autowired
private MockMvc mockMvc;

@MockBean
@MockitoBean
private AuthInfoService authInfoService;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
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.test.context.ActiveProfiles;
import org.springframework.test.context.bean.override.mockito.MockitoBean;
import org.springframework.test.web.servlet.MockMvc;

@WebMvcTest(IsAssignedController.class)
Expand All @@ -21,7 +21,7 @@ public class IsAssignedControllerTest {
@Autowired
private MockMvc mockMvc;

@MockBean
@MockitoBean
private IsAssignedService isAssignedService;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
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.test.context.ActiveProfiles;
import org.springframework.test.context.bean.override.mockito.MockitoBean;
import org.springframework.test.web.servlet.MockMvc;

@WebMvcTest(IsMemberOfController.class)
Expand All @@ -22,7 +22,7 @@ public class IsMemberOfControllerTest {
@Autowired
private MockMvc mockMvc;

@MockBean
@MockitoBean
private IsMemberOfService isMemberOfService;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,11 @@
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.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;
Expand All @@ -28,9 +29,11 @@ public class NotificationControllerTest {
@Autowired
private MockMvc mockMvc;

@MockBean
@MockitoBean
private NotificationService notificationService;

@InjectMocks
private NotificationController notificationController;
/**
* Test Get Unread Notifications
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +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;

Expand All @@ -33,7 +34,7 @@ public class TaskControllerTest {
@Autowired
private MockMvc mockMvc;

@MockBean
@MockitoBean
private TeamMemberService teamMemberService;

@Autowired
Expand Down Expand Up @@ -119,4 +120,4 @@ void testEditTask() throws Exception {
.andExpect(jsonPath("$.teamId").value(teamId))
.andExpect(jsonPath("$.priority").value("HIGH"));
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
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.context.bean.override.mockito.MockitoBean;
import org.springframework.test.web.servlet.MockMvc;

import java.util.Arrays;
Expand All @@ -39,10 +39,10 @@ public class TeamControllerTest {
@Autowired
private MockMvc mockMvc;

@MockBean
@MockitoBean
private TeamService teamService;

@MockBean
@MockitoBean
private AdminService adminService;

@Autowired
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -29,7 +30,7 @@ public class TeamMemberAccountControllerTest {
@Autowired
private MockMvc mockMvc;

@MockBean
@MockitoBean
private AdminService adminService;

@Autowired
Expand Down
Loading
Loading