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
10 changes: 9 additions & 1 deletion AdminPortal/src/app/user-account/user-account.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,13 @@ <h1>User Account Page</h1>
<td [hidden]="!user.enabled"><a (click)="disableUser(user.username)" style="cursor: pointer;">Disable</a></td>
</tr>
</tbody>
</table>
</table>

<nav *ngIf="totalPages > 1">
<ul class="pager">
<li [class.disabled]="page === 0"><a (click)="goToPage(page - 1)" style="cursor: pointer;">Previous</a></li>
<li>Page {{page + 1}} of {{totalPages}} ({{totalUsers}} users)</li>
<li [class.disabled]="page + 1 >= totalPages"><a (click)="goToPage(page + 1)" style="cursor: pointer;">Next</a></li>
</ul>
</nav>

18 changes: 16 additions & 2 deletions AdminPortal/src/app/user-account/user-account.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,34 @@ import { UserService } from '../user.service';
export class UserAccountComponent implements OnInit {

userList: Object[];
page: number = 0;
pageSize: number = 50;
totalPages: number = 0;
totalUsers: number = 0;

constructor(private userService: UserService, private router: Router) {
this.getUsers();
}

getUsers() {
this.userService.getUsers().subscribe(
this.userService.getUsers(this.page, this.pageSize).subscribe(
res => {
this.userList = JSON.parse(JSON.parse(JSON.stringify(res))._body);
this.userList = res.json();
this.totalUsers = Number(res.headers.get('X-Total-Count')) || 0;
this.totalPages = Number(res.headers.get('X-Total-Pages')) || 0;
},
error => console.log(error)
)
}

goToPage(page: number) {
if (page < 0 || page >= this.totalPages) {
return;
}
this.page = page;
this.getUsers();
}

onSelectPrimary(username: string) {
this.router.navigate(['/primaryTransaction', username]);
}
Expand Down
4 changes: 2 additions & 2 deletions AdminPortal/src/app/user.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ export class UserService {

constructor (private http:Http){}

getUsers() {
let url = "http://localhost:8080/api/user/all";
getUsers(page: number = 0, size: number = 50) {
let url = "http://localhost:8080/api/user/all?page="+page+"&size="+size;
return this.http.get(url, { withCredentials: true });
}

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, X-Total-Pages");

if (!(request.getMethod().equalsIgnoreCase("OPTIONS"))) {
try {
Expand Down
9 changes: 6 additions & 3 deletions UserFront/src/main/java/com/userFront/dao/UserDao.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
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.EntityGraph;
import org.springframework.data.repository.CrudRepository;

import com.userFront.domain.User;
Expand All @@ -10,5 +11,7 @@ public interface UserDao extends CrudRepository<User, Long> {

User findByUsername(String username);
User findByEmail(String email);
List<User> findAll();

@EntityGraph(attributePaths = {"primaryAccount", "savingsAccount"}, type = EntityGraph.EntityGraphType.LOAD)
Page<User> findAll(Pageable pageable);
}
3 changes: 3 additions & 0 deletions UserFront/src/main/java/com/userFront/domain/User.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import javax.persistence.OneToMany;
import javax.persistence.OneToOne;

import org.hibernate.annotations.BatchSize;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.userdetails.UserDetails;

Expand Down Expand Up @@ -51,9 +52,11 @@ public class User implements UserDetails{
private List<Appointment> appointmentList;

@OneToMany(mappedBy = "user", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
@JsonIgnore
private List<Recipient> recipientList;

@OneToMany(mappedBy = "user", cascade = CascadeType.ALL, fetch = FetchType.EAGER)
@BatchSize(size = 200)
@JsonIgnore
private Set<UserRole> userRoles = new HashSet<>();

Expand Down
25 changes: 23 additions & 2 deletions UserFront/src/main/java/com/userFront/resource/UserResource.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@
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.HttpHeaders;
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;
Expand All @@ -21,15 +26,31 @@
@PreAuthorize("hasRole('ADMIN')")
public class UserResource {

static final int DEFAULT_PAGE_SIZE = 50;
static final int MAX_PAGE_SIZE = 200;

@Autowired
private UserService userService;

@Autowired
private TransactionService transactionService;

@RequestMapping(value = "/user/all", method = RequestMethod.GET)
public List<User> userList() {
return userService.findUserList();
public ResponseEntity<List<User>> userList(
@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<User> users = userService.findUserList(new PageRequest(page, size, new Sort(Sort.Direction.ASC, "userId")));

HttpHeaders headers = new HttpHeaders();
headers.set("X-Total-Count", String.valueOf(users.getTotalElements()));
headers.set("X-Page", String.valueOf(users.getNumber()));
headers.set("X-Page-Size", String.valueOf(users.getSize()));
headers.set("X-Total-Pages", String.valueOf(users.getTotalPages()));
return ResponseEntity.ok().headers(headers).body(users.getContent());
}

@RequestMapping(value = "/user/primary/transaction", method = RequestMethod.GET)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
package com.userFront.service;

import java.util.List;
import java.util.Set;

import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;

import com.userFront.domain.User;
import com.userFront.domain.security.UserRole;

Expand All @@ -19,7 +21,7 @@ public interface UserService {
User createUser(User user, Set<UserRole> userRoles);
User saveUser(User user);

List<User> findUserList();
Page<User> findUserList(Pageable pageable);

void enableUser (String username);

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 java.util.Set;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
Expand Down Expand Up @@ -113,8 +114,8 @@ public void disableUser(String username) {
System.out.println(username + " is disabled.");
}

public List<User> findUserList() {
return userDao.findAll();
public Page<User> findUserList(Pageable pageable) {
return userDao.findAll(pageable);
}


Expand Down
124 changes: 124 additions & 0 deletions UserFront/src/test/java/com/userFront/resource/UserResourceTest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,124 @@
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.never;
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.header;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;

import java.util.ArrayList;
import java.util.Collections;
import java.util.List;

import org.junit.Before;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.springframework.data.domain.Page;
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.Recipient;
import com.userFront.domain.User;
import com.userFront.service.TransactionService;
import com.userFront.service.UserService;

public class UserResourceTest {

@Mock
private UserService userService;

@Mock
private TransactionService transactionService;

@InjectMocks
private UserResource userResource;

private MockMvc mockMvc;

@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mockMvc = MockMvcBuilders.standaloneSetup(userResource).build();
}

@Test
public void userListReturnsFirstPageWithDefaultSizeAndTotals() throws Exception {
List<User> users = new ArrayList<>();
users.add(user("alice"));
users.add(user("bob"));
when(userService.findUserList(any(Pageable.class)))
.thenAnswer(inv -> new PageImpl<>(users, (Pageable) inv.getArguments()[0], 120));

mockMvc.perform(get("/api/user/all"))
.andExpect(status().isOk())
.andExpect(jsonPath("$", hasSize(2)))
.andExpect(jsonPath("$[0].username").value("alice"))
.andExpect(header().string("X-Total-Count", "120"))
.andExpect(header().string("X-Page", "0"))
.andExpect(header().string("X-Page-Size", String.valueOf(UserResource.DEFAULT_PAGE_SIZE)))
.andExpect(header().string("X-Total-Pages", "3"));

ArgumentCaptor<Pageable> pageable = ArgumentCaptor.forClass(Pageable.class);
verify(userService).findUserList(pageable.capture());
assertEquals(0, pageable.getValue().getPageNumber());
assertEquals(UserResource.DEFAULT_PAGE_SIZE, pageable.getValue().getPageSize());
assertEquals(Sort.Direction.ASC, pageable.getValue().getSort().getOrderFor("userId").getDirection());
}

@Test
public void userListPassesRequestedPage() throws Exception {
when(userService.findUserList(any(Pageable.class)))
.thenAnswer(inv -> new PageImpl<>(Collections.<User>emptyList(), (Pageable) inv.getArguments()[0], 0));

mockMvc.perform(get("/api/user/all").param("page", "2").param("size", "25"))
.andExpect(status().isOk());

ArgumentCaptor<Pageable> pageable = ArgumentCaptor.forClass(Pageable.class);
verify(userService).findUserList(pageable.capture());
assertEquals(2, pageable.getValue().getPageNumber());
assertEquals(25, pageable.getValue().getPageSize());
}

@Test
public void userListRejectsOutOfRangePaging() throws Exception {
mockMvc.perform(get("/api/user/all").param("size", String.valueOf(UserResource.MAX_PAGE_SIZE + 1)))
.andExpect(status().isBadRequest());
mockMvc.perform(get("/api/user/all").param("size", "0"))
.andExpect(status().isBadRequest());
mockMvc.perform(get("/api/user/all").param("page", "-1"))
.andExpect(status().isBadRequest());

verify(userService, never()).findUserList(any(Pageable.class));
}

@Test
public void userListDoesNotSerializeRecipients() throws Exception {
User alice = user("alice");
alice.setRecipientList(Collections.singletonList(new Recipient()));
when(userService.findUserList(any(Pageable.class)))
.thenAnswer(inv -> new PageImpl<>(Collections.singletonList(alice), (Pageable) inv.getArguments()[0], 1));

mockMvc.perform(get("/api/user/all"))
.andExpect(status().isOk())
.andExpect(jsonPath("$[0].recipientList").doesNotExist())
.andExpect(jsonPath("$[0].userRoles").doesNotExist());
}

private static User user(String username) {
User user = new User();
user.setUsername(username);
user.setEmail(username + "@example.com");
return user;
}
}