Increasing test coverage.

api/pom.xml

@@ -75,6 +75,11 @@
  <groupId>org.springframework.boot</groupId>
  <artifactId>spring-boot-starter-data-jpa</artifactId>
  </dependency>
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-test</artifactId>
+ <scope>test</scope>
+ </dependency>
  <dependency>
  <groupId>org.springframework.boot</groupId>
  <artifactId>spring-boot-starter-data-redis</artifactId>

api/src/main/java/ca/bc/gov/educ/api/trax/model/entity/EventHistoryEntity.java

@@ -4,15 +4,17 @@
 import jakarta.persistence.*;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
 import org.hibernate.annotations.DynamicUpdate;
 import org.hibernate.annotations.GenericGenerator;
 
 import java.util.UUID;
 
-@Getter
-@Setter
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@SuperBuilder
 @Entity
 @Table(name = "EVENT_HISTORY")
 @DynamicUpdate

api/src/main/java/ca/bc/gov/educ/api/trax/model/entity/v2/BaseEntity.java

@@ -4,12 +4,18 @@
 import ca.bc.gov.educ.api.trax.util.ThreadLocalStateUtil;
 import jakarta.persistence.*;
 import jakarta.validation.constraints.PastOrPresent;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
 import org.apache.commons.lang3.StringUtils;
 
 import java.time.LocalDateTime;
 
 @Data
