From 47ffa60f9ec015d772db2a017ebfdde05893085d Mon Sep 17 00:00:00 2001
From: Abhinandan Prateek <abhinandan.prateek@shapeblue.com>
Date: Tue, 14 Jul 2015 14:32:39 +0530
Subject: [PATCH] iCLOUDSTACK-8592: adding accountid and domainid to quota
 statement

---
 .../api/response/QuotaStatementResponse.java  | 58 +++++++++++++++----
 .../cloudstack/quota/QuotaDBUtilsImpl.java    |  9 ++-
 2 files changed, 53 insertions(+), 14 deletions(-)

diff --git a/plugins/database/quota/src/org/apache/cloudstack/api/response/QuotaStatementResponse.java b/plugins/database/quota/src/org/apache/cloudstack/api/response/QuotaStatementResponse.java
index 78696feebe8..8d1e9408ff1 100644
--- a/plugins/database/quota/src/org/apache/cloudstack/api/response/QuotaStatementResponse.java
+++ b/plugins/database/quota/src/org/apache/cloudstack/api/response/QuotaStatementResponse.java
@@ -31,6 +31,22 @@ public class QuotaStatementResponse extends BaseResponse {
     @Param(description = "usage type")
     private int usageType;
 
+    @SerializedName("accountid")
+    @Param(description = "account id")
+    private Long accountId;
+
+    @SerializedName("account")
+    @Param(description = "account name")
+    private String accountName;
+
+    @SerializedName("domain")
+    @Param(description = "domain id")
+    private Long domainId;
+
+    @SerializedName("name")
+    @Param(description = "usage type name")
+    private String usageName;
+
     @SerializedName("unit")
     @Param(description = "usage unit")
     private String usageUnit;
@@ -47,60 +63,80 @@ public class QuotaStatementResponse extends BaseResponse {
     @Param(description = "end date")
     private Date endDate = null;
 
-
     public QuotaStatementResponse() {
         super();
     }
 
+    public Long getAccountId() {
+        return accountId;
+    }
+
+    public void setAccountId(Long accountId) {
+        this.accountId = accountId;
+    }
+
+    public String getAccountName() {
+        return accountName;
+    }
+
+    public void setAccountName(String accountName) {
+        this.accountName = accountName;
+    }
+
+    public Long getDomainId() {
+        return domainId;
+    }
+
+    public void setDomainId(Long domainId) {
+        this.domainId = domainId;
+    }
+
+    public String getUsageName() {
+        return usageName;
+    }
+
+    public void setUsageName(String usageName) {
+        this.usageName = usageName;
+    }
 
     public int getUsageType() {
         return usageType;
     }
 
-
     public void setUsageType(int usageType) {
         this.usageType = usageType;
     }
 
-
     public String getUsageUnit() {
         return usageUnit;
     }
 
-
     public void setUsageUnit(String usageUnit) {
         this.usageUnit = usageUnit;
     }
 
-
     public BigDecimal getQuotaUsed() {
         return quotaUsed;
     }
 
-
     public void setQuotaUsed(BigDecimal quotaUsed) {
         this.quotaUsed = quotaUsed;
     }
 
-
     public Date getStartDate() {
         return startDate;
     }
 
-
     public void setStartDate(Date startDate) {
         this.startDate = startDate;
     }
 
-
     public Date getEndDate() {
         return endDate;
     }
 
-
     public void setEndDate(Date endDate) {
         this.endDate = endDate;
     }
 
-
 }
diff --git a/plugins/database/quota/src/org/apache/cloudstack/quota/QuotaDBUtilsImpl.java b/plugins/database/quota/src/org/apache/cloudstack/quota/QuotaDBUtilsImpl.java
index 8c23316c753..0052c79fd10 100644
--- a/plugins/database/quota/src/org/apache/cloudstack/quota/QuotaDBUtilsImpl.java
+++ b/plugins/database/quota/src/org/apache/cloudstack/quota/QuotaDBUtilsImpl.java
@@ -83,10 +83,10 @@ public class QuotaDBUtilsImpl implements QuotaDBUtils {
             }
         });
 
-        HashMap<Integer, String> map = new HashMap<Integer, String>();
+        HashMap<Integer, QuotaMappingVO> map = new HashMap<Integer, QuotaMappingVO>();
         List<QuotaMappingVO> result = _quotaMappingDao.listAll();
         for (QuotaMappingVO mapping : result) {
-            map.put(mapping.getUsageType(), mapping.getUsageUnit());
+            map.put(mapping.getUsageType(), mapping);
         }
 
         List<QuotaStatementResponse> statement = new ArrayList<QuotaStatementResponse>();
@@ -99,7 +99,10 @@ public class QuotaDBUtilsImpl implements QuotaDBUtils {
                     lineitem = new QuotaStatementResponse();
                     lineitem.setUsageType(type);
                     lineitem.setQuotaUsed(totalUsage);
-                    lineitem.setUsageUnit(map.get(type));
+                    lineitem.setAccountId(quotaRecord.getAccountId());
+                    lineitem.setDomainId(quotaRecord.getDomainId());
+                    lineitem.setUsageUnit(map.get(type).getUsageUnit());
+                    lineitem.setUsageName(map.get(type).getUsageName());
                     statement.add(lineitem);
                     totalUsage = new BigDecimal(0);
                 }