Added 'Copied From' list of concept set ids for concept set annotations

Author: oleg-odysseus

src/main/java/org/ohdsi/webapi/conceptset/annotation/ConceptSetAnnotation.java

@@ -47,6 +47,9 @@ public class ConceptSetAnnotation extends CommonEntity<Integer> implements Seria
     @Column(name = "concept_set_version")
     private String conceptSetVersion;
 
+    @Column(name = "copied_from_concept_set_ids")
+    private String copiedFromConceptSetIds;
+
     public Integer getId() {
         return id;
     }
@@ -94,4 +97,12 @@ public String getConceptSetVersion() {
     public void setConceptSetVersion(String conceptSetVersion) {
         this.conceptSetVersion = conceptSetVersion;
     }
+
+    public String getCopiedFromConceptSetIds() {
+        return copiedFromConceptSetIds;
+    }
+
+    public void setCopiedFromConceptSetIds(String copiedFromConceptSetIds) {
+        this.copiedFromConceptSetIds = copiedFromConceptSetIds;
+    }
 }

src/main/java/org/ohdsi/webapi/service/ConceptSetService.java

@@ -30,6 +30,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.UnauthorizedException;
 import org.ohdsi.circe.vocabulary.ConceptSetExpression;
 import org.ohdsi.vocabulary.Concept;
@@ -929,7 +930,7 @@ private void removeAnnotations(int id, SaveConceptSetAnnotationsRequest request)
             }
         }
     }
-    private ConceptSetAnnotation copyAnnotation(ConceptSetAnnotation sourceConceptSetAnnotation, int targetConceptSetId){
+    private ConceptSetAnnotation copyAnnotation(ConceptSetAnnotation sourceConceptSetAnnotation, int sourceConceptSetId, int targetConceptSetId){
         ConceptSetAnnotation targetConceptSetAnnotation = new ConceptSetAnnotation();
         targetConceptSetAnnotation.setConceptSetId(targetConceptSetId);
         targetConceptSetAnnotation.setConceptSetVersion(sourceConceptSetAnnotation.getConceptSetVersion());
@@ -940,17 +941,25 @@ private ConceptSetAnnotation copyAnnotation(ConceptSetAnnotation sourceConceptSe
         targetConceptSetAnnotation.setCreatedDate(sourceConceptSetAnnotation.getCreatedDate());
         targetConceptSetAnnotation.setModifiedBy(sourceConceptSetAnnotation.getModifiedBy());
         targetConceptSetAnnotation.setModifiedDate(sourceConceptSetAnnotation.getModifiedDate());
+        targetConceptSetAnnotation.setCopiedFromConceptSetIds(appendCopiedFromConceptSetId(sourceConceptSetAnnotation.getCopiedFromConceptSetIds(), sourceConceptSetId));
         return targetConceptSetAnnotation;
     }
 
+    private String appendCopiedFromConceptSetId(String copiedFromConceptSetIds, int sourceConceptSetId) {
+        if(StringUtils.isEmpty(copiedFromConceptSetIds)){
+            return Integer.toString(sourceConceptSetId);
+        }
+        return copiedFromConceptSetIds.concat(",").concat(Integer.toString(sourceConceptSetId));
+    }
+
     @POST
     @Path("/copy-annotations")
     @Produces(MediaType.APPLICATION_JSON)
     @Transactional
     public void copyAnnotations(CopyAnnotationsRequest copyAnnotationsRequest ) {
         List<ConceptSetAnnotation> sourceAnnotations = getConceptSetAnnotationRepository().findByConceptSetId(copyAnnotationsRequest.getSourceConceptSetId());
         List<ConceptSetAnnotation> copiedAnnotations= sourceAnnotations.stream()
-                .map(sourceAnnotation -> copyAnnotation(sourceAnnotation, copyAnnotationsRequest.getTargetConceptSetId()))
+                .map(sourceAnnotation -> copyAnnotation(sourceAnnotation, copyAnnotationsRequest.getSourceConceptSetId(), copyAnnotationsRequest.getTargetConceptSetId()))
                 .collect(Collectors.toList());
         getConceptSetAnnotationRepository().save(copiedAnnotations);
     }
@@ -985,6 +994,7 @@ private AnnotationDTO convertAnnotationEntityToDTO(ConceptSetAnnotation conceptS
 
            annotationDTO.setVocabularyVersion(conceptSetAnnotation.getVocabularyVersion());
            annotationDTO.setConceptSetVersion(conceptSetAnnotation.getConceptSetVersion());
+           annotationDTO.setCopiedFromConceptSetIds(conceptSetAnnotation.getCopiedFromConceptSetIds());
            annotationDTO.setCreatedBy(conceptSetAnnotation.getCreatedBy() != null ? conceptSetAnnotation.getCreatedBy().getName() : null);
            annotationDTO.setCreatedDate(conceptSetAnnotation.getCreatedDate() != null ? conceptSetAnnotation.getCreatedDate().toString() : null);
 

src/main/java/org/ohdsi/webapi/service/dto/AnnotationDTO.java

@@ -11,6 +11,7 @@ public class AnnotationDTO {
     private String vocabularyVersion;
     private String conceptSetVersion;
     private String searchData;
+    private String copiedFromConceptSetIds;
     private Integer conceptId;
 
     public String getCreatedBy() {
@@ -68,4 +69,12 @@ public Integer getConceptId() {
     public void setConceptId(Integer conceptId) {
         this.conceptId = conceptId;
     }
+
+    public String getCopiedFromConceptSetIds() {
+        return copiedFromConceptSetIds;
+    }
+
+    public void setCopiedFromConceptSetIds(String copiedFromConceptSetIds) {
+        this.copiedFromConceptSetIds = copiedFromConceptSetIds;
+    }
 }

src/main/resources/db/migration/postgresql/V2.14.0.20240912000000__add_copied_from_concept_set_annotation.sql

@@ -0,0 +1 @@
+ALTER TABLE ${ohdsiSchema}.concept_set_annotation ADD copied_from_concept_set_ids VARCHAR;