Commit 4e80e14e authored by Nikolaos Kyriakoulis's avatar Nikolaos Kyriakoulis
Browse files

Use new version of metrics model

parent 95baeb32

src/main/java/org/etsi/osl/tmf/metrics/api/MetricsApiController.java

+8 −9
Original line number Original line Diff line number Diff line
@@ -12,7 +12,6 @@ import org.springframework.stereotype.Controller; 




import java.time.OffsetDateTime;

import java.time.OffsetDateTime;

import java.time.temporal.ChronoUnit;

import java.time.temporal.ChronoUnit;

import java.util.HashMap;

import java.util.LinkedHashMap;

import java.util.LinkedHashMap;

import java.util.List;

import java.util.List;

import java.util.Map;

import java.util.Map;
@@ -69,13 +68,13 @@ public class MetricsApiController implements MetricsApi { 
            }

            }





            // Convert to model list

            // Convert to model list

            List<GroupByItem> groupByDayList = fullDayMap.entrySet().stream()

            List<ServiceOrdersGroupByDayItem> groupByDayList = fullDayMap.entrySet().stream()

                    .map(entry -> new GroupByItem(entry.getKey(), entry.getValue()))

                    .map(entry -> new ServiceOrdersGroupByDayItem(entry.getKey(), entry.getValue()))

                    .toList();

                    .toList();





            GroupByDayAggregations aggregations = new GroupByDayAggregations(groupByDayList);

            ServiceOrdersGroupByDayAggregations aggregations = new ServiceOrdersGroupByDayAggregations(groupByDayList);

            int total = fullDayMap.values().stream().mapToInt(Integer::intValue).sum();

            int total = fullDayMap.values().stream().mapToInt(Integer::intValue).sum();

            ServiceOrdersDay wrapper = new ServiceOrdersDay(total, aggregations);

            ServiceOrdersGroupByDayParent wrapper = new ServiceOrdersGroupByDayParent(total, aggregations);

            ServiceOrdersGroupByDay response = new ServiceOrdersGroupByDay(wrapper);

            ServiceOrdersGroupByDay response = new ServiceOrdersGroupByDay(wrapper);





            return new ResponseEntity<>(response, HttpStatus.OK);

            return new ResponseEntity<>(response, HttpStatus.OK);
@@ -103,14 +102,14 @@ public class MetricsApiController implements MetricsApi { 
            });

            });





            // Create aggregation items

            // Create aggregation items

            List<GroupByItem> groupByStateList = fullStateMap.entrySet().stream()

            List<ServiceOrdersGroupByStateItem> groupByStateList = fullStateMap.entrySet().stream()

                    .map(entry -> new GroupByItem(entry.getKey(), entry.getValue()))

                    .map(entry -> new ServiceOrdersGroupByStateItem(ServiceOrderStateType.valueOf(entry.getKey()), entry.getValue()))

                    .toList();

                    .toList();





            // Build response structure using models

            // Build response structure using models

            GroupByStateAggregations aggregations = new GroupByStateAggregations(groupByStateList);

            ServiceOrdersGroupByStateAggregations aggregations = new ServiceOrdersGroupByStateAggregations(groupByStateList);

            int total = fullStateMap.values().stream().mapToInt(Integer::intValue).sum();

            int total = fullStateMap.values().stream().mapToInt(Integer::intValue).sum();

            ServiceOrders services = new ServiceOrders(total, aggregations);

            ServiceOrdersGroupByStateParent services = new ServiceOrdersGroupByStateParent(total, aggregations);

            ServiceOrdersGroupByState response = new ServiceOrdersGroupByState(services);

            ServiceOrdersGroupByState response = new ServiceOrdersGroupByState(services);





            return new ResponseEntity<>(response, HttpStatus.OK);

            return new ResponseEntity<>(response, HttpStatus.OK);