Skip to content
Open
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 AdminPortal/src/app/appointment.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 });
}

Expand Down
8 changes: 7 additions & 1 deletion AdminPortal/src/app/appointment/appointment.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,10 @@ <h1>Appointment List Page</h1>
<!-- <td [hidden]="!user.enabled"><a (click)="disableUser(user.username)" style="cursor: pointer;">Disable</a></td> -->
</tr>
</tbody>
</table>
</table>

<ul class="pager" [hidden]="totalCount <= pageSize">
<li class="previous" [class.disabled]="page === 0"><a (click)="previousPage()" style="cursor: pointer;">&larr; Newer</a></li>
<li>Page {{page + 1}} of {{pageCount()}} ({{totalCount}} appointments)</li>
<li class="next" [class.disabled]="page + 1 >= pageCount()"><a (click)="nextPage()" style="cursor: pointer;">Older &rarr;</a></li>
</ul>
24 changes: 23 additions & 1 deletion AdminPortal/src/app/appointment/appointment.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
6 changes: 6 additions & 0 deletions UserFront/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,12 @@
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
11 changes: 8 additions & 3 deletions UserFront/src/main/java/com/userFront/dao/AppointmentDao.java
Original file line number Diff line number Diff line change
@@ -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<Appointment, Long> {

List<Appointment> 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<AppointmentSummary> findAllSummaries(Pageable pageable);
}
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand All @@ -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() {
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,47 @@
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
@RequestMapping("/api/appointment")
@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<Appointment> findAppointmentList() {
List<Appointment> appointmentList = appointmentService.findAll();

return appointmentList;
public ResponseEntity<List<AppointmentSummary>> 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<AppointmentSummary> 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")
Expand Down
Original file line number Diff line number Diff line change
@@ -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<Appointment> findAll();
Page<AppointmentSummary> findAllSummaries(Pageable pageable);

Appointment findAppointment(Long id);

Expand Down
Original file line number Diff line number Diff line change
@@ -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;

Expand All @@ -19,8 +20,8 @@ public Appointment createAppointment(Appointment appointment) {
return appointmentDao.save(appointment);
}

public List<Appointment> findAll() {
return appointmentDao.findAll();
public Page<AppointmentSummary> findAllSummaries(Pageable pageable) {
return appointmentDao.findAllSummaries(pageable);
}

public Appointment findAppointment(Long id) {
Expand Down
97 changes: 97 additions & 0 deletions UserFront/src/test/java/com/userFront/dao/AppointmentDaoTest.java
Original file line number Diff line number Diff line change
@@ -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<AppointmentSummary> page = appointmentDao.findAllSummaries(
new PageRequest(0, 10, new Sort(Sort.Direction.DESC, "date", "id")));
String json = new ObjectMapper().writeValueAsString(page.getContent());

List<AppointmentSummary> 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"));
}
}
Loading