Merge pull request #8 from nimble-platform/staging

Pull Request for Release 14.0.0.
nimble-platform · Nov 28, 2019 · 7098bbf · 7098bbf
2 parents 7a9bbe7 + 56eddab
commit 7098bbf
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 2 deletions.
diff --git a/...ervice/src/main/java/eu/nimble/service/dataaggregation/clients/BusinessProcessClient.java b/...ervice/src/main/java/eu/nimble/service/dataaggregation/clients/BusinessProcessClient.java
@@ -55,14 +55,25 @@ Double getTradingVolumeByStatusForCompany(@RequestParam(value = "role") Role rol
     Double getCollaborationTimeForCompany(@RequestParam(value = "role") Role role,
             @RequestParam(value = "partyId") Integer partyId ,@RequestHeader("Authorization") String bearerToken);
 
+    @RequestMapping(method = RequestMethod.GET, value = "/statistics/collaboration-time")
+    Double getCollaborationTimeForPlatform(@RequestParam(value = "role") Role role,
+            @RequestHeader("Authorization") String bearerToken);
+
     @RequestMapping(method = RequestMethod.GET, value = "/statistics/response-time")
     Double geResponseTimeForCompany(@RequestParam(value = "partyId") Integer partyId ,
             @RequestHeader("Authorization") String bearerToken);
 
+    @RequestMapping(method = RequestMethod.GET, value = "/statistics/response-time")
+    Double geResponseTimeForPlatform(@RequestHeader("Authorization") String bearerToken);
+
     @RequestMapping(method = RequestMethod.GET, value = "/statistics/response-time-months")
     Map<Integer,Double> geResponseTimeForCompanyForMonths(@RequestParam(value = "partyId") Integer partyId ,
             @RequestHeader("Authorization") String bearerToken);
 
+    @RequestMapping(method = RequestMethod.GET, value = "/statistics/response-time-months")
+    Map<Integer,Double> geResponseTimeForPlatformForMonths(@RequestHeader("Authorization") String bearerToken);
+
+
     enum Status {
         APPROVED, WAITINGRESPONSE, DENIED
     }

diff --git a/...rc/main/java/eu/nimble/service/dataaggregation/clients/BusinessProcessClientFallback.java b/...rc/main/java/eu/nimble/service/dataaggregation/clients/BusinessProcessClientFallback.java
@@ -57,4 +57,16 @@ public Map<Integer,Double> geResponseTimeForCompanyForMonths(Integer partyId, St
         Map<Integer, Double> map = new HashMap<>();
         return map;
     }
+
+    @Override
+    public Double getCollaborationTimeForPlatform(Role role,String bearerToken){ return -1.0; }
+
+    @Override
+    public Double geResponseTimeForPlatform(String bearerToken){ return -1.0; }
+
+    @Override
+    public Map<Integer,Double> geResponseTimeForPlatformForMonths(String bearerToken){
+        Map<Integer, Double> map = new HashMap<>();
+        return map;
+    }
 }
diff --git a/...rvice/src/main/java/eu/nimble/service/dataaggregation/controller/AggregateController.java b/...rvice/src/main/java/eu/nimble/service/dataaggregation/controller/AggregateController.java
@@ -61,7 +61,6 @@ public class AggregateController {
     public void init() {
         logger.info("Using the following URLs: {}, {}", environment.getProperty("nimble.identity.url"), environment.getProperty("nimble.business-process.url"));
     }
-
     @ApiOperation(value = "Aggregate statistics of platform.", nickname = "getPlatformStats", response = PlatformStats.class)
     @ApiResponses(value = {
             @ApiResponse(code = 200, message = "Aggregated statistics of platform"),
@@ -229,4 +228,31 @@ public ResponseEntity<?> getCollabarationStatisticsForComany(@ApiParam(value = "
 
         return ResponseEntity.ok(collabStats);
     }
+
+    @ApiOperation(value = "Aggregate statistics of company collaboration.", nickname = "getCollabStats", response = CollaborationStats.class)
+    @ApiResponses(value = {
+            @ApiResponse(code = 200, message = "Aggregated statistics of company collaboration"),
+            @ApiResponse(code = 400, message = "Error while aggregating statistics.")})
+    @RequestMapping(value = "/platform/collabaration", produces = {"application/json"}, method = RequestMethod.GET)
+    public ResponseEntity<?> getCollabarationStatisticsForPlatform(@ApiParam(value = "The Bearer token provided by the identity service") @RequestHeader(value = "Authorization", required = true) String bearerToken) {
+
+
+        //collab time
+        Double averageCollabTimePurchases = businessProcessClient.getCollaborationTimeForPlatform(BUYER,bearerToken);
+        Double averageCollabTimeSales = businessProcessClient.getCollaborationTimeForPlatform(SELLER,bearerToken);
+        Double averageCollabTime = (averageCollabTimePurchases+averageCollabTimeSales)/2;
+        CollaborationTime collaborationTime = new CollaborationTime(averageCollabTime, averageCollabTimePurchases, averageCollabTimeSales);
+
+        //response time
+        Double averageResponseTime = businessProcessClient.geResponseTimeForPlatform(bearerToken);
+        Map<Integer,Double> averagetimeForMonths =
+                businessProcessClient.geResponseTimeForPlatformForMonths(bearerToken);
+        ResponseTime resTime = new ResponseTime(averageResponseTime,averagetimeForMonths);
+
+        // aggregate statistics
+        CollaborationStats collabStats = new CollaborationStats();
+        collabStats.setCollaborationTime(collaborationTime);
+        collabStats.setResponseTime(resTime);
+        return ResponseEntity.ok(collabStats);
+    }
 }
diff --git a/data-aggregation-service/src/main/resources/application.properties b/data-aggregation-service/src/main/resources/application.properties
@@ -11,4 +11,5 @@ spring.jackson.date-format=com.fasterxml.jackson.databind.util.ISO8601DateFormat
 spring.jackson.serialization.WRITE_DATES_AS_TIMESTAMPS=false
 
 # This is feign client default timeout configuration
-hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=20000
+hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=26000
+