Replace ExporterProviderService fileType and producesContentType refe…

…rences in DomainExport with contentType
MauroDataMapper · Jun 7, 2022 · 25f4dcd · 25f4dcd
1 parent bbe85cb
commit 25f4dcd
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/mdm-core/grails-app/domain/uk/ac/ox/softeng/maurodatamapper/core/async/DomainExport.groovy b/mdm-core/grails-app/domain/uk/ac/ox/softeng/maurodatamapper/core/async/DomainExport.groovy
@@ -38,7 +38,6 @@ class DomainExport implements MdmDomain {
     MdmDomain exportedDomain
     byte[] exportData
     String exportFileName
-    String exportFileType
     String exportContentType
 
     String exporterNamespace
@@ -55,7 +54,6 @@ class DomainExport implements MdmDomain {
         exporterNamespace blank: false
         exporterName blank: false
         exportFileName blank: false
-        exportFileType blank: false
         exportContentType nullable: true, blank: false
     }
 
@@ -94,8 +92,7 @@ class DomainExport implements MdmDomain {
         this.exporterNamespace = exporterProviderService.namespace
         this.exporterName = exporterProviderService.name
         this.exporterVersion = exporterProviderService.sortableVersion()
-        this.exportFileType = exporterProviderService.fileType
-        this.exportContentType = exporterProviderService.producesContentType
+        this.exportContentType = exporterProviderService.contentType
     }
 
     Map getDownloadLinkParams() {

diff --git a/mdm-core/grails-app/views/domainExport/_domainExport.gson b/mdm-core/grails-app/views/domainExport/_domainExport.gson
@@ -24,7 +24,6 @@ json {
 
     export {
         fileName domainExport.exportFileName
-        fileType domainExport.exportFileType
         contentType domainExport.exportContentType
         fileSize domainExport.exportFileSize
     }

diff --git a/...test/groovy/uk/ac/ox/softeng/maurodatamapper/core/async/DomainExportFunctionalSpec.groovy b/...test/groovy/uk/ac/ox/softeng/maurodatamapper/core/async/DomainExportFunctionalSpec.groovy
@@ -89,7 +89,7 @@ class DomainExportFunctionalSpec extends BaseFunctionalSpec {
             }
 
             @Override
-            String getFileType() {
+            String getContentType() {
                 grails.web.mime.MimeType.JSON.name
             }
 
@@ -157,8 +157,7 @@ class DomainExportFunctionalSpec extends BaseFunctionalSpec {
   },
   "export": {
     "fileName": "test.json",
-    "fileType": "application/json",
-    "contentType": null,
+    "contentType": "application/json",
     "fileSize": 20
   },
   "exportedOn": "${json-unit.matches:offsetDateTime}",