Export timing places to Jore4 database.

Author: jarkkoka

docker/docker-compose.custom.yml

@@ -32,7 +32,7 @@ services:
       - jore4
 
   jore4-mapmatching:
-    image: "hsldevcom/jore4-map-matching:main--20221101-55b0d65292b29db99c9ddaa93de6b422326d2976"
+    image: "hsldevcom/jore4-map-matching:main--20230314-81b915f44bef9bf57ff707f303a9642fcd4489ce"
 
   jore4-mssqltestdb:
     # pin compatible version of mssql schema
@@ -43,6 +43,6 @@ services:
 
   jore4-hasura:
     # pin compatible version of jore4 data model
-    image: "hsldevcom/jore4-hasura:hsl-main--20230202-6029ef3d1c6678fd14c8e4e2296f2d83ce066db1"
+    image: "hsldevcom/jore4-hasura:hsl-main--20230324-beb6ecbde2b638b79af499e7f18a568d85f1541e"
 networks:
     jore4:

pom.xml

@@ -474,6 +474,7 @@
                                         | reusable_components.*
                                         | route.*
                                         | service_pattern.*
+                                        | timing_pattern.*
                                     </includes>
                                     <excludes>
                                         AUTH_SESSION.*

src/main/java/fi/hsl/jore/importer/config/jobs/JobConfig.java

@@ -58,6 +58,9 @@
 import fi.hsl.jore.importer.feature.batch.scheduled_stop_point.ScheduledStopPointImportProcessor;
 import fi.hsl.jore.importer.feature.batch.scheduled_stop_point.ScheduledStopPointImportReader;
 import fi.hsl.jore.importer.feature.batch.scheduled_stop_point.support.IScheduledStopPointImportRepository;
+import fi.hsl.jore.importer.feature.batch.scheduled_stop_point.timing_place.TimingPlaceExportProcessor;
+import fi.hsl.jore.importer.feature.batch.scheduled_stop_point.timing_place.TimingPlaceExportReader;
+import fi.hsl.jore.importer.feature.batch.scheduled_stop_point.timing_place.TimingPlaceExportWriter;
 import fi.hsl.jore.importer.feature.infrastructure.link.dto.Jore3Link;
 import fi.hsl.jore.importer.feature.infrastructure.link_shape.dto.Jore3LinkShape;
 import fi.hsl.jore.importer.feature.infrastructure.node.dto.Jore3Node;
@@ -73,6 +76,7 @@
 import fi.hsl.jore.importer.feature.jore4.entity.Jore4Route;
 import fi.hsl.jore.importer.feature.jore4.entity.Jore4RouteGeometry;
 import fi.hsl.jore.importer.feature.jore4.entity.Jore4ScheduledStopPoint;
+import fi.hsl.jore.importer.feature.jore4.entity.Jore4TimingPlace;
 import fi.hsl.jore.importer.feature.network.line.dto.ImporterLine;
 import fi.hsl.jore.importer.feature.network.line.dto.PersistableLine;
 import fi.hsl.jore.importer.feature.network.line_header.dto.Jore3LineHeader;
@@ -84,6 +88,7 @@
 import fi.hsl.jore.importer.feature.network.route_point.dto.ImporterRouteGeometry;
 import fi.hsl.jore.importer.feature.network.scheduled_stop_point.dto.ImporterScheduledStopPoint;
 import fi.hsl.jore.importer.feature.network.scheduled_stop_point.dto.Jore3ScheduledStopPoint;
+import fi.hsl.jore.importer.feature.network.scheduled_stop_point.timing_place.ImporterTimingPlace;
 import org.springframework.batch.core.Job;
 import org.springframework.batch.core.Step;
 import org.springframework.batch.core.job.builder.FlowBuilder;