+@NoArgsConstructor
+@AllArgsConstructor
+@SuperBuilder
 @MappedSuperclass
 public class BaseEntity {
 

api/src/test/java/ca/bc/gov/educ/api/trax/controller/EventHistoryControllerTest.java

@@ -0,0 +1,154 @@
+package ca.bc.gov.educ.api.trax.controller;
+
+import ca.bc.gov.educ.api.trax.EducGradTraxApiApplication;
+import ca.bc.gov.educ.api.trax.filter.FilterOperation;
+import ca.bc.gov.educ.api.trax.messaging.NatsConnection;
+import ca.bc.gov.educ.api.trax.messaging.jetstream.Publisher;
+import ca.bc.gov.educ.api.trax.messaging.jetstream.Subscriber;
+import ca.bc.gov.educ.api.trax.model.dto.Search;
+import ca.bc.gov.educ.api.trax.model.dto.SearchCriteria;
+import ca.bc.gov.educ.api.trax.model.dto.ValueType;
+import ca.bc.gov.educ.api.trax.model.entity.EventEntity;
+import ca.bc.gov.educ.api.trax.model.entity.EventHistoryEntity;
+import ca.bc.gov.educ.api.trax.repository.EventHistoryRepository;
+import ca.bc.gov.educ.api.trax.repository.EventRepository;
+import ca.bc.gov.educ.api.trax.util.EducGradTraxApiConstants;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.MockitoAnnotations;
+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.data.redis.connection.jedis.JedisConnectionFactory;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.oauth2.client.OAuth2AuthorizedClientService;
+import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository;
+import org.springframework.security.oauth2.client.web.OAuth2AuthorizedClientRepository;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.MvcResult;
+import redis.clients.jedis.JedisCluster;
+
+import java.time.LocalDateTime;
+import java.util.*;
+
+import static org.hamcrest.Matchers.hasSize;
+import static org.springframework.http.MediaType.APPLICATION_JSON;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.asyncDispatch;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.oidcLogin;
+
+@SpringBootTest(classes = { EducGradTraxApiApplication.class })
+@ActiveProfiles("test")
+@AutoConfigureMockMvc
+class EventHistoryControllerTest {
+
+ private static final String USER = "TEST";
+ private static final String READ_SCOPE = "SCOPE_READ_EVENT_HISTORY";
+ @Autowired
+ private MockMvc mockMvc;
+
+ @Autowired
+ private EventHistoryRepository eventHistoryRepository;
+
+ @Autowired
+ private EventRepository eventRepository;
+
+ @MockBean
+ private Publisher publisher;
+ @MockBean
+ private Subscriber subscriber;
+ @MockBean
+ private NatsConnection natsConnection;
+ @MockBean
+ private ClientRegistrationRepository clientRegistrationRepository;
+ @MockBean
+ private OAuth2AuthorizedClientRepository oAuth2AuthorizedClientRepository;
+ @MockBean
+ private OAuth2AuthorizedClientService oAuth2AuthorizedClientService;
+ @MockBean
+ private JedisConnectionFactory jedisConnectionFactoryMock;
+ @MockBean
+ private JedisCluster jedisClusterMock;
+ private AutoCloseable closeable;
+
+ @BeforeEach
+ void setUp() {
+ closeable = MockitoAnnotations.openMocks(this);
+ EventEntity event = this.eventRepository.save(this.createEventData());
+ this.eventHistoryRepository.save(this.createEventHistoryData(event));
+ }
+
+ @AfterEach
+ void tearDown() throws Exception {
+ this.eventRepository.deleteAll();
+ closeable.close();
+ }
+
+ @Test
+ void testReadEventHistoryPaginated_givenValueNull_ShouldReturnStatusOk() throws Exception {
+ final GrantedAuthority grantedAuthority = () -> READ_SCOPE;
+ final var mockAuthority = oidcLogin().authorities(grantedAuthority);
+ final SearchCriteria criteria = SearchCriteria.builder().key("website").operation(FilterOperation.EQUAL).value(null).valueType(ValueType.STRING).build();
+ final List<SearchCriteria> criteriaList = new ArrayList<>();
+ criteriaList.add(criteria);
+ final List<Search> searches = new LinkedList<>();
+ searches.add(Search.builder().searchCriteriaList(criteriaList).build());
+ final ObjectMapper objectMapper = new ObjectMapper();
+ final String criteriaJSON = objectMapper.writeValueAsString(searches);
+ this.mockMvc.perform(get(EducGradTraxApiConstants.EVENT_HISTORY_MAPPING_V1 + "/paginated").with(mockAuthority).param("searchCriteriaList", criteriaJSON)
+ .contentType(APPLICATION_JSON)).andDo(print()).andExpect(status().isOk());
+ }
+
+ @Test
+ void testReadEventHistoryPaginated_givenUserNameFilter_ShouldReturnStatusOk() throws Exception {
+ final GrantedAuthority grantedAuthority = () -> READ_SCOPE;
+ final var mockAuthority = oidcLogin().authorities(grantedAuthority);
+ final ObjectMapper objectMapper = new ObjectMapper();
+ final SearchCriteria criteria = SearchCriteria.builder().key("createUser").operation(FilterOperation.EQUAL).value(USER).valueType(ValueType.STRING).build();
+ final List<SearchCriteria> criteriaList = new ArrayList<>();
+ criteriaList.add(criteria);
+ final List<Search> searches = new LinkedList<>();
+ searches.add(Search.builder().searchCriteriaList(criteriaList).build());
+ final String criteriaJSON = objectMapper.writeValueAsString(searches);
+ final MvcResult result = this.mockMvc
+ .perform(get(EducGradTraxApiConstants.EVENT_HISTORY_MAPPING_V1 + "/paginated").with(mockAuthority).param("searchCriteriaList", criteriaJSON)
+ .contentType(APPLICATION_JSON))
+ .andReturn();
+ this.mockMvc.perform(asyncDispatch(result)).andDo(print()).andExpect(status().isOk()).andExpect(jsonPath("$.content", hasSize(1)));
+ }
+
+ private EventEntity createEventData() {
+ return EventEntity.builder()
+ .eventId(UUID.randomUUID())
+ .eventPayload("")
+ .eventStatus("PROCESSED")
+ .eventType("CREATE_SCHOOL_CONTACT")
+ .eventOutcome("SCHOOL_CONTACT_CREATED")
+ .createUser(USER)
+ .createDate(LocalDateTime.now())
+ .updateUser(USER)
+ .updateDate(LocalDateTime.now())
+ .activityCode("INSTITUTE_EVENT")
+ .build();
+
+ }
+
+ private EventHistoryEntity createEventHistoryData(EventEntity event) {
+ return EventHistoryEntity.builder()
+ .event(event)
+ .acknowledgeFlag("N")
+ .createDate(LocalDateTime.now())
+ .createUser(USER)
+ .updateDate(LocalDateTime.now())
+ .updateUser(USER)
+ .build();
+ }
+
+}