Return NDLADate for originalDate

Author: gunnarvelle

common/src/main/scala/no/ndla/common/model/NDLADate.scala

@@ -72,6 +72,7 @@ object NDLADate {
       "yyyy-MM-dd'T'HH:mm:ss",
       "yyyy-MM-dd'T'HH:mm:ss.SSS",
       "yyyy-MM-dd'T'HH:mm:ss.SSSSSSSSS",
+      "yyyy:MM:dd HH:mm:ss",
     ).map(DateTimeFormatter.ofPattern)
 
   def now(): NDLADate = NDLADate.fromDate(ZonedDateTime.now(localZone))

image-api/src/main/scala/no/ndla/imageapi/model/api/ImageFileDTO.scala

@@ -10,6 +10,7 @@ package no.ndla.imageapi.model.api
 
 import io.circe.generic.semiauto.{deriveDecoder, deriveEncoder}
 import io.circe.{Decoder, Encoder}
+import no.ndla.common.model.NDLADate
 import no.ndla.imageapi.model.domain.ImageContentType
 import no.ndla.language.Language.LanguageDocString
 import sttp.tapir.Schema.annotations.description
@@ -31,7 +32,7 @@ case class ImageFileDTO(
     @description(LanguageDocString)
     language: String,
     @description("Date image was taken, if available")
-    originalDate: Option[String],
+    originalDate: Option[NDLADate],
 )
 
 object ImageFileDTO {

image-api/src/main/scala/no/ndla/imageapi/service/ConverterService.scala

@@ -11,7 +11,7 @@ package no.ndla.imageapi.service
 import com.typesafe.scalalogging.StrictLogging
 import io.lemonlabs.uri.typesafe.dsl.*
 import io.lemonlabs.uri.UrlPath
-import no.ndla.common.model.{api as commonApi, domain as commonDomain}
+import no.ndla.common.model.{NDLADate, api as commonApi, domain as commonDomain}
 import no.ndla.imageapi.Props
 import no.ndla.imageapi.model.domain.{
   ImageFileData,
@@ -134,7 +134,12 @@ class ConverterService(using clock: Clock, props: Props) extends StrictLogging {
       .map { case domain.ImageDimensions(width, height) =>
         api.ImageDimensionsDTO(width, height)
       }
-    val variants = image.variants.map(asApiImageVariant)
+    val variants     = image.variants.map(asApiImageVariant)
+    val originalDate = image
+      .exifData
+      .get(props.ExifDateTimeOriginal)
+      .filter(s => s != "")
+      .map(s => NDLADate.fromString(s).get)
 
     api.ImageFileDTO(
       fileName = image.fileName,
@@ -144,7 +149,7 @@ class ConverterService(using clock: Clock, props: Props) extends StrictLogging {
       dimensions = dimensions,
       variants = variants,
       language = image.language,
-      originalDate = image.exifData.get(props.ExifDateTimeOriginal),
+      originalDate = originalDate,
     )
   }