BI-2743 - Create Sub Entity Dataset, create obs level

src/main/java/org/breedinginsight/api/v1/controller/ExperimentController.java

@@ -5,6 +5,7 @@
 import io.micronaut.http.HttpStatus;
 import io.micronaut.http.MediaType;
 import io.micronaut.http.annotation.*;
+import io.micronaut.http.exceptions.HttpStatusException;
 import io.micronaut.http.server.types.files.StreamedFile;
 import io.micronaut.security.annotation.Secured;
 import io.micronaut.security.rules.SecurityRule;
@@ -134,6 +135,9 @@ public HttpResponse<Response<Dataset>> createSubEntityDataset(
 
             Response<Dataset> response = new Response(experimentService.createSubEntityDataset(programOptional.get(), experimentId, datasetRequest));
             return HttpResponse.ok(response);
+        } catch (HttpStatusException e) {
+            log.info(e.getMessage());
+            return HttpResponse.status(e.getStatus(), e.getMessage());
         } catch (Exception e){
             log.info(e.getMessage());
             return HttpResponse.status(HttpStatus.UNPROCESSABLE_ENTITY, e.getMessage());

src/main/java/org/breedinginsight/brapi/v2/dao/BrAPIObservationLevelDAO.java

@@ -0,0 +1,90 @@
+/*
+ * See the NOTICE file distributed with this work for additional information
+ * regarding copyright ownership.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.breedinginsight.brapi.v2.dao;
+
+import com.google.gson.Gson;
+import io.micronaut.http.HttpResponse;
+import io.micronaut.http.HttpStatus;
+import lombok.extern.slf4j.Slf4j;
+import okhttp3.HttpUrl;
+import okhttp3.MediaType;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import org.brapi.client.v2.JSON;
+import org.brapi.client.v2.model.exceptions.ApiException;
+import org.brapi.v2.model.pheno.BrAPIObservationUnitHierarchyLevel;
+import org.breedinginsight.model.DatasetLevel;
+import org.breedinginsight.model.Program;
+import org.breedinginsight.utilities.BrAPIDAOUtil;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+@Slf4j
+@Singleton
+public class BrAPIObservationLevelDAO {
+
+    private static final MediaType JSON_MEDIA_TYPE = MediaType.get("application/json");
+    private final BrAPIDAOUtil brAPIDAOUtil;
+    private final Gson gson = new JSON().getGson();
+
+    @Inject
+    public BrAPIObservationLevelDAO(BrAPIDAOUtil brAPIDAOUtil) {
+        this.brAPIDAOUtil = brAPIDAOUtil;
+    }
+
+    public HttpResponse<String> createObservationLevelName(Program program, String levelName, DatasetLevel levelOrder) throws ApiException {
+        HttpUrl url = HttpUrl.parse(brAPIDAOUtil.getProgramBrAPIBaseUrl(program.getId()))
+                             .newBuilder()
+                             .addPathSegment("observationlevelnames")
+                             .build();
+        BrAPIObservationUnitHierarchyLevel level = new BrAPIObservationUnitHierarchyLevel()
+                .levelName(levelName);
+        if (levelOrder != null) {
+            level.setLevelOrder(levelOrder.getValue());
+        }
+        RequestBody body = RequestBody.create(gson.toJson(level), JSON_MEDIA_TYPE);
+        var request = new Request.Builder()
+                .url(url)
+                .post(body)
+                .addHeader("Content-Type", "application/json")
+                .build();
+        return brAPIDAOUtil.makeCall(request);
+    }
+
+    public void deleteObservationLevelName(Program program, String levelName) {
+        HttpUrl url = HttpUrl.parse(brAPIDAOUtil.getProgramBrAPIBaseUrl(program.getId()))
+                             .newBuilder()
+                             .addPathSegment("observationlevelnames")
+                             .addPathSegment(levelName)
+                             .build();
+        var request = new Request.Builder()
+                .url(url)
+                .delete()
+                .addHeader("Content-Type", "application/json")
+                .build();
+        try {
+            HttpResponse<String> response = brAPIDAOUtil.makeCall(request);
+            if (response.getStatus() != HttpStatus.OK && response.getStatus() != HttpStatus.NO_CONTENT && response.getStatus() != HttpStatus.ACCEPTED) {
+                log.warn("Observation level delete returned status {} for {}", response.getStatus(), levelName);
+            }
+        } catch (Exception e) {
+            log.warn("Failed to delete observation level {} during rollback", levelName, e);
+        }
+    }
+}

src/main/java/org/breedinginsight/brapi/v2/dao/BrAPIObservationUnitDAO.java

@@ -26,6 +26,8 @@
 import io.micronaut.scheduling.annotation.Scheduled;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import okhttp3.HttpUrl;
+import okhttp3.Request;
 import org.brapi.client.v2.JSON;
 import org.brapi.client.v2.model.exceptions.ApiException;
 import org.brapi.client.v2.modules.phenotype.ObservationUnitsApi;
@@ -442,4 +444,32 @@ private void preprocessObservationUnits(List<BrAPIObservationUnit> brapiObservat
             }
         }
     }
+
+    public void deleteObservationUnits(Collection<String> observationUnitDbIds, UUID programId) {
+        if (observationUnitDbIds == null || observationUnitDbIds.isEmpty()) {
+            return;
+        }
+        String baseUrl = brAPIDAOUtil.getProgramBrAPIBaseUrl(programId);
+        for (String ouDbId : observationUnitDbIds) {
+            if (StringUtils.isBlank(ouDbId)) {
+                continue;
+            }
+            HttpUrl url = HttpUrl.parse(baseUrl)
+                    .newBuilder()
+                    .addPathSegment("observationunits")
+                    .addPathSegment(ouDbId)
+                    .build();
+            Request request = new Request.Builder()
+                    .url(url)
+                    .delete()
+                    .addHeader("Content-Type", "application/json")
+                    .build();
+            try {
+                brAPIDAOUtil.makeCall(request);
+            } catch (Exception e) {
+                log.warn("Failed to delete observation unit {} during rollback", ouDbId, e);
+            }
+        }
+        repopulateCache(programId);
+    }
 }