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


The following commit(s) were added to refs/heads/DLAB-1571 by this push:
     new 8c28e7a  remote billing
8c28e7a is described below

commit 8c28e7a9b0b4a308215452df2890502a921d35eb
Author: Oleh Fuks <[email protected]>
AuthorDate: Sat Apr 11 18:45:48 2020 +0300

    remote billing
---
 .../src/main/java/com/epam/dlab/BillingServiceImpl.java    |  4 ++--
 .../java/com/epam/dlab/backendapi/dao/BaseBillingDAO.java  |  5 +++++
 .../main/java/com/epam/dlab/backendapi/dao/BillingDAO.java |  2 ++
 .../dlab/backendapi/service/impl/BillingServiceImpl.java   | 14 ++++++++++++--
 4 files changed, 21 insertions(+), 4 deletions(-)

diff --git 
a/services/billing-aws/src/main/java/com/epam/dlab/BillingServiceImpl.java 
b/services/billing-aws/src/main/java/com/epam/dlab/BillingServiceImpl.java
index b2ad457..d474790 100644
--- a/services/billing-aws/src/main/java/com/epam/dlab/BillingServiceImpl.java
+++ b/services/billing-aws/src/main/java/com/epam/dlab/BillingServiceImpl.java
@@ -77,8 +77,8 @@ public class BillingServiceImpl implements BillingService {
        private BillingData toBillingData(Document billingData) {
                return BillingData.builder()
                                .tag(billingData.getString(FIELD_DLAB_ID))
-                               
.usageDateFrom(Optional.ofNullable(billingData.getString("from")).map(LocalDate::parse).orElse(null))
-                               
.usageDateTo(Optional.ofNullable(billingData.getString("to")).map(LocalDate::parse).orElse(null))
+                               
.usageDateFrom(Optional.ofNullable(billingData.getString(FIELD_USAGE_DATE)).map(LocalDate::parse).orElse(null))
+                               
.usageDateTo(Optional.ofNullable(billingData.getString(FIELD_USAGE_DATE)).map(LocalDate::parse).orElse(null))
                                
.usageDate(billingData.getString(FIELD_USAGE_DATE))
                                .product(billingData.getString(FIELD_PRODUCT))
                                
.usageType(billingData.getString(FIELD_RESOURCE_TYPE))
diff --git 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/BaseBillingDAO.java
 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/BaseBillingDAO.java
index 565a9d4..b764c3c 100644
--- 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/BaseBillingDAO.java
+++ 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/BaseBillingDAO.java
@@ -157,6 +157,11 @@ public class BaseBillingDAO extends BaseDAO implements 
BillingDAO {
 
        @Override
        public void deleteByUsageDate(String application, String usageDate) {
+               deleteMany(BILLING, and(eq(APPLICATION, application), 
eq(USAGE_DATE, usageDate)));
+       }
+
+       @Override
+       public void deleteByUsageDateRegex(String application, String 
usageDate) {
                deleteMany(BILLING, and(eq(APPLICATION, application), 
regex(USAGE_DATE, "^" + usageDate)));
        }
 
diff --git 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/BillingDAO.java
 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/BillingDAO.java
index 2e4e945..67630cd 100644
--- 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/BillingDAO.java
+++ 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/BillingDAO.java
@@ -48,5 +48,7 @@ public interface BillingDAO {
 
        void deleteByUsageDate(String application, String usageDate);
 
+       void deleteByUsageDateRegex(String application, String usageDate);
+
        void save(List<BillingReportLine> billingData);
 }
diff --git 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/BillingServiceImpl.java
 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/BillingServiceImpl.java
index d92851b..3d0ecea 100644
--- 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/BillingServiceImpl.java
+++ 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/BillingServiceImpl.java
@@ -215,7 +215,6 @@ public class BillingServiceImpl implements BillingService {
         final String endpointName = endpointDTO.getName();
         final CloudProvider cloudProvider = endpointDTO.getCloudProvider();
         final Map<String, BillingReportLine> billableResources = 
getBillableResources(userInfo);
-
         final Stream<BillingReportLine> billingReportLineStream = billingData
                 .stream()
                 .peek(bd -> bd.setApplication(endpointName))
@@ -225,8 +224,12 @@ public class BillingServiceImpl implements BillingService {
             final Map<String, List<BillingReportLine>> gcpBillingData = 
billingReportLineStream
                     .collect(Collectors.groupingBy(bd -> 
bd.getUsageDate().substring(0, USAGE_DATE_FORMAT.length())));
             updateGcpBillingData(endpointName, gcpBillingData);
+        } else if (cloudProvider == CloudProvider.AWS) {
+            final Map<String, List<BillingReportLine>> awsBillingData = 
billingReportLineStream
+                    
.collect(Collectors.groupingBy(BillingReportLine::getUsageDate));
+            updateAwsBillingData(endpointName, awsBillingData);
         } else if (cloudProvider == CloudProvider.AZURE) {
-            List<BillingReportLine> billingReportLines = 
billingReportLineStream
+            final List<BillingReportLine> billingReportLines = 
billingReportLineStream
                     .collect(Collectors.toList());
             updateAzureBillingData(billingReportLines);
         }
@@ -238,6 +241,13 @@ public class BillingServiceImpl implements BillingService {
 
     private void updateGcpBillingData(String endpointName, Map<String, 
List<BillingReportLine>> billingData) {
         billingData.forEach((usageDate, billingReportLines) -> {
+            billingDAO.deleteByUsageDateRegex(endpointName, usageDate);
+            billingDAO.save(billingReportLines);
+        });
+    }
+
+    private void updateAwsBillingData(String endpointName, Map<String, 
List<BillingReportLine>> billingData) {
+        billingData.forEach((usageDate, billingReportLines) -> {
             billingDAO.deleteByUsageDate(endpointName, usageDate);
             billingDAO.save(billingReportLines);
         });


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

Reply via email to