Skip to content

Commit

Permalink
Update PetStoreAssistantBot.java
Browse files Browse the repository at this point in the history
  • Loading branch information
chtrembl committed Jan 3, 2024
1 parent 2f32af1 commit 98fb929
Showing 1 changed file with 8 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,15 @@

package com.chtrembl.petstoreassistant;

import java.lang.reflect.Field;
import java.util.List;
import java.util.concurrent.CompletableFuture;

import javax.servlet.http.HttpServletRequest;

import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Primary;
import org.springframework.stereotype.Component;
import org.springframework.web.context.request.RequestAttributes;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;

import com.chtrembl.petstoreassistant.model.AzurePetStoreSessionInfo;
import com.chtrembl.petstoreassistant.model.DPResponse;
Expand Down Expand Up @@ -123,7 +117,7 @@ protected CompletableFuture<Void> onMessageActivity(TurnContext turnContext) {
}
else
{
dpResponse.setDpResponseText("Without a session id I can't update your shopping cart.");
dpResponse.setDpResponseText("...");
}
break;
case VIEW_SHOPPING_CART:
Expand All @@ -132,7 +126,7 @@ protected CompletableFuture<Void> onMessageActivity(TurnContext turnContext) {
}
else
{
dpResponse.setDpResponseText("Without a session id I can't retrieve your shopping cart.");
dpResponse.setDpResponseText("...");
}
break;
case PLACE_ORDER:
Expand All @@ -141,7 +135,7 @@ protected CompletableFuture<Void> onMessageActivity(TurnContext turnContext) {
}
else
{
dpResponse.setDpResponseText("Without a session id I can't place your order.");
dpResponse.setDpResponseText("...");
}
break;
case SEARCH_FOR_DOG_FOOD:
Expand All @@ -158,8 +152,13 @@ protected CompletableFuture<Void> onMessageActivity(TurnContext turnContext) {
break;
}

// only respond to the user if the user sent something (seems to be a bug where
// initial messages are sent without a prompt while page loads)
if (dpResponse.getDpResponseText() != null && dpResponse.getDpResponseText().length() > 0) {
return turnContext.sendActivity(
MessageFactory.text(dpResponse.getDpResponseText())).thenApply(sendResult -> null);
}
return null;
}

@Override
Expand Down

0 comments on commit 98fb929

Please sign in to comment.