added EVANS notification location, safer page request

tamu-sad-iii · tamu-sad-iii · commit 0f004f0e3483 · 2017-08-22T13:21:22.000-05:00
diff --git a/src/main/java/edu/tamu/app/enums/NotificationLocation.java b/src/main/java/edu/tamu/app/enums/NotificationLocation.java
@@ -2,6 +2,6 @@
 
 public enum NotificationLocation {
 
-    MAIN, CUSHING, MSL, WCL, PSEL, QATAR;
+    MAIN, EVANS, CUSHING, MSL, WCL, PSEL, QATAR;
 
 }
diff --git a/src/main/java/edu/tamu/app/model/request/FilteredPageRequest.java b/src/main/java/edu/tamu/app/model/request/FilteredPageRequest.java
@@ -34,7 +34,7 @@ public NoteSpecification<Note> getSpecification() {
 
     @JsonIgnore
     public PageRequest getPageRequest() {
-        return new PageRequest(pageNumber - 1, pageSize, new Sort(Sort.Direction.fromString(direction), properties));
+        return new PageRequest(pageNumber > 0 ? pageNumber - 1 : 0, pageSize > 0 ? pageSize : 10, new Sort(Sort.Direction.fromString(direction), properties));
     }
 
     public int getPageNumber() {

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,6 @@`
`2`	`2`
`3`	`3`	`public enum NotificationLocation {`
`4`	`4`
`5`		`- MAIN, CUSHING, MSL, WCL, PSEL, QATAR;`
	`5`	`+ MAIN, EVANS, CUSHING, MSL, WCL, PSEL, QATAR;`
`6`	`6`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public NoteSpecification<Note> getSpecification() {`
`34`	`34`
`35`	`35`	`@JsonIgnore`
`36`	`36`	`public PageRequest getPageRequest() {`
`37`		`- return new PageRequest(pageNumber - 1, pageSize, new Sort(Sort.Direction.fromString(direction), properties));`
	`37`	`+ return new PageRequest(pageNumber > 0 ? pageNumber - 1 : 0, pageSize > 0 ? pageSize : 10, new Sort(Sort.Direction.fromString(direction), properties));`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`public int getPageNumber() {`