BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix insertOrUpdate causing conflict when sending in batch

Browse Source
This commit is contained in:
Gustavo Trott 2024-10-23 21:57:03 -03:00
parent 392953f08e
commit 7d5e5eb75b
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/db/PresAnnotationDAO.scala
View File

@ -28,16 +28,17 @@ object PresAnnotationDAO {
annotation <- annotations
} yield {
DatabaseConnection.enqueue(
TableQuery[PresAnnotationDbTableDef].insertOrUpdate(
PresAnnotationDbModel(
annotationId = annotation.id,
pageId = annotation.wbId,
meetingId = meetingId,
userId = annotation.userId,
annotationInfo = JsonUtils.mapToJson(annotation.annotationInfo).compactPrint,
lastUpdatedAt = new java.sql.Timestamp(annotationUpdatedAt)
)
)
sqlu"""
WITH upsert AS (
UPDATE pres_annotation
SET "annotationInfo"=${JsonUtils.mapToJson(annotation.annotationInfo).compactPrint},
"lastUpdatedAt" = ${new java.sql.Timestamp(annotationUpdatedAt)}
WHERE "annotationId" = ${annotation.id}
RETURNING *)
INSERT INTO pres_annotation ("annotationId", "pageId", "meetingId", "userId", "annotationInfo", "lastUpdatedAt")
SELECT ${annotation.id}, ${annotation.wbId}, ${meetingId}, ${annotation.userId},
${JsonUtils.mapToJson(annotation.annotationInfo).compactPrint}, ${new java.sql.Timestamp(annotationUpdatedAt)}
WHERE NOT EXISTS (SELECT * FROM upsert)"""
)
}
}