Skip to content

Commit

Permalink
feat: CARITAS-286
Browse files Browse the repository at this point in the history 
* add new it tests and unit test to the AgencyController
  • Loading branch information
@Leandro13Silva13
Leandro13Silva13 committed Oct 31, 2024
1 parent 521206a commit 6a89936
Show file tree
Hide file tree
Showing 4 changed files with 372 additions and 248 deletions.
2 changes: 1 addition & 1 deletion src/main/java/de/caritas/cob/agencyservice/config/SecurityConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {

httpSecurity.sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS)
.and().authorizeRequests()
.requestMatchers("/agencies/**").permitAll()
.requestMatchers(WHITE_LIST).permitAll()
.requestMatchers("/agencies").permitAll()
.requestMatchers(HttpMethod.GET, "/agencyadmin/agencies")
Expand All @@ -90,6 +89,7 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
+ "') and hasAuthority('" + AuthorityValue.TENANT_ADMIN + "')")
.requestMatchers("/agencyadmin", "/agencyadmin/", "/agencyadmin/**")
.hasAnyAuthority(AuthorityValue.AGENCY_ADMIN, AuthorityValue.RESTRICTED_AGENCY_ADMIN)
.requestMatchers("/agencies/**").permitAll()
.anyRequest().denyAll();


Expand Down
272 changes: 26 additions & 246 deletions src/test/java/de/caritas/cob/agencyservice/api/controller/AgencyControllerIT.java
View file
Original file line number Diff line number Diff line change
@@ -1,62 +1,40 @@
package de.caritas.cob.agencyservice.api.controller;

import static de.caritas.cob.agencyservice.testHelper.PathConstants.PATH_GET_AGENCIES_WITH_IDS;
import static de.caritas.cob.agencyservice.testHelper.PathConstants.PATH_GET_LIST_OF_AGENCIES;
import static de.caritas.cob.agencyservice.testHelper.PathConstants.PATH_GET_LIST_OF_AGENCIES_PRIVATE;
import static de.caritas.cob.agencyservice.testHelper.PathConstants.PATH_GET_LIST_OF_AGENCIES_TOPICS;
import static de.caritas.cob.agencyservice.testHelper.TestConstants.AGENCY_ID;
import static de.caritas.cob.agencyservice.testHelper.TestConstants.AGENCY_RESPONSE_DTO;
import static de.caritas.cob.agencyservice.testHelper.TestConstants.AGENCY_RESPONSE_DTO_LIST;
import static de.caritas.cob.agencyservice.testHelper.TestConstants.AGENCY_TOPICS_DTO;
import static de.caritas.cob.agencyservice.testHelper.TestConstants.FULL_AGENCY_RESPONSE_DTO;
import static de.caritas.cob.agencyservice.testHelper.TestConstants.INVALID_AGENCY_ID;
import static de.caritas.cob.agencyservice.testHelper.TestConstants.INVALID_CONSULTING_TYPE_QUERY;
import static de.caritas.cob.agencyservice.testHelper.TestConstants.INVALID_POSTCODE_QUERY;
import static de.caritas.cob.agencyservice.testHelper.TestConstants.VALID_AGE_QUERY;
import static de.caritas.cob.agencyservice.testHelper.TestConstants.VALID_CONSULTING_TYPE_QUERY;
import static de.caritas.cob.agencyservice.testHelper.TestConstants.VALID_POSTCODE_QUERY;
import static de.caritas.cob.agencyservice.testHelper.TestConstants.VALID_TOPIC_ID_QUERY;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;

import de.caritas.cob.agencyservice.api.authorization.RoleAuthorizationAuthorityMapper;
import de.caritas.cob.agencyservice.api.exception.httpresponses.InternalServerErrorException;
import de.caritas.cob.agencyservice.api.model.AgencyTopicsDTO;
import de.caritas.cob.agencyservice.api.authorization.Authority.AuthorityValue;
import de.caritas.cob.agencyservice.api.model.FullAgencyResponseDTO;
import de.caritas.cob.agencyservice.api.service.AgencyService;
import de.caritas.cob.agencyservice.api.service.LogService;
import de.caritas.cob.agencyservice.api.service.TopicEnrichmentService;
import de.caritas.cob.agencyservice.config.security.AuthorisationService;
import de.caritas.cob.agencyservice.config.security.JwtAuthConverter;
import de.caritas.cob.agencyservice.config.security.JwtAuthConverterProperties;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
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.hateoas.client.LinkDiscoverers;
import org.springframework.http.MediaType;
import org.springframework.security.test.context.support.WithMockUser;
import org.springframework.test.web.servlet.MockMvc;

