Merge pull request #67 from nitin-ebi/RS_Split

EVA-2562: New EventType created for RS Split Operation
EBIvariation · Sep 6, 2021 · b972754 · b972754
2 parents 201b509 + fa8ddac
commit b972754
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 2 deletions.
diff --git a/...-commons-core/src/main/java/uk/ac/ebi/ampt2d/commons/accession/core/models/EventType.java b/...-commons-core/src/main/java/uk/ac/ebi/ampt2d/commons/accession/core/models/EventType.java
@@ -31,7 +31,10 @@ public enum EventType {
     // accession1 merged into accession2
     MERGED,
 
+    // new accession id created because of RS split
+    RS_SPLIT,
+
     // accession is no longer valid
-    DEPRECATED;
+    DEPRECATED
 
 }
diff --git a/...mmons-core/src/main/java/uk/ac/ebi/ampt2d/commons/accession/core/models/HistoryEvent.java b/...mmons-core/src/main/java/uk/ac/ebi/ampt2d/commons/accession/core/models/HistoryEvent.java
@@ -17,6 +17,7 @@
  */
 package uk.ac.ebi.ampt2d.commons.accession.core.models;
 
+import sun.reflect.generics.reflectiveObjects.NotImplementedException;
 import uk.ac.ebi.ampt2d.commons.accession.persistence.models.IAccessionedObject;
 
 import java.time.LocalDateTime;
@@ -64,6 +65,11 @@ public ACCESSION getMergedInto() {
         return mergedInto;
     }
 
+    @Override
+    public ACCESSION getSplitInto() {
+        throw new NotImplementedException();
+    }
+
     @Override
     public String getReason() {
         return null;

diff --git a/...ion-commons-core/src/main/java/uk/ac/ebi/ampt2d/commons/accession/core/models/IEvent.java b/...ion-commons-core/src/main/java/uk/ac/ebi/ampt2d/commons/accession/core/models/IEvent.java
@@ -41,6 +41,11 @@ public interface IEvent<MODEL, ACCESSION> {
      */
     ACCESSION getMergedInto();
 
+    /**
+     * @return Accession of the target object into which the original object accession has split
+     */
+    ACCESSION getSplitInto();
+
     /**
      * @return Type of the event like creation, update, etc, executed on the accessioned object
      */

diff --git a/...jpa/src/main/java/uk/ac/ebi/ampt2d/commons/accession/persistence/jpa/models/JpaEvent.java b/...jpa/src/main/java/uk/ac/ebi/ampt2d/commons/accession/persistence/jpa/models/JpaEvent.java
@@ -17,6 +17,7 @@
  */
 package uk.ac.ebi.ampt2d.commons.accession.persistence.jpa.models;
 
+import sun.reflect.generics.reflectiveObjects.NotImplementedException;
 import uk.ac.ebi.ampt2d.commons.accession.core.models.EventType;
 import uk.ac.ebi.ampt2d.commons.accession.persistence.models.IAccessionedObject;
 import uk.ac.ebi.ampt2d.commons.accession.core.models.IEvent;
@@ -61,6 +62,11 @@ public ACCESSION getMergedInto() {
         return mergeInto;
     }
 
+    @Override
+    public ACCESSION getSplitInto() {
+        throw new NotImplementedException();
+    }
+
     @Override
     public EventType getEventType() {
         return eventType;

diff --git a/...n/java/uk/ac/ebi/ampt2d/commons/accession/persistence/mongodb/document/EventDocument.java b/...n/java/uk/ac/ebi/ampt2d/commons/accession/persistence/mongodb/document/EventDocument.java
@@ -53,6 +53,8 @@ public abstract class EventDocument<
 
     private ACCESSION mergeInto;
 
+    private ACCESSION splitInto;
+
     private String reason;
 
     private List<INACTIVE_DOCUMENT> inactiveObjects;
@@ -67,7 +69,11 @@ public void fill(EventType eventType, ACCESSION accessionIdOrigin, ACCESSION acc
                      String reason, List<INACTIVE_DOCUMENT> inactiveObjects) {
         this.eventType = eventType;
         this.accession = accessionIdOrigin;
-        this.mergeInto = accessionIdDestiny;
+        if(eventType==EventType.RS_SPLIT){
+            this.splitInto = accessionIdDestiny;
+        }else if(eventType==EventType.MERGED){
+            this.mergeInto = accessionIdDestiny;
+        }
         this.reason = reason;
         this.inactiveObjects = new ArrayList<>();
         if (inactiveObjects != null && !inactiveObjects.isEmpty()) {
@@ -90,6 +96,11 @@ public ACCESSION getMergedInto() {
         return mergeInto;
     }
 
+    @Override
+    public ACCESSION getSplitInto() {
+        return splitInto;
+    }
+
     @Override
     public String getReason() {
         return reason;