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 9fe174e..dc45a4e 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 @@ -31,6 +31,18 @@ public class Telemetry extends DomainObject { @Column(name = "contact") private String contact; + @Column(name = "is_production_instance") + private boolean isProductionInstance; + + @Column(name = "datasource") + private String dataSource; + + @Column(name = "number_of_nodes") + private int numberOfNodes; + + @Column(name = "build_agent_count") + private int buildAgentCount; + public String getProfiles() { return profiles; } @@ -86,4 +98,36 @@ public String getContact() { public void setContact(String contact) { this.contact = contact; } + + public boolean isProductionInstance() { + return isProductionInstance; + } + + public void setProductionInstance(boolean productionInstance) { + isProductionInstance = productionInstance; + } + + public int getNumberOfNodes() { + return numberOfNodes; + } + + public void setNumberOfNodes(int numberOfNodes) { + this.numberOfNodes = numberOfNodes; + } + + public String getDataSource() { + return dataSource; + } + + public void setDataSource(String dataSource) { + this.dataSource = dataSource; + } + + public int getBuildAgentCount() { + return buildAgentCount; + } + + public void setBuildAgentCount(int buildAgentCount) { + this.buildAgentCount = buildAgentCount; + } } 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 e7ee7a8..3cabb17 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 @@ -7,11 +7,13 @@ import java.util.List; @JsonInclude(JsonInclude.Include.NON_EMPTY) -public record TelemetryDTO(Long id, String version, String serverUrl, String operator, String adminName, List profiles, String contact, ZonedDateTime timestamp) { +public record TelemetryDTO(Long id, String version, String serverUrl, String operator, String adminName, List profiles, String contact, ZonedDateTime timestamp, + boolean isProductionInstance, 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()); + return new TelemetryDTO(telemetry.getId(), telemetry.getVersion(), telemetry.getServerUrl(), telemetry.getOperatorName(), telemetry.getAdminName(), profilesList, telemetry.getContact(), telemetry.getTimestamp(), + telemetry.isProductionInstance(), telemetry.getDataSource(), telemetry.getNumberOfNodes(), telemetry.getBuildAgentCount()); } public static Telemetry to(TelemetryDTO telemetryDTO) { @@ -25,6 +27,10 @@ public static Telemetry to(TelemetryDTO telemetryDTO) { telemetry.setProfiles(profiles); telemetry.setTimestamp(telemetryDTO.timestamp()); telemetry.setContact(telemetryDTO.contact()); + telemetry.setProductionInstance(telemetryDTO.isProductionInstance()); + telemetry.setDataSource(telemetryDTO.dataSource()); + telemetry.setNumberOfNodes(telemetryDTO.numberOfNodes()); + telemetry.setBuildAgentCount(telemetryDTO.buildAgentCount()); return telemetry; } } diff --git a/src/main/resources/db/changelog/20240929130000.xml b/src/main/resources/db/changelog/20240929130000.xml new file mode 100644 index 0000000..e2ce217 --- /dev/null +++ b/src/main/resources/db/changelog/20240929130000.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + \ 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 f703673..a58dc44 100644 --- a/src/main/resources/db/changelog/db.changelog-master.xml +++ b/src/main/resources/db/changelog/db.changelog-master.xml @@ -7,5 +7,5 @@ - + \ No newline at end of file