Merge pull request #1 from unblu/feature/lower-level-api-for-outbound-requests

Feature/lower level api for outbound requests

Author: rosecky

build.gradle

@@ -16,6 +16,7 @@ java {
 }
 
 repositories {
+    mavenLocal()
     mavenCentral()
 }
 
@@ -26,8 +27,13 @@ wrapper {
 
 dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-webflux'
-    implementation 'com.unblu.middleware:unblu-middleware-lib:1.5.5'
+    implementation 'com.unblu.middleware:unblu-middleware-lib:1.7.0'
     implementation 'com.unblu.openapi:jersey3-client-v4:8.24.0'
     implementation 'org.projectlombok:lombok:1.18.34'
     annotationProcessor 'org.projectlombok:lombok:1.18.34'
+
+    // Logging
+    implementation 'ch.qos.logback.contrib:logback-json-classic:0.1.5'
+    implementation 'ch.qos.logback.contrib:logback-jackson:0.1.5'
+    implementation 'net.logstash.logback:logstash-logback-encoder:7.3'
 }

src/main/java/com/unblu/middleware/test/TestMiddlewareService.java

@@ -2,6 +2,7 @@
 
 import com.unblu.middleware.bots.annotation.UnbluBots;
 import com.unblu.middleware.bots.service.DialogBotService;
+import com.unblu.middleware.common.entity.ContextSpec;
 import com.unblu.middleware.webhooks.annotation.UnbluWebhooks;
 import com.unblu.middleware.webhooks.service.WebhookHandlerService;
 import com.unblu.webapi.jersey.v4.api.BotsApi;
@@ -34,20 +35,24 @@ public class TestMiddlewareService implements ApplicationRunner {
     @Override
     public void run(ApplicationArguments args) {
         // accept every onboarding offer
-        dialogBotService.acceptOnboardingOfferIf(_o -> Mono.just(true));
+        dialogBotService.acceptOnboardingOfferIf(_o -> Mono.just(true)
+                        .doOnNext(_r -> log.info("Accepting as usual")));
 
         // greet the user when a dialog is opened
         dialogBotService.onDialogOpen(r ->
-                Mono.fromRunnable(() -> sendMessage(r.getDialogToken(), "Hello, I am a bot!")));
+                        Mono.fromRunnable(() -> sendMessage(r.getDialogToken(), "Hello, I am a bot!")));
 
         // echo every message back to the user
         dialogBotService.onDialogMessage(r ->
-                Mono.fromRunnable(() -> echoIfSentByVisitor(r)));
+                        Mono.fromRunnable(() -> echoIfSentByVisitor(r)));
 
         // log every message sent anywhere using a webhook handler
         webhookHandlerService.onWebhook(eventName("conversation.new_message"), ConversationNewMessageEvent.class,
                 e -> Mono.fromRunnable(() -> log.info("Message received: {}", e.getConversationMessage().getFallbackText())),
-                canIgnoreOrder());
+                canIgnoreOrder(),
+                ContextSpec.of(
+                        "conversationId", it -> it.getConversationMessage().getConversationId()
+                ));
     }
 
     private void echoIfSentByVisitor(BotDialogMessageRequest r) {
@@ -58,6 +63,7 @@ private void echoIfSentByVisitor(BotDialogMessageRequest r) {
 
     private void sendMessage(String dialogToken, String text) {
         try {
+            log.info("Sending message: {}", text);
             botsApi.botsSendDialogMessage(new BotDialogPostMessage()
                     .dialogToken(dialogToken)
                     .messageData(new TextPostMessageData().text(text)));

src/main/resources/application.yaml

@@ -5,8 +5,9 @@ unblu:
   middleware:
     url: ${MIDDLEWARE_URL}
     name: Test middleware
-  bot:
+  outbound-requests:
     secret: ${BOT_SECRET}
+  bot:
     onboardingFilter: VISITORS
     person:
       firstName: Test

src/main/resources/logback-spring.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder class="net.logstash.logback.encoder.LoggingEventCompositeJsonEncoder">
+            <providers>
+                <pattern>
+                    <pattern>{"message": "%message %ex","logger": "%logger","severity": "%level","level": "%level","deliveryId": "%X{deliveryId}","eventId": "%X{eventId}","conversationId": "%X{conversationId}","dialogToken": "%X{dialogToken}","thread": "%thread","@timestamp": "%date{\"yyyy-MM-dd'T'HH:mm:ss.SSS\", UTC}Z"}</pattern>
+                </pattern>
+            </providers>
+        </encoder>
+    </appender>
+
+    <include resource="org/springframework/boot/logging/logback/defaults.xml"/>
+    <include resource="org/springframework/boot/logging/logback/console-appender.xml"/>
+
+    <root level="info">
+        <springProfile name="production">
+            <appender-ref ref="STDOUT"/>
+        </springProfile>
+        <springProfile name="!production">
+            <appender-ref ref="CONSOLE"/>
+        </springProfile>
+    </root>
+</configuration>