Github user jburwell commented on a diff in the pull request:
https://github.com/apache/cloudstack/pull/768#discussion_r46784966
--- Diff:
plugins/database/quota/src/org/apache/cloudstack/api/response/QuotaResponseBuilderImpl.java
---
@@ -0,0 +1,516 @@
+//Licensed to the Apache Software Foundation (ASF) under one
+//or more contributor license agreements. See the NOTICE file
+//distributed with this work for additional information
+//regarding copyright ownership. The ASF licenses this file
+//to you under the Apache License, Version 2.0 (the
+//"License"); you may not use this file except in compliance
+//with the License. You may obtain a copy of the License at
+//
+//http://www.apache.org/licenses/LICENSE-2.0
+//
+//Unless required by applicable law or agreed to in writing,
+//software distributed under the License is distributed on an
+//"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+//KIND, either express or implied. See the License for the
+//specific language governing permissions and limitations
+//under the License.
+package org.apache.cloudstack.api.response;
+
+import com.cloud.domain.DomainVO;
+import com.cloud.domain.dao.DomainDao;
+import com.cloud.exception.InvalidParameterValueException;
+import com.cloud.user.Account;
+import com.cloud.user.AccountVO;
+import com.cloud.user.User;
+import com.cloud.user.dao.AccountDao;
+import com.cloud.user.dao.UserDao;
+
+import org.apache.cloudstack.api.command.QuotaBalanceCmd;
+import org.apache.cloudstack.api.command.QuotaEmailTemplateListCmd;
+import org.apache.cloudstack.api.command.QuotaEmailTemplateUpdateCmd;
+import org.apache.cloudstack.api.command.QuotaStatementCmd;
+import org.apache.cloudstack.api.command.QuotaTariffListCmd;
+import org.apache.cloudstack.api.command.QuotaTariffUpdateCmd;
+import org.apache.cloudstack.quota.QuotaService;
+import org.apache.cloudstack.quota.QuotaStatement;
+import org.apache.cloudstack.quota.constant.QuotaConfig;
+import org.apache.cloudstack.quota.constant.QuotaTypes;
+import org.apache.cloudstack.quota.dao.QuotaAccountDao;
+import org.apache.cloudstack.quota.dao.QuotaBalanceDao;
+import org.apache.cloudstack.quota.dao.QuotaCreditsDao;
+import org.apache.cloudstack.quota.dao.QuotaEmailTemplatesDao;
+import org.apache.cloudstack.quota.dao.QuotaTariffDao;
+import org.apache.cloudstack.quota.dao.QuotaUsageDao;
+import org.apache.cloudstack.quota.vo.QuotaAccountVO;
+import org.apache.cloudstack.quota.vo.QuotaBalanceVO;
+import org.apache.cloudstack.quota.vo.QuotaCreditsVO;
+import org.apache.cloudstack.quota.vo.QuotaEmailTemplatesVO;
+import org.apache.cloudstack.quota.vo.QuotaTariffVO;
+import org.apache.cloudstack.quota.vo.QuotaUsageVO;
+import org.apache.cloudstack.region.RegionManager;
+import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
+
+import javax.ejb.Local;
+import javax.inject.Inject;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.ListIterator;
+
+@Component
+@Local(value = QuotaResponseBuilderImpl.class)
+public class QuotaResponseBuilderImpl implements QuotaResponseBuilder {
+ private static final Logger s_logger =
Logger.getLogger(QuotaResponseBuilderImpl.class);
+
+ @Inject
+ private QuotaTariffDao _quotaTariffDao;
+ @Inject
+ private QuotaBalanceDao _quotaBalanceDao;
+ @Inject
+ private QuotaCreditsDao _quotaCreditsDao;
+ @Inject
+ private QuotaUsageDao _quotaUsageDao;
+ @Inject
+ private QuotaEmailTemplatesDao _quotaEmailTemplateDao;
+
+ @Inject
+ private UserDao _userDao;
+ @Inject
+ private QuotaService _quotaService;
+ @Inject
+ private AccountDao _accountDao;
+ @Inject
+ private QuotaAccountDao _quotaAccountDao;
+ @Inject
+ private DomainDao _domainDao;
+ @Inject
+ private RegionManager _regionMgr;
+ @Inject
+ private QuotaStatement _statement;
+
+ @Override
+ public QuotaTariffResponse createQuotaTariffResponse(QuotaTariffVO
tariff) {
+ final QuotaTariffResponse response = new QuotaTariffResponse();
+ response.setUsageType(tariff.getUsageType());
+ response.setUsageName(tariff.getUsageName());
+ response.setUsageUnit(tariff.getUsageUnit());
+ response.setUsageDiscriminator(tariff.getUsageDiscriminator());
+ response.setTariffValue(tariff.getCurrencyValue());
+ response.setEffectiveOn(tariff.getEffectiveOn());
+ response.setDescription(tariff.getDescription());
+ response.setCurrency(QuotaConfig.QuotaCurrencySymbol.value());
+ return response;
+ }
+
+ @Override
+ public List<QuotaSummaryResponse> createQuotaSummaryResponse(final
String accountName, final Long domainId) {
+ List<QuotaSummaryResponse> result = new
ArrayList<QuotaSummaryResponse>();
+
+ if (accountName != null && domainId != null) {
+ Account account = _accountDao.findActiveAccount(accountName,
domainId);
+ QuotaSummaryResponse qr = getQuotaSummaryResponse(account);
+ result.add(qr);
+ }
+
+ return result;
+ }
+
+ @Override
+ public List<QuotaSummaryResponse> createQuotaSummaryResponse(Boolean
listAll) {
+ List<QuotaSummaryResponse> result = new
ArrayList<QuotaSummaryResponse>();
+
+ if (listAll) {
+ for (final AccountVO account : _accountDao.listAll()) {
+ QuotaSummaryResponse qr = getQuotaSummaryResponse(account);
+ result.add(qr);
+ }
+ } else {
+ for (final QuotaAccountVO quotaAccount :
_quotaAccountDao.listAllQuotaAccount()) {
+ AccountVO account =
_accountDao.findById(quotaAccount.getId());
+ QuotaSummaryResponse qr = getQuotaSummaryResponse(account);
+ result.add(qr);
+ }
+ }
+ return result;
+ }
+
+ private QuotaSummaryResponse getQuotaSummaryResponse(final Account
account) {
+ Calendar[] period = _statement.getCurrentStatementTime();
+
+ if (account != null) {
+ QuotaSummaryResponse qr = new QuotaSummaryResponse();
+ DomainVO domain = _domainDao.findById(account.getDomainId());
+ BigDecimal curBalance =
_quotaBalanceDao.lastQuotaBalance(account.getAccountId(),
account.getDomainId(), period[1].getTime());
+ BigDecimal quotaUsage =
_quotaUsageDao.findTotalQuotaUsage(account.getAccountId(),
account.getDomainId(), null, period[0].getTime(), period[1].getTime());
+
+ qr.setAccountId(account.getAccountId());
+ qr.setAccountName(account.getAccountName());
+ qr.setDomainId(account.getDomainId());
+ qr.setDomainName(domain.getName());
+ qr.setBalance(curBalance);
+ qr.setQuotaUsage(quotaUsage);
+ qr.setState(account.getState());
+ qr.setStartDate(period[0].getTime());
+ qr.setEndDate(period[1].getTime());
+ qr.setCurrency(QuotaConfig.QuotaCurrencySymbol.value());
+ qr.setObjectName("summary");
+ return qr;
+ } else {
+ throw new InvalidParameterValueException("Quota summary
response for an account requires a valid account.");
+ }
+ }
+
+ @Override
+ public QuotaBalanceResponse
createQuotaBalanceResponse(List<QuotaBalanceVO> quotaBalance, Date startDate,
Date endDate) {
+ if (quotaBalance == null || quotaBalance.isEmpty()) {
+ new InvalidParameterValueException("The request period does
not contain balance entries.");
+ }
+ Collections.sort(quotaBalance, new Comparator<QuotaBalanceVO>() {
+ public int compare(QuotaBalanceVO o1, QuotaBalanceVO o2) {
+ return o2.getUpdatedOn().compareTo(o1.getUpdatedOn()); //
desc
+ }
+ });
+
+ boolean have_balance_entries = false;
+ //check that there is at least one balance entry
+ for (Iterator<QuotaBalanceVO> it = quotaBalance.iterator();
it.hasNext();) {
+ QuotaBalanceVO entry = it.next();
+ if (entry.getCreditsId() > 0) {
+ have_balance_entries = true;
+ break;
+ }
+ }
+ //if last entry is a credit deposit then remove that as that is
already
+ //accounted for in the starting balance after that entry, note the
sort is desc
+ if (have_balance_entries) {
+ ListIterator<QuotaBalanceVO> li =
quotaBalance.listIterator(quotaBalance.size());
+ // Iterate in reverse.
+ while (li.hasPrevious()) {
+ QuotaBalanceVO entry = li.previous();
+ if (s_logger.isDebugEnabled()) {
+ s_logger.debug("createQuotaBalanceResponse: Entry=" +
entry);
+ }
+ if (entry.getCreditsId() > 0) {
+ li.remove();
+ } else {
+ break;
+ }
+ }
+ }
+
+ int quota_activity = quotaBalance.size();
+ QuotaBalanceResponse resp = new QuotaBalanceResponse();
+ BigDecimal lastCredits = new BigDecimal(0);
+ boolean consecutive = true;
+ for (Iterator<QuotaBalanceVO> it = quotaBalance.iterator();
it.hasNext();) {
+ QuotaBalanceVO entry = it.next();
+ if (s_logger.isDebugEnabled()) {
+ s_logger.debug("createQuotaBalanceResponse: All Credit
Entry=" + entry);
+ }
+ if (entry.getCreditsId() > 0) {
+ if (consecutive) {
+ lastCredits =
lastCredits.add(entry.getCreditBalance());
+ }
+ resp.addCredits(entry);
+ it.remove();
+ } else {
+ consecutive = false;
+ }
+ }
+
+ if (quota_activity > 0 && quotaBalance.size() > 0) {
+ // order is desc last item is the start item
+ QuotaBalanceVO startItem =
quotaBalance.get(quotaBalance.size() - 1);
+ QuotaBalanceVO endItem = quotaBalance.get(0);
+ resp.setStartDate(startItem.getUpdatedOn());
+ resp.setStartQuota(startItem.getCreditBalance());
+ resp.setEndDate(endItem.getUpdatedOn());
+ if (s_logger.isDebugEnabled()) {
+ s_logger.debug("createQuotaBalanceResponse: Start Entry="
+ startItem);
+ s_logger.debug("createQuotaBalanceResponse: End Entry=" +
endItem);
+ }
+ resp.setEndQuota(endItem.getCreditBalance().add(lastCredits));
+ } else if (quota_activity > 0) {
+ // order is desc last item is the start item
+ resp.setStartDate(startDate);
+ resp.setStartQuota(new BigDecimal(0));
+ resp.setEndDate(endDate);
--- End diff --
Since ``Date``s are mutable, ``endDate`` should be copied before being
passed into ``setEndDate``.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
