From 8a2fbc91b6b687e0646c06a8dc726b9264153471 Mon Sep 17 00:00:00 2001
From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Date: Thu, 1 Oct 2026 06:24:25 +0000
Subject: [PATCH] bug: page /api/appointment/all and return AppointmentSummary
DTOs (fix N+1 + unbounded list)
---
AdminPortal/src/app/appointment.service.ts | 4 +-
.../appointment/appointment.component.html | 8 +-
.../app/appointment/appointment.component.ts | 24 +++-
UserFront/pom.xml | 6 +
.../com/userFront/config/RequestFilter.java | 1 +
.../com/userFront/dao/AppointmentDao.java | 11 +-
.../com/userFront/domain/Appointment.java | 6 +-
.../userFront/domain/AppointmentSummary.java | 59 ++++++++++
.../resource/AppointmentResource.java | 30 ++++-
.../userFront/service/AppointmentService.java | 6 +-
.../AppointmentServiceImpl.java | 9 +-
.../com/userFront/dao/AppointmentDaoTest.java | 97 ++++++++++++++++
.../resource/AppointmentResourceTest.java | 105 ++++++++++++++++++
13 files changed, 347 insertions(+), 19 deletions(-)
create mode 100644 UserFront/src/main/java/com/userFront/domain/AppointmentSummary.java
create mode 100644 UserFront/src/test/java/com/userFront/dao/AppointmentDaoTest.java
create mode 100644 UserFront/src/test/java/com/userFront/resource/AppointmentResourceTest.java
diff --git a/AdminPortal/src/app/appointment.service.ts b/AdminPortal/src/app/appointment.service.ts
index ad506808..a88743e8 100644
--- a/AdminPortal/src/app/appointment.service.ts
+++ b/AdminPortal/src/app/appointment.service.ts
@@ -7,8 +7,8 @@ export class AppointmentService {
constructor (private http:Http){}
- getAppointmentList() {
- let url = "http://localhost:8080/api/appointment/all";
+ getAppointmentList(page: number, size: number) {
+ let url = "http://localhost:8080/api/appointment/all?page="+page+"&size="+size;
return this.http.get(url, { withCredentials: true });
}
diff --git a/AdminPortal/src/app/appointment/appointment.component.html b/AdminPortal/src/app/appointment/appointment.component.html
index 5b702e8e..2066c24a 100644
--- a/AdminPortal/src/app/appointment/appointment.component.html
+++ b/AdminPortal/src/app/appointment/appointment.component.html
@@ -22,4 +22,10 @@
Appointment List Page
-
\ No newline at end of file
+
+
+
diff --git a/AdminPortal/src/app/appointment/appointment.component.ts b/AdminPortal/src/app/appointment/appointment.component.ts
index 5be37e91..b9709364 100644
--- a/AdminPortal/src/app/appointment/appointment.component.ts
+++ b/AdminPortal/src/app/appointment/appointment.component.ts
@@ -10,20 +10,42 @@ import {AppointmentService} from '../appointment.service';
export class AppointmentComponent implements OnInit {
appointmentList: Object[];
+ page: number = 0;
+ pageSize: number = 50;
+ totalCount: number = 0;
constructor(private appointmentService: AppointmentService) {
this.getAppointmentList();
}
getAppointmentList() {
- this.appointmentService.getAppointmentList().subscribe(
+ this.appointmentService.getAppointmentList(this.page, this.pageSize).subscribe(
res => {
this.appointmentList = JSON.parse(JSON.parse(JSON.stringify(res))._body);
+ this.totalCount = Number(res.headers.get('X-Total-Count')) || 0;
},
error => console.log(error)
)
}
+ pageCount() {
+ return Math.max(1, Math.ceil(this.totalCount / this.pageSize));
+ }
+
+ previousPage() {
+ if (this.page > 0) {
+ this.page--;
+ this.getAppointmentList();
+ }
+ }
+
+ nextPage() {
+ if (this.page + 1 < this.pageCount()) {
+ this.page++;
+ this.getAppointmentList();
+ }
+ }
+
confirmAppointment(id: number) {
this.appointmentService.confirmAppointment(id).subscribe();
location.reload();
diff --git a/UserFront/pom.xml b/UserFront/pom.xml
index 902ec2b3..a34c8080 100644
--- a/UserFront/pom.xml
+++ b/UserFront/pom.xml
@@ -60,6 +60,12 @@
spring-boot-starter-test
test
+
+
+ com.h2database
+ h2
+ test
+
diff --git a/UserFront/src/main/java/com/userFront/config/RequestFilter.java b/UserFront/src/main/java/com/userFront/config/RequestFilter.java
index efff86c5..68045c7c 100644
--- a/UserFront/src/main/java/com/userFront/config/RequestFilter.java
+++ b/UserFront/src/main/java/com/userFront/config/RequestFilter.java
@@ -25,6 +25,7 @@ public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain)
response.setHeader("Access-Control-Allow-Headers", "x-requested-with");
response.setHeader("Access-Control-Max-Age", "3600");
response.setHeader("Access-Control-Allow-Credentials", "true");
+ response.setHeader("Access-Control-Expose-Headers", "X-Total-Count, X-Page, X-Page-Size");
if (!(request.getMethod().equalsIgnoreCase("OPTIONS"))) {
try {
diff --git a/UserFront/src/main/java/com/userFront/dao/AppointmentDao.java b/UserFront/src/main/java/com/userFront/dao/AppointmentDao.java
index b60473a1..2e4086e0 100644
--- a/UserFront/src/main/java/com/userFront/dao/AppointmentDao.java
+++ b/UserFront/src/main/java/com/userFront/dao/AppointmentDao.java
@@ -1,12 +1,17 @@
package com.userFront.dao;
-import java.util.List;
-
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.CrudRepository;
import com.userFront.domain.Appointment;
+import com.userFront.domain.AppointmentSummary;
public interface AppointmentDao extends CrudRepository {
- List findAll();
+ @Query(value = "select new com.userFront.domain.AppointmentSummary(a.id, a.date, a.location, a.description, a.confirmed, u.username) "
+ + "from Appointment a left join a.user u",
+ countQuery = "select count(a) from Appointment a")
+ Page findAllSummaries(Pageable pageable);
}
diff --git a/UserFront/src/main/java/com/userFront/domain/Appointment.java b/UserFront/src/main/java/com/userFront/domain/Appointment.java
index 1d6623e7..7f3afebe 100644
--- a/UserFront/src/main/java/com/userFront/domain/Appointment.java
+++ b/UserFront/src/main/java/com/userFront/domain/Appointment.java
@@ -3,12 +3,15 @@
import java.util.Date;
import javax.persistence.Entity;
+import javax.persistence.FetchType;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
@Entity
public class Appointment {
@@ -20,8 +23,9 @@ public class Appointment {
private String description;
private boolean confirmed;
- @ManyToOne
+ @ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "user_id")
+ @JsonIgnore
private User user;
public Long getId() {
diff --git a/UserFront/src/main/java/com/userFront/domain/AppointmentSummary.java b/UserFront/src/main/java/com/userFront/domain/AppointmentSummary.java
new file mode 100644
index 00000000..d4a5abe4
--- /dev/null
+++ b/UserFront/src/main/java/com/userFront/domain/AppointmentSummary.java
@@ -0,0 +1,59 @@
+package com.userFront.domain;
+
+import java.util.Date;
+
+public class AppointmentSummary {
+
+ private final Long id;
+ private final Date date;
+ private final String location;
+ private final String description;
+ private final boolean confirmed;
+ private final UserRef user;
+
+ public AppointmentSummary(Long id, Date date, String location, String description, boolean confirmed, String username) {
+ this.id = id;
+ this.date = date;
+ this.location = location;
+ this.description = description;
+ this.confirmed = confirmed;
+ this.user = username == null ? null : new UserRef(username);
+ }
+
+ public Long getId() {
+ return id;
+ }
+
+ public Date getDate() {
+ return date;
+ }
+
+ public String getLocation() {
+ return location;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public boolean isConfirmed() {
+ return confirmed;
+ }
+
+ public UserRef getUser() {
+ return user;
+ }
+
+ public static class UserRef {
+
+ private final String username;
+
+ public UserRef(String username) {
+ this.username = username;
+ }
+
+ public String getUsername() {
+ return username;
+ }
+ }
+}
diff --git a/UserFront/src/main/java/com/userFront/resource/AppointmentResource.java b/UserFront/src/main/java/com/userFront/resource/AppointmentResource.java
index bcb37490..389fba3e 100644
--- a/UserFront/src/main/java/com/userFront/resource/AppointmentResource.java
+++ b/UserFront/src/main/java/com/userFront/resource/AppointmentResource.java
@@ -3,12 +3,17 @@
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Sort;
+import org.springframework.http.ResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
-import com.userFront.domain.Appointment;
+import com.userFront.domain.AppointmentSummary;
import com.userFront.service.AppointmentService;
@RestController
@@ -16,14 +21,29 @@
@PreAuthorize("hasRole('ADMIN')")
public class AppointmentResource {
+ static final int DEFAULT_PAGE_SIZE = 50;
+ static final int MAX_PAGE_SIZE = 200;
+ private static final Sort NEWEST_FIRST = new Sort(Sort.Direction.DESC, "date", "id");
+
@Autowired
private AppointmentService appointmentService;
@RequestMapping("/all")
- public List findAppointmentList() {
- List appointmentList = appointmentService.findAll();
-
- return appointmentList;
+ public ResponseEntity> findAppointmentList(
+ @RequestParam(value = "page", defaultValue = "0") int page,
+ @RequestParam(value = "size", defaultValue = "" + DEFAULT_PAGE_SIZE) int size) {
+ if (page < 0 || size < 1 || size > MAX_PAGE_SIZE) {
+ return ResponseEntity.badRequest().build();
+ }
+
+ Page appointmentPage =
+ appointmentService.findAllSummaries(new PageRequest(page, size, NEWEST_FIRST));
+
+ return ResponseEntity.ok()
+ .header("X-Total-Count", String.valueOf(appointmentPage.getTotalElements()))
+ .header("X-Page", String.valueOf(page))
+ .header("X-Page-Size", String.valueOf(size))
+ .body(appointmentPage.getContent());
}
@RequestMapping("/{id}/confirm")
diff --git a/UserFront/src/main/java/com/userFront/service/AppointmentService.java b/UserFront/src/main/java/com/userFront/service/AppointmentService.java
index be7ab0eb..b43afa35 100644
--- a/UserFront/src/main/java/com/userFront/service/AppointmentService.java
+++ b/UserFront/src/main/java/com/userFront/service/AppointmentService.java
@@ -1,13 +1,15 @@
package com.userFront.service;
-import java.util.List;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
import com.userFront.domain.Appointment;
+import com.userFront.domain.AppointmentSummary;
public interface AppointmentService {
Appointment createAppointment(Appointment appointment);
- List findAll();
+ Page findAllSummaries(Pageable pageable);
Appointment findAppointment(Long id);
diff --git a/UserFront/src/main/java/com/userFront/service/UserServiceImpl/AppointmentServiceImpl.java b/UserFront/src/main/java/com/userFront/service/UserServiceImpl/AppointmentServiceImpl.java
index 838ad223..177822e9 100644
--- a/UserFront/src/main/java/com/userFront/service/UserServiceImpl/AppointmentServiceImpl.java
+++ b/UserFront/src/main/java/com/userFront/service/UserServiceImpl/AppointmentServiceImpl.java
@@ -1,11 +1,12 @@
package com.userFront.service.UserServiceImpl;
-import java.util.List;
-
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
import com.userFront.domain.Appointment;
+import com.userFront.domain.AppointmentSummary;
import com.userFront.service.AppointmentService;
import com.userFront.dao.AppointmentDao;
@@ -19,8 +20,8 @@ public Appointment createAppointment(Appointment appointment) {
return appointmentDao.save(appointment);
}
- public List findAll() {
- return appointmentDao.findAll();
+ public Page findAllSummaries(Pageable pageable) {
+ return appointmentDao.findAllSummaries(pageable);
}
public Appointment findAppointment(Long id) {
diff --git a/UserFront/src/test/java/com/userFront/dao/AppointmentDaoTest.java b/UserFront/src/test/java/com/userFront/dao/AppointmentDaoTest.java
new file mode 100644
index 00000000..b5314628
--- /dev/null
+++ b/UserFront/src/test/java/com/userFront/dao/AppointmentDaoTest.java
@@ -0,0 +1,97 @@
+package com.userFront.dao;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Date;
+import java.util.List;
+
+import javax.persistence.EntityManagerFactory;
+
+import org.hibernate.SessionFactory;
+import org.hibernate.stat.Statistics;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
+import org.springframework.boot.test.autoconfigure.orm.jpa.TestEntityManager;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Sort;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.userFront.domain.Appointment;
+import com.userFront.domain.AppointmentSummary;
+import com.userFront.domain.Recipient;
+import com.userFront.domain.User;
+
+@RunWith(SpringRunner.class)
+@DataJpaTest
+@TestPropertySource(properties = {
+ "spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.H2Dialect",
+ "spring.jpa.properties.hibernate.generate_statistics=true"
+})
+public class AppointmentDaoTest {
+
+ private static final int USERS = 30;
+
+ @Autowired
+ private TestEntityManager entityManager;
+
+ @Autowired
+ private AppointmentDao appointmentDao;
+
+ @Autowired
+ private EntityManagerFactory entityManagerFactory;
+
+ private Statistics statistics;
+
+ @Before
+ public void setUp() {
+ for (int i = 0; i < USERS; i++) {
+ User user = new User();
+ user.setUsername("user" + i);
+ user.setEmail("user" + i + "@example.com");
+ user.setPassword("secret-hash");
+ entityManager.persist(user);
+
+ Recipient recipient = new Recipient();
+ recipient.setName("recipient" + i);
+ recipient.setUser(user);
+ entityManager.persist(recipient);
+
+ Appointment appointment = new Appointment();
+ appointment.setDate(new Date(1000L * i));
+ appointment.setDescription("appointment" + i);
+ appointment.setLocation("branch");
+ appointment.setUser(user);
+ entityManager.persist(appointment);
+ }
+ entityManager.flush();
+ entityManager.clear();
+
+ statistics = entityManagerFactory.unwrap(SessionFactory.class).getStatistics();
+ statistics.clear();
+ }
+
+ @Test
+ public void loadsOneBoundedPageInTwoStatements() throws Exception {
+ Page page = appointmentDao.findAllSummaries(
+ new PageRequest(0, 10, new Sort(Sort.Direction.DESC, "date", "id")));
+ String json = new ObjectMapper().writeValueAsString(page.getContent());
+
+ List content = page.getContent();
+ assertEquals(10, content.size());
+ assertEquals(USERS, page.getTotalElements());
+ assertEquals("appointment29", content.get(0).getDescription());
+ assertEquals("user29", content.get(0).getUser().getUsername());
+ assertEquals(2, statistics.getPrepareStatementCount());
+ assertTrue(json.contains("\"username\":\"user29\""));
+ assertFalse(json.contains("secret-hash"));
+ assertFalse(json.contains("recipient"));
+ }
+}
diff --git a/UserFront/src/test/java/com/userFront/resource/AppointmentResourceTest.java b/UserFront/src/test/java/com/userFront/resource/AppointmentResourceTest.java
new file mode 100644
index 00000000..1b1a8eda
--- /dev/null
+++ b/UserFront/src/test/java/com/userFront/resource/AppointmentResourceTest.java
@@ -0,0 +1,105 @@
+package com.userFront.resource;
+
+import static org.hamcrest.Matchers.hasSize;
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyZeroInteractions;
+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.header;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import java.util.Arrays;
+import java.util.Date;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+
+import com.userFront.domain.AppointmentSummary;
+import com.userFront.service.AppointmentService;
+
+@RunWith(MockitoJUnitRunner.class)
+public class AppointmentResourceTest {
+
+ @Mock
+ private AppointmentService appointmentService;
+
+ @InjectMocks
+ private AppointmentResource appointmentResource;
+
+ private MockMvc mockMvc;
+
+ @Before
+ public void setUp() {
+ mockMvc = MockMvcBuilders.standaloneSetup(appointmentResource).build();
+ }
+
+ @Test
+ public void returnsOnePageOfSummariesWithPagingHeaders() throws Exception {
+ AppointmentSummary summary = new AppointmentSummary(7L, new Date(0), "Branch 1", "Loan", false, "alice");
+ when(appointmentService.findAllSummaries(any(Pageable.class)))
+ .thenReturn(new PageImpl<>(Arrays.asList(summary), new org.springframework.data.domain.PageRequest(1, 10), 11));
+
+ mockMvc.perform(get("/api/appointment/all").param("page", "1").param("size", "10"))
+ .andExpect(status().isOk())
+ .andExpect(header().string("X-Total-Count", "11"))
+ .andExpect(header().string("X-Page", "1"))
+ .andExpect(header().string("X-Page-Size", "10"))
+ .andExpect(jsonPath("$", hasSize(1)))
+ .andExpect(jsonPath("$[0].id").value(7))
+ .andExpect(jsonPath("$[0].description").value("Loan"))
+ .andExpect(jsonPath("$[0].confirmed").value(false))
+ .andExpect(jsonPath("$[0].user.username").value("alice"))
+ .andExpect(jsonPath("$[0].user.password").doesNotExist())
+ .andExpect(jsonPath("$[0].user.recipientList").doesNotExist());
+
+ ArgumentCaptor pageable = ArgumentCaptor.forClass(Pageable.class);
+ verify(appointmentService).findAllSummaries(pageable.capture());
+ assertEquals(1, pageable.getValue().getPageNumber());
+ assertEquals(10, pageable.getValue().getPageSize());
+ assertEquals(Sort.Direction.DESC, pageable.getValue().getSort().getOrderFor("date").getDirection());
+ assertEquals(Sort.Direction.DESC, pageable.getValue().getSort().getOrderFor("id").getDirection());
+ }
+
+ @Test
+ public void defaultsToFirstPageOfDefaultSize() throws Exception {
+ when(appointmentService.findAllSummaries(any(Pageable.class)))
+ .thenReturn(new PageImpl(Arrays.asList()));
+
+ mockMvc.perform(get("/api/appointment/all"))
+ .andExpect(status().isOk())
+ .andExpect(header().string("X-Page", "0"))
+ .andExpect(header().string("X-Page-Size", String.valueOf(AppointmentResource.DEFAULT_PAGE_SIZE)));
+
+ ArgumentCaptor pageable = ArgumentCaptor.forClass(Pageable.class);
+ verify(appointmentService).findAllSummaries(pageable.capture());
+ assertEquals(0, pageable.getValue().getPageNumber());
+ assertEquals(AppointmentResource.DEFAULT_PAGE_SIZE, pageable.getValue().getPageSize());
+ }
+
+ @Test
+ public void rejectsOutOfRangePaging() throws Exception {
+ mockMvc.perform(get("/api/appointment/all").param("size", String.valueOf(AppointmentResource.MAX_PAGE_SIZE + 1)))
+ .andExpect(status().isBadRequest());
+ mockMvc.perform(get("/api/appointment/all").param("size", "0"))
+ .andExpect(status().isBadRequest());
+ mockMvc.perform(get("/api/appointment/all").param("page", "-1"))
+ .andExpect(status().isBadRequest());
+ mockMvc.perform(get("/api/appointment/all").param("page", "abc"))
+ .andExpect(status().isBadRequest());
+
+ verifyZeroInteractions(appointmentService);
+ }
+}