Merge branch 'DEVELOP' of ssh://git.eclipse.org:29418/openk-usermodules/org.eclipse.openk-usermodules.gridFailureInformation.backend into DEVELOP
diff --git a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/bpmn/impl/tasks/ProcessHelper.java b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/bpmn/impl/tasks/ProcessHelper.java
index b1f4f11..4a3cb3b 100644
--- a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/bpmn/impl/tasks/ProcessHelper.java
+++ b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/bpmn/impl/tasks/ProcessHelper.java
@@ -35,9 +35,9 @@
return refPlannedMeasure.getUuid().equals(dto.getFailureClassificationId());
}
+ @Transactional
public FailureInformationDto storeFailureFromViewModel( FailureInformationDto dto ) {
- FailureInformationDto savedDto = environment.getFailureInformationService().storeFailureInfo(dto, GfiProcessState.NEW);
- return savedDto;
+ return environment.getFailureInformationService().storeFailureInfo(dto, GfiProcessState.NEW);
}
public ProcessState getProcessStateFromStatusUuid( UUID statusUuid ) {
diff --git a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/service/FailureInformationService.java b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/service/FailureInformationService.java
index 98f1ea7..e79e9a0 100644
--- a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/service/FailureInformationService.java
+++ b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/service/FailureInformationService.java
@@ -130,18 +130,19 @@
}
}
- //@Transactional
+ @Transactional
public FailureInformationDto insertFailureInfo(FailureInformationDto failureInfoDto, GfiProcessState initialState) {
failureInfoDto.setUuid(null); // force null here
return storeFailureInfo(failureInfoDto, initialState);
}
+ @Transactional
public FailureInformationDto updateFailureInfo(FailureInformationDto failureInfoDto) {
return processGrid(failureInfoDto);
}
- @Transactional
+
public FailureInformationDto storeFailureInfo(FailureInformationDto dto, GfiProcessState initialState) {
TblFailureInformation tblFailureInformationToSave = failureInformationMapper.toTblFailureInformation(dto);
if(dto.getUuid() == null ) {
@@ -170,9 +171,7 @@
TblFailureInformation tblFailureInformationSaved = failureInformationRepository.save(tblFailureInformationToSave);
FailureInformationDto failureInformationDto = failureInformationMapper.toFailureInformationDto(tblFailureInformationSaved);
- FailureInformationDto enrichedFailureInfo = enrichFailureInfo(failureInformationDto);
- return enrichedFailureInfo;
-
+ return enrichFailureInfo(failureInformationDto);
}
private FailureInformationDto processGrid(FailureInformationDto failureInfoDto) {
@@ -396,25 +395,14 @@
private void setRadius(List<TblFailureInformation> listFailureInfos, TblFailureInformation condensedFailureInformation){
- UUID firstRadiusUuid = listFailureInfos.get(0).getRefRadius().getUuid();
-
- List<TblFailureInformation> filteredList = listFailureInfos
- .stream()
- .filter(f -> f.getRefRadius().getUuid()!=null)
- .filter(f -> f.getRefRadius().getUuid().equals(firstRadiusUuid))
- .collect(Collectors.toList());
-
- if (listFailureInfos.size() == filteredList.size()) {
- condensedFailureInformation.setRefRadius(listFailureInfos.get(0).getRefRadius());
- }
- else {
condensedFailureInformation.setRefRadius(
+
listFailureInfos.stream()
+ .filter(fi -> fi.getRefRadius() != null)
.map(TblFailureInformation::getRefRadius)
- .filter(f -> f.getUuid()!=null)
.max( (x,y) -> Long.compare(x.getRadius(), y.getRadius()))
- .orElseThrow(() -> new InternalServerErrorException("Invalid Radii in condenseFailure")));
- }
+ .orElse( null ));
+
}
private void setStreet(List<TblFailureInformation> listFailureInfos, TblFailureInformation condensedFailureInformation){
