Add new poll shape attributes

akka-bbb-apps/src/main/scala/org/bigbluebutton/core/db/PostgresProfile.scala

@@ -68,4 +68,4 @@ object JsonUtils {
     }
   }
 
-}
+}

akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/Polls.scala

@@ -253,13 +253,23 @@ object Polls {
 
   private def pollResultToWhiteboardShape(result: SimplePollResultOutVO): scala.collection.immutable.Map[String, Object] = {
     val shape = new scala.collection.mutable.HashMap[String, Object]()
-    shape += "numRespondents" -> Integer.valueOf(result.numRespondents)
-    shape += "numResponders" -> Integer.valueOf(result.numResponders)
-    shape += "questionType" -> result.questionType
-    shape += "questionText" -> result.questionText.getOrElse("")
+    val props = new scala.collection.mutable.HashMap[String, Object]()
+    val meta = new scala.collection.mutable.HashMap[String, Object]()
+
+    props += "answers" -> result.answers
+    props += "numRespondents" -> Integer.valueOf(result.numRespondents)
+    props += "numResponders" -> Integer.valueOf(result.numResponders)
+    props += "questionText" -> result.questionText.getOrElse("")
+    props += "questionType" -> result.questionType
+
+    shape += "typeName" -> "shape"
+    shape += "opacity" -> Integer.valueOf(1)
     shape += "id" -> s"shape:poll-result-${result.id}"
-    shape += "answers" -> result.answers
-    shape += "type" -> "geo"
+    shape += "meta" -> meta.toMap
+    shape += "type" -> "poll"
+
+    shape += "props" -> props.toMap
+
     shape.toMap
   }
 

akka-bbb-apps/src/main/scala/org/bigbluebutton/core/record/events/AddTldrawShapeWhiteboardRecordEvent.scala

@@ -38,7 +38,10 @@ class AddTldrawShapeWhiteboardRecordEvent extends AbstractWhiteboardRecordEvent
       case l: List[_] => listFormat[Any].write(l)
       case b: Boolean if b == true => JsTrue
       case b: Boolean if b == false => JsFalse
-      case _ => JsNull
+      case v: SimpleVoteOutVO => JsObject("id" -> JsNumber(v.id), "key" -> JsString(v.key), "numVotes" -> JsNumber(v.numVotes))
+      case arr: Array[_] => JsArray(arr.map(write).toVector)
+      case null => JsNull
+      case _ => throw new IllegalArgumentException(s"Unsupported type: ${x.getClass.getName}")
     }
 
     def read(value: JsValue) = {}