Removed newlines and tabs from query translation result

integration-testing/config.json

@@ -27,10 +27,16 @@
   ],
   "assertions": [
     {
-      "type": "consumes",
+      "type": "exact",
       "consumerid": "consumer1",
       "id": "query result returned",
       "data": "{'type':'query_result','values':{'edges':[{'_from':'airports/JFK','_id':'flights/286552','_key':'286552','_rev':'_cLqg0be--U','_to':'airports/SFO','attributes':{'ArrTime':2332,'ArrTimeUTC':'2008-01-16T07:32:00.000Z','Day':15,'DayOfWeek':2,'DepTime':2006,'DepTimeUTC':'2008-01-16T01:06:00.000Z','Distance':2586,'FlightNum':649,'Month':1,'TailNum':'N597JB','UniqueCarrier':'B6','Year':2008}},{'_from':'airports/JFK','_id':'flights/286394','_key':'286394','_rev':'_cLqg0bG--s','_to':'airports/SFO','attributes':{'ArrTime':2330,'ArrTimeUTC':'2008-01-16T07:30:00.000Z','Day':15,'DayOfWeek':2,'DepTime':1958,'DepTimeUTC':'2008-01-16T00:58:00.000Z','Distance':2586,'FlightNum':19,'Month':1,'TailNum':'N537UA','UniqueCarrier':'UA','Year':2008}},{'_from':'airports/JFK','_id':'flights/283386','_key':'283386','_rev':'_cLqg0Ty--g','_to':'airports/SFO','attributes':{'ArrTime':2215,'ArrTimeUTC':'2008-01-16T06:15:00.000Z','Day':15,'DayOfWeek':2,'DepTime':1849,'DepTimeUTC':'2008-01-15T23:49:00.000Z','Distance':2586,'FlightNum':73,'Month':1,'TailNum':'N3759','UniqueCarrier':'DL','Year':2008}},{'_from':'airports/JFK','_id':'flights/282498','_key':'282498','_rev':'_cLqg0Rm--Y','_to':'airports/SFO','attributes':{'ArrTime':2358,'ArrTimeUTC':'2008-01-16T07:58:00.000Z','Day':15,'DayOfWeek':2,'DepTime':2052,'DepTimeUTC':'2008-01-16T01:52:00.000Z','Distance':2586,'FlightNum':9,'Month':1,'TailNum':'N554UA','UniqueCarrier':'UA','Year':2008}},{'_from':'airports/JFK','_id':'flights/282321','_key':'282321','_rev':'_cLqg0RK--s','_to':'airports/SFO','attributes':{'ArrTime':2132,'ArrTimeUTC':'2008-01-16T05:32:00.000Z','Day':15,'DayOfWeek':2,'DepTime':1825,'DepTimeUTC':'2008-01-15T23:25:00.000Z','Distance':2586,'FlightNum':647,'Month':1,'TailNum':'N651JB','UniqueCarrier':'B6','Year':2008}},{'_from':'airports/JFK','_id':'flights/281151','_key':'281151','_rev':'_cLqg0Oe--M','_to':'airports/SFO','attributes':{'ArrTime':2108,'ArrTimeUTC':'2008-01-16T05:08:00.000Z','Day':15,'DayOfWeek':2,'DepTime':1746,'DepTimeUTC':'2008-01-15T22:46:00.000Z','Distance':2586,'FlightNum':17,'Month':1,'TailNum':'N560UA','UniqueCarrier':'UA','Year':2008}},{'_from':'airports/JFK','_id':'flights/281077','_key':'281077','_rev':'_cLqg0OS--S','_to':'airports/SFO','attributes':{'ArrTime':2119,'ArrTimeUTC':'2008-01-16T05:19:00.000Z','Day':15,'DayOfWeek':2,'DepTime':1742,'DepTimeUTC':'2008-01-15T22:42:00.000Z','Distance':2586,'FlightNum':177,'Month':1,'TailNum':'N321AA','UniqueCarrier':'AA','Year':2008}},{'_from':'airports/JFK','_id':'flights/279990','_key':'279990','_rev':'_cLqg0Lq--m','_to':'airports/SFO','attributes':{'ArrTime':1423,'ArrTimeUTC':'2008-01-15T22:23:00.000Z','Day':15,'DayOfWeek':2,'DepTime':1114,'DepTimeUTC':'2008-01-15T16:14:00.000Z','Distance':2586,'FlightNum':11,'Month':1,'TailNum':'N555UA','UniqueCarrier':'UA','Year':2008}},{'_from':'airports/JFK','_id':'flights/279206','_key':'279206','_rev':'_cLqg0Jy--U','_to':'airports/SFO','attributes':{'ArrTime':1406,'ArrTimeUTC':'2008-01-15T22:06:00.000Z','Day':15,'DayOfWeek':2,'DepTime':1054,'DepTimeUTC':'2008-01-15T15:54:00.000Z','Distance':2586,'FlightNum':15,'Month':1,'TailNum':'N356AA','UniqueCarrier':'AA','Year':2008}},{'_from':'airports/JFK','_id':'flights/278458','_key':'278458','_rev':'_cLqg0H6--s','_to':'airports/SFO','attributes':{'ArrTime':2003,'ArrTimeUTC':'2008-01-16T04:03:00.000Z','Day':15,'DayOfWeek':2,'DepTime':1624,'DepTimeUTC':'2008-01-15T21:24:00.000Z','Distance':2586,'FlightNum':151,'Month':1,'TailNum':'N3744D','UniqueCarrier':'DL','Year':2008}},{'_from':'airports/JFK','_id':'flights/276601','_key':'276601','_rev':'_cLqg0Dq--O','_to':'airports/SFO','attributes':{'ArrTime':1909,'ArrTimeUTC':'2008-01-16T03:09:00.000Z','Day':15,'DayOfWeek':2,'DepTime':1535,'DepTimeUTC':'2008-01-15T20:35:00.000Z','Distance':2586,'FlightNum':15,'Month':1,'TailNum':'N510UA','UniqueCarrier':'UA','Year':2008}},{'_from':'airports/JFK','_id':'flights/276139','_key':'276139','_rev':'_cLqg0Ci--i','_to':'airports/SFO','attributes':{'ArrTime':1815,'ArrTimeUTC':'2008-01-16T02:15:00.000Z','Day':15,'DayOfWeek':2,'DepTime':1524,'DepTimeUTC':'2008-01-15T20:24:00.000Z','Distance':2586,'FlightNum':85,'Month':1,'TailNum':'N373AA','UniqueCarrier':'AA','Year':2008}},{'_from':'airports/JFK','_id':'flights/273773','_key':'273773','_rev':'_cLqgz86--K','_to':'airports/SFO','attributes':{'ArrTime':1156,'ArrTimeUTC':'2008-01-15T19:56:00.000Z','Day':15,'DayOfWeek':2,'DepTime':840,'DepTimeUTC':'2008-01-15T13:40:00.000Z','Distance':2586,'FlightNum':2979,'Month':1,'TailNum':'N387AA','UniqueCarrier':'AA','Year':2008}},{'_from':'airports/JFK','_id':'flights/273538','_key':'273538','_rev':'_cLqgz8W--k','_to':'airports/SFO','attributes':{'ArrTime':1131,'ArrTimeUTC':'2008-01-15T19:31:00.000Z','Day':15,'DayOfWeek':2,'DepTime':831,'DepTimeUTC':'2008-01-15T13:31:00.000Z','Distance':2586,'FlightNum':893,'Month':1,'TailNum':'N505UA','UniqueCarrier':'UA','Year':2008}},{'_from':'airports/JFK','_id':'flights/272322','_key':'272322','_rev':'_cLqgz5q--g','_to':'airports/SFO','attributes':{'ArrTime':1118,'ArrTimeUTC':'2008-01-15T19:18:00.000Z','Day':15,'DayOfWeek':2,'DepTime':757,'DepTimeUTC':'2008-01-15T12:57:00.000Z','Distance':2586,'FlightNum':641,'Month':1,'TailNum':'N528JB','UniqueCarrier':'B6','Year':2008}},{'_from':'airports/JFK','_id':'flights/271860','_key':'271860','_rev':'_cLqgz4q--G','_to':'airports/SFO','attributes':{'ArrTime':1133,'ArrTimeUTC':'2008-01-15T19:33:00.000Z','Day':15,'DayOfWeek':2,'DepTime':743,'DepTimeUTC':'2008-01-15T12:43:00.000Z','Distance':2586,'FlightNum':877,'Month':1,'TailNum':'N502UA','UniqueCarrier':'UA','Year':2008}},{'_from':'airports/JFK','_id':'flights/270140','_key':'270140','_rev':'_cLqgz02--K','_to':'airports/SFO','attributes':{'ArrTime':1042,'ArrTimeUTC':'2008-01-15T18:42:00.000Z','Day':15,'DayOfWeek':2,'DepTime':650,'DepTimeUTC':'2008-01-15T11:50:00.000Z','Distance':2586,'FlightNum':59,'Month':1,'TailNum':'N399AA','UniqueCarrier':'AA','Year':2008}},{'_from':'airports/JFK','_id':'flights/269347','_key':'269347','_rev':'_cLqgzz---A','_to':'airports/SFO','attributes':{'ArrTime':913,'ArrTimeUTC':'2008-01-15T17:13:00.000Z','Day':15,'DayOfWeek':2,'DepTime':606,'DepTimeUTC':'2008-01-15T11:06:00.000Z','Distance':2586,'FlightNum':5,'Month':1,'TailNum':'N537UA','UniqueCarrier':'UA','Year':2008}}],'nodes':[{'_id':'airports/SFO','_key':'SFO','_rev':'_cLp3eL6-_G','attributes':{'city':'San Francisco','country':'USA','lat':37.61900194,'long':-122.3748433,'name':'San Francisco International','state':'CA','vip':true}},{'_id':'airports/JFK','_key':'JFK','_rev':'_cLp3eLO-_I','attributes':{'city':'New York','country':'USA','lat':40.63975111,'long':-73.77892556,'name':'John F Kennedy Intl','state':'NY','vip':true}}]}}" 
+    },
+    {
+      "type": "exact",
+      "consumerid": "consumer1",
+      "id": "query translation result returned",
+      "data": "{'type':'query_translation_result','values':'LET n0 = (FOR x IN airports FILTER x.city == \\\"New York\\\" RETURN x)LET r0 = (FOR x IN n0 FOR v, e, p IN 1..1 OUTBOUND x flights OPTIONS { uniqueEdges: \\\"path\\\" }FILTER v.city == \\\"San Francisco\\\" AND v.vip == true FILTER p.edges[*].Month ALL == 1 AND p.edges[*].Day ALL == 15 LIMIT 1000 RETURN DISTINCT p )LET nodes = first(RETURN UNION_DISTINCT(flatten(r0[**].vertices), [],[]))LET edges = first(RETURN UNION_DISTINCT(flatten(r0[**].edges), [],[]))RETURN {\\\"vertices\\\":nodes, \\\"edges\\\":edges }'}" 
     }
   ],
   "redisSet": {

internal/usecases/consume/handlemessage.go

@@ -5,6 +5,7 @@ import (
 	"query-service/internal/adapters/brokeradapter"
 	"query-service/pkg/errorhandler"
 	"query-service/pkg/logger"
+	"strings"
 )
 
 // HandleMessage gets called when a message is received
@@ -21,10 +22,15 @@ func (s *Service) HandleMessage(msg *brokeradapter.Message) {
 		errorhandler.LogError(err, "failed to parse incoming msg to query language") // TODO: send error message to client instead
 		return
 	}
+
+	// Remove newlines and tabs from string
+	queryNoNewlines := strings.ReplaceAll(*query, "\n", "")
+	queryNoTabs := strings.ReplaceAll(queryNoNewlines, "\t", "")
+
 	// Send the resulting query back to the client
 	msgmap := make(map[string]interface{})
 	msgmap["type"] = "query_translation_result"
-	msgmap["values"] = *query
+	msgmap["values"] = queryNoTabs
 	msgbyte, err := json.Marshal(msgmap)
 	if err != nil {
 		errorhandler.LogError(err, "Marshalling query_translation_result went wrong!") // TODO: send error message to client instead