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
The following commit(s) were added to refs/heads/develop by this push:
new 153b342 DLAB-976 added project quote used info to info page api
153b342 is described below
commit 153b342c786106bfeba564b24ce9f3848dbce803
Author: bhliva <[email protected]>
AuthorDate: Tue Aug 6 13:51:34 2019 +0300
DLAB-976 added project quote used info to info page api
---
.../java/com/epam/dlab/backendapi/dao/BaseBillingDAO.java | 5 +++++
.../main/java/com/epam/dlab/backendapi/dao/BillingDAO.java | 1 +
.../com/epam/dlab/backendapi/dao/gcp/GcpBillingDao.java | 5 +++++
.../resources/dto/ProjectInfrastructureInfo.java | 14 ++++++++------
.../service/impl/InfrastructureInfoServiceBase.java | 1 +
5 files changed, 20 insertions(+), 6 deletions(-)
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 23785b4..944aad8 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
@@ -129,6 +129,11 @@ public abstract class BaseBillingDAO<T extends
BillingFilter> extends BaseDAO im
}
@Override
+ public int getBillingProjectQuoteUsed(String project) {
+ return toPercentage(() -> projectDAO.getAllowedBudget(project),
getProjectCost(project));
+ }
+
+ @Override
public boolean isBillingQuoteReached() {
return getBillingQuoteUsed() >= ONE_HUNDRED;
}
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 1498012..cd03bff 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
@@ -32,6 +32,7 @@ public interface BillingDAO<T extends BillingFilter> {
int getBillingQuoteUsed();
int getBillingUserQuoteUsed(String user);
+ int getBillingProjectQuoteUsed(String project);
boolean isBillingQuoteReached();
diff --git
a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/gcp/GcpBillingDao.java
b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/gcp/GcpBillingDao.java
index 05112a2..8e27c8d 100644
---
a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/gcp/GcpBillingDao.java
+++
b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/gcp/GcpBillingDao.java
@@ -51,6 +51,11 @@ public class GcpBillingDao implements
BillingDAO<BillingFilter> {
}
@Override
+ public int getBillingProjectQuoteUsed(String project) {
+ return 0;
+ }
+
+ @Override
public boolean isBillingQuoteReached() {
return false;
}
diff --git
a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/ProjectInfrastructureInfo.java
b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/ProjectInfrastructureInfo.java
index 9fa3a02..314e11d 100644
---
a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/ProjectInfrastructureInfo.java
+++
b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/ProjectInfrastructureInfo.java
@@ -29,10 +29,12 @@ import java.util.Map;
@AllArgsConstructor
@ToString
public class ProjectInfrastructureInfo {
- @JsonProperty
- private String project;
- @JsonProperty
- private Map<String, String> shared;
- @JsonProperty
- private Iterable<Document> exploratory;
+ @JsonProperty
+ private String project;
+ @JsonProperty
+ private int billingQuoteUsed;
+ @JsonProperty
+ private Map<String, String> shared;
+ @JsonProperty
+ private Iterable<Document> exploratory;
}
diff --git
a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/InfrastructureInfoServiceBase.java
b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/InfrastructureInfoServiceBase.java
index e760f25..8c111e2 100644
---
a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/InfrastructureInfoServiceBase.java
+++
b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/InfrastructureInfoServiceBase.java
@@ -78,6 +78,7 @@ public abstract class InfrastructureInfoServiceBase<T>
implements Infrastructure
.entrySet()
.stream()
.map(e -> new
ProjectInfrastructureInfo(e.getKey(),
+
billingDAO.getBillingProjectQuoteUsed(e.getKey()),
getSharedInfo(projectService.get(e.getKey()).getEdgeInfo()),
e.getValue()))
.collect(Collectors.toList());
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]