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/repository/StationRepository.java b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/repository/StationRepository.java
index 990acf7..7dd131c 100644
--- a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/repository/StationRepository.java
+++ b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/repository/StationRepository.java
@@ -15,6 +15,7 @@
package org.eclipse.openk.gridfailureinformation.repository;
+import org.eclipse.openk.gridfailureinformation.model.TblFailureInformation;
import org.eclipse.openk.gridfailureinformation.model.TblStation;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
@@ -31,6 +32,4 @@
Optional<TblStation> findByUuid(UUID uuid);
Optional<TblStation> findByStationId(String stationId);
-
-
}
diff --git a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/service/FailureInformationStationService.java b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/service/FailureInformationStationService.java
index 17683e6..66b1955 100644
--- a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/service/FailureInformationStationService.java
+++ b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/service/FailureInformationStationService.java
@@ -87,13 +87,10 @@
TblStation station = stationRepository.findByUuid(groupDto.getUuid())
.orElseThrow(() -> new NotFoundException("station.uuid.not.existing"));
- List<TblStation> stations = failureInformation.getStations();
- if (!stations.isEmpty()) {
- for (TblStation group : stations) {
- if (group.getUuid().equals(groupDto.getUuid())) {
- throw new OperationDeniedException(OperationType.INSERT, "assignment.already.existing");
- }
- }
+ Optional<TblFailureInformationStation> fiStation = failureInformationStationRepository.findByFkTblFailureInformationAndStationStationId(failureInformation.getId(), station.getStationId());
+
+ if (fiStation.isPresent()) {
+ throw new OperationDeniedException(OperationType.INSERT, "assignment.already.existing");
}
TblFailureInformationStation assignmentToSave = new TblFailureInformationStation();
diff --git a/gfsBackendService/src/main/resources/application_localdev.yml b/gfsBackendService/src/main/resources/application_localdev.yml
index 1cc1a10..75a0f69 100644
--- a/gfsBackendService/src/main/resources/application_localdev.yml
+++ b/gfsBackendService/src/main/resources/application_localdev.yml
@@ -81,6 +81,8 @@
mobile: Mobil
useModuleNameForFilter: false
moduleName: Störungsinformationstool
+ sitCache:
+ name: sitCacheService
portalFeLoginURL: http://entopkon:8880/portalFE/#/login
portalFeModulename: SIT DEV
