fix(conversation): COCO-4649, foreign key usermessagesattachments (#886)

* fix(conversation): COCO-4649, foreign key usermessagesattachments

* Fix batches for messages attachements

Author: pb-jo

conversation/backend/src/main/java/org/entcore/conversation/service/impl/SqlConversationService.java

@@ -320,37 +320,42 @@ public void handle(Either<String, JsonObject> event) {
 				int userMessageValueCount = 0;
 				int userMessageAttachementCount = 0;
 
+				// Messages
+				//
 				// Optimisation de l'envois des messages: faire des requêtes unitaires est couteux pour postgresql notament
 				// au niveau de la gestion des locks et de son index. Les groupes en insert .. values est bcp plus efficace
 				for(Object toObj : ids){
-					if(toObj.equals(user.getUserId())) {
-						continue;
-					}
+					if(toObj.equals(user.getUserId())) continue;
+					
 					userMessageValueCount++;
 					insertUserMessageBuilder.append(String.format("('%s', '%s', %s ),", toObj, draftId, totalQuota));
-					if (userMessageValueCount > conversationBatchSize) {
-						userMessageValueCount = 0;
+					if (userMessageValueCount >= conversationBatchSize) {
 						builder.prepared(insertUserMessageBuilder.deleteCharAt(insertUserMessageBuilder.length()-1).toString(), new JsonArray());
 						insertUserMessageBuilder = new StringBuilder(insertUserMessage);
+						userMessageValueCount = 0;
 					}
 					if (threadId != null) {
 						builder.prepared(insertUserThread, new fr.wseduc.webutils.collections.JsonArray().add(toObj.toString()).add(threadId).add(1));
 					}
+				}
+				if (userMessageValueCount > 0) {
+					builder.prepared(insertUserMessageBuilder.deleteCharAt(insertUserMessageBuilder.length()-1).toString(), new JsonArray());
+				}
+
+				// Pièces jointes
+				for(Object toObj : ids){
+					if(toObj.equals(user.getUserId())) continue;
 
 					for(Object attachmentId : attachmentIds){
 						userMessageAttachementCount++;
 						insertUserAttachmentBuilder.append(String.format("('%s', '%s', '%s' ),", toObj, draftId, attachmentId));
-						if (userMessageAttachementCount > conversationBatchSize) {
-							userMessageAttachementCount = 0;
+						if (userMessageAttachementCount >= conversationBatchSize) {
 							builder.prepared(insertUserAttachmentBuilder.deleteCharAt(insertUserAttachmentBuilder.length()-1).toString(), new JsonArray());
 							insertUserAttachmentBuilder = new StringBuilder(insertUserAttachment);
+							userMessageAttachementCount = 0;
 						}
 					}
 				}
-
-				if (userMessageValueCount > 0) {
-					builder.prepared(insertUserMessageBuilder.deleteCharAt(insertUserMessageBuilder.length()-1).toString(), new JsonArray());
-				}
 				if (userMessageAttachementCount > 0) {
 					builder.prepared(insertUserAttachmentBuilder.deleteCharAt(insertUserAttachmentBuilder.length()-1).toString(), new JsonArray());
 				}