Merge pull request #32 from aquality-automation/feature/bug_link_view_on_AT_is_broken

VladislavKostyukevich · web-flow · commit db540ae66618 · 2019-12-02T17:29:34.000+03:00
Fix for Email URL
diff --git a/src/main/java/main/Session.java b/src/main/java/main/Session.java
@@ -63,7 +63,7 @@ public Importer getImporter(List<String> filePaths, TestRunDto testRunTemplate,
         return new Importer(filePaths, testRunTemplate, pattern, format, nodeType, singleTestRun, user);
     }
 
-    public TestRunEmails getTestRunEmails(){
+    public TestRunEmails getTestRunEmails() throws AqualityException {
         return new TestRunEmails();
     }
 
diff --git a/src/main/java/main/model/db/dao/DAO.java b/src/main/java/main/model/db/dao/DAO.java
@@ -86,7 +86,13 @@ public List<T> searchAll(T entity) throws AqualityException {
      * @return entity
      */
     public T getEntityById(T entity) throws AqualityException {
-        return searchAll(entity).get(0);
+        List<T> all = searchAll(entity);
+        if(all.size() > 0) {
+            return all.get(0);
+        }
+        else{
+            throw new AqualityException("No Entities was found by %s", entity.getIDParameters());
+        }
     }
 
 
diff --git a/src/main/java/main/model/db/dao/settings/EmailSettingsDao.java b/src/main/java/main/model/db/dao/settings/EmailSettingsDao.java
@@ -14,7 +14,7 @@ public class EmailSettingsDao extends DAO<EmailSettingsDto> {
 
     public EmailSettingsDao() {
         super(EmailSettingsDto.class);
-        insert = "{call INSERT_EMAIL_SETTINGS(?,?,?,?,?,?,?,?,?)}";
+        insert = "{call INSERT_EMAIL_SETTINGS(?,?,?,?,?,?,?,?,?,?)}";
         select = "{call SELECT_EMAIL_SETTINGS(?)}";
     }
 
diff --git a/src/main/java/main/model/dto/EmailSettingsDto.java b/src/main/java/main/model/dto/EmailSettingsDto.java
@@ -34,4 +34,7 @@ public class EmailSettingsDto extends BaseDto {
     @DataBaseName(name="request_default_email_pattern")
     @DataBaseInsert
     private String default_email_pattern;
+    @DataBaseName(name="request_base_url")
+    @DataBaseInsert
+    private String base_url;
 }
diff --git a/src/main/java/main/model/email/AuditEmails.java b/src/main/java/main/model/email/AuditEmails.java
@@ -18,10 +18,12 @@ public class AuditEmails extends Emails {
     private AuditStatisticDao auditStatisticController;
     private AppProperties appProperties = new AppProperties();
 
-    public AuditEmails() {
+    public AuditEmails() throws AqualityException {
+        super();
         auditStatisticController = new AuditStatisticDao();
     }
-    public List<EmailDto> GetUpcomingEmails() throws AqualityException {
+
+    public List<EmailDto> getUpcomingEmails() throws AqualityException {
         List<AuditStatisticDto> audits = auditStatisticController.getAll();
         List<String> recipients = getRecipients();
 
@@ -32,7 +34,8 @@ public List<EmailDto> GetUpcomingEmails() throws AqualityException {
 
         return emails;
     }
-    public List<EmailDto> GetOverdueEmails() throws AqualityException {
+
+    public List<EmailDto> getOverdueEmails() throws AqualityException {
         List<AuditStatisticDto> audits = auditStatisticController.getAll();
         List<String> recipients = getRecipients();
         List<AuditStatisticDto> overdueAudits = audits.stream()
@@ -45,9 +48,9 @@ public List<EmailDto> GetOverdueEmails() throws AqualityException {
             EmailDto email = new EmailDto();
             email.setSubject(String.format("[%s] Overdue Project Audit - %s", appProperties.getName(), overdueAudit.getName()));
             email.setContent("<p style=\"font-family: Calibri, sans-serif; font-size: 11pt; line-height: 4px;\">Next Audit Date for the <strong><a style=\"color: #6b6b6b;\" href=\""
-                    + hostUri() +"#/project/" + overdueAudit.getId()+"\">" + overdueAudit.getName() +"</a>&nbsp; </strong>project is overdue and requires your attention.</p>\n" +
+                    + baseURL +"#/project/" + overdueAudit.getId()+"\">" + overdueAudit.getName() +"</a>&nbsp; </strong>project is overdue and requires your attention.</p>\n" +
                     "<p style=\"font-family: Calibri, sans-serif; font-size: 11pt; line-height: 4px;\">Please follow this <a style=\"color: #6b6b6b;\" href=\""
-                    + hostUri() + "#/audit\">link</a> to access Audits Dashboard.</p>\n" +
+                    + baseURL + "#/audit\">link</a> to access Audits Dashboard.</p>\n" +
                     "<p>&nbsp;</p>" +
                     "<p style=\"font-family: Calibri, sans-serif; font-size: 10pt; line-height: 2px;\">Best Regards,</p>\n" +
                     "<p style=\"font-family: Calibri, sans-serif; font-size: 10pt; line-height: 2px;\">" + appProperties.getName() + " Administration</p>\n" +
@@ -78,10 +81,10 @@ private List<EmailDto> getUpcomingAudits(int daysFromToday, List<AuditStatisticD
             EmailDto email = new EmailDto();
             email.setSubject(String.format("[%s] Upcoming Project Audit - %s", appProperties.getName(), upcAudit.getName()));
             email.setContent("<p style=\"font-family: Calibri, sans-serif; font-size: 11pt; line-height: 4px;\">Next Audit for the <strong><a style=\"color: #6b6b6b;\" href=\""
-                    + hostUri() +"#/project/" + upcAudit.getId()+"\">" + upcAudit.getName() + "</a> </strong>project should be submitted within<strong> "
+                    + baseURL +"#/project/" + upcAudit.getId()+"\">" + upcAudit.getName() + "</a> </strong>project should be submitted within<strong> "
                     + days + " days.</strong></p>\n" +
                     "<p style=\"font-family: Calibri, sans-serif; font-size: 11pt; line-height: 4px;\">Please follow this <a style=\"color: #6b6b6b;\" href=\""
-                    + hostUri() + "#/audit\">link</a> to access Audits Dashboard and create a new Audit.</p>\n" +
+                    + baseURL + "#/audit\">link</a> to access Audits Dashboard and create a new Audit.</p>\n" +
                     "<p>&nbsp;</p>\n" +
                     "<p style=\"font-family: Calibri, sans-serif; font-size: 10pt; line-height: 2px;\">Best Regards,</p>\n" +
                     "<p style=\"font-family: Calibri, sans-serif; font-size: 10pt; line-height: 2px;\">" + appProperties.getName() + " Administration</p>\n" +
diff --git a/src/main/java/main/model/email/Emails.java b/src/main/java/main/model/email/Emails.java
@@ -1,26 +1,27 @@
 package main.model.email;
 
 import main.exceptions.AqualityException;
+import main.model.db.dao.settings.EmailSettingsDao;
+import main.model.dto.EmailDto;
+import main.model.dto.EmailSettingsDto;
 import main.utils.DateUtils;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Properties;
+import main.utils.EmailUtil;
 
 abstract class Emails {
+    String baseURL;
     DateUtils dateUtils = new DateUtils();
 
-    String hostUri() throws AqualityException {
-        ClassLoader classloader = Thread.currentThread().getContextClassLoader();
-        Properties prop = new Properties();
-
-        InputStream resource = classloader.getResourceAsStream("hostinfo.properties");
-        try {
-            prop.load(resource);
-        } catch (IOException e) {
-            throw new AqualityException("Not able to load properties");
-        }
+    Emails() throws AqualityException {
+        EmailSettingsDao emailSettingsDao = new EmailSettingsDao();
+        EmailSettingsDto settings = emailSettingsDao.getEntityById(new EmailSettingsDto());
+        baseURL = settings.getBase_url();
+    }
 
-        return String.format("http://%s/", prop.getProperty("frontURI"));
+    boolean sendEmail(EmailDto email) throws AqualityException {
+        EmailSettingsDao emailSettingsDao = new EmailSettingsDao();
+        EmailSettingsDto settings = emailSettingsDao.getAll().get(0);
+        settings.setPassword(emailSettingsDao.getAdminSecret(settings.getPassword()));
+        EmailUtil emailUtil = new EmailUtil(settings);
+        return emailUtil.sendHtmlEmail(email.getRecipients(), email.getSubject(), email.getContent());
     }
 }
diff --git a/src/main/java/main/model/email/TestRunEmails.java b/src/main/java/main/model/email/TestRunEmails.java
@@ -18,30 +18,26 @@
 import java.util.stream.Collectors;
 
 public class TestRunEmails extends Emails{
+    public TestRunEmails() throws AqualityException {
+        super();
+    }
+
     private AppProperties appProperties = new AppProperties();
+    public void sendTestRunResultsToTeam(TestRunDto testRun, List<UserDto> users) throws AqualityException, MessagingException, IOException, URISyntaxException {
+        ProjectDto project = getProject(testRun.getProject_id());
 
-    public void sendTestRunResultsToTeam(TestRunDto testRun, List<UserDto> users) throws IOException, JSONException, SQLException, NamingException, IllegalAccessException, InstantiationException, MessagingException, URISyntaxException, AqualityException {
-        ProjectDao projectDao = new ProjectDao();
-        ProjectDto projectDto = new ProjectDto();
-        projectDto.setId(testRun.getProject_id());
-        projectDto = projectDao.searchAll(projectDto).get(0);
-        List<TestResultDto> testResults = testRun.getTestResults();
-        double totalResultsNum = testResults.size();
-        double passedResultsNum = (int) testResults.stream().filter(x -> x.getFinal_result().getColor() == 5).count();
-        double failedResultsNum = (int) testResults.stream().filter(x -> x.getFinal_result().getColor() == 1).count();
-        double notExecutedResultsNum = (int) testResults.stream().filter(x -> x.getFinal_result().getColor() == 3 || x.getFinal_result().getColor() == 2 || x.getFinal_result().getColor() == 4).count();
-        List<TestResultDto> failedResults = testResults.stream().filter(x -> x.getFinal_result().getColor() != 5).collect(Collectors.toList());
-        List<TestResultDto> appIssues = failedResults.stream().filter(x -> x.getTest_resolution().getColor() == 1).collect(Collectors.toList());
-        List<TestResultDto> otherIssues = failedResults.stream().filter(x -> x.getTest_resolution().getColor() != 1 && x.getTest_resolution().getColor() != 2 && x.getTest_resolution().getColor() != 3).collect(Collectors.toList());
-        double successRate = passedResultsNum/totalResultsNum*100;
-        String rateColor = successRate > 85 ? "#009900" : successRate > 65 ? "#ff6601" : "#cc2100";
-        StringBuilder overview = new StringBuilder(appIssues.size() > 0 ? "  <p style=\"font-family: Calibri, sans-serif;margin:0;color: #4c4c4c;font-weight: bold;\">Application Issues Overview:</p>\n" : "");
-        for (TestResultDto testResult : appIssues) {
-            overview.append("  <p style=\"font-family: Calibri, sans-serif;margin:0;color: #4c4c4c;\">").append(testResult.getTest().getName()).append(": ").append(testResult.getComment() != null ? testResult.getComment() : "No comment for This Failure.").append("</p>\n");
-        }
+        double failedCount = getFailedResultsCount(testRun.getTestResults());
+        double passedCount = getPassedResultsCount(testRun.getTestResults());
+        double totalCount = getTotalResultsCount(testRun.getTestResults());
+        double notExecutedCount = getNotExecutedResultsCount(testRun.getTestResults());
+        double successRate = getSuccessRate(passedCount, totalCount);
+
+        List<TestResultDto> failed = getFailedResults(testRun.getTestResults());
+        List<TestResultDto> appIssues = getAppIssues(failed);
+        List<TestResultDto> otherIssues = getOtherIssues(failed);
 
         EmailDto email = new EmailDto();
-        email.setSubject("[RP]:" + projectDto.getName() + " - " + new DecimalFormat("##.##").format(successRate) + "% - "  + testRun.getBuild_name());
+        email.setSubject("[RP]:" + project.getName() + " - " + new DecimalFormat("##.##").format(successRate) + "% - "  + testRun.getBuild_name());
         email.setContent("<div style=\"\n" +
                 "margin-left: 20px;\n" +
                 "padding-left: 20px;\">\n" +
@@ -60,32 +56,32 @@ public void sendTestRunResultsToTeam(TestRunDto testRun, List<UserDto> users) th
                 "              font-weight: bold;\n" +
                 "              font-family: Calibri, sans-serif;\n" +
                 "              font-size: 15px;\n" +
-                "              line-height: 10px;\" href=\"" + hostUri() + "#/project/" + projectDto.getId() + "/testrun/" + testRun.getId() + "\">View on " + appProperties.getName() + "</a>\n" +
+                "              line-height: 10px;\" href=\"" + baseURL + "#/project/" + project.getId() + "/testrun/" + testRun.getId() + "\">View on " + appProperties.getName() + "</a>\n" +
                 "  </div>\n" +
                 "  <hr>\n" +
-                "  <div style=\"margin: 0;font-family: Calibri, sans-serif;height:50px; padding-top:20px; color:" + rateColor + ";font-size: 30px;\">\n" +
+                "  <div style=\"margin: 0;font-family: Calibri, sans-serif;height:50px; padding-top:20px; color:" + getRateColor(successRate) + ";font-size: 30px;\">\n" +
                 "    Success Rate: " + new DecimalFormat("##.##").format(successRate) + "%\n" +
                 "  </div>\n" +
                 "  <br/>\n" +
                 "  <p style=\"font-family: Calibri, sans-serif;margin:0;color: #4c4c4c;font-weight: bold;\">Test Results:</p>\n" +
                 "  <p style=\"margin: 0; color:#676767;text-transform: uppercase;font-family: Calibri, sans-serif;\">\n" +
-                "    Passed | " + new DecimalFormat("##").format(passedResultsNum) + " | " + new DecimalFormat("##.##").format(passedResultsNum/totalResultsNum*100) + "% </p>\n" +
+                "    Passed | " + new DecimalFormat("##").format(passedCount) + " | " + new DecimalFormat("##.##").format(passedCount/totalCount*100) + "% </p>\n" +
                 "  <p style=\"margin: 0;color:#e27070;text-transform: uppercase;font-family: Calibri, sans-serif;\">\n" +
-                "    Failed | " + new DecimalFormat("##").format(failedResultsNum) + " | " + new DecimalFormat("##.##").format(failedResultsNum/totalResultsNum*100) +"% </p>\n" +
+                "    Failed | " + new DecimalFormat("##").format(failedCount) + " | " + new DecimalFormat("##.##").format(failedCount/totalCount*100) +"% </p>\n" +
                 "  <p style=\"margin: 0;color:#676767;text-transform: uppercase;font-family: Calibri, sans-serif;\">\n" +
-                "    Not Executed | " + new DecimalFormat("##").format(notExecutedResultsNum) + " | " + new DecimalFormat("##.##").format(notExecutedResultsNum/totalResultsNum*100) +"% </p>\n" +
+                "    Not Executed | " + new DecimalFormat("##").format(notExecutedCount) + " | " + new DecimalFormat("##.##").format(notExecutedCount/totalCount*100) +"% </p>\n" +
                 "  <br/>\n" +
                 "  <p style=\"font-family: Calibri, sans-serif;margin:0;color: #4c4c4c;font-weight: bold;\">Failed Test Resolutions:</p>\n" +
                 "  <p style=\"margin: 0;color:#e27070;text-transform: uppercase;font-family: Calibri, sans-serif;\">\n" +
                 "    Application Issues | " + appIssues.size() + " </p>\n" +
                 "  <p style=\"margin: 0;color:#676767;text-transform: uppercase;font-family: Calibri, sans-serif;\">\n" +
-                "    Test Issues | " + (int) failedResults.stream().filter(x -> x.getTest_resolution().getColor() == 2).count() + " </p>\n" +
+                "    Test Issues | " + (int) failed.stream().filter(x -> x.getTest_resolution().getColor() == 2).count() + " </p>\n" +
                 "  <p style=\"margin: 0;color:#676767;text-transform: uppercase;font-family: Calibri, sans-serif;\">\n" +
-                "    Not Assigned | " + (int) failedResults.stream().filter(x -> x.getTest_resolution().getColor() == 3).count() + " </p>\n" +
+                "    Not Assigned | " + (int) failed.stream().filter(x -> x.getTest_resolution().getColor() == 3).count() + " </p>\n" +
                 "  <p style=\"margin: 0;color:#676767;text-transform: uppercase;font-family: Calibri, sans-serif;\">\n" +
                 "    Other Issues | " + otherIssues.size() + " </p>\n" +
                 "  <br/>\n" +
-                overview +
+                buildIssuesOverview(appIssues) +
                 "  <br/>\n" +
                 "  <hr>\n" +
                 "  <br/>\n" +
@@ -100,15 +96,73 @@ public void sendTestRunResultsToTeam(TestRunDto testRun, List<UserDto> users) th
                 "  </p>\n" +
                 "</div>");
         email.setRecipients(getProjectMemberRecipients(users));
-        EmailSettingsDao emailSettingsDao = new EmailSettingsDao();
-        EmailSettingsDto settings = emailSettingsDao.getAll().get(0);
-        settings.setPassword(emailSettingsDao.getAdminSecret(settings.getPassword()));
-        EmailUtil emailUtil = new EmailUtil(settings);
-        emailUtil.SendHtmlEmail(email.getRecipients(), email.getSubject(), email.getContent());
+        if(!sendEmail(email)) {
+            throw new AqualityException("Was not able to send Email!");
+        }
+    }
+
+    private ProjectDto getProject(Integer id) throws AqualityException {
+        ProjectDao projectDao = new ProjectDao();
+        ProjectDto projectDto = new ProjectDto();
+        projectDto.setId(id);
+        return projectDao.getEntityById(projectDto);
     }
 
     private List<String> getProjectMemberRecipients(List<UserDto> users) {
         return users.stream().map(UserDto::getEmail).collect(Collectors.toList());
     }
 
+    private double getSuccessRate(double passedCount, double totalCount) {
+        return passedCount/totalCount*100;
+    }
+
+    private List<TestResultDto> getAppIssues(List<TestResultDto> testResults) {
+        return  testResults.stream().filter(x -> x.getTest_resolution().getColor() == 1).collect(Collectors.toList());
+    }
+
+    private List<TestResultDto> getFailedResults(List<TestResultDto> testResults) {
+        return testResults.stream().filter(x -> x.getFinal_result().getColor() != 5).collect(Collectors.toList());
+    }
+
+    private List<TestResultDto> getOtherIssues(List<TestResultDto> testResults) {
+        return testResults.stream().filter(x -> x.getTest_resolution().getColor() != 1 && x.getTest_resolution().getColor() != 2 && x.getTest_resolution().getColor() != 3).collect(Collectors.toList());
+    }
+
+    private double getTotalResultsCount(List<TestResultDto> testResults) {
+        return testResults.size();
+    }
+
+    private double getNotExecutedResultsCount(List<TestResultDto> testResults) {
+        return (int) testResults.stream().filter(x -> x.getFinal_result().getColor() == 3 || x.getFinal_result().getColor() == 2 || x.getFinal_result().getColor() == 4).count();
+    }
+
+    private double getPassedResultsCount(List<TestResultDto> testResults) {
+        return (int) testResults.stream().filter(x -> x.getFinal_result().getColor() == 5).count();
+    }
+
+    private double getFailedResultsCount(List<TestResultDto> testResults) {
+        return (int) testResults.stream().filter(x -> x.getFinal_result().getColor() == 1).count();
+    }
+
+    private String getRateColor(double successRate) {
+        return successRate > 85 ? "#009900" : successRate > 65 ? "#ff6601" : "#cc2100";
+    }
+
+    private StringBuilder buildIssuesOverview(List<TestResultDto> appIssues){
+        StringBuilder overview = new StringBuilder(appIssues.size() > 0 ? "  <p style=\"font-family: Calibri, sans-serif;margin:0;color: #4c4c4c;font-weight: bold;\">Application Issues Overview:</p>\n" : "");
+
+        for (TestResultDto testResult : appIssues) {
+            overview
+                    .append("  <p style=\"font-family: Calibri, sans-serif;margin:0;color: #4c4c4c;\">")
+                    .append(testResult.getTest().getName())
+                    .append(": ")
+                    .append(
+                            testResult.getComment() != null
+                                    ? testResult.getComment()
+                                    : "No comment for This Failure.")
+                    .append("</p>\n");
+        }
+
+        return overview;
+    }
 }
diff --git a/src/main/java/main/utils/Daily.java b/src/main/java/main/utils/Daily.java
diff --git a/src/main/java/main/utils/EmailUtil.java b/src/main/java/main/utils/EmailUtil.java
diff --git a/src/main/resources/db_changelog/db.changelog-0.3.4.xml b/src/main/resources/db_changelog/db.changelog-0.3.4.xml

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public Importer getImporter(List<String> filePaths, TestRunDto testRunTemplate,`
`63`	`63`	`return new Importer(filePaths, testRunTemplate, pattern, format, nodeType, singleTestRun, user);`
`64`	`64`	`}`
`65`	`65`
`66`		`- public TestRunEmails getTestRunEmails(){`
	`66`	`+ public TestRunEmails getTestRunEmails() throws AqualityException {`
`67`	`67`	`return new TestRunEmails();`
`68`	`68`	`}`
`69`	`69`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ public class EmailSettingsDao extends DAO<EmailSettingsDto> {`
`14`	`14`
`15`	`15`	`public EmailSettingsDao() {`
`16`	`16`	`super(EmailSettingsDto.class);`
`17`		`- insert = "{call INSERT_EMAIL_SETTINGS(?,?,?,?,?,?,?,?,?)}";`
	`17`	`+ insert = "{call INSERT_EMAIL_SETTINGS(?,?,?,?,?,?,?,?,?,?)}";`
`18`	`18`	`select = "{call SELECT_EMAIL_SETTINGS(?)}";`
`19`	`19`	`}`
`20`	`20`
Original file line number	Diff line number	Diff line change
`@@ -34,4 +34,7 @@ public class EmailSettingsDto extends BaseDto {`
`34`	`34`	`@DataBaseName(name="request_default_email_pattern")`
`35`	`35`	`@DataBaseInsert`
`36`	`36`	`private String default_email_pattern;`
	`37`	`+ @DataBaseName(name="request_base_url")`
	`38`	`+ @DataBaseInsert`
	`39`	`+ private String base_url;`
`37`	`40`	`}`