#1708 use dedicated reject messages (#1711)

tanjjj · web-flow · commit db3c5c3af7b0 · 2025-09-08T11:00:45.000+01:00
* #1708 re-arrange * #1708 fix reject message * #1708 update reject message * #1708 update reject message * #1708 use reject msg * #1708 re-arrange
diff --git a/vuu/src/main/scala/org/finos/vuu/core/CoreServerApiHandler.scala b/vuu/src/main/scala/org/finos/vuu/core/CoreServerApiHandler.scala
@@ -143,7 +143,7 @@ class CoreServerApiHandler(val viewPortContainer: ViewPortContainer,
         vsMsg(EnableViewPortSuccess(msg.viewPortId))(ctx)
       case Failure(e) =>
         logger.warn("Failed to enable viewport", e)
-        vsMsg(RemoveViewPortReject(msg.viewPortId))(ctx)
+        vsMsg(EnableViewPortReject(msg.viewPortId))(ctx)
     }
   }
 
@@ -165,7 +165,7 @@ class CoreServerApiHandler(val viewPortContainer: ViewPortContainer,
         vsMsg(FreezeViewPortSuccess(msg.viewPortId))(ctx)
       case Failure(e) =>
         logger.warn("Failed to freeze viewport", e)
-        vsMsg(FreezeViewPortReject(msg.viewPortId, e.toString))(ctx)
+        vsMsg(FreezeViewPortReject(msg.viewPortId, e.getMessage))(ctx)
     }
   }
 
@@ -176,7 +176,7 @@ class CoreServerApiHandler(val viewPortContainer: ViewPortContainer,
         vsMsg(UnfreezeViewPortSuccess(msg.viewPortId))(ctx)
       case Failure(e) =>
         logger.warn("Failed to unfreeze viewport", e)
-        vsMsg(UnfreezeViewPortReject(msg.viewPortId, e.toString))(ctx)
+        vsMsg(UnfreezeViewPortReject(msg.viewPortId, e.getMessage))(ctx)
     }
   }
 
@@ -296,7 +296,7 @@ class CoreServerApiHandler(val viewPortContainer: ViewPortContainer,
           ChangeViewPortSuccess(newViewPort.id, viewport.getColumns.getColumns().map(_.name).toArray, sort, msg.groupBy, msg.filterSpec, msg.aggregations)))
 
       case None =>
-        Some(VsMsg(ctx.requestId, ctx.session.sessionId, ctx.token, ctx.session.user, ErrorResponse(s"Could not find vp ${msg.viewPortId} in session ${ctx.session}")))
+        Some(VsMsg(ctx.requestId, ctx.session.sessionId, ctx.token, ctx.session.user, ChangeViewPortReject(msg.viewPortId, s"Could not find vp ${msg.viewPortId} in session ${ctx.session}")))
     }
 
   }
