This is an automated email from the ASF dual-hosted git repository.

ofuks pushed a commit to branch DLAB-1571
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git

commit 375d4b542f8ecafba1e7e7b0080e69d25474b3cf
Author: Oleh Fuks <[email protected]>
AuthorDate: Wed Mar 4 13:31:31 2020 +0200

    Added Get API by dlabIds
---
 .../billing/gcp/controller/BillingController.java  |  6 +++++
 .../com/epam/dlab/billing/gcp/dao/BillingDAO.java  |  2 ++
 .../billing/gcp/dao/impl/BigQueryBillingDAO.java   | 28 ++++++++++++++++++----
 3 files changed, 31 insertions(+), 5 deletions(-)

diff --git 
a/services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/controller/BillingController.java
 
b/services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/controller/BillingController.java
index dbcfa10..525be72 100644
--- 
a/services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/controller/BillingController.java
+++ 
b/services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/controller/BillingController.java
@@ -24,6 +24,7 @@ import com.epam.dlab.dto.billing.BillingData;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
@@ -37,6 +38,11 @@ public class BillingController {
         this.billingDAO = billingDAO;
     }
 
+    @GetMapping
+    public ResponseEntity<List<BillingData>> getBilling(@RequestParam 
List<String> dlabIds) {
+        return new ResponseEntity<>(billingDAO.getBillingReport(dlabIds), 
HttpStatus.OK);
+    }
+
     @GetMapping("/report")
     public ResponseEntity<List<BillingData>> getBilling() {
         return new ResponseEntity<>(billingDAO.getBillingReport(), 
HttpStatus.OK);
diff --git 
a/services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/dao/BillingDAO.java
 
b/services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/dao/BillingDAO.java
index 55c2c2d..7288614 100644
--- 
a/services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/dao/BillingDAO.java
+++ 
b/services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/dao/BillingDAO.java
@@ -29,4 +29,6 @@ public interface BillingDAO {
     List<GcpBillingData> getBillingData() throws InterruptedException;
 
     List<BillingData> getBillingReport();
+
+    List<BillingData> getBillingReport(List<String> dlabIds);
 }
diff --git 
a/services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/dao/impl/BigQueryBillingDAO.java
 
b/services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/dao/impl/BigQueryBillingDAO.java
index 990399a..1df1ab2 100644
--- 
a/services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/dao/impl/BigQueryBillingDAO.java
+++ 
b/services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/dao/impl/BigQueryBillingDAO.java
@@ -36,6 +36,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.aggregation.Aggregation;
 import org.springframework.data.mongodb.core.aggregation.GroupOperation;
+import org.springframework.data.mongodb.core.aggregation.MatchOperation;
+import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.stereotype.Component;
 
 import java.math.BigDecimal;
@@ -108,8 +110,24 @@ public class BigQueryBillingDAO implements BillingDAO {
                                .sum("cost").as("cost");
                Aggregation aggregation = newAggregation(groupOperation);
 
-               return mongoTemplate.aggregate(aggregation, "billing", 
GcpBillingData.class).getMappedResults().stream()
-                               .map(this::toBillingReportDTO)
+               return mongoTemplate.aggregate(aggregation, "billing", 
GcpBillingData.class).getMappedResults()
+                               .stream()
+                               .map(this::toBillingData)
+                               .collect(Collectors.toList());
+       }
+
+       @Override
+       public List<BillingData> getBillingReport(List<String> dlabIds) {
+               GroupOperation groupOperation = group("product", "currency", 
"usageType", "dlabId")
+                               .min("from").as("from")
+                               .max("to").as("to")
+                               .sum("cost").as("cost");
+               MatchOperation matchOperation = 
Aggregation.match(Criteria.where("dlabId").in(dlabIds));
+               Aggregation aggregation = newAggregation(matchOperation, 
groupOperation);
+
+               return mongoTemplate.aggregate(aggregation, "billing", 
GcpBillingData.class).getMappedResults()
+                               .stream()
+                               .map(this::toBillingData)
                                .collect(Collectors.toList());
        }
 
@@ -124,7 +142,7 @@ public class BigQueryBillingDAO implements BillingDAO {
                                        .build();
                        final Stream<GcpBillingData> gcpBillingDataStream =
                                        
StreamSupport.stream(service.query(queryConfig).getValues().spliterator(), 
false)
-                                                       
.map(this::toBillingData);
+                                                       
.map(this::toGcpBillingData);
                        billingHistoryRepo.save(new BillingHistory(tableName, 
table.getLastModifiedTime()));
                        return gcpBillingDataStream;
                } catch (InterruptedException e) {
@@ -132,7 +150,7 @@ public class BigQueryBillingDAO implements BillingDAO {
                }
        }
 
-       private GcpBillingData toBillingData(FieldValueList fields) {
+       private GcpBillingData toGcpBillingData(FieldValueList fields) {
                return GcpBillingData.builder()
                                .usageDateFrom(toLocalDate(fields, 
"usage_date_from"))
                                .usageDateTo(toLocalDate(fields, 
"usage_date_to"))
@@ -150,7 +168,7 @@ public class BigQueryBillingDAO implements BillingDAO {
                                .atZone(ZoneId.systemDefault()));
        }
 
-       private BillingData toBillingReportDTO(GcpBillingData billingData) {
+       private BillingData toBillingData(GcpBillingData billingData) {
                return BillingData.builder()
                                .usageDateFrom(billingData.getUsageDateFrom())
                                .usageDateTo(billingData.getUsageDateTo())


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to