From 2da53ac2762a9bfe338b97491b3e6938eb071160 Mon Sep 17 00:00:00 2001
From: Jarvanerp <jarno@thehyve.nl>
Date: Fri, 11 Nov 2016 11:21:53 +0100
Subject: [PATCH] Change name of DataTypeRetrieved to Datatypes for frontend
 consistency

---
 .../transmartproject/db/RestExportService.groovy   | 14 +++++++-------
 .../{DataTypeRetrieved.groovy => Datatypes.groovy} |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)
 rename src/groovy/org/transmartproject/export/{DataTypeRetrieved.groovy => Datatypes.groovy} (88%)

diff --git a/grails-app/services/org/transmartproject/db/RestExportService.groovy b/grails-app/services/org/transmartproject/db/RestExportService.groovy
index dcb4baa9..4196ad69 100644
--- a/grails-app/services/org/transmartproject/db/RestExportService.groovy
+++ b/grails-app/services/org/transmartproject/db/RestExportService.groovy
@@ -10,7 +10,7 @@ import org.transmartproject.core.exceptions.InvalidArgumentsException
 import org.transmartproject.core.exceptions.NoSuchResourceException
 import org.transmartproject.core.ontology.ConceptsResource
 import org.transmartproject.core.ontology.OntologyTerm
-import org.transmartproject.export.DataTypeRetrieved
+import org.transmartproject.export.Datatypes
 import org.transmartproject.export.Tasks.DataExportFetchTask
 import org.transmartproject.export.Tasks.DataExportFetchTaskFactory
 
@@ -32,7 +32,7 @@ class RestExportService {
         task.getTsv()
     }
 
-    public List<DataTypeRetrieved> retrieveDataTypes(params) {
+    public List<Datatypes> retrieveDataTypes(params) {
         if (!(params.containsKey('concepts'))) {
             throw new NoSuchResourceException("No parameter named concepts was given.")
         }
@@ -43,7 +43,7 @@ class RestExportService {
 
         def jsonSlurper = new JsonSlurper()
         def conceptParameters = params.get('concepts').decodeURL()
-        List<DataTypeRetrieved> dataTypes = []
+        List<Datatypes> dataTypes = []
         try {
             def conceptArguments = jsonSlurper.parseText(conceptParameters)
             int cohortNumber = 0
@@ -57,7 +57,7 @@ class RestExportService {
         }
     }
 
-    private List<DataTypeRetrieved> getDataTypes(Map conceptKeysList, List dataTypes, int cohortNumber) {
+    private List<Datatypes> getDataTypes(Map conceptKeysList, List dataTypes, int cohortNumber) {
         conceptKeysList.conceptKeys.collect { conceptKey ->
             getDataType(conceptKey, dataTypes, cohortNumber)
         }
@@ -96,16 +96,16 @@ class RestExportService {
         List tempDataTypes = dataTypes.collect { it.dataType }
         if (dataTypeString in tempDataTypes) {
             int index = tempDataTypes.indexOf(dataTypeString)
-            DataTypeRetrieved dataType = dataTypes[index]
+            Datatypes dataType = dataTypes[index]
             addOntologyTerm(term, dataType, cohortNumber)
         } else {
-            DataTypeRetrieved dataType = new DataTypeRetrieved(dataType: dataTypeString, dataTypeCode: dataTypeCode)
+            Datatypes dataType = new Datatypes(dataType: dataTypeString, dataTypeCode: dataTypeCode)
             addOntologyTerm(term, dataType, cohortNumber)
             dataTypes.add(dataType)
         }
     }
 
-    private void addOntologyTerm(OntologyTerm term, DataTypeRetrieved dataType, int cohortNumberID) {
+    private void addOntologyTerm(OntologyTerm term, Datatypes dataType, int cohortNumberID) {
         if (cohortNumberID in dataType.OntologyTermsMap.keySet()) {
             dataType.OntologyTermsMap[cohortNumberID].add(term)
         } else {
diff --git a/src/groovy/org/transmartproject/export/DataTypeRetrieved.groovy b/src/groovy/org/transmartproject/export/Datatypes.groovy
similarity index 88%
rename from src/groovy/org/transmartproject/export/DataTypeRetrieved.groovy
rename to src/groovy/org/transmartproject/export/Datatypes.groovy
index 6d199a07..3220fd5e 100644
--- a/src/groovy/org/transmartproject/export/DataTypeRetrieved.groovy
+++ b/src/groovy/org/transmartproject/export/Datatypes.groovy
@@ -2,7 +2,7 @@ package org.transmartproject.export
 
 import org.transmartproject.core.ontology.OntologyTerm
 
-class DataTypeRetrieved {
+class Datatypes {
 
     Map<Integer, List<OntologyTerm>> OntologyTermsMap = [:]