Add RandomJokeDTO and update random getmapping to it. To not include ID

Author: bacongubbe

Dockerfile

@@ -1,5 +1,4 @@
 FROM openjdk
-VOLUME /tmp
 COPY build/libs/DeveloperJokesApp-0.0.1-SNAPSHOT.jar app.jar
 EXPOSE 8080
 

src/main/kotlin/com/salt/developerjokes/api/JokeController.kt

@@ -3,6 +3,7 @@ package com.salt.developerjokes.api
 import com.salt.developerjokes.api.model.jokes.IncomingJokeDTO
 import com.salt.developerjokes.api.model.jokes.JokeDTO
 import com.salt.developerjokes.api.model.jokes.JokeListDTO
+import com.salt.developerjokes.api.model.jokes.RandomJokeDTO
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.http.ResponseEntity
 import org.springframework.web.bind.annotation.*
@@ -21,7 +22,7 @@ class JokeController(@Autowired val service: JokeService) {
   }
 
   @GetMapping("/random")
-  fun getRandomJoke(@RequestParam language: String?): ResponseEntity<JokeDTO> {
+  fun getRandomJoke(@RequestParam language: String?): ResponseEntity<RandomJokeDTO> {
     if (language == null || language == "") {
       return ResponseEntity.ok(service.getRandomJoke())
     }

src/main/kotlin/com/salt/developerjokes/api/JokeService.kt

@@ -1,9 +1,6 @@
 package com.salt.developerjokes.api
 
-import com.salt.developerjokes.api.model.jokes.IncomingJokeDTO
-import com.salt.developerjokes.api.model.jokes.Joke
-import com.salt.developerjokes.api.model.jokes.JokeDTO
-import com.salt.developerjokes.api.model.jokes.JokeListDTO
+import com.salt.developerjokes.api.model.jokes.*
 import com.salt.developerjokes.api.repository.JokeRepoDAO
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.http.HttpStatusCode
@@ -12,12 +9,12 @@ import org.springframework.web.server.ResponseStatusException
 
 @Service
 class JokeService(@Autowired private val repo: JokeRepoDAO) {
-  fun getRandomJoke(): JokeDTO = repo.getRandomJoke()?.toDTO() ?: throw ResponseStatusException(
+  fun getRandomJoke(): RandomJokeDTO = repo.getRandomJoke()?.toRandomDTO() ?: throw ResponseStatusException(
     HttpStatusCode.valueOf(404),
     "No Jokes in the database"
   )
 
-  fun getRandomJoke(language: String): JokeDTO = repo.getRandomJoke(language)?.toDTO() ?: throw ResponseStatusException(
+  fun getRandomJoke(language: String): RandomJokeDTO = repo.getRandomJoke(language)?.toRandomDTO() ?: throw ResponseStatusException(
     HttpStatusCode.valueOf(404),
     "No Jokes for that language"
   )

src/main/kotlin/com/salt/developerjokes/api/model/jokes/Joke.kt

@@ -17,6 +17,7 @@ class Joke(
   constructor(oldJoke: Joke, newJoke: IncomingJokeDTO) : this(newJoke.text, oldJoke.id, newJoke.language)
 
   fun toDTO(): JokeDTO = JokeDTO(this.text, this.id.toString())
+  fun toRandomDTO() : RandomJokeDTO = RandomJokeDTO(this.text)
   override fun equals(other: Any?): Boolean {
     if (this === other) return true
     if (javaClass != other?.javaClass) return false

src/main/kotlin/com/salt/developerjokes/api/model/jokes/RandomJokeDTO.kt

@@ -0,0 +1,3 @@
+package com.salt.developerjokes.api.model.jokes
+
+data class RandomJokeDTO(val text : String)