From cbdfad862e7a4cc1a7e9e9517fdee0995f0d6c83 Mon Sep 17 00:00:00 2001
From: Greg Rushton <grushton@broadinstitute.org>
Date: Wed, 6 Dec 2023 10:03:35 -0500
Subject: [PATCH] clean up DAR other conditions

---
 .../http/service/UseRestrictionConverter.java       | 13 ++++---------
 .../http/service/UseRestrictionConverterTest.java   | 13 ++-----------
 2 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/src/main/java/org/broadinstitute/consent/http/service/UseRestrictionConverter.java b/src/main/java/org/broadinstitute/consent/http/service/UseRestrictionConverter.java
index 1bcc771c4d..eb1cb0b0fa 100644
--- a/src/main/java/org/broadinstitute/consent/http/service/UseRestrictionConverter.java
+++ b/src/main/java/org/broadinstitute/consent/http/service/UseRestrictionConverter.java
@@ -93,18 +93,13 @@ public DataUse parseDataUsePurpose(DataAccessRequest dar) {
       }
 
       // Other Conditions
-      if (Objects.nonNull(dar.getData().getOther())) {
-        dataUse.setOtherRestrictions(dar.getData().getOther());
-      }
-      if (Objects.nonNull(dar.getData().getOtherText())) {
+      if (Objects.nonNull(dar.getData().getOther())
+        && Boolean.TRUE.equals(dar.getData().getOther())
+        && Objects.nonNull(dar.getData().getOtherText())) {
+        dataUse.setOtherRestrictions(true);
         dataUse.setOther(dar.getData().getOtherText());
       }
 
-//      if (Objects.nonNull(dar.getData().getNotHealth())) {
-//        dataUse.setNotHealth(dar.getData().getNotHealth());
-//        dataUse.setNonBiomedical(dar.getData().getNotHealth());
-//      }
-
       if ((Objects.nonNull(dar.getData().getIllegalBehavior())) && Boolean.TRUE.equals(dar.getData()
           .getIllegalBehavior())) {
         dataUse.setIllegalBehavior(dar.getData().getIllegalBehavior());
diff --git a/src/test/java/org/broadinstitute/consent/http/service/UseRestrictionConverterTest.java b/src/test/java/org/broadinstitute/consent/http/service/UseRestrictionConverterTest.java
index 0cd25899f5..2a0aaab41d 100644
--- a/src/test/java/org/broadinstitute/consent/http/service/UseRestrictionConverterTest.java
+++ b/src/test/java/org/broadinstitute/consent/http/service/UseRestrictionConverterTest.java
@@ -283,25 +283,16 @@ void testParseDataUsePurposeHMB() {
   }
 
   @Test
-  void testParseDataUsePurposeOther1() {
+  void testParseDataUsePurposeOther() {
     Client client = ClientBuilder.newClient();
     UseRestrictionConverter converter = new UseRestrictionConverter(client, config());
     DataAccessRequest dar = createDataAccessRequest();
     dar.getData().setOther(true);
+    dar.getData().setOtherText("Other Text");
     DataUse dataUse = converter.parseDataUsePurpose(dar);
     assertTrue(dataUse.getOtherRestrictions());
   }
 
-  @Test
-  void testParseDataUsePurposeOther2() {
-    Client client = ClientBuilder.newClient();
-    UseRestrictionConverter converter = new UseRestrictionConverter(client, config());
-    DataAccessRequest dar = createDataAccessRequest();
-    dar.getData().setOtherText("other");
-    DataUse dataUse = converter.parseDataUsePurpose(dar);
-    assertNotNull(dataUse.getOther());
-  }
-
   @Test
   void testParseDataUseIllegalBehavior() {
     Client client = ClientBuilder.newClient();