Merge branch 'fix-backup-schedule-list' into '4.20.0.0-scclouds'

Correção na listagem de _backup schedules_ de projetos

Closes #3228

See merge request scclouds/scclouds!1346

Author: Daniel Augusto Veronezi Salvador

server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java

@@ -639,31 +639,28 @@ public List<BackupSchedule> listBackupSchedules(ListBackupScheduleCmd cmd) {
         Long scheduleId = cmd.getId();
         Long vmId = cmd.getVmId();
         Long accountId;
+        String accountName = cmd.getAccountName();
         Long domainId = cmd.getDomainId();
         Long projectId = cmd.getProjectId();
         String strIntervalType = cmd.getIntervalType();
         List<Long> domainsList = new ArrayList<>();
 
         Integer intervalTypeOrdinal = null;
         if (strIntervalType != null) {
-            logger.trace("Searching for informed [{}] interval type in valid intervals: {}", strIntervalType, DateUtil.IntervalType.values());
+            logger.debug("Searching for informed [{}] interval type in valid intervals: {}", strIntervalType, DateUtil.IntervalType.values());
             DateUtil.IntervalType intervalType = DateUtil.IntervalType.getIntervalType(strIntervalType);
 
             if (intervalType == null) {
                 logger.error("The informed interval type [{}] was invalid, thus an exception is being thrown.");
                 throw new InvalidParameterValueException(String.format("No valid interval type was found for [%s].", strIntervalType));
             }
 
-            logger.trace("Interval type {} was found in valid interval types.", intervalType.name());
+            logger.debug("Interval type {} was found in valid interval types.", intervalType.name());
             intervalTypeOrdinal = intervalType.ordinal();
         }
 
         if (domainId != null) {
-            if (projectId != null) {
-                throw new InvalidParameterValueException("Domain and projectId can't be specified together");
-            }
-
-            logger.trace("Searching for domain with ID [{}].", domainId);
+            logger.debug("Searching for domain with ID [{}].", domainId);
             Domain domain = domainDao.findById(domainId);
 
             if (domain == null) {
@@ -677,24 +674,23 @@ public List<BackupSchedule> listBackupSchedules(ListBackupScheduleCmd cmd) {
         }
 
         accountId = caller.getAccountId();
-        if (cmd.getAccountName() != null) {
-            String accName = cmd.getAccountName();
 
+        if (accountName != null) {
             if (projectId != null) {
                 throw new InvalidParameterValueException("Account and projectId can't be specified together");
             }
 
-            logger.info("Searching for account with name [{}].", accName);
-            accountId = accountManager.finalizeAccountIdAndCheckCallerAccess(accName, domainId, null);
+            logger.debug("Searching for account with name [{}].", accountName);
+            accountId = accountManager.finalizeAccountIdAndCheckCallerAccess(accountName, domainId, null);
         }
 
         if (projectId != null) {
-            logger.info("Searching for project with ID [{}]", projectId);
+            logger.debug("Searching for project with ID [{}]", projectId);
             accountId = accountManager.finalizeAccountIdAndCheckCallerAccess(null, null, projectId);
         }
 
         if (vmId != null) {
-            logger.trace("Searching for VM with ID [{}].", vmId);
+            logger.debug("Searching for VM with ID [{}].", vmId);
             final VMInstanceVO vm = findVmById(vmId);
 
             logger.debug("Validating if backup is enabled in the VM's zone.");
@@ -709,8 +705,14 @@ public List<BackupSchedule> listBackupSchedules(ListBackupScheduleCmd cmd) {
         }
 
         if (domainsList.isEmpty()) {
-            logger.info("Defaulting schedule listing to the caller account's domain as it was not informed previously.");
-            domainsList.add(caller.getDomainId());
+            if (accountName == null && projectId == null) {
+                logger.info("Defaulting schedule listing to the caller account's domain as it was not informed previously.");
+                domainsList.add(caller.getDomainId());
+            } else {
+                Account account = accountDao.findById(accountId);
+                logger.info("Defaulting schedule listing domain to [{}] as it is the domain of informed account [{}].", account.getDomainId(), account.getUuid());
+                domainsList.add(account.getDomainId());
+            }
         }
 
         if (cmd.listAll() && accountId.equals(caller.getAccountId()) && accountManager.isAdmin(accountId)) {