code info about subsamples that cannot be deleted in ApiSample.canBeDeleted and ApiSubSample.storedInContainer flags, rather than in separate array of ApiSample

Author: mKowalski256

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

@@ -2,11 +2,10 @@
 package com.researchspace.api.v1.model;
 
 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;
-import java.util.LinkedList;
+import java.util.ArrayList;
 import java.util.List;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -58,32 +57,24 @@
   "fields",
   "extraFields",
   "subSamples",
-  "subSamplesInContainer",
   "_links"
 })
 public class ApiSample extends ApiSampleWithoutSubSamples {
 
   @JsonProperty("subSamples")
-  private List<ApiSubSampleInfo> subSamples = new LinkedList<>();
+  private List<ApiSubSampleInfo> subSamples = new ArrayList<>();
 
-  @JsonProperty(value = "subSamplesInContainer", access = Access.READ_ONLY)
-  private List<ApiSubSampleInfo> subSamplesInContainer = new LinkedList<>();
-
-  /* this will be `true` only when `subSamplesInContainer` is null or empty */
-  @JsonProperty(value = "canBeDeleted", access = Access.READ_ONLY)
+  @JsonProperty(value = "canBeDeleted")
   private Boolean canBeDeleted;
 
   public ApiSample(Sample sample) {
     super(sample);
 
     for (SubSample subSample : sample.getActiveSubSamples()) {
       ApiSubSampleInfo subSampInfo = new ApiSubSampleInfo(subSample);
-      this.subSamples.add(subSampInfo);
-      if (subSample.isStoredInContainer()) {
-        this.subSamplesInContainer.add(subSampInfo);
-      }
+      subSamples.add(subSampInfo);
     }
-    this.canBeDeleted = this.subSamplesInContainer.isEmpty();
+    canBeDeleted = subSamples.stream().noneMatch(ApiSubSampleInfo::isStoredInContainer);
   }
 
   @Override

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

@@ -35,6 +35,7 @@
   "lastModified",
   "modifiedBy",
   "modifiedByFullName",
+  "canBeDeleted",
   "deleted",
   "deletedDate",
   "iconId",
@@ -66,6 +67,9 @@ public class ApiSampleWithFullSubSamples extends ApiSampleWithoutSubSamples {
   @JsonProperty("subSamples")
   private List<ApiSubSample> subSamples = new ArrayList<>();
 
+  @JsonProperty(value = "canBeDeleted")
+  private Boolean canBeDeleted;
+
   @JsonProperty(value = "newSampleSubSamplesCount", access = Access.WRITE_ONLY)
   private Integer newSampleSubSamplesCount;
 
@@ -90,6 +94,7 @@ public ApiSampleWithFullSubSamples(Sample sample) {
     for (SubSample subSample : sample.getActiveSubSamples()) {
       subSamples.add(new ApiSubSample(subSample));
     }
+    canBeDeleted = subSamples.stream().noneMatch(ApiSubSample::isStoredInContainer);
   }
 
   /** to simplify creation of a valid sample (must have name). */

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

@@ -50,6 +50,7 @@
   "lastMoveDate",
   "revisionId",
   "deletedOnSampleDeletion",
+  "storedInContainer",
   "_links"
 })
 public class ApiSubSampleInfo extends ApiInventoryRecordInfo {
@@ -75,6 +76,9 @@ public class ApiSubSampleInfo extends ApiInventoryRecordInfo {
   @JsonProperty("deletedOnSampleDeletion")
   private boolean deletedOnSampleDeletion;
 
+  @JsonProperty("storedInContainer")
+  private boolean storedInContainer;
+
   /** default constructor used by jackson deserializer */
   public ApiSubSampleInfo() {
     setType(ApiInventoryRecordType.SUBSAMPLE);
@@ -94,6 +98,7 @@ public ApiSubSampleInfo(SubSample subSample) {
       setLastMoveDateMillis(Date.from(subSample.getLastMoveDate()).getTime());
     }
     setDeletedOnSampleDeletion(subSample.isDeletedOnSampleDeletion());
+    setStoredInContainer(subSample.isStoredInContainer());
   }
 
   protected void addImageLinksFromParentSample(

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

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

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

@@ -844,10 +844,12 @@ public void deleteSampleAndCheckActions() throws Exception {
     ApiContainer basicContainer = createBasicContainerForUser(anyUser);
     assertFalse(basicSample.getSubSamples().isEmpty());
     ApiSubSample subSample = basicSample.getSubSamples().get(0);
+    assertFalse(subSample.isStoredInContainer());
     verifyAuditAction(AuditAction.CREATE, 3);
 
     // move subsample to container
     moveSubSampleIntoListContainer(subSample.getId(), basicContainer.getId(), anyUser);
+    assertTrue(subSample.isStoredInContainer());
     verifyAuditAction(AuditAction.MOVE, 1);
 
     // verify subsample in container
@@ -870,7 +872,7 @@ public void deleteSampleAndCheckActions() throws Exception {
             .andReturn();
     ApiSample sampleCannotBeDeleted = getFromJsonResponseBody(deleteResult, ApiSample.class);
     assertFalse(sampleCannotBeDeleted.getCanBeDeleted());
-    assertEquals(1, sampleCannotBeDeleted.getSubSamplesInContainer().size());
+    assertTrue(sampleCannotBeDeleted.getSubSamples().get(0).isStoredInContainer());
     verifyAuditAction(AuditAction.DELETE, 0);
 
     // delete sample with forceDelete=true

src/test/java/com/researchspace/service/inventory/SampleApiManagerTest.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.getSubSamplesInContainer().size());
+    assertTrue(apiSample.getSubSamples().get(0).isStoredInContainer());
     listContainer = containerApiMgr.getApiContainerById(listContainer.getId(), testUser);
     assertEquals(1, listContainer.getContentSummary().getTotalCount());
     Mockito.verify(mockPublisher, Mockito.never())