Merge pull request #35 from hawklike/dev

Dev 1.1.4

Author: hawklike

build.gradle

@@ -6,7 +6,7 @@ plugins {
 }
 
 group "cz.cvut.fit.steuejan"
-version "1.1.3"
+version "1.1.4"
 mainClassName = "io.ktor.server.netty.EngineMain"
 
 repositories {

src/main/kotlin/cz/cvut/fit/steuejan/travel/api/trip/itinerary/model/ActivityItinerary.kt

@@ -9,12 +9,12 @@ import kotlinx.serialization.Serializable
 class ActivityItinerary(
     val id: Int,
     val name: String,
-    val activity: ActivityType?,
+    val activity: ActivityType,
     override val duration: Duration,
 ) : CommonItinerary(ItineraryType.ACTIVITY) {
     companion object {
         fun fromDto(dto: ActivityDto) = with(dto) {
-            ActivityItinerary(id, name, type, duration)
+            ActivityItinerary(id, name, type ?: ActivityType.OTHER, duration)
         }
     }
 }

src/main/kotlin/cz/cvut/fit/steuejan/travel/api/trip/poi/activity/response/ActivityResponse.kt

@@ -13,7 +13,7 @@ data class ActivityResponse(
     override val tripId: Int,
     override val duration: Duration,
     override val name: String,
-    val type: ActivityType?,
+    val type: ActivityType,
     val address: Address,
     val coordinates: Coordinates,
     val mapLink: String?,

src/main/kotlin/cz/cvut/fit/steuejan/travel/data/database/activity/ActivityDto.kt

@@ -50,7 +50,7 @@ data class ActivityDto(
         tripId = tripId,
         duration = duration,
         name = name,
-        type = type,
+        type = type ?: ActivityType.OTHER,
         address = address,
         coordinates = coordinates,
         mapLink = mapLink,

src/main/kotlin/cz/cvut/fit/steuejan/travel/data/model/ActivityType.kt

@@ -2,7 +2,7 @@ package cz.cvut.fit.steuejan.travel.data.model
 
 @Suppress("unused") // used in DB
 enum class ActivityType {
-    HIKING, CYCLING, SKIING, RUNNING, KAYAK, SWIMMING, CLIMBING, CROSS_COUNTRY;
+    HIKING, CYCLING, SKIING, RUNNING, KAYAK, SWIMMING, CLIMBING, CROSS_COUNTRY, OTHER;
 
     companion object {
         const val MAX_LENGTH = 13