ATL-8: Adding accesstrends regexp update

Author: hernaldourbina

src/main/java/org/ohdsi/webapi/statistic/controller/StatisticController.java

@@ -41,7 +41,7 @@ public enum ResponseFormat {
     }};
 
     private static final List<String[]> ACCESS_TRENDS_CSV_RESULT_HEADER = new ArrayList<String[]>() {{
-        add(new String[]{"Date", "Endpoint"});
+        add(new String[]{"Date", "Endpoint", "UserID"});
     }};        
 
     public StatisticController(StatisticService service) {
@@ -107,7 +107,7 @@ private Response prepareAccessTrendsResponse(List<AccessTrendDto> trends, String
         List<String[]> data = trends.stream()
                 .flatMap(trend ->
                         new ArrayList<String[]>() {{
-                            add(new String[]{trend.getExecutionDate().toString(), trend.getEndpointName()});
+                            add(new String[]{trend.getExecutionDate().toString(), trend.getEndpointName(), trend.getUserID()});
                         }}.stream()
                 )
                 .collect(Collectors.toList());

src/main/java/org/ohdsi/webapi/statistic/service/StatisticService.java

@@ -21,7 +21,11 @@
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.time.ZoneId;
-import java.util.*;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -72,9 +76,8 @@ public class StatisticService {
             Pattern.compile("^.*(\\d{4}-\\d{2}-\\d{2})T\\d{2}:\\d{2}:\\d{2}.*POST\\s/WebAPI/prediction/\\d+/generation/(.+)\\s-\\s.*status::String,startDate::Date,endDate::Date.*$");
 
     private static final String ENDPOINT_REGEXP =
-            "^.*(\\d{4}-\\d{2}-\\d{2})T\\d{2}:\\d{2}:\\d{2}.*-\\s({METHOD_PLACEHOLDER}\\s.*{ENDPOINT_PLACEHOLDER})\\s-.*$";
+            "^.*(\\d{4}-\\d{2}-\\d{2})T(\\d{2}:\\d{2}:\\d{2}).*-\\s([\\w.-]+)\\s.*-\\s({METHOD_PLACEHOLDER}\\s.*{ENDPOINT_PLACEHOLDER})\\s-.*$";
 
-    private static final Pattern PLP_USER_REGEXP = Pattern.compile("- ([a-zA-Z0-9_]+) \\d+:\\d+:\\d+:\\d+:\\d+:\\d+:\\d+:\\d+");
     private static final String COHORT_GENERATION_NAME = "Cohort Generation";
 
     private static final String CHARACTERIZATION_GENERATION_NAME = "Characterization Generation";
@@ -87,8 +90,6 @@ public class StatisticService {
 
     private static final String PLP_GENERATION_NAME = "Prediction Generation";
 
-    private static final String PLP_USERNAME = "Username";
-
     private static final Map<String, Pattern> patternMap = new HashMap<>();
 
     static {
@@ -98,7 +99,6 @@ public class StatisticService {
         patternMap.put(IR_GENERATION_NAME, IR_GENERATION_REGEXP);
         patternMap.put(PLE_GENERATION_NAME, PLE_GENERATION_REGEXP);
         patternMap.put(PLP_GENERATION_NAME, PLP_GENERATION_REGEXP);
-        patternMap.put(PLP_USERNAME, PLP_USER_REGEXP);
     }
 
     public StatisticService() {
@@ -147,21 +147,22 @@ private List<AccessTrendDto> extractAccessTrends(Path path, List<EndpointDto> en
         List<Pattern> patterns = endpoints.stream()
                 .map(endpointPair -> {
                     String method = endpointPair.getMethod();
+
                     String endpoint = endpointPair.getUrlPattern().replaceAll("\\{\\}", ".*");
                     String regexpStr = ENDPOINT_REGEXP.replace("{METHOD_PLACEHOLDER}", method);
                     regexpStr = regexpStr.replace("{ENDPOINT_PLACEHOLDER}", endpoint);
 
                     return Pattern.compile(regexpStr);
                 })
+
                 .collect(Collectors.toList());
         try (Stream<String> stream = Files.lines(path)) {
             return stream
                     .map(str -> {
-                            Matcher userMatcher = PLP_USER_REGEXP.matcher(str);
                             return patterns.stream()
                                     .map(pattern -> pattern.matcher(str))
                                     .filter(Matcher::matches)
-                                    .map(matcher -> new AccessTrendDto(matcher.group(2), LocalDate.parse(matcher.group(1)), showUserInformation && userMatcher.find() ? userMatcher.group(1) : null))
+                                    .map(matcher -> new AccessTrendDto(matcher.group(4), LocalDate.parse(matcher.group(1)), showUserInformation ? matcher.group(3) : null))
                                     .findFirst();
                         })
                     .filter(Optional::isPresent)