Merge pull request #54 from daithihearn/alexa-model-refactor

refactor: poorly named model objects

.version

@@ -1 +1 @@
-1.18.0
+1.18.1

src/main/kotlin/ie/daithi/electricityprices/model/alexa/AlexaResponse.kt

@@ -1,6 +1,13 @@
 package ie.daithi.electricityprices.model.alexa
 
+import ie.daithi.electricityprices.utils.alexaSkillFormatter
+import java.time.LocalDateTime
+import java.util.UUID
+
 data class AlexaResponse(
-    val version: String = "1.0",
-    val response: AlexaResponseBody
+    val uid: String = UUID.randomUUID().toString(),
+    val updateDate: String = LocalDateTime.now().format(alexaSkillFormatter),
+    val titleText: String,
+    val mainText: String,
+    val redirectionUrl: String = "https://elec.daithiapp.com/"
 )

src/main/kotlin/ie/daithi/electricityprices/model/alexa/AlexaSkillResponse.kt

@@ -1,13 +1,6 @@
 package ie.daithi.electricityprices.model.alexa
 
-import ie.daithi.electricityprices.utils.alexaSkillFormatter
-import java.time.LocalDateTime
-import java.util.UUID
-
 data class AlexaSkillResponse(
-    val uid: String = UUID.randomUUID().toString(),
-    val updateDate: String = LocalDateTime.now().format(alexaSkillFormatter),
-    val titleText: String,
-    val mainText: String,
-    val redirectionUrl: String = "https://elec.daithiapp.com/"
+    val version: String = "1.0",
+    val response: AlexaResponseBody
 )

src/main/kotlin/ie/daithi/electricityprices/utils/AlexaUtils.kt

@@ -1,14 +1,14 @@
 package ie.daithi.electricityprices.utils
 
-import ie.daithi.electricityprices.model.alexa.AlexaSkillResponse
+import ie.daithi.electricityprices.model.alexa.AlexaResponse
 import java.time.LocalDateTime
 
 fun wrapInSkillResponse(
     message: String,
     title: String,
     dateTime: LocalDateTime = LocalDateTime.now(),
-): AlexaSkillResponse {
-    return AlexaSkillResponse(
+): AlexaResponse {
+    return AlexaResponse(
         updateDate = dateTime.format(alexaSkillFormatter),
         titleText = title,
         mainText = message

src/main/kotlin/ie/daithi/electricityprices/web/controller/AlexaSkillController.kt

@@ -39,7 +39,7 @@ class AlexaSkillController(
         ApiResponse(responseCode = "200", description = "Request successful")
     )
     @ResponseBody
-    fun getFullFeed(@RequestParam(value = "lang", required = false) lang: String?): AlexaSkillResponse {
+    fun getFullFeed(@RequestParam(value = "lang", required = false) lang: String?): AlexaResponse {
         val resolvedLocale = lang?.let { Locale.forLanguageTag(it) } ?: Locale.forLanguageTag("es")
         return wrapInSkillResponse(
             message = alexSkillService.getFullFeed(resolvedLocale),
@@ -57,7 +57,7 @@ class AlexaSkillController(
         ApiResponse(responseCode = "200", description = "Request successful")
     )
     @ResponseBody
-    fun processAlexaRequest(@RequestBody rawBody: String, request: HttpServletRequest): AlexaResponse {
+    fun processAlexaRequest(@RequestBody rawBody: String, request: HttpServletRequest): AlexaSkillResponse {
         // Map the rawBody to an AlexaRequest object using the jackson mapper
         val body = mapper.readValue(rawBody, AlexaRequest::class.java)
 
@@ -97,6 +97,6 @@ class AlexaSkillController(
         }
         val outputSpeech = OutputSpeech(text = response.first)
         val responseBody = AlexaResponseBody(outputSpeech = outputSpeech, shouldEndSession = response.second)
-        return AlexaResponse(response = responseBody)
+        return AlexaSkillResponse(response = responseBody)
     }
 }