Marmelator/persistence-service
1
0
Fork 0
Code Issues Pull Requests 17 Actions Packages Projects Releases 1.1k Wiki Activity

RED-7653: removed unnecessary test file, updated database-tenants-commons... #167

Merged
yannik.hampe merged 2 commits from RED-7653 into master 2023-10-09 14:48:16 +02:00
Conversation 9 Commits 2 Files Changed 5 +22 -8
5 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
persistence-service-v1/persistence-service-processor-v1/pom.xml
View File

@ -19,7 +19,7 @@
<swagger-commons.version>0.5.0</swagger-commons.version>
<keycloak-commons.version>0.18.0</keycloak-commons.version>
<jobs-commons.version>0.6.0</jobs-commons.version>
<database-tenant-commons.version>0.4.0</database-tenant-commons.version>
<database-tenant-commons.version>0.12.0</database-tenant-commons.version>
</properties>
<dependencies>

15
persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/DossierTemplateImportService.java
View File

@ -25,6 +25,8 @@ import java.util.stream.Collectors;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
import org.apache.commons.compress.archivers.zip.ZipArchiveInputStream;
import org.apache.commons.compress.compressors.FileNameUtil;
import org.apache.commons.compress.utils.FileNameUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@ -215,10 +217,17 @@ public class DossierTemplateImportService {
FileAttributesGeneralConfiguration fileAttributesGeneralConfiguration = objectMapper.readValue(bytes, FileAttributesGeneralConfiguration.class);
importTemplateResult.setFileAttributesGeneralConfiguration(fileAttributesGeneralConfiguration);
} else if (ze.getName().contains(ExportFilename.RULES.getFilename())) {
String rules = objectMapper.readValue(bytes, String.class);
importTemplateResult.setRuleSet(rules);
if(ze.getName().endsWith(".txt")) {
String rules = objectMapper.readValue(new String(bytes), String.class);
importTemplateResult.setRuleSet(rules);
}else if(ze.getName().endsWith(".drl")) {
String rules = new String(bytes);
importTemplateResult.setRuleSet(rules);
} else {
throw new BadRequestException("File is not in TXT or DRL format. "+ FileNameUtils.getExtension(ze.getName()) +" format is not supported.");
}
} else if (ze.getName().contains(ExportFilename.COMPONENT_RULES.getFilename())) {
String rules = objectMapper.readValue(bytes, String.class);
String rules = objectMapper.readValue(new String(bytes), String.class);
importTemplateResult.setComponentRuleSet(rules);
} else if (ze.getName().contains(ExportFilename.DOSSIER_TYPE.getFilename())) {
Type type = objectMapper.readValue(bytes, Type.class);

9
persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/export/DossierTemplateExportService.java
View File

@ -6,9 +6,12 @@ import java.io.ByteArrayOutputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.Locale;
import java.util.stream.Collectors;
import org.apache.commons.text.StringEscapeUtils;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.stereotype.Service;
@ -55,6 +58,7 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemp
import com.iqser.red.service.persistence.service.v1.api.shared.model.download.DownloadStatusValue;
import jakarta.transaction.Transactional;
import liquibase.util.StringUtil;
import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
@ -66,6 +70,7 @@ public class DossierTemplateExportService {
private static final String JSON_EXT = ".json";
private static final String TXT_EXT = ".txt";
private static final String RULE_EXT = ".drl";
private final DossierTemplatePersistenceService dossierTemplatePersistenceService;
private final DownloadStatusPersistenceService downloadStatusPersistenceService;
private final DossierAttributeConfigPersistenceService dossierAttributeConfigPersistenceService;
@ -173,8 +178,8 @@ public class DossierTemplateExportService {
// add rule set
var ruleSet = rulesPersistenceService.getRules(dossierTemplateId, RuleFileType.ENTITY);
fileSystemBackedArchiver.addEntries(new FileSystemBackedArchiver.ArchiveModel(null,
getFilename(ExportFilename.RULES, TXT_EXT),
objectMapper.writeValueAsBytes(ruleSet.getValue())));
getFilename(ExportFilename.RULES, RULE_EXT),
ruleSet.getValue().getBytes(StandardCharsets.UTF_8)));
// add component rule set
try {

2
persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierTemplateImportTest.java
View File

@ -47,7 +47,7 @@ public class DossierTemplateImportTest extends AbstractPersistenceServerServiceT
@Disabled
public void testLocalDossierTemplateImport() {
var importDir = new File("/Users/timobejan/work/dossier-templates-v2/dev");
var importDir = new File("C:\\Users\\YannikHampe\\Downloads\\testing\\");
assertThat(importDir).isNotNull();
assertThat(importDir.exists()).isTrue();

2
publish-custom-docker-img.sh
View File

@ -17,7 +17,7 @@ GIT_BRANCH=$(git symbolic-ref --short HEAD)
# Get the first 5 characters of the commit hash
GIT_COMMIT_HASH=$(git rev-parse --short=5 HEAD)
# Create the image tag by combining branch and commit hash
IMAGE_TAG="${USER}-${GIT_BRANCH}-${GIT_COMMIT_HASH}"
IMAGE_TAG="${GIT_BRANCH}-${GIT_COMMIT_HASH}"
IMAGE_NAME="$NEXUS_REPO/$IMAGE_NAME:$IMAGE_TAG"
echo "Building docker image: {$IMAGE_NAME}"