Commit 8fbbb428 authored by Nikolaos Kyriakoulis's avatar Nikolaos Kyriakoulis
Browse files

Use metrics models for API responses

parent 7fc6f2dd

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

+4 −2
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@ import io.swagger.v3.oas.annotations.responses.ApiResponses; 
import io.swagger.v3.oas.annotations.tags.Tag;

import jakarta.validation.Valid;

import org.etsi.osl.tmf.common.model.service.ServiceStateType;

import org.etsi.osl.tmf.metrics.ServicesGroupByState;

import org.etsi.osl.tmf.metrics.TotalServices;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;

import org.springframework.format.annotation.DateTimeFormat;
@@ -29,7 +31,7 @@ public interface MetricsApi { 
            @ApiResponse(responseCode = "500", description = "Internal Server Error")

    })

    @RequestMapping(value = "/metrics/totalServices", method = RequestMethod.GET, produces = "application/json;charset=utf-8")

    ResponseEntity<Map<String, Integer>> getTotalServices(

    ResponseEntity<TotalServices> getTotalServices(

            @Valid @RequestParam(value = "state", required = false) ServiceStateType state

    );
@@ -40,7 +42,7 @@ public interface MetricsApi { 
            @ApiResponse(responseCode = "500", description = "Internal Server Error")

    })

    @RequestMapping(value = "/metrics/servicesGroupByState", method = RequestMethod.GET, produces = "application/json;charset=utf-8")

    ResponseEntity<Map<String, Object>> getServicesGroupedByState(

    ResponseEntity<ServicesGroupByState> getServicesGroupedByState(

            @Valid @RequestParam(value = "starttime", required = true) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime starttime,

            @Valid @RequestParam(value = "endtime", required = true) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime endtime

    );

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

+12 −20
Original line number Diff line number Diff line 
package org.etsi.osl.tmf.metrics.api;



import org.etsi.osl.tmf.common.model.service.ServiceStateType;

import org.etsi.osl.tmf.metrics.*;

import org.etsi.osl.tmf.metrics.reposervices.MetricsRepoService;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;
@@ -27,11 +28,10 @@ public class MetricsApiController implements MetricsApi { 
    }



    @Override

    public ResponseEntity<Map<String, Integer>> getTotalServices(ServiceStateType state) {

    public ResponseEntity<TotalServices> getTotalServices(ServiceStateType state) {

        try {

            int totalServices = serviceMetricsRepoService.countTotalServices(state);

            Map<String, Integer> response = new HashMap<>();

            response.put("totalServices", totalServices);

            TotalServices response = new TotalServices(totalServices);

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

        } catch (Exception e) {

            log.error("Couldn't retrieve total services. ", e);
@@ -40,7 +40,7 @@ public class MetricsApiController implements MetricsApi { 
    }



    @Override

    public ResponseEntity<Map<String, Object>> getServicesGroupedByState(OffsetDateTime starttime, OffsetDateTime endtime) {

    public ResponseEntity<ServicesGroupByState> getServicesGroupedByState(OffsetDateTime starttime, OffsetDateTime endtime) {

        try {

            Map<String, Integer> servicesByState = serviceMetricsRepoService.getServicesGroupedByState(starttime, endtime);
@@ -55,25 +55,17 @@ public class MetricsApiController implements MetricsApi { 
                fullStateMap.put(key.toUpperCase(), value); // normalize case just in case

            });



            // Build groupByState list

            List<Map<String, Object>> groupByStateList = fullStateMap.entrySet().stream()

                    .map(entry -> {

                        Map<String, Object> map = new HashMap<>();

                        map.put("key", entry.getKey());

                        map.put("count", entry.getValue());

                        return map;

                    })

            // Create aggregation items

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

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

                    .toList();



            // Build response structure using metrics models

            GroupByStateAggregations aggregations = new GroupByStateAggregations(groupByStateList);

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

            Services services = new Services(total, aggregations);

            ServicesGroupByState response = new ServicesGroupByState(services);



            // Wrap in response structure

            Map<String, Object> aggregations = Map.of("groupByState", groupByStateList);

            Map<String, Object> services = Map.of(

                    "total", fullStateMap.values().stream().mapToInt(Integer::intValue).sum(),

                    "aggregations", aggregations

            );



            Map<String, Object> response = Map.of("services", services);

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



        } catch (Exception e) {