Skip to content

Commit

Permalink
#1828 Accept case template without tasks
Browse files Browse the repository at this point in the history
  • Loading branch information
To-om committed Mar 11, 2021
1 parent cc933e0 commit d211849
Showing 1 changed file with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -457,8 +457,8 @@ class Input @Inject() (configuration: Configuration, dbFind: DBFind, dbGet: DBGe
.map { json =>
for {
metaData <- json.validate[MetaData]
tasksJson <- (json \ "tasks").validate[Seq[JsValue]]
} yield (metaData, tasksJson)
tasksJson <- (json \ "tasks").validateOpt[Seq[JsValue]]
} yield (metaData, tasksJson.getOrElse(Nil))
}
.mapConcat {
case JsSuccess(x, _) => List(x)
Expand All @@ -480,7 +480,7 @@ class Input @Inject() (configuration: Configuration, dbFind: DBFind, dbGet: DBGe
dbGet("caseTemplate", caseTemplateId)
.map { json =>
val metaData = json.as[MetaData]
val tasks = (json \ "tasks").as(Reads.seq(caseTemplateTaskReads(metaData)))
val tasks = (json \ "tasks").asOpt(Reads.seq(caseTemplateTaskReads(metaData))).getOrElse(Nil)
Source(tasks.to[immutable.Iterable].map(t => Success(caseTemplateId -> t)))
}
.recover {
Expand Down

0 comments on commit d211849

Please sign in to comment.