Merge pull request #226 from rwth-acis/releases/1.7.0

Releases/1.7.0
rwth-acis · Oct 10, 2023 · 04f592b · 04f592b
2 parents 88cceab + fe27119
commit 04f592b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,7 +1,7 @@
 core.version=1.3.1
 service.name=i5.las2peer.services.socialBotManagerService
 service.class=SocialBotManagerService
-service.version=1.7.0
+service.version=.2.1.0
 java.version=17
 
 las2peer_user1.name=alice

diff --git a/...r/src/main/java/i5/las2peer/services/socialBotManagerService/SocialBotManagerService.java b/...r/src/main/java/i5/las2peer/services/socialBotManagerService/SocialBotManagerService.java
@@ -1343,7 +1343,7 @@ public void performIntentTrigger(BotConfiguration botConfig, BotAgent botAgent,
 			if (botFunction.getActionType().equals(ActionType.SERVICE)) {
 				functionPath = botFunction.getFunctionPath();
 			} else if (botFunction.getActionType().equals(ActionType.OPENAPI)) {
-				functionPath = botFunction.getFunctionPath();
+				functionPath = botFunction.getFunctionPath();				
 			}
 			JSONObject body = new JSONObject();
 			HashMap<String, ServiceFunctionAttribute> attlist = new HashMap<String, ServiceFunctionAttribute>();
@@ -1520,8 +1520,9 @@ public void checkTriggerBot(BotConfiguration botConfig, JSONObject body, BotAgen
 
 						String functionPath = "";
 						// add path if the triggered function is a service function
-						if (triggeredFunction.getActionType().equals(ActionType.SERVICE))
+						if (triggeredFunction.getActionType().equals(ActionType.SERVICE) || triggeredFunction.getActionType().equals(ActionType.OPENAPI)){
 							functionPath = triggeredFunction.getFunctionPath();
+						}
 						JSONObject triggeredBody = new JSONObject();
 						HashMap<String, ServiceFunctionAttribute> attlist = new HashMap<String, ServiceFunctionAttribute>();
 						for (ServiceFunction bsf : bot.getBotServiceFunctions().values()) {
@@ -2073,6 +2074,10 @@ private void performTrigger(BotConfiguration botConfig, ServiceFunction sf, BotA
 								JSONObject triggerAttributes = new JSONObject();
 								triggeredBody.put("attributes", triggerAttributes);
 
+								//Set the endpoint to the base url for the SBFManager
+								if (sf.getActionType().equals(ActionType.OPENAPI)){
+									client.setConnectorEndpoint(webconnectorUrl);
+								}
 
 								try {
 									ClientResponse result = client.sendRequest("POST",

diff --git a/...-manager/src/main/java/i5/las2peer/services/socialBotManagerService/parser/BotParser.java b/...-manager/src/main/java/i5/las2peer/services/socialBotManagerService/parser/BotParser.java
@@ -201,6 +201,8 @@ public void parseNodesAndEdges(BotConfiguration config, HashMap<String, BotAgent
 						ServiceFunctionAttribute sfaChild = sfaList.get(target);
 						sfaParent.addChildAttribute(sfaChild);
 						//sfaChild.setParent(sfaParent);
+						//System.out.println("PARENT ATTRIBUTE");
+						//System.out.println(sfaParent);
 					}
 					// Incoming Message has...
 				} else if (incomingMessages.get(source) != null) {
@@ -811,6 +813,7 @@ private JSONArray swaggerHelperFunction(Bot b) {
 			if (b.getServiceInformation().get(s.getServiceName()) != null && s.getFunctionName() != null) {
 				addServiceInformation(s, b.getServiceInformation().get(s.getServiceName()));
 			}
+
 
 			if (s.getOnStart().containsKey(b.getId())){
 				MiniClient client = new MiniClient();