update again

Author: aracho1

common/src/main/scala/models/Registration.scala

@@ -1,6 +1,5 @@
  package models
 
-import org.slf4j.LoggerFactory
 import play.api.libs.json._
 
 case class Registration(
@@ -12,24 +11,23 @@ case class Registration(
 )
 
 object Registration {
-  private val logger = LoggerFactory.getLogger(classOf[Registration])
-
   implicit val registrationJF: Format[Registration] = {
     val base = Json.format[Registration]
     Format(
       Reads { json =>
-        (json \ "topics").asOpt[JsArray].foreach { arr =>
-          val invalid = arr.value.flatMap { v =>
+        val invalid = (json \ "topics").asOpt[JsArray].toSeq.flatMap { arr =>
+          arr.value.flatMap { v =>
             if (v.validate[Topic].isError) {
               val topicType = (v \ "type").asOpt[String].getOrElse("unknown")
               val topicName = (v \ "name").asOpt[String].getOrElse("unknown")
-              Some(s"""$topicType is not a valid topic type (topic name="$topicName")""")
+              Some(s"""Topic type="$topicType" (topic name="$topicName")""")
             } else None
           }
-          if (invalid.nonEmpty)
-            logger.warn(s"Bad request: ${invalid.mkString(", ")}")
         }
-        base.reads(json)
+        if (invalid.nonEmpty)
+          JsError(s"$InvalidTopicMarker: ${invalid.mkString(", ")}")
+        else
+          base.reads(json)
       },
       base
     )

registration/app/registration/CustomErrorHandler.scala

@@ -14,9 +14,11 @@ class CustomErrorHandler(env: Environment, config: Configuration, sourceMapper:
   private val logger: Logger = LoggerFactory.getLogger(this.getClass)
   override def onBadRequest(request: RequestHeader, message: String): Future[Result] = {
     val debugInfo = request.headers.get("User-Agent")
-    if (!message.startsWith("Json validation error")) {
-      logger.error(s"Bad request due to $message. User agent = $debugInfo")
-    }
+    val logMessage = "INVALID_TOPICS: (.+)\\)\\)\\)".r
+      .findFirstMatchIn(message)
+      .map(m => s"Bad request due to invalid topic types. ${m.group(1)}")
+      .getOrElse(s"Bad request due to $message")
+    logger.error(s"$logMessage. User agent = $debugInfo")
     Future.successful(BadRequest("Bad request"))
   }
 }