You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by bh...@apache.org on 2019/11/13 14:20:22 UTC
[incubator-dlab] 01/02: [DLAB-1260] Fixed bug with export billing
report
This is an automated email from the ASF dual-hosted git repository.
bhliva pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit be2760277f4dc092cd01c7f5e25ab4f22e017194
Author: Oleh Fuks <ol...@gmail.com>
AuthorDate: Wed Nov 13 16:00:47 2019 +0200
[DLAB-1260] Fixed bug with export billing report
---
.../main/java/com/epam/dlab/backendapi/dao/aws/AwsBillingDAO.java | 4 ++--
.../com/epam/dlab/backendapi/service/aws/AwsBillingService.java | 3 ---
.../epam/dlab/backendapi/service/aws/AwsBillingServiceTest.java | 8 ++++----
3 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/aws/AwsBillingDAO.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/aws/AwsBillingDAO.java
index aa78255..5205cc4 100644
--- a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/aws/AwsBillingDAO.java
+++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/aws/AwsBillingDAO.java
@@ -39,8 +39,8 @@ import static com.mongodb.client.model.Aggregates.sort;
public class AwsBillingDAO extends BaseBillingDAO<AwsBillingFilter> {
public static final String DLAB_RESOURCE_TYPE = "dlab_resource_type";
- public static final String USAGE_DATE_START = "usage_date_start";
- public static final String USAGE_DATE_END = "usage_date_end";
+ public static final String USAGE_DATE_START = "from";
+ public static final String USAGE_DATE_END = "to";
public static final String TAG_RESOURCE_ID = "tag_resource_id";
@Override
diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/aws/AwsBillingService.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/aws/AwsBillingService.java
index b036822..aa102cb 100644
--- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/aws/AwsBillingService.java
+++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/aws/AwsBillingService.java
@@ -20,14 +20,11 @@
package com.epam.dlab.backendapi.service.aws;
import com.epam.dlab.auth.UserInfo;
-import com.epam.dlab.backendapi.dao.BillingDAO;
import com.epam.dlab.backendapi.dao.aws.AwsBillingDAO;
import com.epam.dlab.backendapi.resources.dto.aws.AwsBillingFilter;
import com.epam.dlab.backendapi.service.BillingService;
import com.epam.dlab.backendapi.util.CSVFormatter;
-import com.epam.dlab.exceptions.DlabException;
import com.epam.dlab.model.aws.ReportLine;
-import com.google.inject.Inject;
import com.google.inject.Singleton;
import lombok.extern.slf4j.Slf4j;
import org.bson.Document;
diff --git a/services/self-service/src/test/java/com/epam/dlab/backendapi/service/aws/AwsBillingServiceTest.java b/services/self-service/src/test/java/com/epam/dlab/backendapi/service/aws/AwsBillingServiceTest.java
index 6b58482..e24e009 100644
--- a/services/self-service/src/test/java/com/epam/dlab/backendapi/service/aws/AwsBillingServiceTest.java
+++ b/services/self-service/src/test/java/com/epam/dlab/backendapi/service/aws/AwsBillingServiceTest.java
@@ -117,7 +117,7 @@ public class AwsBillingServiceTest {
@Test
public void downloadReportWithInapproprietaryDateFormatInDocument() {
- basicDocument.put("usage_date_start", "someDateStart");
+ basicDocument.put("from", "someDateStart");
when(billingDAO.getReport(any(UserInfo.class), any(AwsBillingFilter.class))).thenReturn(basicDocument);
try {
@@ -155,7 +155,7 @@ public class AwsBillingServiceTest {
@Test
public void getFirstLineWithException() throws ParseException {
- basicDocument.put("usage_date_start", "someStartDate");
+ basicDocument.put("from", "someStartDate");
expectedException.expect(ParseException.class);
expectedException.expectMessage("Unparseable date: \"someStartDate\"");
@@ -207,8 +207,8 @@ public class AwsBillingServiceTest {
private Document getBasicDocument() {
return new Document().append("service_base_name", "someSBN").append("user", "someUser")
.append("dlab_id", "someId").append("dlab_resource_type", "someResType")
- .append("tag_resource_id", "someTagResourceId").append("usage_date_start", "2018-03-21")
- .append("usage_date_end", "2018-03-22").append("full_report", false)
+ .append("tag_resource_id", "someTagResourceId").append("from", "2018-03-21")
+ .append("to", "2018-03-22").append("full_report", false)
.append("shape", "someShape").append("product", "someProduct").append("cost", "someCost")
.append("cost_total", "someCostTotal").append("currency_code", "someCode")
.append("lines", Collections.singletonList(new Document()));
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org