Feature/folder import export with dataflow

mauro-api/src/main/groovy/org/maurodata/controller/dataflow/DataClassComponentController.groovy

@@ -36,7 +36,7 @@ import org.maurodata.web.PaginationParams
 @Secured(SecurityRule.IS_AUTHENTICATED)
 class DataClassComponentController extends AdministeredItemController<DataClassComponent, DataFlow> implements DataClassComponentApi {
 
-    AdministeredItemCacheableRepository.DataClassCacheableRepository dataClassRepository
+    DataClassCacheableRepository dataClassRepository
 
     AdministeredItemCacheableRepository.DataClassComponentCacheableRepository dataClassComponentRepository
 

mauro-api/src/main/groovy/org/maurodata/controller/dataflow/DataFlowController.groovy

@@ -41,7 +41,7 @@ import org.maurodata.plugin.exporter.DataFlowExporterPlugin
 import org.maurodata.plugin.exporter.ModelItemExporterPlugin
 import org.maurodata.plugin.importer.DataFlowImporterPlugin
 import org.maurodata.plugin.importer.json.JsonDataFlowImporterPlugin
-import org.maurodata.service.dataflow.DataflowService
+import org.maurodata.service.dataflow.DataFlowService
 import org.maurodata.util.exporter.ExporterUtils
 import org.maurodata.web.ListResponse
 import org.maurodata.web.PaginationParams
@@ -55,12 +55,11 @@ class DataFlowController extends AdministeredItemController<DataFlow, DataModel>
     AdministeredItemCacheableRepository.DataFlowCacheableRepository dataFlowRepository
     ModelCacheableRepository.DataModelCacheableRepository dataModelRepository
     DataFlowContentRepository dataFlowContentRepository
-    DataflowService dataFlowService
-
+    DataFlowService dataFlowService
 
     DataFlowController(AdministeredItemCacheableRepository.DataFlowCacheableRepository dataFlowRepository,
                        ModelCacheableRepository.DataModelCacheableRepository dataModelRepository,
-                       DataFlowContentRepository dataFlowContentRepository, DataflowService dataFlowService) {
+                       DataFlowContentRepository dataFlowContentRepository, DataFlowService dataFlowService) {
         super(DataFlow, dataFlowRepository, dataModelRepository, dataFlowContentRepository)
         this.dataFlowRepository = dataFlowRepository
         this.dataModelRepository = dataModelRepository

mauro-api/src/main/groovy/org/maurodata/controller/datamodel/DataModelController.groovy

@@ -56,7 +56,6 @@ import org.maurodata.domain.search.dto.SearchRequestDTO
 import org.maurodata.domain.search.dto.SearchResultsDTO
 import org.maurodata.domain.security.Role
 import org.maurodata.persistence.cache.AdministeredItemCacheableRepository.DataElementCacheableRepository
-import org.maurodata.persistence.cache.AdministeredItemCacheableRepository.DataTypeCacheableRepository
 import org.maurodata.persistence.cache.ModelCacheableRepository.DataModelCacheableRepository
 import org.maurodata.persistence.cache.ModelCacheableRepository.FolderCacheableRepository
 import org.maurodata.persistence.datamodel.DataElementRepository
@@ -65,8 +64,10 @@ import org.maurodata.persistence.datamodel.DataTypeContentRepository
 import org.maurodata.persistence.search.SearchRepository
 import org.maurodata.plugin.datatype.DefaultDataTypeProviderPlugin
 import org.maurodata.plugin.exporter.DataModelExporterPlugin
+import org.maurodata.plugin.exporter.ModelExporterPlugin
 import org.maurodata.plugin.importer.DataModelImporterPlugin
 import org.maurodata.service.plugin.PluginService
+import org.maurodata.util.exporter.ExporterUtils
 import org.maurodata.web.ListResponse
 
 @Slf4j
@@ -81,27 +82,21 @@ class DataModelController extends ModelController<DataModel> implements DataMode
     @Inject
     SearchRepository searchRepository
 
-    @Inject
-    DataModelService dataModelService
-
     @Inject
     DataElementCacheableRepository dataElementCacheableRepository
 
-    @Inject
-    DataTypeCacheableRepository dataTypeCacheableRepository
-
     @Inject
     DataTypeContentRepository dataTypeContentRepository
 
     @Inject
     DataElementRepository dataElementRepository
 
+
     DataModelController(DataModelCacheableRepository dataModelRepository, FolderCacheableRepository folderRepository, DataModelContentRepository dataModelContentRepository,
-                        DataModelService dataModelService) {
-        super(DataModel, dataModelRepository, folderRepository, dataModelContentRepository, dataModelService)
+                        DataModelService domainDataModelService) {
+        super(DataModel, dataModelRepository, folderRepository, dataModelContentRepository, domainDataModelService)
         this.dataModelRepository = dataModelRepository
         this.dataModelContentRepository = dataModelContentRepository
-        this.dataModelService = dataModelService
     }
 
     @Audit
@@ -116,14 +111,14 @@ class DataModelController extends ModelController<DataModel> implements DataMode
     DataModel create(UUID folderId, @Body @NonNull DataModel dataModel, @Nullable @QueryValue String defaultDataTypeProvider = null) {
         // First try and get the default datatypes if applicable
         List<DataType> importedDataTypes = []
-        if(defaultDataTypeProvider) {
+        if (defaultDataTypeProvider) {
             DefaultDataTypeProviderPlugin defaultDataTypeProviderPlugin = mauroPluginService.getPlugin(DefaultDataTypeProviderPlugin, defaultDataTypeProvider)
             PluginService.handlePluginNotFound(defaultDataTypeProviderPlugin, DefaultDataTypeProviderPlugin, defaultDataTypeProvider)
             importedDataTypes.addAll(defaultDataTypeProviderPlugin.dataTypes)
         }
         DataModel newDataModel = super.create(folderId, dataModel) as DataModel
         // If we previously got datatypes, now save them into the model
-        if(importedDataTypes.size() > 0) {
+        if (importedDataTypes.size() > 0) {
             newDataModel.dataTypes = importedDataTypes
             newDataModel.dataTypes.each {dataType ->
                 dataType.dataModel = newDataModel
@@ -199,7 +194,12 @@ class DataModelController extends ModelController<DataModel> implements DataMode
     @Audit
     @Get(Paths.DATA_MODEL_EXPORT)
     HttpResponse<byte[]> exportModel(UUID id, @Nullable String namespace, @Nullable String name, @Nullable String version) {
-        super.exportModel(id, namespace, name, version)
+        ModelExporterPlugin mauroPlugin = mauroPluginService.getPlugin(ModelExporterPlugin, namespace, name, version)
+        PluginService.handlePluginNotFound(mauroPlugin, namespace, name)
+
+        DataModel existing = getModelContent(id)
+        super.dataModelImportService.updateModelPaths(existing)
+        ExporterUtils.createExportResponse(mauroPlugin, existing)
     }
 
     @Transactional
@@ -208,10 +208,12 @@ class DataModelController extends ModelController<DataModel> implements DataMode
     @Consumes(MediaType.MULTIPART_FORM_DATA)
     @Post(Paths.DATA_MODEL_IMPORT)
     ListResponse<DataModel> importModel(@Body MultipartBody body, String namespace, String name, @Nullable String version) {
-        super.importModel(body, namespace, name, version)
+        List<DataModel> imported = super.consumeExportFile(body, namespace, name, version)
+        List<DataModel> saved = super.dataModelImportService.saveImportedModels(imported)
+        smallerResponse(saved)
     }
 
-    @Audit
+        @Audit
     @Get(Paths.DATA_MODEL_DIFF)
     ObjectDiff diffModels(@NonNull UUID id, @NonNull UUID otherId) {
         DataModel dataModel = modelContentRepository.findWithContentById(id)
@@ -519,4 +521,6 @@ class DataModelController extends ModelController<DataModel> implements DataMode
     List<String> dataModelTypes() {
         return DataModelType.labels()
     }
+
+
 }

mauro-api/src/main/groovy/org/maurodata/controller/folder/FolderController.groovy

@@ -1,25 +1,5 @@
 package org.maurodata.controller.folder
 
-import org.maurodata.ErrorHandler
-import org.maurodata.api.Paths
-import org.maurodata.api.folder.FolderApi
-import org.maurodata.api.model.PermissionsDTO
-import org.maurodata.audit.Audit
-import org.maurodata.controller.model.ModelController
-import org.maurodata.domain.datamodel.DataModel
-import org.maurodata.domain.facet.EditType
-import org.maurodata.domain.folder.Folder
-import org.maurodata.persistence.cache.ModelCacheableRepository.FolderCacheableRepository
-import org.maurodata.persistence.folder.FolderContentRepository
-import org.maurodata.domain.search.dto.SearchRequestDTO
-import org.maurodata.domain.search.dto.SearchResultsDTO
-import org.maurodata.plugin.exporter.FolderExporterPlugin
-import org.maurodata.plugin.exporter.ModelExporterPlugin
-import org.maurodata.plugin.importer.DataModelImporterPlugin
-import org.maurodata.plugin.importer.FolderImporterPlugin
-import org.maurodata.service.plugin.PluginService
-import org.maurodata.web.ListResponse
-
 import groovy.transform.CompileStatic
 import groovy.util.logging.Slf4j
 import io.micronaut.core.annotation.NonNull
@@ -43,19 +23,37 @@ import io.micronaut.security.annotation.Secured
 import io.micronaut.security.rules.SecurityRule
 import io.micronaut.transaction.annotation.Transactional
 import jakarta.inject.Inject
-import jakarta.inject.Named
+import org.maurodata.ErrorHandler
+import org.maurodata.api.Paths
+import org.maurodata.api.folder.FolderApi
+import org.maurodata.api.model.PermissionsDTO
+import org.maurodata.audit.Audit
+import org.maurodata.controller.model.ModelController
+import org.maurodata.domain.facet.EditType
+import org.maurodata.domain.folder.Folder
+import org.maurodata.domain.search.dto.SearchRequestDTO
+import org.maurodata.domain.search.dto.SearchResultsDTO
+import org.maurodata.persistence.cache.ModelCacheableRepository.FolderCacheableRepository
+import org.maurodata.persistence.folder.FolderContentRepository
+import org.maurodata.plugin.exporter.FolderExporterPlugin
+import org.maurodata.plugin.importer.FolderImporterPlugin
+import org.maurodata.service.core.AllFolderService
+import org.maurodata.web.ListResponse
 
 @Slf4j
 @CompileStatic
 @Controller
 @Secured(SecurityRule.IS_ANONYMOUS)
 class FolderController extends ModelController<Folder> implements FolderApi {
 
-    @Inject
     FolderContentRepository folderContentRepository
 
+    @Inject
+    AllFolderService allFolderService
+
     FolderController(FolderCacheableRepository folderRepository, FolderContentRepository folderContentRepository) {
         super(Folder, folderRepository, folderRepository, folderContentRepository)
+        this.folderContentRepository = folderContentRepository
     }
 
     @Audit
@@ -171,7 +169,9 @@ class FolderController extends ModelController<Folder> implements FolderApi {
     @Audit(title = EditType.IMPORT, description = 'Import folder')
     @Post(Paths.FOLDER_IMPORT)
     ListResponse<Folder> importModel(@Body MultipartBody body, String namespace, String name, @Nullable String version) {
-        super.importModel(body, namespace, name, version)
+        List<Folder> imported = super.consumeExportFile(body, namespace, name, version) as List<Folder>
+        List<Folder> saved = allFolderService.importModel(imported, folderContentRepository)
+        smallerResponse(saved)
     }
 
     @Get('/api/folder/search{?requestDTO}')
@@ -238,16 +238,4 @@ class FolderController extends ModelController<Folder> implements FolderApi {
     List<FolderExporterPlugin> folderExporters() {
         mauroPluginService.listPlugins(FolderExporterPlugin)
     }
-
-    /*
-    @Transactional
-    @ExecuteOn(TaskExecutors.IO)
-    @Audit(title = EditType.IMPORT, description = "Import folder")
-    @Consumes(MediaType.MULTIPART_FORM_DATA)
-    @Post(Paths.FOLDER_IMPORT)
-    ListResponse<Folder> importFolder(@Body MultipartBody body, String namespace, String name, @Nullable String version) {
-        super.importModel(body, namespace, name, version)
-    }
-*/
-
 }

mauro-api/src/main/groovy/org/maurodata/controller/folder/VersionedFolderController.groovy

@@ -6,7 +6,9 @@ import io.micronaut.core.annotation.NonNull
 import io.micronaut.core.annotation.Nullable
 import io.micronaut.http.HttpResponse
 import io.micronaut.http.HttpStatus
+import io.micronaut.http.MediaType
 import io.micronaut.http.annotation.Body
+import io.micronaut.http.annotation.Consumes
 import io.micronaut.http.annotation.Controller
 import io.micronaut.http.annotation.Delete
 import io.micronaut.http.annotation.Get
@@ -31,12 +33,14 @@ import org.maurodata.api.model.ModelVersionedWithTargetsRefDTO
 import org.maurodata.api.model.PermissionsDTO
 import org.maurodata.audit.Audit
 import org.maurodata.controller.model.ModelController
+import org.maurodata.domain.facet.EditType
 import org.maurodata.domain.folder.Folder
 import org.maurodata.domain.folder.FolderService
 import org.maurodata.domain.model.version.CreateNewVersionData
 import org.maurodata.domain.model.version.FinaliseData
 import org.maurodata.persistence.cache.ModelCacheableRepository.FolderCacheableRepository
 import org.maurodata.persistence.folder.FolderContentRepository
+import org.maurodata.service.core.AllFolderService
 import org.maurodata.web.ListResponse
 
 @Slf4j
@@ -47,15 +51,14 @@ class VersionedFolderController extends ModelController<Folder> implements Versi
 
     private static final String MY_CLASS_TYPE = "VersionedFolder"
 
-    @Inject
     FolderContentRepository folderContentRepository
 
     @Inject
-    FolderService folderService
+    AllFolderService allFolderService
 
     VersionedFolderController(FolderCacheableRepository folderRepository, FolderContentRepository folderContentRepository, FolderService folderService) {
         super(Folder, folderRepository, folderRepository, folderContentRepository, folderService)
-        this.folderService = folderService
+        this.folderContentRepository = folderContentRepository
     }
 
     @Get(Paths.VERSIONED_FOLDER_ID)
@@ -86,8 +89,15 @@ class VersionedFolderController extends ModelController<Folder> implements Versi
     @Transactional
     @Post(Paths.CHILD_VERSIONED_FOLDER_LIST)
     Folder create(UUID parentId, @Body @NonNull Folder folder) {
+        folder.authority = super.authorityService.getDefaultAuthority()
+        Folder cleanItem = cleanBody(folder)
+
+        Folder parent = validate(cleanItem, parentId)
         folder.setVersionable(true)
-        super.create(parentId, folder)
+
+        Folder created = createEntity(parent, cleanItem)
+        created = validateAndAddClassifiers(created)
+        created
     }
 
     @Audit
@@ -139,11 +149,27 @@ class VersionedFolderController extends ModelController<Folder> implements Versi
     }
 
 
+    @Audit(title = EditType.EXPORT, description = 'Export Versioned folder')
+    @Get(Paths.VERSIONED_FOLDER_EXPORT)
+    @Override
+    HttpResponse<byte[]> exportModel(UUID id, @Nullable String namespace, @Nullable String name, @Nullable String version) {
+        super.exportModel(id,namespace, name, version)
+
+    }
+
+    @Transactional
+    @ExecuteOn(TaskExecutors.IO)
+    @Consumes(MediaType.MULTIPART_FORM_DATA)
+    @Audit(title = EditType.IMPORT, description = 'Import folder')
+    @Post(Paths.VERSIONED_FOLDER_IMPORT)
     @Override
     ListResponse<Folder> importModel(@Body MultipartBody body, String namespace, String name, @Nullable String version) {
-        super.importModel(body, namespace, name, version)
+        List<Folder> imported = super.consumeExportFile(body, namespace, name, version)
+        List<Folder> saved = allFolderService.importModel(imported, folderContentRepository)
+        smallerResponse(saved)
     }
 
+
     @Audit
     @Transactional
     @Delete(Paths.VERSIONED_FOLDER_ID)

mauro-api/src/main/groovy/org/maurodata/controller/model/AdministeredItemController.groovy

@@ -50,7 +50,7 @@ abstract class AdministeredItemController<I extends AdministeredItem, P extends
     @Inject
     PathRepository pathRepository
 
-    @Inject
+
     AdministeredItemController(Class<I> itemClass, AdministeredItemRepository<I> administeredItemRepository, AdministeredItemRepository<P> parentItemRepository,
                                AdministeredItemContentRepository administeredItemContentRepository) {
         super(administeredItemRepository)
@@ -257,4 +257,5 @@ abstract class AdministeredItemController<I extends AdministeredItem, P extends
         }
     }
 
+
 }