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

Pull request #32: Fixed not working download

Browse Source 
Merge in RED/persistence-service from DownloadFix to master

* commit '9b26d3563787c47538a324c8e9638cb4345d1e72':
  Fixed not working download
This commit is contained in:
Dominique Eiflaender 2021-10-01 15:25:37 +02:00
commit 64244a8f7a
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,13 +5,16 @@ import com.iqser.red.service.persistence.management.v1.processor.entity.download
import com.iqser.red.service.persistence.management.v1.processor.exception.NotFoundException;
import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.DownloadStatusRepository;
import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.FileRepository;
import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.DownloadFileType;
import com.iqser.red.service.persistence.service.v1.api.model.download.DownloadStatusValue;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import javax.transaction.Transactional;
import java.time.OffsetDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
@Service
@RequiredArgsConstructor
@ -21,7 +24,7 @@ public class DownloadStatusPersistenceService {
private final FileRepository fileRepository;
public void createStatus(String userId, String storageId, DossierEntity dossier, String filename, String mimeType,
List<String> fileIds) {
List<String> fileIds, Set<DownloadFileType> downloadFileTypes) {
DownloadStatusEntity downloadStatus = new DownloadStatusEntity();
@ -32,6 +35,7 @@ public class DownloadStatusPersistenceService {
downloadStatus.setDossier(dossier);
downloadStatus.setCreationDate(OffsetDateTime.now());
downloadStatus.setFiles(fileRepository.findAllById(fileIds));
downloadStatus.setDownloadFileTypes(new ArrayList<>(downloadFileTypes));
downloadStatusRepository.save(downloadStatus);
}

2
persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/DownloadController.java
View File

@ -49,7 +49,7 @@ public class DownloadController implements DownloadResource {
var dossier = dossierPersistenceService.getAndValidateDossier(request.getDossierId());
downloadStatusPersistenceService.createStatus(request.getUserId(), storageId, dossier, downloadFilename, mimeType, request.getFileIds());
downloadStatusPersistenceService.createStatus(request.getUserId(), storageId, dossier, downloadFilename, mimeType, request.getFileIds(), dossier.getDownloadFileTypes());
addToDownloadQueue(DownloadJob.builder().storageId(storageId).userId(request.getUserId()).build(), 1);