Skip to content

[feat] Added Page Support #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Prajwalprakash3722 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

[feat] Added Page Support #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
25fa738
[feat] Added Page Support
Prajwalprakash3722 Feb 12, 2024
24cbcf2
Merge branch 'main' into pagination
Prajwalprakash3722 Feb 12, 2024
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
10 changes: 5 additions & 5 deletions src/main/java/org/ieeervce/api/siterearnouveau/controller/EventsController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
package org.ieeervce.api.siterearnouveau.controller;

import java.util.List;

import org.ieeervce.api.siterearnouveau.dto.ResultsDTO;
import org.ieeervce.api.siterearnouveau.entity.Event;
import org.ieeervce.api.siterearnouveau.service.EventsService;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

@RestController
@RequestMapping("/api/event")
public class EventsController {
private EventsService eventsService;
private final EventsService eventsService;

public EventsController(EventsService eventsService) {
this.eventsService = eventsService;
}

@GetMapping
public ResultsDTO<List<Event>> list() {
List<Event> events = eventsService.list();
public ResultsDTO<Page<Event>> list(Pageable pageable) {
Page<Event> events = eventsService.list(pageable);
return new ResultsDTO<>(events);
}
}
13 changes: 8 additions & 5 deletions src/main/java/org/ieeervce/api/siterearnouveau/service/EventsService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,23 @@
package org.ieeervce.api.siterearnouveau.service;

import java.util.List;

import org.ieeervce.api.siterearnouveau.entity.Event;
import org.ieeervce.api.siterearnouveau.repository.EventsRepository;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.stereotype.Service;

@Service
public class EventsService {
private EventsRepository eventsRepository;
private final EventsRepository eventsRepository;

public EventsService(EventsRepository eventsRepository) {
this.eventsRepository = eventsRepository;
}

public List<Event> list() {
return eventsRepository.findAll();
public Page<Event> list(Pageable pageable) {
pageable = PageRequest.of(pageable.getPageNumber(), pageable.getPageSize(), Sort.by("eventStartTime").ascending());
return eventsRepository.findAll(pageable);
}
}
52 changes: 30 additions & 22 deletions src/test/java/org/ieeervce/api/siterearnouveau/controller/EventsControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,8 @@
package org.ieeervce.api.siterearnouveau.controller;

import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.iterableWithSize;
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 java.util.Collections;

import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonMappingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.ieeervce.api.siterearnouveau.entity.Event;
import org.ieeervce.api.siterearnouveau.service.EventsService;
import org.junit.jupiter.api.BeforeEach;
Expand All @@ -18,21 +12,30 @@
import org.mockito.Mock;
import org.mockito.Spy;
import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageImpl;
import org.springframework.data.domain.Pageable;
import org.springframework.data.web.PageableHandlerMethodArgumentResolver;
import org.springframework.test.web.servlet.MockMvc;
import org.springframework.test.web.servlet.setup.MockMvcBuilders;

import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonMappingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import java.util.Collections;

import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.iterableWithSize;
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;

@ExtendWith(MockitoExtension.class)
class EventsControllerTest {
private static final String KEYWORDS = "a b c d";

private static final int EVENT_ID = 1;
private static final int EVENT_ID = 1;
private static final String HOST_NAME = "abcd efgh";

private static final String EXAMPLE_HOSTS_TREE_STRING = String.format("{\"name\":\"%s\"}",HOST_NAME);
private static final String EXAMPLE_HOSTS_TREE_STRING = String.format("{\"name\":\"%s\"}", HOST_NAME);

@Mock
EventsService eventsService;
Expand All @@ -46,25 +49,30 @@ class EventsControllerTest {

MockMvc mvc;


@BeforeEach
void setup() throws JsonMappingException, JsonProcessingException {
mvc = MockMvcBuilders.standaloneSetup(eventsController).build();
void setup() throws JsonProcessingException {
mvc = MockMvcBuilders.standaloneSetup(eventsController)
.setCustomArgumentResolvers(new PageableHandlerMethodArgumentResolver())
.build();
event.setEventId(EVENT_ID);
event.setKeywords(KEYWORDS);
event.setHosts(objectMapper.readTree(EXAMPLE_HOSTS_TREE_STRING));
}

@Test
void testList() throws Exception {
when(eventsService.list()).thenReturn(Collections.singletonList(event));

Page<Event> mockEventPage = new PageImpl<>(Collections.singletonList(event));
Pageable pageable = Pageable.ofSize(20).withPage(0);
when(eventsService.list(pageable)).thenReturn(mockEventPage);
mvc.perform(get("/api/event"))
.andExpect(status().isOk())
.andExpect(jsonPath("$.ok", equalTo(true)))
.andExpect(jsonPath("$.response", iterableWithSize(1)))
.andExpect(jsonPath("$.response[0].eventId",equalTo(EVENT_ID)))
.andExpect(jsonPath("$.response[0].keywords",equalTo(KEYWORDS)))
.andExpect(jsonPath("$.response[0].hosts.name",equalTo(HOST_NAME)));

.andExpect(jsonPath("$.response.content", iterableWithSize(1)))
.andExpect(jsonPath("$.response.content[0].eventId", equalTo(EVENT_ID)))
.andExpect(jsonPath("$.response.content[0].keywords", equalTo(KEYWORDS)))
.andExpect(jsonPath("$.response.content[0].hosts.name", equalTo(HOST_NAME)));
}

}
25 changes: 15 additions & 10 deletions src/test/java/org/ieeervce/api/siterearnouveau/service/EventsServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,37 @@
package org.ieeervce.api.siterearnouveau.service;

import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.when;

import java.util.Collections;

import org.ieeervce.api.siterearnouveau.entity.Event;
import org.ieeervce.api.siterearnouveau.repository.EventsRepository;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.data.domain.*;

import java.util.Collections;

import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.when;

@ExtendWith(MockitoExtension.class)
class EventsServiceTest {
@Mock
EventsRepository eventsRepository;
@InjectMocks
EventsService eventsService;
EventsService eventsService;

@Mock
Event event;

@Test
void testList(){
when(eventsRepository.findAll()).thenReturn(Collections.singletonList(event));
var eventsList = eventsService.list();
assertThat(eventsList).isNotNull().singleElement().isSameAs(event);
void testList() {
Pageable pageable = Pageable.ofSize(20).withPage(0);
Copy link
Member

@chrisvrose chrisvrose Feb 12, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you use default Page size? instead of 20?

Copy link
Member Author

@Prajwalprakash3722 Prajwalprakash3722 Feb 12, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Default is 20

Page<Event> eventPage = new PageImpl<>(Collections.singletonList(event), pageable, 1);
pageable = PageRequest.of(pageable.getPageNumber(), pageable.getPageSize(), Sort.by("eventStartTime").ascending());
when(eventsRepository.findAll(pageable)).thenReturn(eventPage);
Page<Event> results = eventsService.list(pageable);
assertThat(results).isNotNull();
assertThat(results.getContent()).containsExactly(event);
}
}