tests: fetch requests test

push-protocol · Jul 17, 2023 · c2b23f5 · c2b23f5
1 parent 69d47a1
commit c2b23f5
Show file tree

Hide file tree

Showing 2 changed files with 61 additions and 4 deletions.
diff --git a/Sources/Chat/Send.swift b/Sources/Chat/Send.swift
@@ -199,6 +199,7 @@ extension PushChat {
       try await ConversationHash(conversationId: receiverAddress, account: senderAddress) == nil
 
     if isConversationFirst {
+      print("sending intenting")
       return try await PushChat.sendIntent(chatOptions)
     } else {
       // send regular message
@@ -237,9 +238,11 @@ extension PushChat {
     var shouldEncrypt = true
 
     // else create the user frist and send unencrypted intent message
-    if anotherUser == nil || anotherUser?.publicKey == nil {
-      let _ = try await PushUser.createUserEmpty(
-        userAddress: sendOptions.receiverAddress, env: sendOptions.env)
+    if anotherUser?.publicKey == nil || anotherUser?.publicKey == "" {
+      if anotherUser == nil {
+        let _ = try await PushUser.createUserEmpty(
+          userAddress: sendOptions.receiverAddress, env: sendOptions.env)
+      }
 
       shouldEncrypt = false
     }

diff --git a/Tests/Chat/P2P/GetChatsTests.swift b/Tests/Chat/P2P/GetChatsTests.swift
@@ -48,7 +48,7 @@ class GetChatsTests: XCTestCase {
     }
   }
 
-  func testGetChatRequests() async throws {
+  func testGetChatRequestsForEmptyUser() async throws {
 
     // send intent
     let reqAddress = generateRandomEthereumAddress()
@@ -71,4 +71,58 @@ class GetChatsTests: XCTestCase {
     XCTAssertEqual(userReqs[0].msg!.messageContent, messageToSen1)
   }
 
+  func testGetChatRequestsForNonExistingUser() async throws {
+
+    // send intent
+    let reqAddress = generateRandomEthereumAddress()
+    let messageToSen1 = "Hello user --- Intent \(reqAddress)"
+
+    let _ = try await Push.PushChat.send(
+      PushChat.SendOptions(
+        messageContent: messageToSen1,
+        messageType: "Text",
+        receiverAddress: reqAddress,
+        account: UserAddress,
+        pgpPrivateKey: UserPrivateKey
+      ))
+
+    let userReqs = try await PushChat.requests(
+      options: PushChat.RequestOptionsType(account: reqAddress, pgpPrivateKey: "", toDecrypt: false)
+    )
+
+    XCTAssertEqual(userReqs[0].msg!.messageContent, messageToSen1)
+  }
+
+  func testGetChatRequestsForExistingUser() async throws {
+
+    let userPk1 = getRandomAccount()
+    let _ = try await PushUser.create(
+      options: PushUser.CreateUserOptions(
+        env: ENV.STAGING,
+        signer: SignerPrivateKey(
+          privateKey: userPk1
+        ),
+        progressHook: nil
+      ))
+
+    // send intent
+    let reqAddress = generateRandomEthereumAddress()
+    let messageToSen1 = "Hello user --- Intent \(reqAddress)"
+
+    let _ = try await Push.PushChat.send(
+      PushChat.SendOptions(
+        messageContent: messageToSen1,
+        messageType: "Text",
+        receiverAddress: reqAddress,
+        account: UserAddress,
+        pgpPrivateKey: UserPrivateKey
+      ))
+
+    let userReqs = try await PushChat.requests(
+      options: PushChat.RequestOptionsType(account: reqAddress, pgpPrivateKey: UserPrivateKey, toDecrypt: true)
+    )
+
+    XCTAssertEqual(userReqs[0].msg!.messageContent, messageToSen1)
+  }
+
 }