From 33718dd55dd263cb2efc1976537540f09aee3759 Mon Sep 17 00:00:00 2001
From: LeonFLK <51441505+LeonFLK@users.noreply.github.com>
Date: Fri, 7 Aug 2020 12:23:26 +0200
Subject: [PATCH] fix: destructure message before responding (#73)

fix: destructuring of message before responding
---
 src/messaging/mongodb-messaging.service.ts | 34 ++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/src/messaging/mongodb-messaging.service.ts b/src/messaging/mongodb-messaging.service.ts
index 68befd1..414ac57 100644
--- a/src/messaging/mongodb-messaging.service.ts
+++ b/src/messaging/mongodb-messaging.service.ts
@@ -20,13 +20,43 @@ export class MongoDbMessagingService implements MessagingService {
   public async findBySenderAddress(
     senderAddress: IEncryptedMessage['senderAddress']
   ): Promise<IEncryptedMessage[]> {
-    return await this.messageModel.find({ senderAddress }).exec()
+    return (await this.messageModel.find({ senderAddress }).exec()).map(
+      (singleDBMessage: MessageDB) => {
+        return {
+          message: singleDBMessage.message,
+          nonce: singleDBMessage.nonce,
+          createdAt: singleDBMessage.createdAt,
+          hash: singleDBMessage.hash,
+          signature: singleDBMessage.signature,
+          receiverAddress: singleDBMessage.receiverAddress,
+          senderAddress: singleDBMessage.senderAddress,
+          senderBoxPublicKey: singleDBMessage.senderBoxPublicKey,
+          messageId: singleDBMessage.messageId,
+          receivedAt: singleDBMessage.receivedAt,
+        } as IEncryptedMessage
+      }
+    ) as IEncryptedMessage[]
   }
 
   public async findByReceiverAddress(
     receiverAddress: IEncryptedMessage['receiverAddress']
   ): Promise<IEncryptedMessage[]> {
-    return await this.messageModel.find({ receiverAddress }).exec()
+    return (await this.messageModel.find({ receiverAddress }).exec()).map(
+      (singleDBMessage: MessageDB) => {
+        return {
+          message: singleDBMessage.message,
+          nonce: singleDBMessage.nonce,
+          createdAt: singleDBMessage.createdAt,
+          hash: singleDBMessage.hash,
+          signature: singleDBMessage.signature,
+          receiverAddress: singleDBMessage.receiverAddress,
+          senderAddress: singleDBMessage.senderAddress,
+          senderBoxPublicKey: singleDBMessage.senderBoxPublicKey,
+          messageId: singleDBMessage.messageId,
+          receivedAt: singleDBMessage.receivedAt,
+        } as IEncryptedMessage
+      }
+    ) as IEncryptedMessage[]
   }
 
   public async remove(