feat: additional fields for SendMessageDto

Onlineberatung · Nov 4, 2022 · d710d58 · d710d58
1 parent 52d2235
commit d710d58
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 2 deletions.
diff --git a/services/rocketchat.yaml b/services/rocketchat.yaml
@@ -170,4 +170,30 @@ components:
         attachments:
           type: array
           items:
-            $ref: '#/components/schemas/Attachment'
+            $ref: '#/components/schemas/Attachment'
+        file:
+          type: object
+          properties:
+            _id:
+              type: string
+              example: pw6oyrjBStWwMdeMv
+            name:
+              type: string
+              example: example.txt
+            type:
+              type: string
+              example: text/plain
+        files:
+          type: array
+          items:
+            type: object
+            properties:
+              _id:
+                type: string
+                example: pw6oyrjBStWwMdeMv
+              name:
+                type: string
+                example: example.txt
+              type:
+                type: string
+                example: text/plain
diff --git a/src/main/java/de/caritas/cob/uploadservice/api/facade/UploadFacade.java b/src/main/java/de/caritas/cob/uploadservice/api/facade/UploadFacade.java
@@ -148,7 +148,7 @@ private void sanitizeAndEncryptParametersAndUploadToRocketChatRoom(
 
     log.debug("Upload Response: {}", uploadResponse);
 
-    if (doAttachmentE2e || true) {
+    if (doAttachmentE2e) {
       // TEMP DEV TryCatch TODO: REMOVE
       try {
         if (rocketChatService.deleteMessage(rocketChatCredentials,
@@ -161,6 +161,8 @@ private void sanitizeAndEncryptParametersAndUploadToRocketChatRoom(
               .alias(uploadResponse.getMessage().getAlias())
               .org(uploadResponse.getMessage().getOrg())
               .t("e2e")
+              .file(uploadResponse.getMessage().getFile())
+              .files(uploadResponse.getMessage().getFiles())
               .attachments(uploadResponse.getMessage().getAttachments())
               .build();
           SendMessageResponseDTO postResponse = rocketChatService.sendGroupMessage(