feat: refactor constants for log event data and update Elasticsearch query

Author: mjabascal10

user-auditor/src/main/java/com/utmstack/userauditor/service/elasticsearch/Constants.java

@@ -11,9 +11,7 @@ public final class Constants {
     // - Indices common fields
     // ----------------------------------------------------------------------------------
 
-    public static final String logxWineventlogEventDataTargetSidKeyword = "logx.wineventlog.event_data.TargetSid.keyword";
-    public static final String logxWineventlogEventDataTargetUserSidKeyword = "logx.wineventlog.event_data.TargetUserSid.keyword";
-    public static final String logxWineventlogEventDataMemberSidKeyword = "logx.wineventlog.event_data.MemberSid.keyword";
+    public static final String LOG_WINLOG_EVENT_DATA_TARGET_USER_SID_KEYWORD = "log.winlogEventDataTargetUserSid.keyword";
 
     /**
      * Environment variables

user-auditor/src/main/java/com/utmstack/userauditor/service/elasticsearch/ElasticsearchService.java

@@ -90,9 +90,7 @@ public <T> SearchResponse<T> searchBySid(String sid, String to, String from, Str
     private static BoolQuery.Builder getBuilder(String sid) {
         BoolQuery.Builder shouldList = new BoolQuery.Builder();
         shouldList.minimumShouldMatch("1");
-        shouldList.should(f -> f.matchPhrase(m -> m.field(Constants.logxWineventlogEventDataTargetSidKeyword).query(sid)));
-        shouldList.should(f -> f.matchPhrase(m -> m.field(Constants.logxWineventlogEventDataTargetUserSidKeyword).query(String.valueOf(sid))));
-        shouldList.should(f -> f.matchPhrase(m -> m.field(Constants.logxWineventlogEventDataMemberSidKeyword).query(String.valueOf(sid))));
+        shouldList.should(f -> f.matchPhrase(m -> m.field(Constants.LOG_WINLOG_EVENT_DATA_TARGET_USER_SID_KEYWORD).query(String.valueOf(sid))));
         return shouldList;
     }