Fix revsiable flag when saving or updating samples (#924)

Signed-off-by: Angelica Ochoa <[email protected]>
mskcc · Mar 30, 2023 · 68897d4 · 68897d4
1 parent 2a08454
commit 68897d4
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/service/src/main/java/org/mskcc/smile/service/impl/SampleServiceImpl.java b/service/src/main/java/org/mskcc/smile/service/impl/SampleServiceImpl.java
@@ -50,13 +50,15 @@ public class SampleServiceImpl implements SmileSampleService {
     @Transactional(rollbackFor = {Exception.class})
     public SmileSample saveSmileSample(SmileSample
             sample) throws Exception {
+        // sample to return
+        SmileSample toReturn;
         fetchAndLoadPatientDetails(sample);
         SmileSample existingSample =
                 sampleRepository.findSampleByPrimaryId(sample.getPrimarySampleAlias());
         if (existingSample == null) {
             UUID newSampleId = sampleRepository.save(sample).getSmileSampleId();
             sample.setSmileSampleId(newSampleId);
-            return sample;
+            toReturn = sample;
         } else {
             // populate existing sample details and check if there are actual updates to persist
             getDetailedSmileSample(existingSample);
@@ -88,10 +90,12 @@ public SmileSample saveSmileSample(SmileSample
                         existingSample.getPatient().getSmilePatientId());
                 existingSample.setPatient(sample.getPatient());
             }
-            sampleRepository.updateRevisableBySampleId(existingSample.getSmileSampleId(), Boolean.TRUE);
             sampleRepository.save(existingSample);
-            return existingSample;
+            toReturn = existingSample;
         }
+        // update revisable to true for sample
+        sampleRepository.updateRevisableBySampleId(toReturn.getSmileSampleId(), Boolean.TRUE);
+        return toReturn;
     }
 
     /**