Add types to error responses

README.md

@@ -39,7 +39,6 @@ When the submodule is updated, to get the newest version of inserter you need to
 
 ## API structure
 
-- `GET /hello` Hello world example interface returns http 200
 - `POST /timetables/replace`: Import staging timetables to target priority
   by replacing matching currently active vehicle schedule frames.
   Example request body:

docker/docker-compose.custom.yml

@@ -29,7 +29,7 @@ services:
     # locking hasura image so that we can develop against a static graphql API
     # Link to available jore4-hasura images in Docker Hub:
     # https://hub.docker.com/r/hsldevcom/jore4-hasura/tags?page=1&ordering=last_updated
-    image: "hsldevcom/jore4-hasura:hsl-main--20231019-667942672c4ff4f7493a49903f6ed2bbe35a7615"
+    image: "hsldevcom/jore4-hasura:hsl-main--20231115-5c29d7e8103145ac12554a01da6e04a9b08be784"
     # Waiting for database to be ready to avoid startup delay due to hasura crashing at startup if db is offline
     # Note: this should only be done in development setups as Kubernetes does not allow waiting for services to be ready
     depends_on:

src/generated-sources/jooq/fi/hsl/jore/jore4/jooq/passing_times/routines/CreateValidatePassingTimesSequenceQueueTempTables.kt → src/generated-sources/jooq/fi/hsl/jore/jore4/jooq/passing_times/routines/ValidatePassingTimeSequences.kt

@@ -13,7 +13,7 @@ import org.jooq.impl.AbstractRoutine
  * This class is generated by jOOQ.
  */
 @Suppress("UNCHECKED_CAST")
