diff --git a/data-collectors/radelt/.env.example b/data-collectors/radelt/.env.example index 24183e17..62a88cee 100644 --- a/data-collectors/radelt/.env.example +++ b/data-collectors/radelt/.env.example @@ -16,7 +16,7 @@ OAUTH_CLIENT_NAME=odh-mobility-datacollector-development OAUTH_CLIENT_SECRET=7bd46f8f-c296-416d-a13d-dc81e68d0830 ODH_CLIENT_STATIONTYPE=your-stationtype -ODH_CLIENT_PROVENANCE_NAME=dc-helloworld +ODH_CLIENT_PROVENANCE_NAME=dc-radelt ODH_CLIENT_PROVENANCE_VERSION=0.0.0-local-dev ODH_CLIENT_PROVENANCE_ORIGIN=your-original-datasource ODH_CLIENT_PERIOD=600 diff --git a/data-collectors/radelt/src/main/java/com/opendatahub/bdp/radelt/SyncScheduler.java b/data-collectors/radelt/src/main/java/com/opendatahub/bdp/radelt/SyncScheduler.java index 96c9193c..d1eee548 100644 --- a/data-collectors/radelt/src/main/java/com/opendatahub/bdp/radelt/SyncScheduler.java +++ b/data-collectors/radelt/src/main/java/com/opendatahub/bdp/radelt/SyncScheduler.java @@ -15,6 +15,7 @@ import org.springframework.stereotype.Service; import com.fasterxml.jackson.databind.ObjectMapper; import com.opendatahub.bdp.radelt.dto.aktionen.AktionenResponseDto; +import com.opendatahub.bdp.radelt.dto.aktionen.RadeltChallengeDto; import com.opendatahub.bdp.radelt.dto.organisationen.OrganisationenResponseDto; import com.opendatahub.bdp.radelt.dto.utils.MappingUtilsAktionen; import com.opendatahub.bdp.radelt.dto.utils.MappingUtilsOrganisationen; @@ -45,52 +46,82 @@ private void syncDataTypes() { /** * Scheduled job Aktionen */ - @Scheduled(cron = "${scheduler.actions}") + @Scheduled(cron = "${scheduler.actions_and_organization}") public void syncJobAktionen() { LOG.info("Cron job syncJobAktionen started: Sync Stations with type {} and data types", odhClient.getIntegreenTypology()); // Define base URL for challenges String baseUrlChallenges = "https://www.altoadigepedala.bz.it/dashboard/api/opendata/challenges"; - // Fetch and process challenges + int limit = 5; + int offset = 0; + AktionenResponseDto challengeResponseDto; - try { - challengeResponseDto = fetchChallenges(baseUrlChallenges, "true", "5", "0", ""); - } catch (Exception e) { - LOG.error("Error fetching challenges: {}", e.getMessage()); - return; // Exit the method if fetching challenges fails - } - MappingUtilsAktionen.mapToStationList(challengeResponseDto, odhClient, LOG); + while (true) { + try { + challengeResponseDto = fetchChallenges(baseUrlChallenges, "true", String.valueOf(limit), String.valueOf(offset), "DISTANCE"); + if (challengeResponseDto == null) { + break; // No more data to fetch + } + MappingUtilsAktionen.mapToStationList(challengeResponseDto, odhClient, LOG); + offset += limit; // Increment offset for next page + + for (RadeltChallengeDto challengeDto : challengeResponseDto.getData().getChallenges()) + { + syncJobOrganisationen(challengeDto); + } + } catch (Exception e) { + e.printStackTrace(); + LOG.error("Error fetching challenges:", e.getMessage()); + break; // Exit the loop if fetching challenges fails + } + } LOG.info("Cron job syncJobAktionen completed successfully"); } - /** - * Scheduled job Organisationen - */ - @Scheduled(cron = "${scheduler.organization}") - public void syncJobOrganisationen() { - LOG.info("Cron job syncJobOrganisationen started: Pushing measurements for {}", - odhClient.getIntegreenTypology()); + private void syncJobOrganisationen(RadeltChallengeDto challengeDto) { + + LOG.info("Cron job syncJobOrganisationen started: Pushing challenge with id: #" + challengeDto.getId(), + odhClient.getIntegreenTypology()); // Define base URL for organizations String baseUrlOrganizations = "https://www.suedtirolradelt.bz.it/dashboard/api/opendata/organisations"; + // Initialize pagination variables + String limit = "5"; // Number of records per page + String offset = "0"; // Starting offset + // Fetch and process organizations OrganisationenResponseDto organizationResponseDto; - try { - organizationResponseDto = fetchOrganizations(baseUrlOrganizations, "280", "", "", "10", "0"); - } catch (Exception e) { - LOG.error("Error fetching organizations: {}", e.getMessage()); - return; // Exit the method if fetching organizations fails - } + while (true) { + try { + organizationResponseDto = fetchOrganizations(baseUrlOrganizations, String.valueOf(challengeDto.getId()), "", "", limit, offset); + if (organizationResponseDto == null) { + break; // Exit the loop if no more data + } - MappingUtilsOrganisationen.mapToStationList(organizationResponseDto, odhClient, LOG); + MappingUtilsOrganisationen.mapToStationList(organizationResponseDto, odhClient, LOG); + + // Update offset for next page + offset = String.valueOf(Integer.parseInt(offset) + Integer.parseInt(limit)); + + } catch (Exception e) { + e.printStackTrace(); + LOG.error("Error fetching organizations with challenge id #" + + challengeDto.getId() + " : ", e.getMessage()); + return; // Exit the method if fetching organizations fails + } + } LOG.info("Cron job Organisationen completed successfully"); } - public static AktionenResponseDto fetchChallenges(String baseUrl, String active, String limit, String offset, - String type) throws Exception { + public static AktionenResponseDto fetchChallenges( + String baseUrl, + String active, + String limit, + String offset, + String type + ) throws Exception { URIBuilder uriBuilder = new URIBuilder(baseUrl); uriBuilder.setParameter("active", active); uriBuilder.setParameter("limit", limit); @@ -113,12 +144,21 @@ public static AktionenResponseDto fetchChallenges(String baseUrl, String active, } else { LOG.error("HTTP Request failed with status code: {}", response.getStatusLine().getStatusCode()); } + }catch (Exception e) { + e.printStackTrace(); + throw new Exception("Error fetching actions", e); } return null; } - public static OrganisationenResponseDto fetchOrganizations(String baseUrl, String challengeId, String type, - String query, String limit, String offset) throws Exception { + public static OrganisationenResponseDto fetchOrganizations( + String baseUrl, + String challengeId, + String type, + String query, + String limit, + String offset + ) throws Exception { URIBuilder uriBuilder = new URIBuilder(baseUrl); uriBuilder.setParameter("challengeId", String.valueOf(challengeId)); uriBuilder.setParameter("type", type); @@ -129,6 +169,7 @@ public static OrganisationenResponseDto fetchOrganizations(String baseUrl, Strin URI uri = uriBuilder.build(); CloseableHttpClient httpClient = HttpClients.createDefault(); HttpGet request = new HttpGet(uri); + LOG.info(uri.toString()); try (CloseableHttpResponse response = httpClient.execute(request)) { if (response.getStatusLine().getStatusCode() == 200) { diff --git a/data-collectors/radelt/src/main/java/com/opendatahub/bdp/radelt/dto/aktionen/RadeltChallengeDto.java b/data-collectors/radelt/src/main/java/com/opendatahub/bdp/radelt/dto/aktionen/RadeltChallengeDto.java index a7451061..d2117375 100644 --- a/data-collectors/radelt/src/main/java/com/opendatahub/bdp/radelt/dto/aktionen/RadeltChallengeDto.java +++ b/data-collectors/radelt/src/main/java/com/opendatahub/bdp/radelt/dto/aktionen/RadeltChallengeDto.java @@ -4,18 +4,23 @@ package com.opendatahub.bdp.radelt.dto.aktionen; -import java.util.Date; import com.fasterxml.jackson.annotation.JsonProperty; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.TimeZone; public class RadeltChallengeDto { private int id; private String name; private String shortName; private String headerImage; - private Date start; - private Date end; - private Date registrationStart; - private Date registrationEnd; + private long start; + private long end; + private long registrationStart; + private long entryStart; + private long registrationEnd; + private long entryEnd; private String type; @JsonProperty("isExternal") private boolean isExternal; @@ -57,36 +62,100 @@ public void setHeaderImage(String headerImage) { this.headerImage = headerImage; } - public Date getStart() { + public long getStart() { return start; } - public void setStart(Date start) { - this.start = start; + public void setStart(String start) { + try { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSSSS'Z'"); + sdf.setTimeZone(TimeZone.getTimeZone("UTC")); + // Parse the date string to a Date object + Date date = sdf.parse(start); + this.start = date.getTime(); + } catch (ParseException e) { + e.printStackTrace(); + } } - public Date getEnd() { + public long getEntryStart() { + return entryStart; + } + + public void setEntryStart(String entryStart) { + try{ + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSSSS'Z'"); + sdf.setTimeZone(TimeZone.getTimeZone("UTC")); + // Parse the date string to a Date object + Date date = sdf.parse(entryStart); + this.entryStart = date.getTime(); + } catch (ParseException e) { + e.printStackTrace(); + } + } + + public long getEnd() { return end; } - public void setEnd(Date end) { - this.end = end; + public void setEnd(String end) { + try { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSSSS'Z'"); + sdf.setTimeZone(TimeZone.getTimeZone("UTC")); + // Parse the date string to a Date object + Date date = sdf.parse(end); + this.end = date.getTime(); + } catch (ParseException e) { + e.printStackTrace(); + } } - public Date getRegistrationStart() { + public long getEntryEnd() { + return entryEnd; + } + + public void setEntryEnd(String entryEnd) { + try { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSSSS'Z'"); + sdf.setTimeZone(TimeZone.getTimeZone("UTC")); + // Parse the date string to a Date object + Date date = sdf.parse(entryEnd); + this.registrationStart = date.getTime(); + } catch (ParseException e) { + e.printStackTrace(); + } + } + + public long getRegistrationStart() { return registrationStart; } - public void setRegistrationStart(Date registrationStart) { - this.registrationStart = registrationStart; + public void setRegistrationStart(String registrationStart) { + try { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSSSS'Z'"); + sdf.setTimeZone(TimeZone.getTimeZone("UTC")); + // Parse the date string to a Date object + Date date = sdf.parse(registrationStart); + this.registrationStart = date.getTime(); + } catch (ParseException e) { + e.printStackTrace(); + } } - public Date getRegistrationEnd() { + public long getRegistrationEnd() { return registrationEnd; } - public void setRegistrationEnd(Date registrationEnd) { - this.registrationEnd = registrationEnd; + public void setRegistrationEnd(String registrationEnd) { + try { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSSSS'Z'"); + sdf.setTimeZone(TimeZone.getTimeZone("UTC")); + // Parse the date string to a Date object + Date date = sdf.parse(registrationEnd); + this.registrationEnd = date.getTime(); + } catch (ParseException e) { + e.printStackTrace(); + } } public String getType() { diff --git a/data-collectors/radelt/src/main/java/com/opendatahub/bdp/radelt/dto/aktionen/RadeltChallengeMetric.java b/data-collectors/radelt/src/main/java/com/opendatahub/bdp/radelt/dto/aktionen/RadeltChallengeMetric.java index fad42ba2..3cc66943 100644 --- a/data-collectors/radelt/src/main/java/com/opendatahub/bdp/radelt/dto/aktionen/RadeltChallengeMetric.java +++ b/data-collectors/radelt/src/main/java/com/opendatahub/bdp/radelt/dto/aktionen/RadeltChallengeMetric.java @@ -4,8 +4,10 @@ package com.opendatahub.bdp.radelt.dto.aktionen; -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.TimeZone; public class RadeltChallengeMetric { private long id; @@ -20,7 +22,7 @@ public class RadeltChallengeMetric { private double money_saved; private Double physical_activity_percentage; private int number_of_people; - private LocalDateTime created_at; + private long created_at; private int organisation_count; private int workplace_count; private int school_count; @@ -127,14 +129,20 @@ public void setNumber_of_people(int number_of_people) { this.number_of_people = number_of_people; } - public LocalDateTime getCreated_at() { + public long getCreated_at() { return created_at; } public void setCreated_at(String created_at) { - DateTimeFormatter format = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSSSSX"); - LocalDateTime formattedDate = LocalDateTime.parse(created_at, format); - this.created_at = formattedDate; + try { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSSSS'Z'"); + sdf.setTimeZone(TimeZone.getTimeZone("UTC")); + // Parse the date string to a Date object + Date date = sdf.parse(created_at); + this.created_at = date.getTime(); + } catch (ParseException e) { + e.printStackTrace(); + } } public int getOrganisation_count() { diff --git a/data-collectors/radelt/src/main/java/com/opendatahub/bdp/radelt/dto/organisationen/RadeltChallengeStatisticDto.java b/data-collectors/radelt/src/main/java/com/opendatahub/bdp/radelt/dto/organisationen/RadeltChallengeStatisticDto.java index f7fc72ae..6b9983d9 100644 --- a/data-collectors/radelt/src/main/java/com/opendatahub/bdp/radelt/dto/organisationen/RadeltChallengeStatisticDto.java +++ b/data-collectors/radelt/src/main/java/com/opendatahub/bdp/radelt/dto/organisationen/RadeltChallengeStatisticDto.java @@ -4,8 +4,10 @@ package com.opendatahub.bdp.radelt.dto.organisationen; -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.TimeZone; public class RadeltChallengeStatisticDto { @@ -21,7 +23,7 @@ public class RadeltChallengeStatisticDto { private double money_saved; private Object physical_activity_percentage; // can be null, so Object type private int number_of_people; - private LocalDateTime created_at; + private long created_at; private String name; private String challenge_type; @@ -121,15 +123,20 @@ public void setNumber_of_people(int number_of_people) { this.number_of_people = number_of_people; } - public LocalDateTime getCreated_at() { + public long getCreated_at() { return created_at; } public void setCreated_at(String created_at) { - - DateTimeFormatter format = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSSSSX"); - LocalDateTime formattedDate = LocalDateTime.parse(created_at, format); - this.created_at = formattedDate; + try { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSSSS'Z'"); + sdf.setTimeZone(TimeZone.getTimeZone("UTC")); + // Parse the date string to a Date object + Date date = sdf.parse(created_at); + this.created_at = date.getTime(); + } catch (ParseException e) { + e.printStackTrace(); + } } public String getName() { diff --git a/data-collectors/radelt/src/main/java/com/opendatahub/bdp/radelt/dto/organisationen/RadeltOrganisationenDto.java b/data-collectors/radelt/src/main/java/com/opendatahub/bdp/radelt/dto/organisationen/RadeltOrganisationenDto.java index 17f9aabd..48c5aac3 100644 --- a/data-collectors/radelt/src/main/java/com/opendatahub/bdp/radelt/dto/organisationen/RadeltOrganisationenDto.java +++ b/data-collectors/radelt/src/main/java/com/opendatahub/bdp/radelt/dto/organisationen/RadeltOrganisationenDto.java @@ -12,6 +12,7 @@ public class RadeltOrganisationenDto { private String logo; private String website; private int peopleTotal; + private Object children; private RadeltStatisticsDto statistics; // Getters and Setters @@ -63,6 +64,14 @@ public void setPeopleTotal(int peopleTotal) { this.peopleTotal = peopleTotal; } + public Object getChildren() { + return children; + } + + public void setChildren(Object children) { + this.children = children; + } + public RadeltStatisticsDto getStatistics() { return statistics; } diff --git a/data-collectors/radelt/src/main/java/com/opendatahub/bdp/radelt/dto/utils/DataTypeUtils.java b/data-collectors/radelt/src/main/java/com/opendatahub/bdp/radelt/dto/utils/DataTypeUtils.java index bebfbf15..c6506b6c 100644 --- a/data-collectors/radelt/src/main/java/com/opendatahub/bdp/radelt/dto/utils/DataTypeUtils.java +++ b/data-collectors/radelt/src/main/java/com/opendatahub/bdp/radelt/dto/utils/DataTypeUtils.java @@ -15,6 +15,7 @@ import it.bz.idm.bdp.dto.DataMapDto; import it.bz.idm.bdp.dto.RecordDtoImpl; import it.bz.idm.bdp.dto.SimpleRecordDto; +import org.springframework.web.reactive.function.client.WebClientRequestException; public class DataTypeUtils { @@ -102,8 +103,13 @@ public static void setupDataType(OdhClient odhClient, Logger LOG) { "total" ) ); - odhClient.syncDataTypes(odhDataTypeList); - LOG.info("Cron job syncJobAktionen completed successfully"); + + try { + odhClient.syncDataTypes(odhDataTypeList); + LOG.info("Sync data type completed successfully"); + } catch (WebClientRequestException e) { + LOG.error("Sync data types failed: Request exception: {}", e.getMessage()); + } } public static void addMeasurement(DataMapDto map, String dataType, long timestamp, double value) { diff --git a/data-collectors/radelt/src/main/java/com/opendatahub/bdp/radelt/dto/utils/MappingUtilsAktionen.java b/data-collectors/radelt/src/main/java/com/opendatahub/bdp/radelt/dto/utils/MappingUtilsAktionen.java index 4094d54a..afe04e78 100644 --- a/data-collectors/radelt/src/main/java/com/opendatahub/bdp/radelt/dto/utils/MappingUtilsAktionen.java +++ b/data-collectors/radelt/src/main/java/com/opendatahub/bdp/radelt/dto/utils/MappingUtilsAktionen.java @@ -8,6 +8,8 @@ import org.springframework.web.reactive.function.client.WebClientRequestException; import java.util.ArrayList; import java.time.ZoneOffset; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import it.bz.idm.bdp.dto.DataMapDto; import it.bz.idm.bdp.dto.DataTypeDto; @@ -75,8 +77,8 @@ public static void mapToStationList(AktionenResponseDto responseDto, OdhClient o if(statistics != null && statistics.getChallenge() != null){ RadeltChallengeMetric challenge = statistics.getChallenge(); - long timestamp = challenge.getCreated_at().toInstant(ZoneOffset.UTC).toEpochMilli(); - + long timestamp = challenge.getCreated_at(); + LOG.info("add measurement with ts: " + timestamp); DataTypeUtils.addMeasurement(stationMap, "km_total", timestamp, challenge.getKm_total()); DataTypeUtils.addMeasurement(stationMap, "height_meters_total", timestamp, challenge.getHeight_meters_total()); DataTypeUtils.addMeasurement(stationMap, "km_average", timestamp, challenge.getKm_average()); diff --git a/data-collectors/radelt/src/main/java/com/opendatahub/bdp/radelt/dto/utils/MappingUtilsOrganisationen.java b/data-collectors/radelt/src/main/java/com/opendatahub/bdp/radelt/dto/utils/MappingUtilsOrganisationen.java index 6d00a187..bd3dadec 100644 --- a/data-collectors/radelt/src/main/java/com/opendatahub/bdp/radelt/dto/utils/MappingUtilsOrganisationen.java +++ b/data-collectors/radelt/src/main/java/com/opendatahub/bdp/radelt/dto/utils/MappingUtilsOrganisationen.java @@ -23,7 +23,7 @@ public class MappingUtilsOrganisationen { public static final String DATA_ORIGIN = "SuedtirolRadelt_AltoAdigePedala"; public static final String DATA_TYPE = "CompanyGamificationAction"; - public static StationDto mapToStationDto(RadeltOrganisationenDto organisation) { + public static StationDto mapToStationDto(RadeltOrganisationenDto organisation, Logger LOG) { StationDto stationDto = new StationDto(); RadeltStatisticsDto statisticsDto = organisation.getStatistics(); @@ -31,8 +31,8 @@ public static StationDto mapToStationDto(RadeltOrganisationenDto organisation) { if(statisticsDto != null) { RadeltChallengeStatisticDto challengeStatistics = statisticsDto.getChallengeStatistics().get(0); if (challengeStatistics.getChallenge_id() != null) { - stationDto.setId(String.valueOf(challengeStatistics.getChallenge_id())); - stationDto.setName(challengeStatistics.getChallenge_name()); + stationDto.setId(String.valueOf(challengeStatistics.getId()) + "-" + String.valueOf(challengeStatistics.getChallenge_id())); + stationDto.setName(challengeStatistics.getName() + '-' + challengeStatistics.getChallenge_name()); stationDto.setStationType(DATA_TYPE); //METADATA @@ -40,7 +40,7 @@ public static StationDto mapToStationDto(RadeltOrganisationenDto organisation) { stationDto.getMetaData().put("logo", organisation.getLogo()); stationDto.getMetaData().put("website", organisation.getWebsite()); stationDto.getMetaData().put("peopleTotal", organisation.getPeopleTotal()); - //stationDto.getMetaData().put("challenge_type", organisation.getChallenge_type()); //TODO: missing field on response + stationDto.getMetaData().put("challenge_type", challengeStatistics.getChallenge_type()); //Additional stationDto.setOrigin(DATA_ORIGIN); @@ -53,16 +53,20 @@ public static StationDto mapToStationDto(RadeltOrganisationenDto organisation) { } public static void mapToStationList(OrganisationenResponseDto responseDto, OdhClient odhClient, Logger LOG) { + LOG.info("Start mapping challenge"); StationList stationListOrganisationen = new StationList(); for (RadeltOrganisationenDto organisationenDto : responseDto.getData().getOrganisations()) { - StationDto stationDto = mapToStationDto(organisationenDto); + StationDto stationDto = mapToStationDto(organisationenDto, LOG); - if (stationDto.getId() != null) {//TODO: handle duplicated entries? - stationListOrganisationen.add(stationDto); - LOG.info("Add station with id #" + stationDto.getId()); + if (stationDto.getId() == null) {//TODO: handle duplicated entries? + LOG.error("Skipping station with empty statistics"); + return; } + stationListOrganisationen.add(stationDto); + LOG.info("Add station (organizazion) with id #" + stationDto.getId()); + // Create measurement records DataMapDto rootMap = new DataMapDto<>(); DataMapDto stationMap = rootMap.upsertBranch(stationDto.getId()); @@ -70,8 +74,9 @@ public static void mapToStationList(OrganisationenResponseDto responseDto, OdhCl for (RadeltChallengeStatisticDto challengeStatisticDto : organisationenDto.getStatistics().getChallengeStatistics()){ - long timestamp = challengeStatisticDto.getCreated_at().toInstant(ZoneOffset.UTC).toEpochMilli(); + long timestamp = challengeStatisticDto.getCreated_at(); + LOG.info("add measurement with ts: " + timestamp); DataTypeUtils.addMeasurement(stationMap, "km_total", timestamp, challengeStatisticDto.getKm_total()); DataTypeUtils.addMeasurement(stationMap, "height_meters_total", timestamp, challengeStatisticDto.getHeight_meters_total()); DataTypeUtils.addMeasurement(stationMap, "km_average", timestamp, challengeStatisticDto.getKm_average()); @@ -87,7 +92,7 @@ public static void mapToStationList(OrganisationenResponseDto responseDto, OdhCl odhClient.pushData(stationMap); LOG.info("Pushing data successful"); } catch (WebClientRequestException e) { - LOG.error("Pushing data failed: Request exception: {}", e.getMessage()); + LOG.error("Pushing data failed: Request exception:", e.getMessage()); } } diff --git a/data-collectors/radelt/src/main/resources/application.properties b/data-collectors/radelt/src/main/resources/application.properties index 82a2d990..5dc8ea5a 100644 --- a/data-collectors/radelt/src/main/resources/application.properties +++ b/data-collectors/radelt/src/main/resources/application.properties @@ -1,7 +1,6 @@ # Cron definition to start jobs # We set it to "every 10 or 20 seconds" for development purposes -scheduler.actions=${SCHEDULER_CRON_ACTIONS:*/10 * * * * *} -scheduler.organization=${SCHEDULER_CRON_ORGANIZATION:*/20 * * * * *} +scheduler.actions_and_organization=${SCHEDULER_CRON_ACTIONS_AND_ORGANIZATIONS:*/10 * * * * *} # set scheduler pool size spring.task.scheduling.pool.size=${SCHEDULER_POOL_SIZE:1} @@ -9,7 +8,7 @@ spring.task.scheduling.pool.size=${SCHEDULER_POOL_SIZE:1} ##### Open Data Hub Configuration # Data provenance (Where does our data come from?) odh_client.stationtype=${ODH_CLIENT_STATIONTYPE:your-stationtype} -odh_client.provenance.name=${ODH_CLIENT_PROVENANCE_NAME:dc-helloworld} +odh_client.provenance.name=${ODH_CLIENT_PROVENANCE_NAME:dc-radelt} odh_client.provenance.version=${ODH_CLIENT_PROVENANCE_VERSION:0.0.0-local-dev} odh_client.provenance.origin=${ODH_CLIENT_PROVENANCE_ORIGIN:your-original-datasource} odh_client.period=${ODH_CLIENT_PERIOD:600}