fixed ANY and prefix

Author: adubovikov

data/service/search.go

@@ -1158,29 +1158,52 @@ func uniqueHepTable(hepSlice []model.HepTable) []model.HepTable {
 	}
 }
 
-// this method create new user in the database
-// it doesn't check internally whether all the validation are applied or not
 func (ss *SearchService) GetTransactionData(table string, fieldKey string, dataWhere []interface{}, timeFrom,
 	timeTo time.Time, nodes []string, userGroup string, likeSearch bool, whitelist []string) ([]model.HepTable, error) {
 
 	searchData := []model.HepTable{}
-	query := "create_date between ? AND ? "
 
-	query += fmt.Sprintf("AND %s %s ANY(ARRAY[?])", fieldKey, heputils.GetSQLEqualityOperator(likeSearch))
+	// Start with base query conditions
+	baseQuery := "create_date between ? AND ?"
+	params := []interface{}{
+		timeFrom.Format(time.RFC3339),
+		timeTo.Format(time.RFC3339),
+	}
+
+	// Handle the ANY condition differently - we'll construct it based on length of dataWhere
+	anyPlaceholders := make([]string, len(dataWhere))
+	for i := range anyPlaceholders {
+		anyPlaceholders[i] = "?"
+	}
+
+	anyQueryPart := fmt.Sprintf("AND %s %s ANY(ARRAY[%s])",
+		fieldKey,
+		heputils.GetSQLEqualityOperator(likeSearch),
+		strings.Join(anyPlaceholders, ","))
+
+	query := baseQuery + " " + anyQueryPart
+	params = append(params, dataWhere...)
 
+	logger.Debug("GetTransactionData: ", table, fieldKey, dataWhere, timeFrom, timeTo, nodes, userGroup, likeSearch, whitelist)
 	logger.Debug("ISOLATEGROUP ", config.Setting.MAIN_SETTINGS.IsolateGroup)
 	logger.Debug("USERGROUP ", userGroup)
 
+	// Add isolation group condition if needed
 	if config.Setting.MAIN_SETTINGS.IsolateGroup != "" && config.Setting.MAIN_SETTINGS.IsolateGroup == userGroup {
 		query = query + " AND " + config.Setting.MAIN_SETTINGS.IsolateQuery
 	}
 
-	var whitelistParams []interface{}
+	// Add whitelist conditions
 	for _, ip := range whitelist {
-		query = query + " AND (protocol_header->>'srcIp' != ? AND protocol_header->>'dstIp' != ? ) "
-		whitelistParams = append(whitelistParams, ip, ip)
+		query = query + " AND (protocol_header->>'srcIp' != ? AND protocol_header->>'dstIp' != ?) "
+		params = append(params, ip, ip)
 	}
 
+	// Debug the final query and parameters
+	logger.Debug("Final query: ", query)
+	logger.Debug("Params count: ", len(params))
+	logger.Debug("Params: ", params)
+
 	for session := range ss.Session {
 		/* if node doesnt exists - continue */
 		if !heputils.ElementExists(nodes, session) {
@@ -1190,15 +1213,15 @@ func (ss *SearchService) GetTransactionData(table string, fieldKey string, dataW
 		searchTmp := []model.HepTable{}
 		if err := ss.Session[session].Debug().
 			Table(table).
-			Where(query, append([]interface{}{timeFrom.Format(time.RFC3339), timeTo.Format(time.RFC3339)}, append(dataWhere, whitelistParams...)...)...).
+			Where(query, params...).
 			Find(&searchTmp).Error; err != nil {
 			logger.Error("GetTransactionData: We have got error: ", err)
+			return nil, err
 		}
 
 		logger.Debug("GetTransactionData: Len: ", len(searchTmp))
 
 		if len(searchTmp) > 0 {
-
 			profileName := strings.TrimPrefix(table, "hep_proto_")
 
 			for val := range searchTmp {
@@ -1210,7 +1233,6 @@ func (ss *SearchService) GetTransactionData(table string, fieldKey string, dataW
 		}
 	}
 
-	//response, _ := json.Marshal(searchData)
 	return searchData, nil
 }
 

main.go

@@ -810,8 +810,8 @@ func configureAsHTTPServer() {
 				if strings.HasSuffix(c.Request().RequestURI, ".js") {
 
 					//Prefix
-					if *appFlags.APIPrefix != "" && strings.HasPrefix(c.Request().RequestURI, *appFlags.APIPrefix) {
-						c.Request().RequestURI = strings.TrimPrefix(c.Request().RequestURI, *appFlags.APIPrefix)
+					if config.Setting.MAIN_SETTINGS.APIPrefix != "" && strings.HasPrefix(c.Request().RequestURI, config.Setting.MAIN_SETTINGS.APIPrefix) {
+						c.Request().RequestURI = strings.TrimPrefix(c.Request().RequestURI, config.Setting.MAIN_SETTINGS.APIPrefix)
 					}
 
 					if heputils.FileExists(config.Setting.MAIN_SETTINGS.RootPath + c.Request().RequestURI + ".gz") {
@@ -1734,7 +1734,7 @@ func applyDBConfigParamToConfig(user *string, password *string, dbname *string,
 
 func registerGetRedirect(e *echo.Echo, path string) {
 
-	prefix := *appFlags.APIPrefix
+	prefix := config.Setting.MAIN_SETTINGS.APIPrefix
 
 	if viper.IsSet("http_settings.api_prefix") {
 		prefix = viper.GetString("http_settings.api_prefix")

version.go

@@ -1,7 +1,7 @@
 package main
 
 // VERSION
-var VERSION_APPLICATION = "1.5.7"
+var VERSION_APPLICATION = "1.5.8"
 
 // NAME
 var NAME_APPLICATION = "homer-app"