-open class CreateValidatePassingTimesSequenceQueueTempTables : AbstractRoutine<java.lang.Void>("create_validate_passing_times_sequence_queue_temp_tables", PassingTimes.PASSING_TIMES) {
+open class ValidatePassingTimeSequences : AbstractRoutine<java.lang.Void>("validate_passing_time_sequences", PassingTimes.PASSING_TIMES) {
     companion object {
     }
 

src/generated-sources/jooq/fi/hsl/jore/jore4/jooq/passing_times/routines/references/Routines.kt

@@ -4,8 +4,7 @@
 package fi.hsl.jore.jore4.jooq.passing_times.routines.references
 
 
-import fi.hsl.jore.jore4.jooq.passing_times.routines.CreateValidatePassingTimesSequenceQueueTempTables
-import fi.hsl.jore.jore4.jooq.passing_times.routines.PassingTimesSequenceAlreadyValidated
+import fi.hsl.jore.jore4.jooq.passing_times.routines.ValidatePassingTimeSequences
 import fi.hsl.jore.jore4.jooq.passing_times.tables.GetPassingTimeOrderValidityData
 import fi.hsl.jore.jore4.jooq.passing_times.tables.records.GetPassingTimeOrderValidityDataRecord
 
@@ -18,39 +17,16 @@ import org.jooq.Result
 
 
 /**
- * Call
- * <code>passing_times.create_validate_passing_times_sequence_queue_temp_tables</code>
+ * Call <code>passing_times.validate_passing_time_sequences</code>
  */
-fun createValidatePassingTimesSequenceQueueTempTables(
+fun validatePassingTimeSequences(
       configuration: Configuration
 ): Unit {
-    val p = CreateValidatePassingTimesSequenceQueueTempTables()
+    val p = ValidatePassingTimeSequences()
 
     p.execute(configuration)
 }
 
-/**
- * Call <code>passing_times.passing_times_sequence_already_validated</code>
- */
-fun passingTimesSequenceAlreadyValidated(
-      configuration: Configuration
-): Boolean? {
-    val f = PassingTimesSequenceAlreadyValidated()
-
-    f.execute(configuration)
-    return f.returnValue
-}
-
-/**
- * Get <code>passing_times.passing_times_sequence_already_validated</code> as a
- * field.
- */
-fun passingTimesSequenceAlreadyValidated(): Field<Boolean?> {
-    val f = PassingTimesSequenceAlreadyValidated()
-
-    return f.asField()
-}
-
 /**
  * Call <code>passing_times.get_passing_time_order_validity_data</code>.
  */

src/generated-sources/jooq/fi/hsl/jore/jore4/jooq/vehicle_service/VehicleService.kt

@@ -9,7 +9,9 @@ import fi.hsl.jore.jore4.jooq.return_value.tables.records.TimetableVersionRecord
 import fi.hsl.jore.jore4.jooq.vehicle_service.tables.Block
 import fi.hsl.jore.jore4.jooq.vehicle_service.tables.GetTimetableVersionsByJourneyPatternIds
 import fi.hsl.jore.jore4.jooq.vehicle_service.tables.GetTimetablesAndSubstituteOperatingDays
+import fi.hsl.jore.jore4.jooq.vehicle_service.tables.GetVehicleServiceTimingData
 import fi.hsl.jore.jore4.jooq.vehicle_service.tables.JourneyPatternsInVehicleService
+import fi.hsl.jore.jore4.jooq.vehicle_service.tables.records.GetVehicleServiceTimingDataRecord
 
 import java.time.LocalDate
 import java.util.UUID
@@ -154,6 +156,41 @@ open class VehicleService : SchemaImpl("vehicle_service", DefaultCatalog.DEFAULT
         endDate
     )
 
+    /**
+     * The table <code>vehicle_service.get_vehicle_service_timing_data</code>.
+     */
+    val GET_VEHICLE_SERVICE_TIMING_DATA: GetVehicleServiceTimingData get() = GetVehicleServiceTimingData.GET_VEHICLE_SERVICE_TIMING_DATA
+
+    /**
+     * Call <code>vehicle_service.get_vehicle_service_timing_data</code>.
+     */
+    fun GET_VEHICLE_SERVICE_TIMING_DATA(
+          configuration: Configuration
+        , vehicleServiceIds: Array<UUID?>?
+    ): Result<GetVehicleServiceTimingDataRecord> = configuration.dsl().selectFrom(fi.hsl.jore.jore4.jooq.vehicle_service.tables.GetVehicleServiceTimingData.GET_VEHICLE_SERVICE_TIMING_DATA.call(
+          vehicleServiceIds
+    )).fetch()
+
+    /**
+     * Get <code>vehicle_service.get_vehicle_service_timing_data</code> as a
+     * table.
+     */
+    fun GET_VEHICLE_SERVICE_TIMING_DATA(
+          vehicleServiceIds: Array<UUID?>?
+    ): GetVehicleServiceTimingData = fi.hsl.jore.jore4.jooq.vehicle_service.tables.GetVehicleServiceTimingData.GET_VEHICLE_SERVICE_TIMING_DATA.call(
+        vehicleServiceIds
+    )
+
+    /**
+     * Get <code>vehicle_service.get_vehicle_service_timing_data</code> as a
+     * table.
+     */
+    fun GET_VEHICLE_SERVICE_TIMING_DATA(
+          vehicleServiceIds: Field<Array<UUID?>?>
+    ): GetVehicleServiceTimingData = fi.hsl.jore.jore4.jooq.vehicle_service.tables.GetVehicleServiceTimingData.GET_VEHICLE_SERVICE_TIMING_DATA.call(
+        vehicleServiceIds
+    )
+
     /**
      * A denormalized table containing relationships between vehicle_services
      * and journey_patterns (via journey_pattern_ref.journey_pattern_id).
@@ -177,6 +214,7 @@ open class VehicleService : SchemaImpl("vehicle_service", DefaultCatalog.DEFAULT
         Block.BLOCK,
         GetTimetableVersionsByJourneyPatternIds.GET_TIMETABLE_VERSIONS_BY_JOURNEY_PATTERN_IDS,
         GetTimetablesAndSubstituteOperatingDays.GET_TIMETABLES_AND_SUBSTITUTE_OPERATING_DAYS,
+        GetVehicleServiceTimingData.GET_VEHICLE_SERVICE_TIMING_DATA,
         JourneyPatternsInVehicleService.JOURNEY_PATTERNS_IN_VEHICLE_SERVICE,
         fi.hsl.jore.jore4.jooq.vehicle_service.tables.VehicleService.VEHICLE_SERVICE_
     )

src/generated-sources/jooq/fi/hsl/jore/jore4/jooq/vehicle_service/routines/ValidateServiceSequentialIntegrity.kt

@@ -0,0 +1,22 @@
+/*
+ * This file is generated by jOOQ.
+ */
+package fi.hsl.jore.jore4.jooq.vehicle_service.routines
+
+
+import fi.hsl.jore.jore4.jooq.vehicle_service.VehicleService
+
+import org.jooq.impl.AbstractRoutine
+
+
+/**
+ * This class is generated by jOOQ.
+ */
+@Suppress("UNCHECKED_CAST")
+open class ValidateServiceSequentialIntegrity : AbstractRoutine<java.lang.Void>("validate_service_sequential_integrity", VehicleService.VEHICLE_SERVICE) {
+    companion object {
+    }
+
+    init {
+    }
+}

src/generated-sources/jooq/fi/hsl/jore/jore4/jooq/vehicle_service/routines/references/Routines.kt

@@ -6,8 +6,11 @@ package fi.hsl.jore.jore4.jooq.vehicle_service.routines.references
 
 import fi.hsl.jore.jore4.jooq.return_value.tables.records.TimetableVersionRecord
 import fi.hsl.jore.jore4.jooq.vehicle_service.routines.RefreshJourneyPatternsInVehicleService
+import fi.hsl.jore.jore4.jooq.vehicle_service.routines.ValidateServiceSequentialIntegrity
 import fi.hsl.jore.jore4.jooq.vehicle_service.tables.GetTimetableVersionsByJourneyPatternIds
 import fi.hsl.jore.jore4.jooq.vehicle_service.tables.GetTimetablesAndSubstituteOperatingDays
+import fi.hsl.jore.jore4.jooq.vehicle_service.tables.GetVehicleServiceTimingData
+import fi.hsl.jore.jore4.jooq.vehicle_service.tables.records.GetVehicleServiceTimingDataRecord
 
 import java.time.LocalDate
 import java.util.UUID
@@ -29,6 +32,17 @@ fun refreshJourneyPatternsInVehicleService(
     p.execute(configuration)
 }
 
+/**
+ * Call <code>vehicle_service.validate_service_sequential_integrity</code>
+ */
+fun validateServiceSequentialIntegrity(
+      configuration: Configuration
+): Unit {
+    val p = ValidateServiceSequentialIntegrity()
+
+    p.execute(configuration)
+}
+
 /**
  * Call
  * <code>vehicle_service.get_timetable_versions_by_journey_pattern_ids</code>.
@@ -122,3 +136,31 @@ fun getTimetablesAndSubstituteOperatingDays(
     startDate,
     endDate
 )
+
+/**
+ * Call <code>vehicle_service.get_vehicle_service_timing_data</code>.
+ */
+fun getVehicleServiceTimingData(
+      configuration: Configuration
+    , vehicleServiceIds: Array<UUID?>?
+): Result<GetVehicleServiceTimingDataRecord> = configuration.dsl().selectFrom(fi.hsl.jore.jore4.jooq.vehicle_service.tables.GetVehicleServiceTimingData.GET_VEHICLE_SERVICE_TIMING_DATA.call(
+      vehicleServiceIds
+)).fetch()
+
+/**
+ * Get <code>vehicle_service.get_vehicle_service_timing_data</code> as a table.
+ */
+fun getVehicleServiceTimingData(
+      vehicleServiceIds: Array<UUID?>?
+): GetVehicleServiceTimingData = fi.hsl.jore.jore4.jooq.vehicle_service.tables.GetVehicleServiceTimingData.GET_VEHICLE_SERVICE_TIMING_DATA.call(
+    vehicleServiceIds
+)
+
+/**
+ * Get <code>vehicle_service.get_vehicle_service_timing_data</code> as a table.
+ */
+fun getVehicleServiceTimingData(
+      vehicleServiceIds: Field<Array<UUID?>?>
+): GetVehicleServiceTimingData = fi.hsl.jore.jore4.jooq.vehicle_service.tables.GetVehicleServiceTimingData.GET_VEHICLE_SERVICE_TIMING_DATA.call(
+    vehicleServiceIds
+)