Merge pull request #1772 from US-CBP/graph_rule_enabled

Graph rule enabled
US-CBP · Apr 13, 2020 · 32be525 · 32be525
2 parents d65d71d + 13186fd
commit 32be525
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 21 deletions.
diff --git a/gtas-parent/gtas-commons/src/main/java/gov/gtas/model/GraphRule.java b/gtas-parent/gtas-commons/src/main/java/gov/gtas/model/GraphRule.java
@@ -35,9 +35,21 @@ public void setDisplayCondition(String displayCondition) {
 	@Column(name = "displayCondition")
 	private String displayCondition;
 
+
+	@Column(name = "enabled")
+	private boolean enabled = true;
+
 	@OneToMany(mappedBy = "graphRule")
 	private Set<GraphRuleParameter> graphParameter = new HashSet<>();
 
+	public boolean isEnabled() {
+		return enabled;
+	}
+
+	public void setEnabled(boolean enabled) {
+		this.enabled = enabled;
+	}
+
 	public String getCipherQuery() {
 		return cipherQuery;
 	}

diff --git a/gtas-parent/gtas-rulesvc/src/main/java/gov/gtas/svc/GraphRulesServiceImpl.java b/gtas-parent/gtas-rulesvc/src/main/java/gov/gtas/svc/GraphRulesServiceImpl.java
@@ -70,27 +70,29 @@ public Set<RuleHitDetail> graphResults(Set<Passenger> passengers) {
 		}
 
 		for (GraphRule graphRule : graphRules) {
-			Set<String> passengerHitIds = getPassengerHitIds(graphRule, paxMap.keySet()); // This command runs the
-																							// graph rules!
-			for (String idTag : passengerHitIds) {
-				for (Passenger passenger : paxMap.get(idTag)) {
-					RuleHitDetail rhd = new RuleHitDetail(HitTypeEnum.GRAPH_HIT);
-					rhd.setFlightId(passenger.getFlight().getId());
-					rhd.setPassenger(passenger);
-					rhd.setPassengerName(passenger.getPassengerDetails().getFirstName() + " "
-							+ passenger.getPassengerDetails().getLastName());
-					rhd.setTitle(graphRule.getTitle());
-					rhd.setDescription(graphRule.getDescription());
-					rhd.setHitRule(graphRule.getDescription() + ":" + graphRule.getId());
-					rhd.setHitCount(1);
-					rhd.setRuleId(graphRule.getId());
-					rhd.setPassengerId(passenger.getId());
-					rhd.setPassengerType(PassengerTypeCode.P);
-					rhd.setFlightId(passenger.getFlight().getId());
-					rhd.setHitMakerId(graphRule.getId());
-					rhd.setCipherQuery(graphRule.getCipherQuery());
-					rhd.setGraphHitDisplay(graphRule.getDisplayCondition());
-					ruleHitDetails.add(rhd);
+			if (graphRule.isEnabled()) {
+				Set<String> passengerHitIds = getPassengerHitIds(graphRule, paxMap.keySet()); // This command runs the
+				// graph rules!
+				for (String idTag : passengerHitIds) {
+					for (Passenger passenger : paxMap.get(idTag)) {
+						RuleHitDetail rhd = new RuleHitDetail(HitTypeEnum.GRAPH_HIT);
+						rhd.setFlightId(passenger.getFlight().getId());
+						rhd.setPassenger(passenger);
+						rhd.setPassengerName(passenger.getPassengerDetails().getFirstName() + " "
+								+ passenger.getPassengerDetails().getLastName());
+						rhd.setTitle(graphRule.getTitle());
+						rhd.setDescription(graphRule.getDescription());
+						rhd.setHitRule(graphRule.getDescription() + ":" + graphRule.getId());
+						rhd.setHitCount(1);
+						rhd.setRuleId(graphRule.getId());
+						rhd.setPassengerId(passenger.getId());
+						rhd.setPassengerType(PassengerTypeCode.P);
+						rhd.setFlightId(passenger.getFlight().getId());
+						rhd.setHitMakerId(graphRule.getId());
+						rhd.setCipherQuery(graphRule.getCipherQuery());
+						rhd.setGraphHitDisplay(graphRule.getDisplayCondition());
+						ruleHitDetails.add(rhd);
+					}
 				}
 			}
 		}

diff --git a/gtas-parent/scripts/db/1.10.0_to_1.11.0/graph_rule_active_column.sql b/gtas-parent/scripts/db/1.10.0_to_1.11.0/graph_rule_active_column.sql
@@ -0,0 +1,2 @@
+alter table graph_rules
+    add enabled bit null;
diff --git a/gtas-parent/scripts/db/1.10.0_to_1.11.0/rollback/graph_rule_active_column_rollback.sql b/gtas-parent/scripts/db/1.10.0_to_1.11.0/rollback/graph_rule_active_column_rollback.sql
@@ -0,0 +1,3 @@
+alter table graph_rules
+    DROP COLUMN IF EXISTS enabled;
+
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		alter table graph_rules
		DROP COLUMN IF EXISTS enabled;