Update PetStoreAssistantBot.java

chtrembl · Jan 4, 2024 · 8a994ac · 8a994ac
1 parent a2e80da
commit 8a994ac
Showing 1 changed file with 7 additions and 24 deletions.
diff --git a/.../petstoreassistant/src/main/java/com/chtrembl/petstoreassistant/PetStoreAssistantBot.java b/.../petstoreassistant/src/main/java/com/chtrembl/petstoreassistant/PetStoreAssistantBot.java
@@ -83,10 +83,11 @@ protected CompletableFuture<Void> onMessageActivity(TurnContext turnContext) {
                 .getAzurePetStoreSessionInfo(text);
         if (azurePetStoreSessionInfo != null) {
             text = azurePetStoreSessionInfo.getNewText();
-            this.sessionCache.put(turnContext.getActivity().getRecipient().getId(), azurePetStoreSessionInfo);
+            //turnContext.getActivity().getId() is unique per browser over the broken recipient for some reason
+            this.sessionCache.put(turnContext.getActivity().getId(), azurePetStoreSessionInfo);
         }
         else{
-            azurePetStoreSessionInfo = this.sessionCache.get(turnContext.getActivity().getRecipient().getId());
+            azurePetStoreSessionInfo = this.sessionCache.get(turnContext.getActivity().getId());
         }
 
         if(text.isEmpty())
@@ -97,14 +98,14 @@ protected CompletableFuture<Void> onMessageActivity(TurnContext turnContext) {
         if(text.equals("..."))
         {
             return turnContext.sendActivity(
-            MessageFactory.text(WELCOME_MESSAGE+" "+turnContext.getActivity().getRecipient().getId())).thenApply(sendResult -> null);
+            MessageFactory.text(WELCOME_MESSAGE+" "+turnContext.getActivity().getId())).thenApply(sendResult -> null);
         }
 
          //DEBUG ONLY
         if (text.contains("session"))
         {      
             return turnContext.sendActivity(
-                MessageFactory.text("id:"+turnContext.getActivity().getRecipient().getId())).thenApply(sendResult -> null);
+                MessageFactory.text("id:"+turnContext.getActivity().getId())).thenApply(sendResult -> null);
             //return turnContext.sendActivity(
             //    MessageFactory.text("sender: "+turnContext.getActivity().getFrom())).thenApply(sendResult -> null);
             //Set<String> keys =  turnContext.getActivity().getRecipient().getProperties().keySet();
@@ -116,17 +117,6 @@ protected CompletableFuture<Void> onMessageActivity(TurnContext turnContext) {
             //    MessageFactory.text("recipient id:"+turnContext.getActivity().getRecipient().getId()+ " recipient keys: "+keystring)).thenApply(sendResult -> null);
         }
 
-        if (text.contains("session1"))
-        {      
-            Set<String> keys =  turnContext.getActivity().getRecipient().getProperties().keySet();
-            String keystring = "";
-            for(String key: keys){    
-                keystring += key+" ";
-            }
-            return turnContext.sendActivity(
-                MessageFactory.text("recipient id:"+turnContext.getActivity().getRecipient().getId()+ " recipient keys: "+keystring)).thenApply(sendResult -> null);
-        }
-
         if (text.contains("card")) {
             if(azurePetStoreSessionInfo != null && azurePetStoreSessionInfo.getNewText() != null)
             { 
@@ -234,19 +224,12 @@ protected CompletableFuture<Void> onMessageActivity(TurnContext turnContext) {
                 MessageFactory.text(dpResponse.getDpResponseText())).thenApply(sendResult -> null);
        }
 
+    // this method obly gets invoked once, regardless of browser/user, state isnt working right for some reason (DP related, not in issue with emulator)
     @Override
     protected CompletableFuture<Void> onMembersAdded(
             List<ChannelAccount> membersAdded,
             TurnContext turnContext) {
 
-        String message = "";
-        String id = turnContext.getActivity().getRecipient().getId();
-
-        if(this.sessionCache.get(id) == null)
-        {
-            this.sessionCache.put(id, null);
-            message = this.WELCOME_MESSAGE + " " + id;
-        }
          //   return membersAdded.stream()
          //   .filter(
          //           member -> !StringUtils
@@ -258,7 +241,7 @@ protected CompletableFuture<Void> onMembersAdded(
 
 
             return turnContext.sendActivity(
-                MessageFactory.text(message)).thenApply(sendResult -> null);
+                MessageFactory.text("")).thenApply(sendResult -> null);
         }
 
    }