diff --git a/src/main/java/de/tum/cit/ase/artemistelemetry/domain/Telemetry.java b/src/main/java/de/tum/cit/ase/artemistelemetry/domain/Telemetry.java index 8cf6805..1dd0f77 100644 --- a/src/main/java/de/tum/cit/ase/artemistelemetry/domain/Telemetry.java +++ b/src/main/java/de/tum/cit/ase/artemistelemetry/domain/Telemetry.java @@ -37,6 +37,9 @@ public class Telemetry extends DomainObject { @Column(name = "is_test_server") private boolean isTestServer; + @Column(name = "is_multi_node") + private boolean isMultiNode; + @Column(name = "datasource") private String dataSource; @@ -141,4 +144,12 @@ public boolean isTestServer() { public void setTestServer(boolean testServer) { isTestServer = testServer; } + + public boolean isMultiNode() { + return isMultiNode; + } + + public void setMultiNode(boolean multiNode) { + isMultiNode = multiNode; + } } diff --git a/src/main/java/de/tum/cit/ase/artemistelemetry/service/dto/TelemetryDTO.java b/src/main/java/de/tum/cit/ase/artemistelemetry/service/dto/TelemetryDTO.java index 1739876..da36835 100644 --- a/src/main/java/de/tum/cit/ase/artemistelemetry/service/dto/TelemetryDTO.java +++ b/src/main/java/de/tum/cit/ase/artemistelemetry/service/dto/TelemetryDTO.java @@ -8,12 +8,25 @@ @JsonInclude(JsonInclude.Include.NON_EMPTY) public record TelemetryDTO(Long id, String version, String serverUrl, String operator, String adminName, List profiles, String contact, ZonedDateTime timestamp, - boolean isProductionInstance, boolean isTestServer, String dataSource, int numberOfNodes, int buildAgentCount) { + boolean isProductionInstance, boolean isTestServer, boolean isMultiNode, String dataSource, int numberOfNodes, int buildAgentCount) { public static TelemetryDTO from(Telemetry telemetry) { List profilesList = List.of(telemetry.getProfiles().split(",")); - return new TelemetryDTO(telemetry.getId(), telemetry.getVersion(), telemetry.getServerUrl(), telemetry.getOperatorName(), telemetry.getAdminName(), profilesList, telemetry.getContact(), telemetry.getTimestamp(), - telemetry.isProductionInstance(), telemetry.isTestServer(), telemetry.getDataSource(), telemetry.getNumberOfNodes(), telemetry.getBuildAgentCount()); + return new TelemetryDTO( + telemetry.getId(), + telemetry.getVersion(), + telemetry.getServerUrl(), + telemetry.getOperatorName(), + telemetry.getAdminName(), + profilesList, + telemetry.getContact(), + telemetry.getTimestamp(), + telemetry.isProductionInstance(), + telemetry.isTestServer(), + telemetry.isMultiNode(), + telemetry.getDataSource(), + telemetry.getNumberOfNodes(), + telemetry.getBuildAgentCount()); } public static Telemetry to(TelemetryDTO telemetryDTO) { @@ -28,6 +41,7 @@ public static Telemetry to(TelemetryDTO telemetryDTO) { telemetry.setTimestamp(telemetryDTO.timestamp()); telemetry.setContact(telemetryDTO.contact()); telemetry.setProductionInstance(telemetryDTO.isProductionInstance()); + telemetry.setTestServer(telemetryDTO.isMultiNode()); telemetry.setDataSource(telemetryDTO.dataSource()); telemetry.setNumberOfNodes(telemetryDTO.numberOfNodes()); telemetry.setBuildAgentCount(telemetryDTO.buildAgentCount()); diff --git a/src/main/resources/db/changelog/20241010210000.xml b/src/main/resources/db/changelog/20241010210000.xml new file mode 100644 index 0000000..a210733 --- /dev/null +++ b/src/main/resources/db/changelog/20241010210000.xml @@ -0,0 +1,10 @@ + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/db/changelog/db.changelog-master.xml b/src/main/resources/db/changelog/db.changelog-master.xml index 1c3ee73..956ebea 100644 --- a/src/main/resources/db/changelog/db.changelog-master.xml +++ b/src/main/resources/db/changelog/db.changelog-master.xml @@ -9,4 +9,5 @@ + \ No newline at end of file