From c3d0590ee48470837e1f6588047cb3252684ae10 Mon Sep 17 00:00:00 2001
From: Yinnii <y.yin94@outlook.de>
Date: Tue, 8 Aug 2023 22:39:25 +0200
Subject: [PATCH] update removebrackets, add eventmonitoring

---
 .../LMSChatbotService/LMSChatbotService.class | Bin 5770 -> 7103 bytes
 .../LMSChatbotService/LMSChatbotService.java  |  44 ++++++++++++++----
 2 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/lms-chatbot-service/output/main/i5/las2peer/services/LMSChatbotService/LMSChatbotService.class b/lms-chatbot-service/output/main/i5/las2peer/services/LMSChatbotService/LMSChatbotService.class
index 89bd65e90451fa7b2842519d525b4a14e229ddee..aa33ec32fb26682887c559ec5a01d78ccc85d9cc 100644
GIT binary patch
literal 7103
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

delta 2181
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
GOnwcbX7k<v

diff --git a/lms-chatbot-service/src/main/java/i5/las2peer/services/LMSChatbotService/LMSChatbotService.java b/lms-chatbot-service/src/main/java/i5/las2peer/services/LMSChatbotService/LMSChatbotService.java
index dee8892..5361c04 100644
--- a/lms-chatbot-service/src/main/java/i5/las2peer/services/LMSChatbotService/LMSChatbotService.java
+++ b/lms-chatbot-service/src/main/java/i5/las2peer/services/LMSChatbotService/LMSChatbotService.java
@@ -8,9 +8,12 @@
 import java.net.URLEncoder;
 import java.net.http.HttpClient;
 import java.net.http.HttpResponse;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import java.net.http.HttpRequest;
 
 import javax.mail.internet.ContentType;
+import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
@@ -54,9 +57,19 @@
 @ServicePath("/lms-chatbot")
 public class LMSChatbotService extends RESTService {
     public static String removeBrackets(String input) {
-        String clearString = input.replaceAll("[<>]", " ' ");
-        
-        return clearString;
+        String regex = "(?<=<)[^>\s]+(?=>)";
+        Pattern pattern = Pattern.compile(regex);
+        Matcher matcher = pattern.matcher(input);
+        int x;
+        int y;
+        StringBuilder result = new StringBuilder(input);
+        while (matcher.find()) {
+            x = matcher.start()-1;
+            result.setCharAt(x, '\'');
+            y = matcher.end();
+            result.setCharAt(y, '\'');
+        }
+        return result.toString();    
     }
 	/*
 	 * POST method to get the chat response from the LMS-Chatbot-Service
@@ -64,13 +77,15 @@ public static String removeBrackets(String input) {
 	@POST
 	@Path("/chat")
 	@Produces(MediaType.APPLICATION_JSON)
+    @Consumes(MediaType.APPLICATION_JSON)
 	@ApiResponses(
-			value = { @ApiResponse(
-					code = HttpURLConnection.HTTP_OK,
-					message = "Everything is okay!") })
+        value = { 
+                @ApiResponse(
+                    code = HttpURLConnection.HTTP_OK,
+                    message = "Everything is okay!")})
 	@ApiOperation(
-			value = "getInput",
-			notes = "Method that returns a phrase containing the received input.")
+			value = "Get the chat response from the LMS-Chatbot-Service",
+			notes = "Returns the chat response from the LMS-Chatbot-Service")
 	public Response chat(String body) {
 		JSONParser p = new JSONParser(JSONParser.MODE_PERMISSIVE);
         JSONObject json = null;
@@ -78,9 +93,12 @@ public Response chat(String body) {
         JSONObject newEvent = new JSONObject();
         String message = null;
         String channel = null;
+        JSONObject monitorEvent61 = new JSONObject();
+        final long start = System.currentTimeMillis();
 
         try {
             json = (JSONObject) p.parse(body);
+            System.out.println(json.toJSONString());
             message = json.getAsString("msg");
             channel = json.getAsString("channel");
             chatResponse.put("channel", channel);
@@ -105,18 +123,24 @@ public Response chat(String body) {
                 System.out.print("Response from service: " + final_response);
                 // Update chatResponse with the result from the POST request
                 chatResponse.put("text", final_response);
-            } else {
+            } else if (responseCode == HttpURLConnection.HTTP_INTERNAL_ERROR) {
                 // Handle unsuccessful response
                 chatResponse.appendField("text", "An error has occurred.");
             }
 
+            monitorEvent61.put("Task", "Answer Generation");
+            monitorEvent61.put("Process time", System.currentTimeMillis() - start);
+            Context.get().monitorEvent(MonitoringEvent.SERVICE_CUSTOM_MESSAGE_61,monitorEvent61.toString());
+
         } catch (ParseException | IOException | InterruptedException e) {
             e.printStackTrace();
             chatResponse.appendField("text", "An error has occurred.");
+        } catch (Exception e) {
+            e.printStackTrace();
+            chatResponse.appendField("text", "An unknown error has occurred.");
         }
 
         return Response.ok().entity(chatResponse).build();
-
 	}
  
 }