possible fix, will have to deploy and check (#1265)

CDCgov · Apr 1, 2024 · 0e20ea3 · 0e20ea3
1 parent 77d2b77
commit 0e20ea3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/.../question-bank/src/main/java/gov/cdc/nbs/questionbank/pagerules/SourceQuestionFinder.java b/.../question-bank/src/main/java/gov/cdc/nbs/questionbank/pagerules/SourceQuestionFinder.java
@@ -31,10 +31,10 @@ public PagesResponse filterQuestions(Long id, SourceQuestionRequest request) {
   }
 
   private void processQuestions(PagesQuestion question, Collection<PagesQuestion> questionsResult) {
-    if (question.dataType() != null && question.dataType().equals("CODED") && !question.isStandardNnd()
+    if ("CODED".equals(question.dataType()) && !question.isStandardNnd()
         && question.componentBehavior().contains(COMPONENT_BEHAVIOR_DATA)
-        && (question.question().equals("INV169")
-            || (question.classCode().equalsIgnoreCase("CODE_VALUE_GENERAL")))) {
+        && ("INV169".equals(question.question())
+            || ("CODE_VALUE_GENERAL".equalsIgnoreCase(question.classCode())))) {
       questionsResult.add(question);
     }
   }
@@ -106,8 +106,8 @@ private PagesResponse filterOtherQuestions(Long id) {
   }
 
   private void processDateQuestions(PagesQuestion question, Collection<PagesQuestion> questionsResult) {
-    if (question.dataType() != null && (question.dataType().equals("DATE")
-        || question.dataType().equals("DATETIME")) && !question.isStandardNnd() && question.visible()
+    if (("DATE".equals(question.dataType())
+        || "DATETIME".equals(question.dataType())) && !question.isStandardNnd() && question.visible()
         && question.componentBehavior().contains(COMPONENT_BEHAVIOR_DATA)) {
       questionsResult.add(question);
     }

diff --git a/.../question-bank/src/main/java/gov/cdc/nbs/questionbank/pagerules/TargetQuestionFinder.java b/.../question-bank/src/main/java/gov/cdc/nbs/questionbank/pagerules/TargetQuestionFinder.java
@@ -37,8 +37,8 @@ private void processDateQuestions(Collection<PagesQuestion> questionsResult, Pag
       TargetQuestionRequest request) {
     List<Long> selectedTargetIds = currentTargetQuestions(request);
 
-    if (question.dataType() != null && (question.dataType().equals("DATE")
-        || question.dataType().equals("DATETIME"))
+    if (("DATE".equals(question.dataType())
+        || "DATETIME".equals(question.dataType()))
         && !question.isStandardNnd() && question.visible()
         && question.componentBehavior().contains(COMPONENT_BEHAVIOR_DATA)) {
       if (request.targetQuestion() != null) {