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

Added support for multi custom fields #67

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Added support for multi custom fields #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,5 @@ tmp
__pycache__/
*.py[cod]
*$py.class

sbt-launch.jar
39 changes: 33 additions & 6 deletions app/org/elastic4play/models/CustomAttributeFormat.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,44 @@ class CustomAttributeFormat extends AttributeFormat[JsValue]("custom") {
case _ ⇒ false
}

private def objectFieldsIsValid(v: JsValue) = v match {
private def objectFieldsIsValid(v: JsValue): Boolean = v match {
case JsObject(fields) ⇒ fields.forall(fieldIsValid)
case _ ⇒ false
}

private def fieldIsValid(f: (String, JsValue)): Boolean = f match {
case ("number", _: JsNumber | JsNull) ⇒ true
case ("string", _: JsString | JsNull) ⇒ true
case ("date", JsString(d)) ⇒ DateAttributeFormat.parse(d).isDefined
case ("date", JsNull) ⇒ true
case ("date", _: JsNumber | JsNull) ⇒ true
case ("number", _: JsNumber | JsNull) ⇒ true
case ("number", arr: JsArray) ⇒ arr.validate[IndexedSeq[JsNumber]] match {
case success: JsSuccess[IndexedSeq[JsNumber]] ⇒ true
case failure: JsError ⇒ arr.value.forall(elem ⇒ elem.validate[JsNumber] match {
case success: JsSuccess[JsNumber] ⇒ true
case failure: JsError ⇒ if (elem == JsNull) true else false
})
}

case ("string", _: JsString | JsNull) ⇒ true
case ("string", arr: JsArray) ⇒ arr.validate[IndexedSeq[JsString]] match {
case success: JsSuccess[IndexedSeq[JsString]] ⇒ true
case failure: JsError ⇒ arr.value.forall(elem ⇒ elem.validate[JsString] match {
case success: JsSuccess[JsString] ⇒ true
case failure: JsError ⇒ if (elem == JsNull) true else false
})
}

case ("date", JsString(d)) ⇒ DateAttributeFormat.parse(d).isDefined
case ("date", JsNull) ⇒ true
case ("date", _: JsNumber | JsNull) ⇒ true
case ("date", arr: JsArray) ⇒ arr.validate[IndexedSeq[JsString]] match {
case success: JsSuccess[IndexedSeq[JsString]] ⇒ success.get.map(elem ⇒ elem.value).forall(value ⇒ DateAttributeFormat.parse(value).isDefined)
case failure: JsError ⇒ arr.validate[IndexedSeq[JsNumber]] match {
case success: JsSuccess[IndexedSeq[JsNumber]] ⇒ true
case failure: JsError ⇒ arr.value.forall(elem ⇒ elem.validate[JsNumber] match {
case success: JsSuccess[JsNumber] ⇒ true
case failure: JsError ⇒ if (elem == JsNull) true else false
})
}
}

case ("boolean", _: JsBoolean | JsNull) ⇒ true
case ("order", _: JsNumber | JsNull) ⇒ true
case _ ⇒ false
Expand Down