SI-3095 Als Betreiber moechte ich, dass Meldungen, die über die Schnittstelle SARIS importiert werden ohne weitere manuelle Taetigkeit oder Freigabe ueber den Kanal eigene Webseite veroeffentlicht werden.
diff --git a/testImportGridFailures/src/main/java/org/eclipse/openk/gridfailureinformation/jobs/importgridfailures/config/SwaggerConfig.java b/testImportGridFailures/src/main/java/org/eclipse/openk/gridfailureinformation/jobs/importgridfailures/config/SwaggerConfig.java
index d015ba2..9b692e4 100644
--- a/testImportGridFailures/src/main/java/org/eclipse/openk/gridfailureinformation/jobs/importgridfailures/config/SwaggerConfig.java
+++ b/testImportGridFailures/src/main/java/org/eclipse/openk/gridfailureinformation/jobs/importgridfailures/config/SwaggerConfig.java
@@ -32,9 +32,9 @@
@Profile({"!test","!prod"})
public class SwaggerConfig {
- @Value("${swagger.baseUrl}")
+ @Value("${swagger.baseUrl:}")
public String baseUrl;
- @Value("${swagger.proxyUrl}")
+ @Value("${swagger.proxyUrl:}")
public String proxyUrl;
@Bean
diff --git a/testImportGridFailures/src/main/java/org/eclipse/openk/gridfailureinformation/jobs/importgridfailures/dtos/ForeignFailureDataDto.java b/testImportGridFailures/src/main/java/org/eclipse/openk/gridfailureinformation/jobs/importgridfailures/dtos/ForeignFailureDataDto.java
index 8db46b3..1c5e998 100644
--- a/testImportGridFailures/src/main/java/org/eclipse/openk/gridfailureinformation/jobs/importgridfailures/dtos/ForeignFailureDataDto.java
+++ b/testImportGridFailures/src/main/java/org/eclipse/openk/gridfailureinformation/jobs/importgridfailures/dtos/ForeignFailureDataDto.java
@@ -26,11 +26,14 @@
@Data
public class ForeignFailureDataDto implements Serializable {
+ private boolean isAutopublish;
+
@NotNull
private boolean isPlanned;
+ @Size(max=255)
@JsonProperty("description")
- private String internalRemark;
+ private String description;
@NotNull
@Pattern(regexp = "^$|(S|W|F|G|TK|ST|OS)")
diff --git a/testImportGridFailures/src/main/java/org/eclipse/openk/gridfailureinformation/jobs/importgridfailures/service/ImportService.java b/testImportGridFailures/src/main/java/org/eclipse/openk/gridfailureinformation/jobs/importgridfailures/service/ImportService.java
index 77cbd42..480b468 100644
--- a/testImportGridFailures/src/main/java/org/eclipse/openk/gridfailureinformation/jobs/importgridfailures/service/ImportService.java
+++ b/testImportGridFailures/src/main/java/org/eclipse/openk/gridfailureinformation/jobs/importgridfailures/service/ImportService.java
@@ -19,6 +19,7 @@
import org.eclipse.openk.gridfailureinformation.jobs.importgridfailures.dtos.ForeignFailureMessageDto;
import org.eclipse.openk.gridfailureinformation.jobs.importgridfailures.exceptions.InternalServerErrorException;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.messaging.support.MessageBuilder;
@@ -31,6 +32,9 @@
@ConfigurationProperties(prefix = "rabbitmq")
public class ImportService {
+ @Value("${gridFailureInformation.autopublish:false}")
+ private boolean autopublish;
+
@Autowired
private MessageChannel failureImportChannel;
@@ -39,6 +43,8 @@
public void pushForeignFailure(ForeignFailureMessageDto foreignFailureMessageDto) {
+ foreignFailureMessageDto.getPayload().setAutopublish(autopublish);
+
try {
failureImportChannel.send(
MessageBuilder.withPayload(
diff --git a/testImportGridFailures/src/main/resources/application.yml b/testImportGridFailures/src/main/resources/application.yml
index 67cbdee..5bf6544 100644
--- a/testImportGridFailures/src/main/resources/application.yml
+++ b/testImportGridFailures/src/main/resources/application.yml
@@ -36,6 +36,7 @@
gridFailureInformation:
maxListSize: 2000
+ autopublish: true
services:
authNAuth:
@@ -54,10 +55,6 @@
cors:
corsEnabled: false
-swagger:
- baseUrl:
- proxyUrl:
-
---
spring:
@@ -153,5 +150,4 @@
corsEnabled: true
swagger:
- baseUrl: /testImporter
- proxyUrl:
\ No newline at end of file
+ baseUrl: /testImporter
\ No newline at end of file
diff --git a/testImportGridFailures/src/main/resources/application_localdev.yml b/testImportGridFailures/src/main/resources/application_localdev.yml
index 2ed5011..82b5a6f 100644
--- a/testImportGridFailures/src/main/resources/application_localdev.yml
+++ b/testImportGridFailures/src/main/resources/application_localdev.yml
@@ -45,6 +45,7 @@
gridFailureInformation:
maxListSize: 2000
+ autopublish: true
jwt:
tokenHeader: Authorization
@@ -62,10 +63,6 @@
cors:
corsEnabled: true
-swagger:
- baseUrl:
- proxyUrl:
-
---
spring:
