code review changes

Author: mKowalski256

src/main/java/com/researchspace/api/v1/model/ApiSample.java

@@ -1,8 +1,8 @@
 /** RSpace Inventory API Access your RSpace Inventory programmatically. */
 package com.researchspace.api.v1.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty.Access;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.researchspace.model.inventory.Sample;
 import com.researchspace.model.inventory.SubSample;
@@ -58,20 +58,19 @@
   "fields",
   "extraFields",
   "subSamples",
-  "subSamplesIntoContainer",
+  "subSamplesInContainer",
   "_links"
 })
-@JsonIgnoreProperties(ignoreUnknown = true)
 public class ApiSample extends ApiSampleWithoutSubSamples {
 
   @JsonProperty("subSamples")
   private List<ApiSubSampleInfo> subSamples = new LinkedList<>();
 
-  @JsonProperty("subSamplesIntoContainer")
-  private List<ApiSubSampleInfo> subSamplesIntoContainer = new LinkedList<>();
+  @JsonProperty(value = "subSamplesInContainer", access = Access.READ_ONLY)
+  private List<ApiSubSampleInfo> subSamplesInContainer = new LinkedList<>();
 
-  /* this will be `true` only when `subSamplesIntoContainer` is null or empty */
-  @JsonProperty("canBeDeleted")
+  /* this will be `true` only when `subSamplesInContainer` is null or empty */
+  @JsonProperty(value = "canBeDeleted", access = Access.READ_ONLY)
   private Boolean canBeDeleted;
 
   public ApiSample(Sample sample) {
@@ -81,10 +80,10 @@ public ApiSample(Sample sample) {
       ApiSubSampleInfo subSampInfo = new ApiSubSampleInfo(subSample);
       this.subSamples.add(subSampInfo);
       if (subSample.isStoredInContainer()) {
-        this.subSamplesIntoContainer.add(subSampInfo);
+        this.subSamplesInContainer.add(subSampInfo);
       }
     }
-    this.canBeDeleted = this.subSamplesIntoContainer.isEmpty();
+    this.canBeDeleted = this.subSamplesInContainer.isEmpty();
   }
 
   @Override

src/main/java/com/researchspace/api/v1/model/ApiSampleWithFullSubSamples.java

@@ -1,7 +1,6 @@
 /** RSpace Inventory API Access your RSpace Inventory programmatically. */
 package com.researchspace.api.v1.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonProperty.Access;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
@@ -62,7 +61,6 @@
   "subSamples",
   "_links"
 })
-@JsonIgnoreProperties(ignoreUnknown = true)
 public class ApiSampleWithFullSubSamples extends ApiSampleWithoutSubSamples {
 
   @JsonProperty("subSamples")

src/main/java/com/researchspace/service/inventory/impl/InventoryBulkOperationHandler.java

@@ -117,7 +117,6 @@ private ApiInventoryBulkOperationResult runOperationForEachRecordFromBulkList(
           }
           ApiInventoryRecordInfo operationResult = operation.apply(recInfo, user);
           if (operationResult != null) {
-            /* manage Sample deletion */
             if (operationResult.getClass().isInstance(ApiSample.class)) {
               ApiSample apiSample = (ApiSample) operationResult;
               if (!apiSample.getCanBeDeleted()) {
@@ -126,8 +125,7 @@ private ApiInventoryBulkOperationResult runOperationForEachRecordFromBulkList(
                         HttpStatus.NOT_ACCEPTABLE,
                         ApiErrorCodes.CONSTRAINT_VIOLATION.getCode(),
                         "Errors detected : 1",
-                        "The Sample had got at least one active Subsample(s) located in a"
-                            + " container");
+                        "The Sample has at least one Subsample located inside a container");
                 result.addErrorWithRecord(operationResult, err);
                 continue;
               }

src/main/webapp/ui/package-lock.json

@@ -436,7 +436,7 @@ export default class Search implements SearchInterface {
               record: {
                 type: string,
                 canBeDeleted?: boolean,
-                subSamplesIntoContainer: $ReadOnlyArray<
+                subSamplesInContainer: $ReadOnlyArray<
                   $Diff<SubSampleAttrs, { sample: mixed }>
                 >,
                 ...
@@ -476,7 +476,7 @@ export default class Search implements SearchInterface {
       if (samplesThatCouldNotBeDeleted.length > 0) {
         const subsamplesThatPreventedSampleDeletion =
           samplesThatCouldNotBeDeleted.flatMap((s) =>
-            s.subSamplesIntoContainer.map((ss) => [s, ss])
+            s.subSamplesInContainer.map((ss) => [s, ss])
           );
         uiStore.addAlert(
           mkAlert({

src/main/webapp/ui/src/stores/models/Search.js

@@ -870,7 +870,7 @@ public void deleteSampleAndCheckActions() throws Exception {
             .andReturn();
     ApiSample sampleCannotBeDeleted = getFromJsonResponseBody(deleteResult, ApiSample.class);
     assertFalse(sampleCannotBeDeleted.getCanBeDeleted());
-    assertEquals(1, sampleCannotBeDeleted.getSubSamplesIntoContainer().size());
+    assertEquals(1, sampleCannotBeDeleted.getSubSamplesInContainer().size());
     verifyAuditAction(AuditAction.DELETE, 0);
 
     // delete sample with forceDelete=true

src/test/java/com/researchspace/api/v1/controller/SamplesApiControllerMVCIT.java

@@ -582,7 +582,7 @@ public void deleteSample() {
     // try deleting without forceDelete flag
     ApiSample apiSample = sampleApiMgr.markSampleAsDeleted(newSample.getId(), false, testUser);
     assertFalse(apiSample.getCanBeDeleted());
-    assertEquals(1, apiSample.getSubSamplesIntoContainer().size());
+    assertEquals(1, apiSample.getSubSamplesInContainer().size());
     listContainer = containerApiMgr.getApiContainerById(listContainer.getId(), testUser);
     assertEquals(1, listContainer.getContentSummary().getTotalCount());
     Mockito.verify(mockPublisher, Mockito.never())