Skip to content
Snippets Groups Projects
Commit 65875ce7 authored by vkovtun's avatar vkovtun
Browse files

BIS-772: Writing implementation for export.

parent d1b04246
No related branches found
No related tags found
1 merge request!40SSDM-13578 : 2PT : Database and V3 Implementation - include the new AFS "free"...
Hide whitespace changes
Inline Side-by-side
server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/exporter/ExportExecutor.java
+ 112
− 9
View file @ 65875ce7
......@@ -17,31 +17,40 @@
package ch.ethz.sis.openbis.generic.server.asapi.v3.executor.exporter;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
import org.springframework.stereotype.Component;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.exporter.ExportOperation;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.exporter.data.Attribute;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.exporter.data.ExportData;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.exporter.data.IExportableFields;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.exporter.data.SelectedFields;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.exporter.options.ExportFormat;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.exporter.options.ExportOptions;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.importer.ImportOperation;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.importer.data.IImportData;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.importer.data.ImportScript;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.importer.data.UncompressedImportData;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.importer.data.ZipImportData;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.importer.options.ImportOptions;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.id.PropertyTypePermId;
import ch.ethz.sis.openbis.generic.server.asapi.v3.IApplicationServerInternalApi;
import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.IOperationContext;
import ch.ethz.sis.openbis.generic.server.xls.export.ExportableKind;
import ch.ethz.sis.openbis.generic.server.xls.export.ExportablePermId;
import ch.ethz.sis.openbis.generic.server.xls.export.FieldType;
import ch.ethz.sis.openbis.generic.server.xls.export.XLSExport;
import ch.ethz.sis.openbis.generic.server.xls.importer.XLSImport;
import ch.ethz.sis.openbis.generic.server.xls.importer.enums.ImportModes;
import ch.systemsx.cisd.common.exceptions.UserFailureException;
import ch.systemsx.cisd.openbis.generic.server.CommonServiceProvider;
@SuppressWarnings("SizeReplaceableByIsEmpty")
@Component
public class ExportExecutor implements IExportExecutor
{
......@@ -49,9 +58,103 @@ public class ExportExecutor implements IExportExecutor
@Override
public void doExport(final IOperationContext context, final ExportOperation operation)
{
final ExportData exportData = operation.getExportData();
try {
final ExportData exportData = operation.getExportData();
final ExportOptions exportOptions = operation.getExportOptions();
final Set<ExportFormat> formats = exportOptions.getFormats();
// TODO: implement
if (formats.contains(ExportFormat.XLS))
{
// TODO: extract to a method
final IApplicationServerInternalApi applicationServerApi = CommonServiceProvider.getApplicationServerApi();
// final ch.ethz.sis.openbis.generic.server.xls.export.ImportOptions importerImportOptions =
// new ch.ethz.sis.openbis.generic.server.xls.importer.ImportOptions();
//
// final boolean projectSamplesEnabled = Boolean.parseBoolean(applicationServerApi.getServerInformation(context.getSession().getSessionToken())
// .get("project-samples-enabled"));
// importerImportOptions.setAllowProjectSamples(projectSamplesEnabled);
final List<ExportablePermId> exportablePermIds = exportData.getPermIds().stream().map(exportablePermIdDto ->
new ExportablePermId(
ExportableKind.valueOf(exportablePermIdDto.getExportableKind().name()), exportablePermIdDto.getPermId())).collect(
Collectors.toList());
final IExportableFields fields = exportData.getFields();
final Map<String, Map<String, List<Map<String, String>>>> exportFields;
if (fields instanceof SelectedFields)
{
final SelectedFields selectedFields = (SelectedFields) fields;
exportFields = new HashMap<>();
// TODO: are all attributes exported?
final Collection<Attribute> attributes = EnumSet.copyOf(selectedFields.getAttributes());
if (attributes.size() > 0)
{
final Map<String, List<Map<String, String>>> selectedAttributes =
attributes.stream().collect(Collectors.toMap(Attribute::name, this::convertAttributeToMap));
exportFields.put("TYPE", selectedAttributes);
}
final List<PropertyTypePermId> properties = selectedFields.getProperties();
// TODO: how to map PropertyTypePermId to entity kind?
properties.stream().collect(Collectors.toMap(propertyTypePermId -> propertyTypePermId.))
} else
{
exportFields = null;
}
// TODO: file prefix probably should be configurable
final XLSExport.ExportResult exportResult = XLSExport.export("export", applicationServerApi, context.getSession().getSessionToken(),
exportablePermIds, exportOptions.isWithReferredTypes(), exportFields,
XLSExport.TextFormatting.valueOf(exportOptions.getXlsTextFormat().name()), exportOptions.isWithImportCompatibility());
}
} catch (final IOException e)
{
throw UserFailureException.fromTemplate(e, "IO exception exporting.");
}
}
private List<Map<String, String>> convertAttributeToMap(final Attribute attribute)
{
final List<Map<String, String>> result = new ArrayList<>();
result.add(Map.of("type", FieldType.ATTRIBUTE.name(), "id", ch.ethz.sis.openbis.generic.server.xls.export.Attribute.CODE.getName()));
result.add(Map.of("type", FieldType.ATTRIBUTE.name(), "id", ch.ethz.sis.openbis.generic.server.xls.export.Attribute.DESCRIPTION.getName()));
switch (attribute)
{
case SPACE:
{
result.add(Map.of("type", FieldType.ATTRIBUTE.name(), "id",
ch.ethz.sis.openbis.generic.server.xls.export.Attribute.REGISTRATOR.getName()));
result.add(Map.of("type", FieldType.ATTRIBUTE.name(), "id",
ch.ethz.sis.openbis.generic.server.xls.export.Attribute.REGISTRATION_DATE.getName()));
break;
}
case SAMPLE_TYPE:
{
result.add(Map.of("type", FieldType.ATTRIBUTE.name(), "id",
ch.ethz.sis.openbis.generic.server.xls.export.Attribute.AUTO_GENERATE_CODES.getName()));
result.add(Map.of("type", FieldType.ATTRIBUTE.name(),
"id", ch.ethz.sis.openbis.generic.server.xls.export.Attribute.VALIDATION_SCRIPT.getName()));
result.add(Map.of("type", FieldType.ATTRIBUTE.name(),
"id", ch.ethz.sis.openbis.generic.server.xls.export.Attribute.GENERATED_CODE_PREFIX.getName()));
result.add(Map.of("type", FieldType.ATTRIBUTE.name(),
"id", ch.ethz.sis.openbis.generic.server.xls.export.Attribute.UNIQUE_SUBCODES.getName()));
result.add(Map.of("type", FieldType.ATTRIBUTE.name(),
"id", ch.ethz.sis.openbis.generic.server.xls.export.Attribute.MODIFICATION_DATE.getName()));
break;
}
case EXPERIMENT_TYPE:
{
result.add(Map.of("type", FieldType.ATTRIBUTE.name(),
"id", ch.ethz.sis.openbis.generic.server.xls.export.Attribute.VALIDATION_SCRIPT.getName()));
result.add(Map.of("type", FieldType.ATTRIBUTE.name(),
"id", ch.ethz.sis.openbis.generic.server.xls.export.Attribute.MODIFICATION_DATE.getName()));
break;
}
}
}
private static void importXls(final IOperationContext context, final ImportOperation operation, final Map<String, String> scripts,
......
server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/XLSExport.java
+ 5
− 0
View file @ 65875ce7
......@@ -70,6 +70,11 @@ public class XLSExport
private static final String TYPE_KEY = "TYPE";
private XLSExport()
{
throw new UnsupportedOperationException("Instantiation of a utility class.");
}
public static ExportResult export(final String filePrefix, final IApplicationServerApi api,
final String sessionToken, final List<ExportablePermId> exportablePermIds,
final boolean exportReferredMasterData,
......
ui-admin/src/core-plugins/admin/1/as/services/xls-export/xls-export.py
+ 1
− 1
View file @ 65875ce7
......@@ -34,7 +34,7 @@ def export(context, parameters):
"<SAMPLE_TYPE | EXPERIMENT_TYPE | DATASET_TYPE | VOCABULARY_TYPE | SPACE | PROJECT>": [
{"type": "ATTRIBUTE", "id": "<attribute name>"},
...
] - attribute for each type and entity without types to be exported,
] - attributes for each type and entity without types to be exported,
if the list is empty no attributes will be exported for the given one
...
},
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment