Merge branch 'fix-quota-email-account-check' into '4.20.0.0-scclouds'

Correção de `quotaConfigureEmail` para contas recém criadas

Closes #3178

See merge request scclouds/scclouds!1320

Author: SadiJr

plugins/database/quota/src/main/java/org/apache/cloudstack/api/response/QuotaResponseBuilderImpl.java

@@ -1103,7 +1103,9 @@ protected QuotaEmailConfigurationVO getQuotaEmailConfigurationVo(QuotaConfigureE
     }
 
     protected void validateQuotaConfigureEmailCmdParameters(QuotaConfigureEmailCmd cmd) {
-        if (quotaAccountDao.findByIdQuotaAccount(cmd.getAccountId()) == null) {
+        long accountId = cmd.getAccountId();
+
+        if (!quotaAccountDao.getQuotaAccountEnabled(accountId)) {
             throw new InvalidParameterValueException("You must have the quota enabled for this account to configure quota emails.");
         }
 
@@ -1114,6 +1116,11 @@ protected void validateQuotaConfigureEmailCmdParameters(QuotaConfigureEmailCmd c
         if ((cmd.getTemplateName() != null && cmd.getEnable() == null) || (cmd.getTemplateName() == null && cmd.getEnable() != null)) {
             throw new InvalidParameterValueException("Parameter 'enable' must be informed along with 'templatename'.");
         }
+
+        if (quotaAccountDao.findByIdQuotaAccount(accountId) == null) {
+            logger.warn("Quota Account not found for [{}], so adding 0 credits to create it.", accountId);
+            addQuotaCredits(accountId, 0D, CallContext.current().getCallingUserId(), null, null);
+        }
     }
 
     public QuotaConfigureEmailResponse createQuotaConfigureEmailResponse(QuotaEmailConfigurationVO quotaEmailConfigurationVO, Double minBalance, long accountId) {

plugins/database/quota/src/test/java/org/apache/cloudstack/api/response/QuotaResponseBuilderImplTest.java

@@ -496,42 +496,55 @@ public void filterSupportedTypesTestCallRecursiveMethodWhenIsGenericPresetVariab
                 Mockito.anyString());
     }
 
-    @Test (expected = InvalidParameterValueException.class)
+    @Test
     public void validateQuotaConfigureEmailCmdParametersTestNullQuotaAccount() {
+        Mockito.doReturn(true).when(quotaAccountDaoMock).getQuotaAccountEnabled(Mockito.any());
+        Mockito.doReturn(QuotaConfig.QuotaEmailTemplateTypes.QUOTA_LOW.toString()).when(quotaConfigureEmailCmdMock).getTemplateName();
+        Mockito.doReturn(true).when(quotaConfigureEmailCmdMock).getEnable();
         Mockito.doReturn(null).when(quotaAccountDaoMock).findByIdQuotaAccount(Mockito.any());
+        Mockito.doReturn(null).when(quotaResponseBuilderSpy).addQuotaCredits(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any());
+        quotaResponseBuilderSpy.validateQuotaConfigureEmailCmdParameters(quotaConfigureEmailCmdMock);
+        Mockito.verify(quotaResponseBuilderSpy).addQuotaCredits(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any());
+    }
+
+    @Test (expected = InvalidParameterValueException.class)
+    public void validateQuotaConfigureEmailCmdParametersTestAccountWithDisabledQuota() {
+        Mockito.doReturn(false).when(quotaAccountDaoMock).getQuotaAccountEnabled(Mockito.any());
         quotaResponseBuilderSpy.validateQuotaConfigureEmailCmdParameters(quotaConfigureEmailCmdMock);
     }
 
     @Test (expected = InvalidParameterValueException.class)
     public void validateQuotaConfigureEmailCmdParametersTestNullTemplateNameAndMinBalance() {
-        Mockito.doReturn(quotaAccountVOMock).when(quotaAccountDaoMock).findByIdQuotaAccount(Mockito.any());
+        Mockito.doReturn(true).when(quotaAccountDaoMock).getQuotaAccountEnabled(Mockito.any());
         Mockito.doReturn(null).when(quotaConfigureEmailCmdMock).getTemplateName();
         Mockito.doReturn(null).when(quotaConfigureEmailCmdMock).getMinBalance();
         quotaResponseBuilderSpy.validateQuotaConfigureEmailCmdParameters(quotaConfigureEmailCmdMock);
     }
 
     @Test (expected = InvalidParameterValueException.class)
     public void validateQuotaConfigureEmailCmdParametersTestEnableNullAndTemplateNameNotNull() {
-        Mockito.doReturn(quotaAccountVOMock).when(quotaAccountDaoMock).findByIdQuotaAccount(Mockito.any());
+        Mockito.doReturn(true).when(quotaAccountDaoMock).getQuotaAccountEnabled(Mockito.any());
         Mockito.doReturn(QuotaConfig.QuotaEmailTemplateTypes.QUOTA_LOW.toString()).when(quotaConfigureEmailCmdMock).getTemplateName();
         Mockito.doReturn(null).when(quotaConfigureEmailCmdMock).getEnable();
         quotaResponseBuilderSpy.validateQuotaConfigureEmailCmdParameters(quotaConfigureEmailCmdMock);
     }
 
     @Test
     public void validateQuotaConfigureEmailCmdParametersTestNullTemplateName() {
-        Mockito.doReturn(quotaAccountVOMock).when(quotaAccountDaoMock).findByIdQuotaAccount(Mockito.any());
+        Mockito.doReturn(true).when(quotaAccountDaoMock).getQuotaAccountEnabled(Mockito.any());
         Mockito.doReturn(null).when(quotaConfigureEmailCmdMock).getTemplateName();
         Mockito.doReturn(null).when(quotaConfigureEmailCmdMock).getEnable();
         Mockito.doReturn(100D).when(quotaConfigureEmailCmdMock).getMinBalance();
+        Mockito.doReturn(quotaAccountVOMock).when(quotaAccountDaoMock).findByIdQuotaAccount(Mockito.any());
         quotaResponseBuilderSpy.validateQuotaConfigureEmailCmdParameters(quotaConfigureEmailCmdMock);
     }
 
     @Test
     public void validateQuotaConfigureEmailCmdParametersTestWithTemplateNameAndEnable() {
-        Mockito.doReturn(quotaAccountVOMock).when(quotaAccountDaoMock).findByIdQuotaAccount(Mockito.any());
+        Mockito.doReturn(true).when(quotaAccountDaoMock).getQuotaAccountEnabled(Mockito.any());
         Mockito.doReturn(QuotaConfig.QuotaEmailTemplateTypes.QUOTA_LOW.toString()).when(quotaConfigureEmailCmdMock).getTemplateName();
         Mockito.doReturn(true).when(quotaConfigureEmailCmdMock).getEnable();
+        Mockito.doReturn(quotaAccountVOMock).when(quotaAccountDaoMock).findByIdQuotaAccount(Mockito.any());
         quotaResponseBuilderSpy.validateQuotaConfigureEmailCmdParameters(quotaConfigureEmailCmdMock);
     }