Merge pull request #873 from MetadataConsulting/MET-1282-show-version…

…-in-search MET-1282 show version number in search
MetadataConsulting · Nov 1, 2016 · 9fd79b6 · 9fd79b6
2 parents 60ad8e8 + 6a971fc
commit 9fd79b6
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/...gin/src/groovy/org/modelcatalogue/core/util/marshalling/CatalogueElementMarshaller.groovy b/...gin/src/groovy/org/modelcatalogue/core/util/marshalling/CatalogueElementMarshaller.groovy
@@ -221,7 +221,7 @@ abstract class CatalogueElementMarshaller extends AbstractMarshaller {
         }
 
         if (element.dataModel) {
-            return "${element.name} (${element.dataModel.name})"
+            return "${element.name} (${element.dataModel.name} ${element.dataModelSemanticVersion})"
         }
 
         return element.name

diff --git a/ModelCatalogueCorePlugin/test/integration/org/modelcatalogue/core/RelationshipISpec.groovy b/ModelCatalogueCorePlugin/test/integration/org/modelcatalogue/core/RelationshipISpec.groovy
@@ -116,7 +116,7 @@ class RelationshipISpec extends AbstractIntegrationSpec{
         DataClass model = new DataClass(dataModel: classification, name: "Supermodel").save(failOnError: true)
 
         then:
-        CatalogueElementMarshaller.getClassifiedName(model) == 'Supermodel (classy)'
+        CatalogueElementMarshaller.getClassifiedName(model) == 'Supermodel (classy 0.0.1)'
 
         cleanup:
         classification?.delete()

diff --git a/...ogueCorePluginTestApp/test/functional/org/modelcatalogue/core/SearchFunctionalSpec.groovy b/...ogueCorePluginTestApp/test/functional/org/modelcatalogue/core/SearchFunctionalSpec.groovy
@@ -16,7 +16,7 @@ class SearchFunctionalSpec extends AbstractModelCatalogueGebSpec {
     private static final String searchInput = '.modal-body .input-group-lg input'
     private static final String firstItemFound = '.list-group-item.item-found:first-of-type'
     private static final String firstItemFoundId = '.list-group-item.item-found:first-of-type .search-model-catalogue-id'
-    private static final String DATA_ELEMENT_NAME_WITH_DATA_MODEL = 'TESTCER SYMPTOMS FIRST NOTED DATE (NHIC)'
+    private static final String DATA_ELEMENT_NAME_WITH_DATA_MODEL = 'TESTCER SYMPTOMS FIRST NOTED DATE (NHIC 0.0.1)'
     private static final String NAME_LOWER_CASE = 'testcer symptoms first note date'
     private static final String PART_OF_DESCRIPTION = 'the time when the symptoms were first noted'
     private static final String UNIQUE_EXTENSION_VALUE = 'TEST_27'

diff --git a/...archPlugin/src/groovy/org/modelcatalogue/core/elasticsearch/ElasticSearchQueryList.groovy b/...archPlugin/src/groovy/org/modelcatalogue/core/elasticsearch/ElasticSearchQueryList.groovy
@@ -126,7 +126,7 @@ class ElasticSearchQueryList<T> implements JsonAwareListWithTotalAndType<T> {
                 versionNumber: source.get('version_number'),
                 latestVersionId: source.get('latest_id'),
                 dataModel: readSource(source.get('data_model')?.entity_id?.toString(), source.get('data_model') as  Map<String, Object>),
-                classifiedName: source.get('data_model') ? "${source.get('name')} (${source.get('data_model').get('name')})" : source.get('name'),
+                classifiedName: source.get('data_model') ? "${source.get('name')} (${source.get('data_model').get('name')} ${source.get('data_model').get('semantic_version')})" : source.get('name'),
                 modelCatalogueId: source.get('model_catalogue_id'),
                 internalModelCatalogueId: source.get('internal_model_catalogue_id'),
                 description: source.get('description'),