@@ -546,6 +551,7 @@ public Step commitScheduledStopPointsStep(final IScheduledStopPointImportReposit
 
     @Bean
     public Flow jore4ExportFlow(final Step prepareJore4ExportStep,
+                                final Step exportTimingPlacesStep,
                                 final Step exportScheduledStopPointsStep,
                                 final Step exportLinesStep,
                                 final Step exportRoutesStep,
@@ -554,6 +560,7 @@ public Flow jore4ExportFlow(final Step prepareJore4ExportStep,
                                 final Step exportJourneyPatternStopsStep) {
         return new FlowBuilder<SimpleFlow>("jore4ExportFlow")
                 .start(prepareJore4ExportStep)
+                .next(exportTimingPlacesStep)
                 .next(exportScheduledStopPointsStep)
                 .next(exportLinesStep)
                 .next(exportRoutesStep)
@@ -571,6 +578,21 @@ public Step prepareJore4ExportStep(final Jore4SchemaCleanupTasklet cleanupTaskle
                     .build();
     }
 
+    @Bean
+    public Step exportTimingPlacesStep(final TimingPlaceExportReader reader,
+                                       final TimingPlaceExportWriter writer) {
+        return steps.get("exportTimingPlacesStep")
+                    .allowStartIfComplete(true)
+                    .<ImporterTimingPlace, Jore4TimingPlace>chunk(1)
+                    .reader(reader.build())
+                    .processor(new TimingPlaceExportProcessor())
+                    .writer(writer)
+                    .faultTolerant()
+                    .skipPolicy(new AlwaysSkipItemSkipPolicy())
+                    .listener(new StatisticsLoggingStepExecutionListener())
+                    .build();
+    }
+
     @Bean
     public Step exportScheduledStopPointsStep(final ScheduledStopPointExportReader reader,
                                               final ScheduledStopPointExportProcessor processor,

src/main/java/fi/hsl/jore/importer/feature/batch/common/Jore4SchemaCleanupTasklet.java

@@ -28,7 +28,7 @@ public Jore4SchemaCleanupTasklet(final IDataEraser dataEraser) {
     public RepeatStatus execute(final StepContribution contribution, final ChunkContext chunkContext) throws Exception {
         dataEraser.deleteJourneyPatterns();
         dataEraser.deleteRoutesAndLines();
-        dataEraser.deleteScheduledStopPoints();
+        dataEraser.deleteScheduledStopPointsAndTimingPlaces();
 
         return RepeatStatus.FINISHED;
     }

src/main/java/fi/hsl/jore/importer/feature/batch/scheduled_stop_point/ScheduledStopPointExportMapper.java

@@ -41,7 +41,8 @@ public ImporterScheduledStopPoint mapRow(final ResultSet resultSet,
                 csvToElyNumbers(resultSet.getString("ely_number")),
                 pointFromDatabaseObject(resultSet.getObject("location")),
                 jsonConverter.fromJson(resultSet.getString("name"), MultilingualString.class),
-                getOptionalString(resultSet, "short_id")
+                getOptionalString(resultSet, "short_id"),
+                getOptionalString(resultSet, "hastus_place_id")
         );
     }
 

src/main/java/fi/hsl/jore/importer/feature/batch/scheduled_stop_point/ScheduledStopPointExportProcessor.java

@@ -62,7 +62,6 @@ public Jore4ScheduledStopPoint process(final ImporterScheduledStopPoint jore3Sto
             return null;
         }
 
-
         for (int index = 0; index < elyNumbers.size(); index++) {
             final ExternalId externalId = externalIds.get(index);
             final Long elyNumber = elyNumbers.get(index);
@@ -79,6 +78,7 @@ public Jore4ScheduledStopPoint process(final ImporterScheduledStopPoint jore3Sto
                         Jore4ScheduledStopPointDirection.valueOf(digiroadStop.directionOnInfraLink().name()),
                         jore3Stop.shortId().get(),
                         jore3Stop.location(),
+                        jore3Stop.hastusPlaceId(),
                         DEFAULT_PRIORITY,
                         Optional.of(DEFAULT_VALIDITY_START),
                         Optional.of(DEFAULT_VALIDITY_END)

src/main/java/fi/hsl/jore/importer/feature/batch/scheduled_stop_point/timing_place/TimingPlaceExportMapper.java

@@ -0,0 +1,22 @@
+package fi.hsl.jore.importer.feature.batch.scheduled_stop_point.timing_place;
+
+import fi.hsl.jore.importer.feature.network.scheduled_stop_point.timing_place.ImporterTimingPlace;
+import org.springframework.jdbc.core.RowMapper;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+/**
+ * Maps a result set row into an {@link ImporterTimingPlace} object.
+ */
+public class TimingPlaceExportMapper implements RowMapper<ImporterTimingPlace> {
+
+    public static final String SQL_PATH = "classpath:jore4-export/export_timing_places.sql";
+
+    @Override
+    public ImporterTimingPlace mapRow(final ResultSet resultSet,
+                                      final int rowNumber) throws SQLException {
+
+        return ImporterTimingPlace.of((resultSet.getString("hastus_place_id")));
+    }
+}

src/main/java/fi/hsl/jore/importer/feature/batch/scheduled_stop_point/timing_place/TimingPlaceExportProcessor.java

@@ -0,0 +1,26 @@
+package fi.hsl.jore.importer.feature.batch.scheduled_stop_point.timing_place;
+
+import fi.hsl.jore.importer.feature.jore4.entity.Jore4TimingPlace;
+import fi.hsl.jore.importer.feature.network.scheduled_stop_point.timing_place.ImporterTimingPlace;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.batch.item.ItemProcessor;
+
+import java.util.UUID;
+
+public class TimingPlaceExportProcessor implements ItemProcessor<ImporterTimingPlace, Jore4TimingPlace> {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(TimingPlaceExportProcessor.class);
+
+    @Override
+    public Jore4TimingPlace process(final ImporterTimingPlace timingPlace) throws Exception {
+        LOGGER.debug("Processing timing place input: {}", timingPlace);
+
+        final Jore4TimingPlace jore4TimingPlace = Jore4TimingPlace.of(UUID.randomUUID(),
+                                                                      timingPlace.hastusPlaceId());
+
+        LOGGER.debug("Created timing place output: {}", jore4TimingPlace);
+
+        return jore4TimingPlace;
+    }
+}

src/main/java/fi/hsl/jore/importer/feature/batch/scheduled_stop_point/timing_place/TimingPlaceExportReader.java

@@ -0,0 +1,43 @@
+package fi.hsl.jore.importer.feature.batch.scheduled_stop_point.timing_place;
+
+import fi.hsl.jore.importer.feature.batch.util.ResourceUtil;
+import fi.hsl.jore.importer.feature.network.scheduled_stop_point.timing_place.ImporterTimingPlace;
+import org.springframework.batch.item.database.JdbcCursorItemReader;
+import org.springframework.batch.item.database.builder.JdbcCursorItemReaderBuilder;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.io.Resource;
+import org.springframework.stereotype.Component;
+
+import javax.sql.DataSource;
+
+/**
+ * Reads Hastus place IDs from scheduled stop points from the import schemas
+ * which are found from the database of this Spring Boot application.
+ */
+@Component
+public class TimingPlaceExportReader {
+
+    private static final String NAME = "timingPlaceExportReader";
+
+    private final DataSource dataSource;
+    private final String sql;
+
+    @Autowired
+    public TimingPlaceExportReader(@Qualifier("importerDataSource") final DataSource dataSource,
+                                   @Value(TimingPlaceExportMapper.SQL_PATH) final Resource sqlResource) {
+        this.dataSource = dataSource;
+        this.sql = ResourceUtil.fromResource(sqlResource);
+    }
+
+    public JdbcCursorItemReader<ImporterTimingPlace> build() {
+        // The default fetch size seems to be 128 items.
+        return new JdbcCursorItemReaderBuilder<ImporterTimingPlace>()
+                .dataSource(dataSource)
+                .name(NAME)
+                .sql(sql)
+                .rowMapper(new TimingPlaceExportMapper())
+                .build();
+    }
+}

src/main/java/fi/hsl/jore/importer/feature/batch/scheduled_stop_point/timing_place/TimingPlaceExportWriter.java

@@ -0,0 +1,28 @@
+package fi.hsl.jore.importer.feature.batch.scheduled_stop_point.timing_place;
+
+import fi.hsl.jore.importer.feature.jore4.entity.Jore4TimingPlace;
+import fi.hsl.jore.importer.feature.jore4.repository.IJore4TimingPlaceRepository;
+import org.springframework.batch.item.ItemWriter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * Writes the timing place objects to the Jore 4 database.
+ */
+@Component
+public class TimingPlaceExportWriter implements ItemWriter<Jore4TimingPlace> {
+
+    private final IJore4TimingPlaceRepository jore4Repository;
+
+    @Autowired
+    public TimingPlaceExportWriter(final IJore4TimingPlaceRepository jore4Repository) {
+        this.jore4Repository = jore4Repository;
+    }
+
+    @Override
+    public void write(final List<? extends Jore4TimingPlace> items) throws Exception {
+        jore4Repository.insert(items);
+    }
+}