Added a staging area endpoint that accepts raw JSON for direct insertion

into the staging area.
ncats · Oct 26, 2023 · e368a51 · e368a51
1 parent 09e71c6
commit e368a51
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 0 deletions.
diff --git a/...configure/src/main/java/gsrs/controller/AbstractImportSupportingGsrsEntityController.java b/...configure/src/main/java/gsrs/controller/AbstractImportSupportingGsrsEntityController.java
@@ -679,6 +679,33 @@ public ResponseEntity<Object> updateImport(@RequestBody JsonNode updatedJson,
         return new ResponseEntity<>(GsrsControllerUtil.enhanceWithView(itmd, queryParameters), HttpStatus.OK);
     }
 
+    @hasAdminRole
+    @PostGsrsRestApiMapping(value = {"/stagingArea"})
+    public ResponseEntity<Object> createEntity(@RequestBody String newEntity,
+                                               @RequestParam Map<String, String> queryParameters) throws Exception {
+        log.trace("in createEntity");
+        String entityType = queryParameters.get("entityType");//type of domain object to create
+        Objects.requireNonNull(entityType, "Must supply entityType (class of object to create)");
+        String adapterName = queryParameters.get("adapter");
+
+        StagingAreaService stagingAreaService = getDefaultStagingAreaService();
+        ImportUtilities<T> importUtilities = new ImportUtilities<>(getEntityService().getContext(), getEntityService().getEntityClass(),
+                stagingAreaService);
+        AutowireHelper.getInstance().autowire(importUtilities);
+        ImportTaskMetaData task = new ImportTaskMetaData();
+        task.setAdapter(adapterName);
+        task.setEntityType(entityType);
+        task.setFilename("POSTed JSON");
+        task.setInternalUuid(UUID.randomUUID());
+        task.setSize((long) newEntity.length());
+        task.setAdapterSettings(JsonNodeFactory.instance.objectNode());
+        String result= importUtilities.saveStagingAreaRecord(newEntity, task, null);
+
+        ObjectNode resultsNode = JsonNodeFactory.instance.objectNode();
+        resultsNode.put("results", result);
+        return new ResponseEntity<>(GsrsControllerUtil.enhanceWithView(resultsNode, queryParameters), HttpStatus.OK);
+    }
+
     //STEP 3.5: Preview import
     //May required additional work
     @hasAdminRole

diff --git a/gsrs-spring-boot-autoconfigure/src/main/java/gsrs/imports/ImportUtilities.java b/gsrs-spring-boot-autoconfigure/src/main/java/gsrs/imports/ImportUtilities.java
@@ -730,6 +730,11 @@ public JsonNode handleObjectCreationAsync(AbstractImportSupportingGsrsEntityCont
     public String saveStagingAreaRecord(String json, AbstractImportSupportingGsrsEntityController.ImportTaskMetaData importTaskMetaData, Principal creatingUser) {
         log.trace("in saveStagingAreaRecord,importTaskMetaData.getEntityType(): {}, file name: {}, adapter",
                 importTaskMetaData.getEntityType(), importTaskMetaData.getFilename(), importTaskMetaData.getAdapter());
+        if(creatingUser==null ){
+            creatingUser= (GsrsSecurityUtils.getCurrentUsername()!=null && GsrsSecurityUtils.getCurrentUsername().isPresent())
+                    ? principalRepository.findDistinctByUsernameIgnoreCase(GsrsSecurityUtils.getCurrentUsername().get())
+                    : null;
+        }
         ImportRecordParameters.ImportRecordParametersBuilder builder=
          ImportRecordParameters.builder()
                 .jsonData(json)