diff --git a/eeg_backend/src/main/java/at/mueller/eeg/backend/common/event/MakoConsensApprovedEvent.java b/eeg_backend/src/main/java/at/mueller/eeg/backend/common/event/MakoConsensApprovedEvent.java deleted file mode 100644 index 9eef81d..0000000 --- a/eeg_backend/src/main/java/at/mueller/eeg/backend/common/event/MakoConsensApprovedEvent.java +++ /dev/null @@ -1,3 +0,0 @@ -package at.mueller.eeg.backend.common.event; - -public record MakoConsensApprovedEvent(String atNumber) {} \ No newline at end of file diff --git a/eeg_backend/src/main/java/at/mueller/eeg/backend/common/event/MakoConsensRejectedEvent.java b/eeg_backend/src/main/java/at/mueller/eeg/backend/common/event/MakoConsensRejectedEvent.java deleted file mode 100644 index 2ad9d79..0000000 --- a/eeg_backend/src/main/java/at/mueller/eeg/backend/common/event/MakoConsensRejectedEvent.java +++ /dev/null @@ -1,3 +0,0 @@ -package at.mueller.eeg.backend.common.event; - -public record MakoConsensRejectedEvent(String atNumber, String reason) {} \ No newline at end of file diff --git a/eeg_backend/src/main/java/at/mueller/eeg/backend/common/event/MakoConsensTechnicalFailedEvent.java b/eeg_backend/src/main/java/at/mueller/eeg/backend/common/event/MakoConsensTechnicalFailedEvent.java deleted file mode 100644 index b2a8bbe..0000000 --- a/eeg_backend/src/main/java/at/mueller/eeg/backend/common/event/MakoConsensTechnicalFailedEvent.java +++ /dev/null @@ -1,3 +0,0 @@ -package at.mueller.eeg.backend.common.event; - -public record MakoConsensTechnicalFailedEvent(String atNumber, String reason) {} \ No newline at end of file diff --git a/eeg_backend/src/main/java/at/mueller/eeg/backend/common/event/MakoConsentApprovedEvent.java b/eeg_backend/src/main/java/at/mueller/eeg/backend/common/event/MakoConsentApprovedEvent.java new file mode 100644 index 0000000..72617f3 --- /dev/null +++ b/eeg_backend/src/main/java/at/mueller/eeg/backend/common/event/MakoConsentApprovedEvent.java @@ -0,0 +1,3 @@ +package at.mueller.eeg.backend.common.event; + +public record MakoConsentApprovedEvent(String atNumber) {} diff --git a/eeg_backend/src/main/java/at/mueller/eeg/backend/common/event/MakoConsentRejectedEvent.java b/eeg_backend/src/main/java/at/mueller/eeg/backend/common/event/MakoConsentRejectedEvent.java new file mode 100644 index 0000000..ea22035 --- /dev/null +++ b/eeg_backend/src/main/java/at/mueller/eeg/backend/common/event/MakoConsentRejectedEvent.java @@ -0,0 +1,3 @@ +package at.mueller.eeg.backend.common.event; + +public record MakoConsentRejectedEvent(String atNumber, String reason) {} diff --git a/eeg_backend/src/main/java/at/mueller/eeg/backend/common/event/MakoConsentTechnicalFailedEvent.java b/eeg_backend/src/main/java/at/mueller/eeg/backend/common/event/MakoConsentTechnicalFailedEvent.java new file mode 100644 index 0000000..7ecfaac --- /dev/null +++ b/eeg_backend/src/main/java/at/mueller/eeg/backend/common/event/MakoConsentTechnicalFailedEvent.java @@ -0,0 +1,3 @@ +package at.mueller.eeg.backend.common.event; + +public record MakoConsentTechnicalFailedEvent(String atNumber, String reason) {} diff --git a/eeg_backend/src/main/java/at/mueller/eeg/backend/common/event/listener/NotificationListener.java b/eeg_backend/src/main/java/at/mueller/eeg/backend/common/event/listener/NotificationListener.java index 97ad6dd..b43e8ca 100644 --- a/eeg_backend/src/main/java/at/mueller/eeg/backend/common/event/listener/NotificationListener.java +++ b/eeg_backend/src/main/java/at/mueller/eeg/backend/common/event/listener/NotificationListener.java @@ -47,7 +47,7 @@ public class NotificationListener { @EventListener @Transactional - public void handleMakoConsensApproved(MakoConsensApprovedEvent event) { + public void handleMakoConsentApproved(MakoConsentApprovedEvent event) { findMeteringPointByAtNumber(event.atNumber()).ifPresent(point -> { notificationService.create( point.getUserId(), @@ -61,7 +61,7 @@ public class NotificationListener { @EventListener @Transactional - public void handleMakoConsensRejected(MakoConsensRejectedEvent event) { + public void handleMakoConsentRejected(MakoConsentRejectedEvent event) { findMeteringPointByAtNumber(event.atNumber()).ifPresent(point -> { notificationService.create( point.getUserId(), diff --git a/eeg_backend/src/main/java/at/mueller/eeg/backend/community/domain/PointType.java b/eeg_backend/src/main/java/at/mueller/eeg/backend/community/domain/PointType.java index 4707308..26b0692 100644 --- a/eeg_backend/src/main/java/at/mueller/eeg/backend/community/domain/PointType.java +++ b/eeg_backend/src/main/java/at/mueller/eeg/backend/community/domain/PointType.java @@ -4,5 +4,5 @@ public enum PointType { CONSUMER, PRODUCER, //TODO: Prüfen ob PROSUMER wirklich ein eigener Typ ist und sich nicht aus Consumer/Producer ergibt - PROSUME; + PROSUMER; } diff --git a/eeg_backend/src/main/java/at/mueller/eeg/backend/community/event/listener/MakoConsensListener.java b/eeg_backend/src/main/java/at/mueller/eeg/backend/community/event/listener/MakoConsentListener.java similarity index 88% rename from eeg_backend/src/main/java/at/mueller/eeg/backend/community/event/listener/MakoConsensListener.java rename to eeg_backend/src/main/java/at/mueller/eeg/backend/community/event/listener/MakoConsentListener.java index e12a3e6..1716bc2 100644 --- a/eeg_backend/src/main/java/at/mueller/eeg/backend/community/event/listener/MakoConsensListener.java +++ b/eeg_backend/src/main/java/at/mueller/eeg/backend/community/event/listener/MakoConsentListener.java @@ -1,9 +1,9 @@ package at.mueller.eeg.backend.community.event.listener; import at.mueller.eeg.backend.common.event.EdaTopologyCheckEvent; -import at.mueller.eeg.backend.common.event.MakoConsensApprovedEvent; -import at.mueller.eeg.backend.common.event.MakoConsensRejectedEvent; -import at.mueller.eeg.backend.common.event.MakoConsensTechnicalFailedEvent; +import at.mueller.eeg.backend.common.event.MakoConsentApprovedEvent; +import at.mueller.eeg.backend.common.event.MakoConsentRejectedEvent; +import at.mueller.eeg.backend.common.event.MakoConsentTechnicalFailedEvent; import at.mueller.eeg.backend.community.domain.MeteringPoint; import at.mueller.eeg.backend.community.domain.state.MakoTrigger; import at.mueller.eeg.backend.community.repository.MeteringPointRepository; @@ -17,14 +17,14 @@ import org.springframework.transaction.annotation.Transactional; @Component @RequiredArgsConstructor @Slf4j -public class MakoConsensListener { +public class MakoConsentListener { private final MeteringPointRepository meteringPointRepository; private final ApplicationEventPublisher eventPublisher; @EventListener @Transactional - public void handleMakoConsensApproved(MakoConsensApprovedEvent event) { + public void handleMakoConsentApproved(MakoConsentApprovedEvent event) { log.info("MaKo-Consent erteilt für AT-Nummer: {}", event.atNumber()); meteringPointRepository.findByAtNumber(event.atNumber()).ifPresentOrElse(point -> { @@ -49,7 +49,7 @@ public class MakoConsensListener { @EventListener @Transactional - public void handleMakoConsensRejected(MakoConsensRejectedEvent event) { + public void handleMakoConsentRejected(MakoConsentRejectedEvent event) { log.info("MaKo-Consent abgelehnt für AT-Nummer: {}. Grund: {}", event.atNumber(), event.reason()); meteringPointRepository.findByAtNumber(event.atNumber()).ifPresentOrElse(point -> { @@ -67,7 +67,7 @@ public class MakoConsensListener { @EventListener @Transactional - public void handleMakoConsensTechnicalFailed(MakoConsensTechnicalFailedEvent event) { + public void handleMakoConsentTechnicalFailed(MakoConsentTechnicalFailedEvent event) { log.warn("MaKo-Consent technischer Fehler für AT-Nummer: {}. Grund: {}", event.atNumber(), event.reason()); meteringPointRepository.findByAtNumber(event.atNumber()).ifPresentOrElse(point -> { diff --git a/eeg_backend/src/main/java/at/mueller/eeg/backend/iam/config/SecurityConfig.java b/eeg_backend/src/main/java/at/mueller/eeg/backend/iam/config/SecurityConfig.java index 7064069..587299e 100644 --- a/eeg_backend/src/main/java/at/mueller/eeg/backend/iam/config/SecurityConfig.java +++ b/eeg_backend/src/main/java/at/mueller/eeg/backend/iam/config/SecurityConfig.java @@ -57,11 +57,6 @@ public class SecurityConfig { .requestMatchers("/", "/index.html", "/assets/**", "/static/**", "/*.js", "/*.css", "/*.ico").permitAll() .requestMatchers("/v3/api-docs/**", "/swagger-ui/**", "/swagger-ui.html").permitAll() .requestMatchers("/api/auth/**").permitAll() - .requestMatchers( - "/api/community/admin/**", - "/api/iam/admin/**", - "/api/mako/admin/**" - ).hasRole("ADMIN") .requestMatchers("/api/**").authenticated() .anyRequest().denyAll() ) diff --git a/eeg_backend/src/main/java/at/mueller/eeg/backend/mako/event/listener/EdaCommuncationEventListener.java b/eeg_backend/src/main/java/at/mueller/eeg/backend/mako/event/listener/EdaCommunicationEventListener.java similarity index 96% rename from eeg_backend/src/main/java/at/mueller/eeg/backend/mako/event/listener/EdaCommuncationEventListener.java rename to eeg_backend/src/main/java/at/mueller/eeg/backend/mako/event/listener/EdaCommunicationEventListener.java index e27d23c..641d7e3 100644 --- a/eeg_backend/src/main/java/at/mueller/eeg/backend/mako/event/listener/EdaCommuncationEventListener.java +++ b/eeg_backend/src/main/java/at/mueller/eeg/backend/mako/event/listener/EdaCommunicationEventListener.java @@ -15,7 +15,7 @@ import org.springframework.stereotype.Component; @Component @RequiredArgsConstructor @Slf4j -public class EdaCommuncationEventListener { +public class EdaCommunicationEventListener { private final EdaTopologyService edaTopologyService; private final EdaConsentService edaConsentService; @@ -70,7 +70,7 @@ public class EdaCommuncationEventListener { log.error("MaKo-Domain: Fehler beim Senden des Consent-Requests für AT-Nummer {}: {}", event.atNumber(), e.getMessage()); - eventPublisher.publishEvent(new MakoConsensTechnicalFailedEvent( + eventPublisher.publishEvent(new MakoConsentTechnicalFailedEvent( event.atNumber(), e.getMessage() )); diff --git a/eeg_backend/src/main/java/at/mueller/eeg/backend/mako/service/impl/SimulatedEdaConsentService.java b/eeg_backend/src/main/java/at/mueller/eeg/backend/mako/service/impl/SimulatedEdaConsentService.java index a6e4145..154c1d0 100644 --- a/eeg_backend/src/main/java/at/mueller/eeg/backend/mako/service/impl/SimulatedEdaConsentService.java +++ b/eeg_backend/src/main/java/at/mueller/eeg/backend/mako/service/impl/SimulatedEdaConsentService.java @@ -1,8 +1,8 @@ package at.mueller.eeg.backend.mako.service.impl; -import at.mueller.eeg.backend.common.event.MakoConsensApprovedEvent; -import at.mueller.eeg.backend.common.event.MakoConsensRejectedEvent; -import at.mueller.eeg.backend.common.event.MakoConsensTechnicalFailedEvent; +import at.mueller.eeg.backend.common.event.MakoConsentApprovedEvent; +import at.mueller.eeg.backend.common.event.MakoConsentRejectedEvent; +import at.mueller.eeg.backend.common.event.MakoConsentTechnicalFailedEvent; import at.mueller.eeg.backend.mako.service.EdaConsentService; import jakarta.annotation.PreDestroy; import lombok.RequiredArgsConstructor; @@ -49,15 +49,15 @@ public class SimulatedEdaConsentService implements EdaConsentService { try { if (atNumber.toUpperCase().endsWith("REJECT")) { log.info("[EDA-SIMULATION] OUTCOME: Zustimmung verweigert (Magic Value erkannt)."); - eventPublisher.publishEvent(new MakoConsensRejectedEvent(atNumber, "Kunde hat im Portal abgelehnt.")); + eventPublisher.publishEvent(new MakoConsentRejectedEvent(atNumber, "Kunde hat im Portal abgelehnt.")); } else if (atNumber.toUpperCase().endsWith("ERROR")) { log.warn("[EDA-SIMULATION] OUTCOME: Technischer EDA-Fehler (Magic Value erkannt)."); - eventPublisher.publishEvent(new MakoConsensTechnicalFailedEvent(atNumber, "EDA-Gateway Timeout (504).")); + eventPublisher.publishEvent(new MakoConsentTechnicalFailedEvent(atNumber, "EDA-Gateway Timeout (504).")); } else { log.info("[EDA-SIMULATION] OUTCOME: Zustimmung erteilt!"); - eventPublisher.publishEvent(new MakoConsensApprovedEvent(atNumber)); + eventPublisher.publishEvent(new MakoConsentApprovedEvent(atNumber)); } } catch (Exception e) { log.error("[EDA-SIMULATION] Kritischer Fehler im Simulator: {}", e.getMessage()); diff --git a/eeg_frontend/openapi.yaml b/eeg_frontend/openapi.yaml index 3c79ada..73ed73a 100644 --- a/eeg_frontend/openapi.yaml +++ b/eeg_frontend/openapi.yaml @@ -638,7 +638,7 @@ components: enum: - CONSUMER - PRODUCER - - PROSUME + - PROSUMER required: - type MeteringPointResponse: @@ -657,7 +657,7 @@ components: enum: - CONSUMER - PRODUCER - - PROSUME + - PROSUMER makoState: type: string enum: @@ -707,7 +707,7 @@ components: enum: - CONSUMER - PRODUCER - - PROSUME + - PROSUMER required: - atNumber - type