Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HIPP-1857: Fallback to ZonedDateTime parser when the default one fails #73

Merged
merged 2 commits into from
Jan 27, 2025
Merged

HIPP-1857: Fallback to ZonedDateTime parser when the default one fails #73

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c0335d7
HIPP-1857: Fallback to ZonedDateTime parser when the default one fails
victorarbuesmallada Jan 24, 2025
2e16882
HIPP-1857: Address PR comments
victorarbuesmallada Jan 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/uk/gov/hmrc/integrationcatalogue/models/JsonFormatters.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ object JsonFormatters extends DateTimeFormatters {
}

private def parseDate(input: String): Option[Instant] =
scala.util.control.Exception.nonFatalCatch[Instant].opt(Instant.from(ZonedDateTime.parse(input).toInstant)) orElse
scala.util.control.Exception.nonFatalCatch[Instant].opt(ZonedDateTime.parse(input).toInstant) orElse
scala.util.control.Exception.nonFatalCatch[Instant].opt(Instant.from(dateAndOptionalTimeFormatter.parse(input)))
}

Expand Down
6 changes: 4 additions & 2 deletions app/uk/gov/hmrc/integrationcatalogue/parser/oas/adapters/OASExtensionsAdapter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ import cats.implicits.*
import io.swagger.v3.oas.models.info.Info
import uk.gov.hmrc.integrationcatalogue.config.AppConfig
import uk.gov.hmrc.integrationcatalogue.models.ApiStatus
import uk.gov.hmrc.integrationcatalogue.models.ApiStatus._
import uk.gov.hmrc.integrationcatalogue.models.ApiStatus.*
import uk.gov.hmrc.integrationcatalogue.models.common.ApiType
import uk.gov.hmrc.integrationcatalogue.models.JsonFormatters.dateAndOptionalTimeFormatter

import java.time.Instant
import java.time.{Instant, ZonedDateTime}
import java.util
import scala.jdk.CollectionConverters.*
import scala.reflect.runtime.universe.*
Expand Down Expand Up @@ -124,6 +124,8 @@ trait OASExtensionsAdapter extends ExtensionKeys {
case Some(x: String) =>
Try[Instant] {
Instant.from(dateAndOptionalTimeFormatter.parse(x))
} orElse Try {
ZonedDateTime.parse(x).toInstant
} match {
case Success(instant) => Validated.valid(instant)
case Failure(_) => "Reviewed date is not a valid date".invalidNel[Instant]
Expand Down