Merge pull request #1202 from US-CBP/release_candidate_1.1.4

Release candidate 1.1.4
US-CBP · Jun 17, 2019 · da6c9d8 · da6c9d8
2 parents 3a4c133 + e21b12f
commit da6c9d8
Show file tree

Hide file tree

Showing 18 changed files with 7,439 additions and 7,336 deletions.
diff --git a/gtas-parent/gtas-commons/src/main/java/gov/gtas/constant/GtasSecurityConstants.java b/gtas-parent/gtas-commons/src/main/java/gov/gtas/constant/GtasSecurityConstants.java
@@ -29,7 +29,7 @@ private GtasSecurityConstants() {
 
 	public static final String PRIVILEGE_ADMIN = "hasAuthority('Admin')";
 
-	public static final String PRIVILEGES_ADMIN_AND_VIEW_FLIGHT_PASSENGER = "hasAnyAuthority('Admin', 'View Flight And Passenger')";
+	public static final String PRIVILEGES_ADMIN_AND_VIEW_PASSENGER = "hasAnyAuthority('Admin', 'View Passenger')";
 
 	public static final String PRIVILEGES_ADMIN_AND_MANAGE_WATCH_LIST = "hasAnyAuthority('Admin', 'Manage Watch List')";
 
@@ -38,8 +38,10 @@ private GtasSecurityConstants() {
 	public static final String PRIVILEGES_ADMIN_AND_MANAGE_RULES_AND_MANAGE_WATCH_LIST = "hasAnyAuthority('Admin', 'Manage Rules', 'Manage Watch List')";
 
     public static final String PRIVILEGES_ADMIN_AND_MANAGE_RULES_AND_MANAGE_WATCH_LIST_AND_MANAGE_QUERIES = "hasAnyAuthority('Admin', 'Manage Rules', 'Manage Watch List', 'Manage Queries')";
+
+    public static final String PRIVLEGES_ADMIN_AND_MANAGE_RULES_AND_MANAGE_WATCH_LIST_AND_MANAGE_QUERIES_AND_VIEW_PASSENGER = "hasAnyAuthority('Admin', 'Manage Rules', 'Manage Watch List', 'Manage Queries', 'View Passenger')";
 
-    public static final String ALL_PRIVS_AND_ONE_DAY = "hasAnyAuthority('Admin', 'Manage Rules', 'Manage Watch List', 'Manage Queries', 'One Day Lookout')";
+    public static final String ALL_PRIVS_AND_ONE_DAY = "hasAnyAuthority('Admin', 'Manage Rules', 'Manage Watch List', 'Manage Queries','View Passenger', 'One Day Lookout')";
 
 	public static final String PRIVILEGES_ADMIN_AND_MANAGE_RULES = "hasAnyAuthority('Admin', 'Manage Rules')";
 

diff --git a/gtas-parent/gtas-commons/src/main/java/gov/gtas/model/lookup/AirportRestore.java b/gtas-parent/gtas-commons/src/main/java/gov/gtas/model/lookup/AirportRestore.java
@@ -19,7 +19,7 @@
 
 @Cacheable
 @Entity
-@Table(name = "airportRestore", indexes = { @Index(columnList = "iata", name = "airportRestore_iata_index") })
+@Table(name = "airport_restore", indexes = { @Index(columnList = "iata", name = "airportRestore_iata_index") })
 public class AirportRestore extends BaseEntity {
     public AirportRestore() { }
     private String name;

diff --git a/gtas-parent/gtas-commons/src/main/java/gov/gtas/model/lookup/CarrierRestore.java b/gtas-parent/gtas-commons/src/main/java/gov/gtas/model/lookup/CarrierRestore.java
@@ -16,7 +16,7 @@
 
 @Cacheable
 @Entity
-@Table(name = "carrierRestore", indexes = { @Index(columnList = "iata", name = "carrierRestore_iata_index") })
+@Table(name = "carrier_restore", indexes = { @Index(columnList = "iata", name = "carrierRestore_iata_index") })
 public class CarrierRestore extends BaseEntity {
   public CarrierRestore() { }
   private String name;

diff --git a/gtas-parent/gtas-commons/src/main/java/gov/gtas/model/lookup/CountryRestore.java b/gtas-parent/gtas-commons/src/main/java/gov/gtas/model/lookup/CountryRestore.java
@@ -18,7 +18,7 @@
 
 @Cacheable
 @Entity
-@Table(name = "countryRestore", indexes = { @Index(columnList = "iso3", name = "countryRestore_iso3_index") })
+@Table(name = "country_restore", indexes = { @Index(columnList = "iso3", name = "countryRestore_iso3_index") })
 public class CountryRestore extends BaseEntity {
     public CountryRestore() { }
     @Column(length = 2)

diff --git a/gtas-parent/gtas-commons/src/main/java/gov/gtas/services/CaseDispositionService.java b/gtas-parent/gtas-commons/src/main/java/gov/gtas/services/CaseDispositionService.java
@@ -30,10 +30,10 @@
 
 public interface CaseDispositionService {
 
-    @PreAuthorize(PRIVILEGES_ADMIN_AND_MANAGE_RULES_AND_MANAGE_WATCH_LIST_AND_MANAGE_QUERIES)
+    @PreAuthorize(PRIVLEGES_ADMIN_AND_MANAGE_RULES_AND_MANAGE_WATCH_LIST_AND_MANAGE_QUERIES_AND_VIEW_PASSENGER)
     public CasePageDto findAll(CaseRequestDto dto);
 
-    @PreAuthorize(PRIVILEGES_ADMIN_AND_MANAGE_RULES_AND_MANAGE_WATCH_LIST_AND_MANAGE_QUERIES)
+    @PreAuthorize(PRIVLEGES_ADMIN_AND_MANAGE_RULES_AND_MANAGE_WATCH_LIST_AND_MANAGE_QUERIES_AND_VIEW_PASSENGER)
     public CasePageDto findHitsDispositionByCriteria(CaseRequestDto dto);
 
     @PreAuthorize(ALL_PRIVS_AND_ONE_DAY)

diff --git a/gtas-parent/gtas-commons/src/main/java/gov/gtas/services/FlightService.java b/gtas-parent/gtas-commons/src/main/java/gov/gtas/services/FlightService.java
@@ -5,7 +5,7 @@
  */
 package gov.gtas.services;
 
-import static gov.gtas.constant.GtasSecurityConstants.PRIVILEGES_ADMIN_AND_VIEW_FLIGHT_PASSENGER;
+import static gov.gtas.constant.GtasSecurityConstants.PRIVILEGES_ADMIN_AND_VIEW_PASSENGER;
 import gov.gtas.model.Document;
 import gov.gtas.model.Flight;
 import gov.gtas.model.Passenger;
@@ -28,7 +28,7 @@ public interface FlightService {
 
 	public Flight findById(Long id);
 
-	@PreAuthorize(PRIVILEGES_ADMIN_AND_VIEW_FLIGHT_PASSENGER)
+	//@PreAuthorize(PRIVILEGES_ADMIN_AND_VIEW_PASSENGER)
 	public FlightsPageDto findAll(FlightsRequestDto dto);
 
 	public Flight getUniqueFlightByCriteria(String carrier,
@@ -39,7 +39,7 @@ public Flight getUniqueFlightByCriteria(String carrier,
 
 	public List<Flight> getFlightsByDates(Date startDate, Date endDate);
 
-	@PreAuthorize(PRIVILEGES_ADMIN_AND_VIEW_FLIGHT_PASSENGER)
+	//@PreAuthorize(PRIVILEGES_ADMIN_AND_VIEW_PASSENGER)
 	public HashMap<Document, List<Flight>> getFlightsByPassengerNameAndDocument(
 			String firstName, String lastName, Set<Document> documents);
 

diff --git a/gtas-parent/gtas-commons/src/main/java/gov/gtas/services/PassengerService.java b/gtas-parent/gtas-commons/src/main/java/gov/gtas/services/PassengerService.java
@@ -5,7 +5,7 @@
  */
 package gov.gtas.services;
 
-import static gov.gtas.constant.GtasSecurityConstants.PRIVILEGES_ADMIN_AND_VIEW_FLIGHT_PASSENGER;
+import static gov.gtas.constant.GtasSecurityConstants.PRIVILEGES_ADMIN_AND_VIEW_PASSENGER;
 import static gov.gtas.constant.GtasSecurityConstants.PRIVILEGES_ADMIN_AND_MANAGE_RULES_AND_MANAGE_WATCH_LIST_AND_MANAGE_QUERIES;
 import gov.gtas.model.Disposition;
 import gov.gtas.model.Flight;
@@ -31,10 +31,10 @@ public interface PassengerService {
 
 	Passenger update(Passenger passenger);
 
-	@PreAuthorize(PRIVILEGES_ADMIN_AND_VIEW_FLIGHT_PASSENGER)
+	@PreAuthorize(PRIVILEGES_ADMIN_AND_VIEW_PASSENGER)
 	Passenger findById(Long id);
 
-	@PreAuthorize(PRIVILEGES_ADMIN_AND_VIEW_FLIGHT_PASSENGER)
+	@PreAuthorize(PRIVILEGES_ADMIN_AND_VIEW_PASSENGER)
 	Passenger findByIdWithFlightPaxAndDocuments(Long paxId);
 
 /*
@@ -43,11 +43,11 @@ public interface PassengerService {
 */
 
 
-	@PreAuthorize(PRIVILEGES_ADMIN_AND_VIEW_FLIGHT_PASSENGER)
+	@PreAuthorize(PRIVILEGES_ADMIN_AND_VIEW_PASSENGER)
 	List<Disposition> getPassengerDispositionHistory(Long passengerId,
 			Long flightId);
 
-	@PreAuthorize(PRIVILEGES_ADMIN_AND_VIEW_FLIGHT_PASSENGER)
+	@PreAuthorize(PRIVILEGES_ADMIN_AND_VIEW_PASSENGER)
 	void createDisposition(DispositionData disposition, User user);
 
 	void createDisposition(HitsSummary hit);
@@ -71,7 +71,7 @@ List<Disposition> getPassengerDispositionHistory(Long passengerId,
 	 * @param request the request
 	 * @return the passengers by criteria
 	 */
-	@PreAuthorize(PRIVILEGES_ADMIN_AND_VIEW_FLIGHT_PASSENGER)
+	@PreAuthorize(PRIVILEGES_ADMIN_AND_VIEW_PASSENGER)
 	PassengersPageDto getPassengersByCriteria(Long flightId,
 			PassengersRequestDto request);
 
@@ -86,16 +86,16 @@ PassengersPageDto getPassengersByCriteria(Long flightId,
 	 * @param docExpirationDate the doc expiration date
 	 * @return the travel history
 	 */
-	@PreAuthorize(PRIVILEGES_ADMIN_AND_VIEW_FLIGHT_PASSENGER)
+	@PreAuthorize(PRIVILEGES_ADMIN_AND_VIEW_PASSENGER)
 	List<Flight> getTravelHistory(Long pId, String docNum, String docIssuCountry, Date docExpDate);
 
-	@PreAuthorize(PRIVILEGES_ADMIN_AND_VIEW_FLIGHT_PASSENGER)
+	@PreAuthorize(PRIVILEGES_ADMIN_AND_VIEW_PASSENGER)
 	List<Flight> getTravelHistoryByItinerary(Long pnrId, String pnrRef);
 
-	@PreAuthorize(PRIVILEGES_ADMIN_AND_VIEW_FLIGHT_PASSENGER)
+	@PreAuthorize(PRIVILEGES_ADMIN_AND_VIEW_PASSENGER)
 	List<Flight> getTravelHistoryNotByItinerary(Long pId, Long pnrId, String pnrRef);
 
-	@PreAuthorize(PRIVILEGES_ADMIN_AND_VIEW_FLIGHT_PASSENGER)
+	@PreAuthorize(PRIVILEGES_ADMIN_AND_VIEW_PASSENGER)
 	List<Passenger> getBookingDetailHistoryByPaxID(Long pId);
 
 	Set<Flight> getAllFlights(Long id);