DT-2531: Migrate translate usages from UseRestrictionConverter to OntologyService (#2815)

Author: rushtong

src/main/java/org/broadinstitute/consent/http/ConsentModule.java

@@ -238,7 +238,7 @@ HealthCheckRegistry providesHealthCheckRegistry() {
 
   @Provides
   UseRestrictionConverter providesUseRestrictionConverter() {
-    return new UseRestrictionConverter(providesClient(), config.getServicesConfiguration());
+    return new UseRestrictionConverter();
   }
 
   @Provides
@@ -431,9 +431,9 @@ VoteService providesVoteService() {
         providesElectionDAO(),
         providesEmailService(),
         providesElasticSearchService(),
-        providesUseRestrictionConverter(),
         providesVoteDAO(),
-        providesVoteServiceDAO());
+        providesVoteServiceDAO(),
+        providesOntologyService());
   }
 
   @Provides

src/main/java/org/broadinstitute/consent/http/service/DataAccessReportsParser.java

@@ -20,15 +20,19 @@ public class DataAccessReportsParser implements ConsentLogger {
 
   private final DatasetDAO datasetDAO;
   private final UseRestrictionConverter useRestrictionConverter;
+  private final OntologyService ontologyService;
 
   private static final String DEFAULT_SEPARATOR = "\t";
 
   private static final String END_OF_LINE = System.lineSeparator();
 
   public DataAccessReportsParser(
-      DatasetDAO datasetDAO, UseRestrictionConverter useRestrictionConverter) {
+      DatasetDAO datasetDAO,
+      UseRestrictionConverter useRestrictionConverter,
+      OntologyService ontologyService) {
     this.datasetDAO = datasetDAO;
     this.useRestrictionConverter = useRestrictionConverter;
+    this.ontologyService = ontologyService;
   }
 
   public void setApprovedDARHeader(FileWriter darWriter) throws IOException {
@@ -163,8 +167,7 @@ private void addDARLine(
               ? translatedUseRestriction.replace("\n", " ")
               : "";
       DataUse dataUse = useRestrictionConverter.parseDataUsePurpose(dar);
-      String sDAR =
-          useRestrictionConverter.translateDataUse(dataUse, DataUseTranslationType.PURPOSE);
+      String sDAR = ontologyService.translateDataUse(dataUse, DataUseTranslationType.PURPOSE);
       String formattedSDAR = sDAR.replace("\n", " ");
       darWriter.write(
           darCode

src/main/java/org/broadinstitute/consent/http/service/UseRestrictionConverter.java

@@ -1,30 +1,16 @@
 package org.broadinstitute.consent.http.service;
 
-import jakarta.ws.rs.InternalServerErrorException;
-import jakarta.ws.rs.client.Client;
-import jakarta.ws.rs.client.Entity;
-import jakarta.ws.rs.client.WebTarget;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.Response;
 import java.util.List;
 import java.util.Objects;
 import org.apache.commons.collections4.CollectionUtils;
-import org.broadinstitute.consent.http.configurations.ServicesConfiguration;
-import org.broadinstitute.consent.http.enumeration.DataUseTranslationType;
 import org.broadinstitute.consent.http.models.DataAccessRequest;
 import org.broadinstitute.consent.http.models.DataUse;
 import org.broadinstitute.consent.http.models.OntologyEntry;
 import org.broadinstitute.consent.http.util.ConsentLogger;
 
 public class UseRestrictionConverter implements ConsentLogger {
 
-  private final ServicesConfiguration servicesConfiguration;
-  private final Client client;
-
-  public UseRestrictionConverter(Client client, ServicesConfiguration config) {
-    this.client = client;
-    this.servicesConfiguration = config;
-  }
+  public UseRestrictionConverter() {}
 
   /**
    * This method, and its counterpart that processes a map, translates DAR questions to a DataUse
@@ -130,22 +116,4 @@ public DataUse parseDataUsePurpose(DataAccessRequest dar) {
     }
     return dataUse;
   }
-
-  public String translateDataUse(DataUse dataUse, DataUseTranslationType type) {
-    WebTarget target =
-        client.target(servicesConfiguration.getOntologyURL() + "translate?for=" + type.getValue());
-    Response response =
-        target.request(MediaType.APPLICATION_JSON).post(Entity.json(dataUse.toString()));
-    if (response.getStatus() == 200) {
-      try {
-        return response.readEntity(String.class);
-      } catch (Exception e) {
-        logException("Error parsing response from Ontology service", e);
-      }
-    }
-    logException(
-        "Error response from Ontology service: " + response.readEntity(String.class),
-        new InternalServerErrorException());
-    return null;
-  }
 }

src/main/java/org/broadinstitute/consent/http/service/VoteService.java

@@ -57,9 +57,9 @@ public class VoteService implements ConsentLogger {
   private final ElectionDAO electionDAO;
   private final EmailService emailService;
   private final ElasticSearchService elasticSearchService;
-  private final UseRestrictionConverter useRestrictionConverter;
   private final VoteDAO voteDAO;
   private final VoteServiceDAO voteServiceDAO;
+  private final OntologyService ontologyService;
 
   @Inject
   public VoteService(
@@ -70,19 +70,19 @@ public VoteService(
       ElectionDAO electionDAO,
       EmailService emailService,
       ElasticSearchService elasticSearchService,
-      UseRestrictionConverter useRestrictionConverter,
       VoteDAO voteDAO,
-      VoteServiceDAO voteServiceDAO) {
+      VoteServiceDAO voteServiceDAO,
+      OntologyService ontologyService) {
     this.userDAO = userDAO;
     this.dacDAO = dacDAO;
     this.dataAccessRequestDAO = dataAccessRequestDAO;
     this.datasetDAO = datasetDAO;
     this.electionDAO = electionDAO;
     this.emailService = emailService;
     this.elasticSearchService = elasticSearchService;
-    this.useRestrictionConverter = useRestrictionConverter;
     this.voteDAO = voteDAO;
     this.voteServiceDAO = voteServiceDAO;
+    this.ontologyService = ontologyService;
   }
 
   /**
@@ -289,7 +289,7 @@ public void sendDatasetApprovalNotifications(List<Vote> votes, User user) {
                 approvedDatasetsInDar.stream()
                     .map(
                         dataset ->
-                            useRestrictionConverter.translateDataUse(
+                            ontologyService.translateDataUse(
                                 dataset.getDataUse(), DataUseTranslationType.DATASET))
                     .distinct()
                     .collect(Collectors.joining(";"));

src/test/java/org/broadinstitute/consent/http/service/DataAccessReportsParserTest.java

@@ -29,6 +29,7 @@ class DataAccessReportsParserTest {
 
   @Mock private DatasetDAO datasetDAO;
   @Mock private UseRestrictionConverter useRestrictionConverter;
+  @Mock private OntologyService ontologyService;
   private DataAccessReportsParser parser;
   private final String CONSENT_NAME = "ORSP-1903";
   private final String NAME = "Test";
@@ -46,7 +47,7 @@ Future use for methods research (analytic/software/technology development) is no
   private final String DAR_CODE = "DAR_3";
 
   @BeforeEach
-  public void setUp() {
+  void setUp() {
     Dataset d = new Dataset();
     d.setDatasetId(1); // This translates to an identifier of "DUOS-000001"
     d.setAlias(1);
@@ -58,8 +59,8 @@ public void setUp() {
         Research is limited to samples restricted for use under the following conditions:
         Data is limited for health/medical/biomedical research. [HMB]
     """;
-    when(useRestrictionConverter.translateDataUse(any(), any())).thenReturn(translation);
-    this.parser = new DataAccessReportsParser(datasetDAO, useRestrictionConverter);
+    when(ontologyService.translateDataUse(any(), any())).thenReturn(translation);
+    this.parser = new DataAccessReportsParser(datasetDAO, useRestrictionConverter, ontologyService);
   }
 
   @Test