diff --git a/vuu/src/main/scala/org/finos/vuu/net/json/CoreJsonSerializationMixin.scala b/vuu/src/main/scala/org/finos/vuu/net/json/CoreJsonSerializationMixin.scala
@@ -10,7 +10,11 @@ import org.finos.vuu.net._
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type")
 @JsonSubTypes(Array(
   new Type(value = classOf[AuthenticateRequest], name = "AUTH"),
+  new Type(value = classOf[AuthenticateSuccess], name = "AUTH_SUCCESS"),
+  new Type(value = classOf[AuthenticateFailure], name = "AUTH_FAIL"),
   new Type(value = classOf[CreateViewPortRequest], name = "CREATE_VP"),
+  new Type(value = classOf[CreateViewPortSuccess], name = "CREATE_VP_SUCCESS"),
+  new Type(value = classOf[CreateViewPortReject], name = "CREATE_VP_REJECT"),
   new Type(value = classOf[DisableViewPortRequest], name = "DISABLE_VP"),
   new Type(value = classOf[DisableViewPortSuccess], name = "DISABLE_VP_SUCCESS"),
   new Type(value = classOf[DisableViewPortReject], name = "DISABLE_VP_REJECT"),
@@ -26,15 +30,11 @@ import org.finos.vuu.net._
   new Type(value = classOf[RemoveViewPortRequest], name = "REMOVE_VP"),
   new Type(value = classOf[RemoveViewPortSuccess], name = "REMOVE_VP_SUCCESS"),
   new Type(value = classOf[RemoveViewPortReject], name = "REMOVE_VP_REJECT"),
-  new Type(value = classOf[CreateViewPortSuccess], name = "CREATE_VP_SUCCESS"),
-  new Type(value = classOf[CreateViewPortReject], name = "CREATE_VP_REJECT"),
   new Type(value = classOf[ChangeViewPortRange], name = "CHANGE_VP_RANGE"),
   new Type(value = classOf[ChangeViewPortRangeSuccess], name = "CHANGE_VP_RANGE_SUCCESS"),
   new Type(value = classOf[ChangeViewPortRequest], name = "CHANGE_VP"),
   new Type(value = classOf[ChangeViewPortSuccess], name = "CHANGE_VP_SUCCESS"),
   new Type(value = classOf[ChangeViewPortReject], name = "CHANGE_VP_REJECT"),
-  new Type(value = classOf[AuthenticateSuccess], name = "AUTH_SUCCESS"),
-  new Type(value = classOf[AuthenticateFailure], name = "AUTH_FAIL"),
   new Type(value = classOf[LoginRequest], name = "LOGIN"),
   new Type(value = classOf[LoginSuccess], name = "LOGIN_SUCCESS"),
   new Type(value = classOf[LoginFailure], name = "LOGIN_FAIL"),
diff --git a/vuu/src/test/scala/org/finos/vuu/wsapi/FreezeViewPortWSApiTest.scala b/vuu/src/test/scala/org/finos/vuu/wsapi/FreezeViewPortWSApiTest.scala
@@ -90,7 +90,7 @@ class FreezeViewPortWSApiTest extends WebSocketApiTestBase {
       val response = vuuClient.awaitForResponse(requestId)
       val responseBody = assertBodyIsInstanceOf[FreezeViewPortReject](response)
       responseBody.viewPortId shouldEqual fakeViewPortId
-      responseBody.errorMessage shouldEqual s"java.lang.Exception: Could not find viewport to freeze $fakeViewPortId"
+      responseBody.errorMessage shouldEqual s"Could not find viewport to freeze $fakeViewPortId"
     }
 
     Scenario("Unfreeze a view port that doesn't exist") {
@@ -103,7 +103,7 @@ class FreezeViewPortWSApiTest extends WebSocketApiTestBase {
 
       val responseBody = assertBodyIsInstanceOf[UnfreezeViewPortReject](response)
       responseBody.viewPortId shouldEqual fakeViewPortId
-      responseBody.errorMessage shouldEqual s"java.lang.Exception: Could not find viewport to unfreeze $fakeViewPortId"
+      responseBody.errorMessage shouldEqual s"Could not find viewport to unfreeze $fakeViewPortId"
     }
 
     Scenario("Freeze a view port that is already frozen") {
@@ -127,7 +127,7 @@ class FreezeViewPortWSApiTest extends WebSocketApiTestBase {
       val response2 = vuuClient.awaitForResponse(requestId2)
       val responseBody2 = assertBodyIsInstanceOf[FreezeViewPortReject](response2)
       responseBody2.viewPortId shouldEqual viewPortId
-      responseBody2.errorMessage shouldEqual s"java.lang.Exception: Could not freeze viewport $viewPortId because it's already frozen"
+      responseBody2.errorMessage shouldEqual s"Could not freeze viewport $viewPortId because it's already frozen"
     }
 
     Scenario("Unfreeze a view port that is not frozen") {
@@ -142,7 +142,7 @@ class FreezeViewPortWSApiTest extends WebSocketApiTestBase {
       val unfreezeVPResponse = vuuClient.awaitForResponse(requestId)
       val responseBody = assertBodyIsInstanceOf[UnfreezeViewPortReject](unfreezeVPResponse)
       responseBody.viewPortId shouldEqual viewPortId
-      responseBody.errorMessage shouldEqual s"java.lang.Exception: Could not unfreeze viewport $viewPortId because it's not frozen"
+      responseBody.errorMessage shouldEqual s"Could not unfreeze viewport $viewPortId because it's not frozen"
     }
 
     Scenario("Freeze a view port for a join table") {

Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ class CoreServerApiHandler(val viewPortContainer: ViewPortContainer,`
`143`	`143`	`vsMsg(EnableViewPortSuccess(msg.viewPortId))(ctx)`
`144`	`144`	`case Failure(e) =>`
`145`	`145`	`logger.warn("Failed to enable viewport", e)`
`146`		`- vsMsg(RemoveViewPortReject(msg.viewPortId))(ctx)`
	`146`	`+ vsMsg(EnableViewPortReject(msg.viewPortId))(ctx)`
`147`	`147`	`}`
`148`	`148`	`}`
`149`	`149`
`@@ -165,7 +165,7 @@ class CoreServerApiHandler(val viewPortContainer: ViewPortContainer,`
`165`	`165`	`vsMsg(FreezeViewPortSuccess(msg.viewPortId))(ctx)`
`166`	`166`	`case Failure(e) =>`
`167`	`167`	`logger.warn("Failed to freeze viewport", e)`
`168`		`- vsMsg(FreezeViewPortReject(msg.viewPortId, e.toString))(ctx)`
	`168`	`+ vsMsg(FreezeViewPortReject(msg.viewPortId, e.getMessage))(ctx)`
`169`	`169`	`}`
`170`	`170`	`}`
`171`	`171`
`@@ -176,7 +176,7 @@ class CoreServerApiHandler(val viewPortContainer: ViewPortContainer,`
`176`	`176`	`vsMsg(UnfreezeViewPortSuccess(msg.viewPortId))(ctx)`
`177`	`177`	`case Failure(e) =>`
`178`	`178`	`logger.warn("Failed to unfreeze viewport", e)`
`179`		`- vsMsg(UnfreezeViewPortReject(msg.viewPortId, e.toString))(ctx)`
	`179`	`+ vsMsg(UnfreezeViewPortReject(msg.viewPortId, e.getMessage))(ctx)`
`180`	`180`	`}`
`181`	`181`	`}`
`182`	`182`
`@@ -296,7 +296,7 @@ class CoreServerApiHandler(val viewPortContainer: ViewPortContainer,`
`296`	`296`	`ChangeViewPortSuccess(newViewPort.id, viewport.getColumns.getColumns().map(_.name).toArray, sort, msg.groupBy, msg.filterSpec, msg.aggregations)))`
`297`	`297`
`298`	`298`	`case None =>`
`299`		`- Some(VsMsg(ctx.requestId, ctx.session.sessionId, ctx.token, ctx.session.user, ErrorResponse(s"Could not find vp ${msg.viewPortId} in session ${ctx.session}")))`
	`299`	`+ Some(VsMsg(ctx.requestId, ctx.session.sessionId, ctx.token, ctx.session.user, ChangeViewPortReject(msg.viewPortId, s"Could not find vp ${msg.viewPortId} in session ${ctx.session}")))`
`300`	`300`	`}`
`301`	`301`
`302`	`302`	`}`