@WebMvcTest(AgencyController.class)
@AutoConfigureMockMvc(addFilters = false)
@SpringBootTest(properties = "spring.liquibase.enabled=false")
@AutoConfigureMockMvc
@AutoConfigureTestDatabase
class AgencyControllerIT {

static final String PATH_GET_AGENCIES_BY_CONSULTINGTYPE = "/agencies/consultingtype/1";

@Autowired
private MockMvc mvc;

Expand All @@ -66,224 +44,8 @@ class AgencyControllerIT {
@MockBean
private AgencyService agencyService;

@MockBean
private LinkDiscoverers linkDiscoverers;

@MockBean
private RoleAuthorizationAuthorityMapper roleAuthorizationAuthorityMapper;

@MockBean
private JwtAuthConverter jwtAuthConverter;

@MockBean
private AuthorisationService authorisationService;

@MockBean
private JwtAuthConverterProperties jwtAuthConverterProperties;

@Mock
private Logger logger;

@Test
void getAgencies_Should_ReturnNoContent_When_ServiceReturnsEmptyList() throws Exception {

when(agencyService.getAgencies(Mockito.any(Optional.class), Mockito.anyInt(), Mockito.any(Optional.class), Mockito.any(Optional.class), Mockito.any(Optional.class), Mockito.any(Optional.class)))
.thenReturn(null);

mvc.perform(
get(PATH_GET_LIST_OF_AGENCIES + "?" + VALID_POSTCODE_QUERY + "&"
+ VALID_CONSULTING_TYPE_QUERY + "&" + VALID_AGE_QUERY)
.accept(MediaType.APPLICATION_JSON))
.andExpect(status().isNoContent());
}

@Test
void getAgencies_Should_ReturnBadRequest_When_PostcodeParamIsInvalid() throws Exception {

mvc.perform(
get(PATH_GET_LIST_OF_AGENCIES + "?" + INVALID_POSTCODE_QUERY + "&"
+ VALID_CONSULTING_TYPE_QUERY)
.accept(MediaType.APPLICATION_JSON))
.andExpect(status().isBadRequest());
}

@Test
void getAgencies_Should_ReturnBadRequest_When_ConsultingTypeParamIsInvalid()
throws Exception {

mvc.perform(
get(PATH_GET_LIST_OF_AGENCIES + "?" + VALID_POSTCODE_QUERY + "&"
+ INVALID_CONSULTING_TYPE_QUERY)
.accept(MediaType.APPLICATION_JSON))
.andExpect(status().isBadRequest());
}

@Test
void getAgencies_Should_ReturnRespondWith2XXResponseCode_When_PostcodeParamIsNotProvided()
throws Exception {

mvc.perform(get(PATH_GET_LIST_OF_AGENCIES + "?" + VALID_CONSULTING_TYPE_QUERY)
.accept(MediaType.APPLICATION_JSON)).andExpect(status().isNoContent());
}

@Test
void getAgencies_Should_ReturnBadRequest_When_ConsultingTypeParamIsNotProvided()
throws Exception {

mvc.perform(get(PATH_GET_LIST_OF_AGENCIES + "?" + VALID_POSTCODE_QUERY)
.accept(MediaType.APPLICATION_JSON)).andExpect(status().isBadRequest());
}

@Test
void getAgencies_Should_ReturnListAndOk_When_ServiceReturnsList() throws Exception {

List<FullAgencyResponseDTO> agencies = new ArrayList<>();
agencies.add(FULL_AGENCY_RESPONSE_DTO);

when(agencyService.getAgencies(Mockito.any(Optional.class), Mockito.anyInt(), Mockito.any(Optional.class), Mockito.any(Optional.class), Mockito.any(Optional.class), Mockito.any(Optional.class)))
.thenReturn(agencies);

mvc.perform(
get(PATH_GET_LIST_OF_AGENCIES + "?" + VALID_POSTCODE_QUERY + "&"
+ VALID_CONSULTING_TYPE_QUERY)
.accept(MediaType.APPLICATION_JSON))
.andExpect(status().isOk())
.andExpect(jsonPath("[0].name").value(AGENCY_RESPONSE_DTO.getName()));

verify(agencyService, atLeastOnce()).getAgencies(Mockito.any(Optional.class),
Mockito.anyInt(), Mockito.any(Optional.class), Mockito.any(Optional.class), Mockito.any(Optional.class), Mockito.any(Optional.class));
}

@Test
void getAgencies_With_Ids_Should_ReturnNoContent_When_ServiceReturnsNoAgency()
throws Exception {

when(agencyService.getAgencies(Mockito.anyList())).thenReturn(Collections.emptyList());

mvc.perform(get(PATH_GET_AGENCIES_WITH_IDS + AGENCY_ID).accept(MediaType.APPLICATION_JSON))
.andExpect(status().isNotFound());
}

@Test
void getAgencies_With_Ids_Should_ReturnBadRequest_When_IdInvalid() throws Exception {

mvc.perform(
get(PATH_GET_AGENCIES_WITH_IDS + INVALID_AGENCY_ID).contentType(MediaType.APPLICATION_JSON)
.accept(MediaType.APPLICATION_JSON)).andExpect(status().isBadRequest());
}

@Test
void getAgencies_With_Ids_Should_ReturnAgencyAndOk_When_ServiceReturnsAgency()
throws Exception {

when(agencyService.getAgencies(Mockito.anyList())).thenReturn(AGENCY_RESPONSE_DTO_LIST);

mvc.perform(get(PATH_GET_AGENCIES_WITH_IDS + AGENCY_ID + "," + AGENCY_ID)
.accept(MediaType.APPLICATION_JSON))
.andExpect(status().isOk())
.andExpect(jsonPath("[0].name").value(AGENCY_RESPONSE_DTO.getName()));

verify(agencyService, atLeastOnce()).getAgencies(Mockito.anyList());
}

@Test
void getListOfAgencies_Should_ReturnServerErrorAndLogDatabaseError_OnAgencyServiceThrowsServerErrorException()
throws Exception {

InternalServerErrorException dbEx = new InternalServerErrorException(
LogService::logDatabaseError, "message");
when(agencyService.getAgencies(any(), anyInt(), Mockito.any(Optional.class), Mockito.any(Optional.class), Mockito.any(Optional.class), Mockito.any(Optional.class))).thenThrow(dbEx);

mvc.perform(get(PATH_GET_LIST_OF_AGENCIES + "?" + VALID_POSTCODE_QUERY + "&"
+ VALID_CONSULTING_TYPE_QUERY)
.accept(MediaType.APPLICATION_JSON))
.andExpect(status().isInternalServerError());
}

@Test
void getAgencies_With_Ids_Should_ReturnServerErrorAndLogDatabaseError_OnAgencyServiceThrowsServerErrorException()
throws Exception {

InternalServerErrorException dbEx = new InternalServerErrorException(
LogService::logDatabaseError, "message");
when(agencyService.getAgencies(any())).thenThrow(dbEx);

mvc.perform(get(PATH_GET_AGENCIES_WITH_IDS + AGENCY_ID + "," + AGENCY_ID)
.accept(MediaType.APPLICATION_JSON))
.andExpect(status().isInternalServerError());
}

@Test
void getListOfAgencies_Should_ReturnServerErrorAndLogNumberFormatError_OnAgencyServiceThrowsServerErrorException()
throws Exception {

InternalServerErrorException nfEx = new InternalServerErrorException(
LogService::logNumberFormatException, "message");

when(agencyService.getAgencies(any(), anyInt(), Mockito.any(Optional.class), Mockito.any(Optional.class), Mockito.any(Optional.class), Mockito.any(Optional.class))).thenThrow(nfEx);

mvc.perform(get(PATH_GET_LIST_OF_AGENCIES + "?" + VALID_POSTCODE_QUERY + "&"
+ VALID_CONSULTING_TYPE_QUERY)
.accept(MediaType.APPLICATION_JSON))
.andExpect(status().isInternalServerError());

}

@Test
void getAgencies_Should_ReturnBadRequest_When_ConsultingTypeIsNull() throws Exception {
mvc.perform(
get(PATH_GET_LIST_OF_AGENCIES + "?" + VALID_POSTCODE_QUERY + "&"
+ "consultingType=").accept(MediaType.APPLICATION_JSON))
.andExpect(status().isBadRequest());
}

@Test
void getAgenciesByConsultingType_Should_ReturnBadRequest_When_consultingTypeIsInvalid()
throws Exception {
mvc.perform(
get(PATH_GET_AGENCIES_BY_CONSULTINGTYPE.replace("1", "invalid"))
.accept(MediaType.APPLICATION_JSON))
.andExpect(status().isBadRequest());
}

@Test
void getAgenciesByConsultingType_Should_ReturnOk_When_consultingTypeIsValid()
throws Exception {
mvc.perform(
get(PATH_GET_AGENCIES_BY_CONSULTINGTYPE)
.accept(MediaType.APPLICATION_JSON))
.andExpect(status().isOk());
}

@Test
void getAgenciesTopics_Should_ReturnNoContent_When_ServiceReturnsEmptyList() throws Exception {

when(agencyService.getAgenciesTopics())
.thenReturn(null);

mvc.perform(
get(PATH_GET_LIST_OF_AGENCIES_TOPICS)
.accept(MediaType.APPLICATION_JSON))
.andExpect(status().isNoContent());
}

@Test
void getAgenciesTopics_Should_ReturnListAndOk_When_ServiceReturnsList() throws Exception {

List<AgencyTopicsDTO> agenciesTopics = new ArrayList<>();
agenciesTopics.add(AGENCY_TOPICS_DTO);

when(topicEnrichmentService.enrichTopicIdsWithTopicData(Mockito.anyList()))
.thenReturn(agenciesTopics);

mvc.perform(
get(PATH_GET_LIST_OF_AGENCIES_TOPICS))
.andExpect(status().isOk());

verify(topicEnrichmentService, atLeastOnce()).enrichTopicIdsWithTopicData(Mockito.anyList());
}

@Test
@WithMockUser(authorities = {AuthorityValue.SEARCH_AGENCIES_WITHIN_TENANT})
void getTenantAgencies_Should_ReturnNoContent_When_ServiceReturnsEmptyList() throws Exception {

when(agencyService.getAgencies(Mockito.anyString(), Mockito.anyInt()))
Expand All @@ -297,6 +59,7 @@ void getTenantAgencies_Should_ReturnNoContent_When_ServiceReturnsEmptyList() thr
}

@Test
@WithMockUser(authorities = {AuthorityValue.SEARCH_AGENCIES_WITHIN_TENANT})
void getTenantAgencies_Should_ReturnBadRequest_When_PostcodeParamIsInvalid() throws Exception {

mvc.perform(
Expand All @@ -307,6 +70,7 @@ void getTenantAgencies_Should_ReturnBadRequest_When_PostcodeParamIsInvalid() thr
}

@Test
@WithMockUser(authorities = {AuthorityValue.SEARCH_AGENCIES_WITHIN_TENANT})
void getTenantAgencies_Should_ReturnBadRequest_When_topicIdParamIsNotProvided()
throws Exception {

Expand All @@ -315,6 +79,7 @@ void getTenantAgencies_Should_ReturnBadRequest_When_topicIdParamIsNotProvided()
}

@Test
@WithMockUser(authorities = {AuthorityValue.SEARCH_AGENCIES_WITHIN_TENANT})
void getTenantAgencies_Should_ReturnBadRequest_When_PostCodeParamIsNotProvided()
throws Exception {

Expand All @@ -323,6 +88,7 @@ void getTenantAgencies_Should_ReturnBadRequest_When_PostCodeParamIsNotProvided()
}

@Test
@WithMockUser(authorities = {AuthorityValue.SEARCH_AGENCIES_WITHIN_TENANT})
void getTenantAgencies_Should_ReturnListAndOk_When_ServiceReturnsList() throws Exception {

List<FullAgencyResponseDTO> agencies = new ArrayList<>();
Expand All @@ -341,4 +107,18 @@ void getTenantAgencies_Should_ReturnListAndOk_When_ServiceReturnsList() throws E
verify(agencyService, atLeastOnce()).getAgencies(Mockito.anyString(), Mockito.anyInt());
}

@Test
void getTenantAgencies_Should_ReturnUnauthorized_When_UserHasNoAuthority() throws Exception {

mvc.perform(get(PATH_GET_LIST_OF_AGENCIES_PRIVATE + "?" + VALID_TOPIC_ID_QUERY)
.accept(MediaType.APPLICATION_JSON)).andExpect(status().isUnauthorized());
}

@Test
@WithMockUser(authorities = {AuthorityValue.SEARCH_AGENCIES})
void getTenantAgencies_Should_ReturnForbidden_When_UserHasWrongAuthority() throws Exception {

mvc.perform(get(PATH_GET_LIST_OF_AGENCIES_PRIVATE + "?" + VALID_TOPIC_ID_QUERY)
.accept(MediaType.APPLICATION_JSON)).andExpect(status().isForbidden());
}
}
Loading

0 comments on commit 6a89936

Please sign in to comment.