Merge pull request #916 from MetadataConsulting/import-refactor

Adding in a relationship for the latestVersionId in the "adding relat…
MetadataConsulting · Jan 23, 2017 · 75d4c96 · 75d4c96
2 parents f8eb6f8 + 5b99f06
commit 75d4c96
Showing 1 changed file with 21 additions and 0 deletions.
diff --git a/...pp/src/groovy/org/modelcatalogue/core/util/builder/CatalogueElementProxyRepository.groovy b/...pp/src/groovy/org/modelcatalogue/core/util/builder/CatalogueElementProxyRepository.groovy
@@ -5,6 +5,7 @@ import grails.gorm.DetachedCriteria
 import groovy.transform.CompileDynamic
 import groovy.util.logging.Log4j
 import org.modelcatalogue.core.*
+import org.modelcatalogue.core.util.HibernateHelper
 import org.modelcatalogue.core.api.ElementStatus
 import org.modelcatalogue.core.publishing.DraftContext
 import org.modelcatalogue.core.publishing.PublishingContext
@@ -602,8 +603,28 @@ class CatalogueElementProxyRepository {
                 relationship.destination.latestVersionId = relationship.source.latestVersionId
                 FriendlyErrors.failFriendlySave(relationship.destination)
             }
+
+
+            if(HibernateHelper.getEntityClass(relationship.source) == DataModel){
+
+                // for each element which does the source data model declare
+                for (CatalogueElement element in (relationship.source as DataModel).declares) {
+                    if(!element.latestVersionId){
+                        element.latestVersionId = element.id
+                        FriendlyErrors.failFriendlySave(element)
+                    }
+
+                    CatalogueElement other = CatalogueElement.findByNameAndDataModel(element.name, relationship.destination)
+                    if (other && !other.latestVersionId) {
+                        other.latestVersionId = element.latestVersionId
+                        FriendlyErrors.failFriendlySave(other)
+                    }
+                }
+            }
         }
 
+
+
         createdRelationships[hash] = relationship
 
         return relationship