Merge branch 'feat/backend-reports' into 'main'

feat: change incoming query JSON to only include query ID, ML and cached parameters

See merge request !5

entityv2/queryStruct.go

@@ -9,17 +9,8 @@ package entityv2
 IncomingQueryJSON describes the query coming into the service in JSON format
 */
 type IncomingQueryJSON struct {
-	SaveStateID string        `json:"saveStateId"`
-	Limit       int           `json:"limit"`
-	Return      []string      `json:"return"`
-	Query       []QueryStruct `json:"query"`
-	Logic       interface{}   `json:"logic"`
-	// Entities        []QueryEntityStruct   `json:"entities"`
-	// Relations       []QueryRelationStruct `json:"relations"`
-	// GroupBys        []QueryGroupByStruct  `json:"groupBys"`
-	MachineLearning []QueryMLStruct `json:"machineLearning"`
-	// Modifiers []QueryModifierStruct
-	// Prefix    string
+	QueryID string `json:"queryID"`
+	MachineLearning []QueryMLStruct `json:"ml"`
 	Cached bool `json:"cached"`
 }
 
@@ -27,8 +18,8 @@ type IncomingQueryJSON struct {
 QueryMLStruct holds info for machinelearning
 */
 type QueryMLStruct struct {
-	Type       string
-	Parameters []string
+	Type       string `json:"type"`
+	Parameters []string `json:"parameters"`
 }
 
 type QueryStruct struct {