Merge pull request #10 from aquality-automation/feature/Rebranding

VladislavKostyukevich · web-flow · commit 47ae091fca5f · 2019-08-19T18:42:41.000+03:00
Feature/rebranding
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# Reporting portal API
+# Aquality Tracking API
 
 ## Getting started
 
diff --git a/src/main/filters/local.properties b/src/main/filters/local.properties
@@ -1 +1 @@
-db.name= union_reporting
+db.name=union_reporting
diff --git a/src/main/java/main/model/db/dao/project/UserDao.java b/src/main/java/main/model/db/dao/project/UserDao.java
@@ -15,7 +15,7 @@
 public class UserDao extends DAO<UserDto> {
     public UserDao() {
         super(UserDto.class);
-        select = "{call SELECT_USERS(?,?,?,?,?,?)}";
+        select = "{call SELECT_USERS(?,?,?,?,?,?,?)}";
         insert = "{call INSERT_USER(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)}";
         remove = "{call REMOVE_USER(?)}";
     }
diff --git a/src/main/java/main/model/dto/AuditorDto.java b/src/main/java/main/model/dto/AuditorDto.java
@@ -14,7 +14,7 @@ public class AuditorDto extends UserDto {
     @DataBaseName(name="request_user_id")
     @DataBaseInsert
     @DataBaseSearchable
-    private Integer assignee_user_id;
+    private Integer id;
     @DataBaseName(name="request_auditor_id")
     @DataBaseID
     private Integer auditor_id;
diff --git a/src/main/java/main/model/dto/UserDto.java b/src/main/java/main/model/dto/UserDto.java
@@ -43,6 +43,7 @@ public class UserDto extends BaseDto {
     private Integer manager;
     @DataBaseName(name="request_auditor")
     @DataBaseInsert
+    @DataBaseSearchable
     private Integer auditor;
     @DataBaseName(name="request_unit_coordinator")
     @DataBaseInsert
diff --git a/src/main/java/main/model/email/AuditEmails.java b/src/main/java/main/model/email/AuditEmails.java
@@ -5,6 +5,7 @@
 import main.model.db.dao.audit.AuditStatisticDao;
 import main.model.db.dao.project.UserDao;
 import main.model.dto.*;
+import main.utils.AppProperties;
 import org.json.JSONException;
 
 import javax.naming.NamingException;
@@ -19,12 +20,13 @@
 public class AuditEmails extends Emails {
 
     private AuditStatisticDao auditStatisticController;
+    private AppProperties appProperties = new AppProperties();
 
     public AuditEmails() {
         auditStatisticController = new AuditStatisticDao();
     }
 
-    public List<EmailDto> GetUpcomingEmails() throws SQLException, IOException, JSONException, NamingException, IllegalAccessException, InstantiationException, RPException {
+    public List<EmailDto> GetUpcomingEmails() throws  RPException {
         List<AuditStatisticDto> audits = auditStatisticController.getAll();
         List<String> recipients = getRecipients();
 
@@ -36,7 +38,7 @@ public List<EmailDto> GetUpcomingEmails() throws SQLException, IOException, JSON
         return emails;
     }
 
-    public List<EmailDto> GetOverdueEmails() throws SQLException, IOException, JSONException, NamingException, IllegalAccessException, InstantiationException, RPException {
+    public List<EmailDto> GetOverdueEmails() throws RPException {
         List<AuditStatisticDto> audits = auditStatisticController.getAll();
         List<String> recipients = getRecipients();
         List<AuditStatisticDto> overdueAudits = audits.stream()
@@ -47,16 +49,16 @@ public List<EmailDto> GetOverdueEmails() throws SQLException, IOException, JSONE
 
         for(AuditStatisticDto overdueAudit: overdueAudits){
             EmailDto email = new EmailDto();
-            email.setSubject("[REPORTING PORTAL] Overdue Project Audit - " + overdueAudit.getName());
+            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" +
                     "<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" +
                     "<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;\">Reporting Portal Administration</p>\n" +
+                    "<p style=\"font-family: Calibri, sans-serif; font-size: 10pt; line-height: 2px;\">" + appProperties.getName() + " Administration</p>\n" +
                     "<p><img src=\"cid:logo\"></p>\n" +
-                    "<p><span style=\"font-family: Calibri; font-size: 7.5pt; color: #7f7f7f;\">This message is automatically generated by Notification Assistant for Reporting Portal.<br /> If you think it was sent incorrectly, please contact your Reporting Portal administrators.</span></p>");
+                    "<p><span style=\"font-family: Calibri; font-size: 7.5pt; color: #7f7f7f;\">This message is automatically generated by Notification Assistant for " + appProperties.getName() + ".<br /> If you think it was sent incorrectly, please contact your " + appProperties.getName() + " administrators.</span></p>");
             List<String> customRecipients = new ArrayList<>(recipients);
 
             if(!Objects.equals(overdueAudit.getLast_created_id(), overdueAudit.getLast_submitted_id())){
@@ -80,17 +82,17 @@ private List<EmailDto> getUpcomingAudits(int daysFromToday, List<AuditStatisticD
 
         for(AuditStatisticDto upcAudit: upcomingAudits){
             EmailDto email = new EmailDto();
-            email.setSubject("[REPORTING PORTAL] Upcoming Project Audit - " + upcAudit.getName());
+            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> "
                     + 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" +
                     "<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;\">Reporting Portal Administration</p>\n" +
+                    "<p style=\"font-family: Calibri, sans-serif; font-size: 10pt; line-height: 2px;\">" + appProperties.getName() + " Administration</p>\n" +
                     "<p><img src=\"cid:logo\"></p>\n" +
-                    "<p><span style=\"font-family: Calibri; font-size: 7.5pt; color: #7f7f7f;\">This message is automatically generated by Notification Assistant for Reporting Portal.<br /> If you think it was sent incorrectly, please contact your Reporting Portal administrators.</span></p>");
+                    "<p><span style=\"font-family: Calibri; font-size: 7.5pt; color: #7f7f7f;\">This message is automatically generated by Notification Assistant for " + appProperties.getName() + ".<br /> If you think it was sent incorrectly, please contact your " + appProperties.getName() + " administrators.</span></p>");
             email.setRecipients(recipients);
             emails.add(email);
         }
@@ -111,7 +113,7 @@ private List<String> getCustomRecipients(Integer id) throws RPException {
         auditTemplate.setId(id);
         List<AuditorDto> users = auditDao.searchAll(auditTemplate).get(0).getAuditors();
         users = users.stream().filter(userX -> userX.getAudit_notifications() == 1).collect(Collectors.toList());
-        return users.stream().map(auditor -> auditor.getEmail()).collect(Collectors.toList());
+        return users.stream().map(UserDto::getEmail).collect(Collectors.toList());
     }
 
     private Date getDueDate(AuditStatisticDto auditStat){
diff --git a/src/main/java/main/model/email/TestRunEmails.java b/src/main/java/main/model/email/TestRunEmails.java
@@ -4,6 +4,7 @@
 import main.model.db.dao.project.ProjectDao;
 import main.model.db.dao.settings.EmailSettingsDao;
 import main.model.dto.*;
+import main.utils.AppProperties;
 import main.utils.EmailUtil;
 import org.json.JSONException;
 
@@ -17,6 +18,7 @@
 import java.util.stream.Collectors;
 
 public class TestRunEmails extends Emails{
+    private AppProperties appProperties = new AppProperties();
 
     public void sendTestRunResultsToTeam(TestRunDto testRun, List<UserDto> users) throws IOException, JSONException, SQLException, NamingException, IllegalAccessException, InstantiationException, MessagingException, URISyntaxException, RPException {
         ProjectDao projectDao = new ProjectDao();
@@ -25,17 +27,17 @@ public void sendTestRunResultsToTeam(TestRunDto testRun, List<UserDto> users) th
         projectDto = projectDao.searchAll(projectDto).get(0);
         List<TestResultDto> testResults = testRun.getTestResults();
         double totalResultsNum = testResults.size();
-        double passedResultsNum = testResults.stream().filter(x -> x.getFinal_result().getColor() == 5).collect(Collectors.toList()).size();
-        double failedResultsNum = testResults.stream().filter(x -> x.getFinal_result().getColor() == 1).collect(Collectors.toList()).size();
-        double notExecutedResultsNum = testResults.stream().filter(x -> x.getFinal_result().getColor() == 3 || x.getFinal_result().getColor() == 2 || x.getFinal_result().getColor() == 4).collect(Collectors.toList()).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";
-        String overview = appIssues.size() > 0 ? "  <p style=\"font-family: Calibri, sans-serif;margin:0;color: #4c4c4c;font-weight: bold;\">Application Issues Overview:</p>\n" : "";
+        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 += "  <p style=\"font-family: Calibri, sans-serif;margin:0;color: #4c4c4c;\">" + testResult.getTest().getName() + ": " + (testResult.getComment() != null ? testResult.getComment() : "No comment for This Failure.") + "</p>\n";
+            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");
         }
 
         EmailDto email = new EmailDto();
@@ -58,7 +60,7 @@ 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 Reporting Portal</a>\n" +
+                "              line-height: 10px;\" href=\"" + hostUri() + "#/project/" + projectDto.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" +
@@ -77,9 +79,9 @@ public void sendTestRunResultsToTeam(TestRunDto testRun, List<UserDto> users) th
                 "  <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 | " + failedResults.stream().filter(x -> x.getTest_resolution().getColor() == 2 ).collect(Collectors.toList()).size() + " </p>\n" +
+                "    Test Issues | " + (int) failedResults.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 | " + failedResults.stream().filter(x -> x.getTest_resolution().getColor() == 3).collect(Collectors.toList()).size() + " </p>\n" +
+                "    Not Assigned | " + (int) failedResults.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" +
@@ -88,13 +90,13 @@ public void sendTestRunResultsToTeam(TestRunDto testRun, List<UserDto> users) th
                 "  <hr>\n" +
                 "  <br/>\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;\">Reporting Portal Administration</p>\n" +
+                "  <p style=\"font-family: Calibri, sans-serif; font-size: 10pt; line-height: 2px;\">" + appProperties.getName() + " Administration</p>\n" +
                 "  <p>\n" +
                 "    <img src=\"cid:logo\">\n" +
                 "  </p>\n" +
                 "  <p>\n" +
-                "    <span style=\"font-family: Calibri; font-size: 7.5pt; color: #7f7f7f;\">This message is automatically generated by Notification Assistant for Reporting Portal.\n" +
-                "      <br/> If you think it was sent incorrectly, please contact your Reporting Portal administrators.</span>\n" +
+                "    <span style=\"font-family: Calibri; font-size: 7.5pt; color: #7f7f7f;\">This message is automatically generated by Notification Assistant for " + appProperties.getName() + ".\n" +
+                "      <br/> If you think it was sent incorrectly, please contact your " + appProperties.getName() + " administrators.</span>\n" +
                 "  </p>\n" +
                 "</div>");
         email.setRecipients(getProjectMemberRecipients(users));
diff --git a/src/main/java/main/utils/AppProperties.java b/src/main/java/main/utils/AppProperties.java
@@ -0,0 +1,11 @@
+package main.utils;
+
+public class AppProperties extends PropertyUtils{
+    public AppProperties() {
+        super(AvailableProperties.APPLICATION);
+    }
+
+    public String getName(){
+       return prop.getProperty("name");
+    }
+}
diff --git a/src/main/java/main/utils/AvailableProperties.java b/src/main/java/main/utils/AvailableProperties.java
@@ -0,0 +1,14 @@
+package main.utils;
+
+public enum AvailableProperties {
+    APPLICATION("appinfo.properties");
+
+    private String name;
+    AvailableProperties(String name) {
+        this.name = name;
+    }
+
+    public String getName() {
+        return name;
+    }
+}
diff --git a/src/main/java/main/utils/EmailUtil.java b/src/main/java/main/utils/EmailUtil.java
@@ -62,7 +62,7 @@ public void SendHtmlEmail(List<String> to, String subject, String content) throw
 
             imageBodyPart.setHeader("Content-ID", "<logo>");
             imageBodyPart.setDisposition(Part.INLINE);
-            imageBodyPart.attachFile(new File(classloader.getResource("rp-logo.png").toURI()));
+            imageBodyPart.attachFile(new File(classloader.getResource("logo.png").toURI()));
 
             multipart.addBodyPart(imageBodyPart);
 
diff --git a/src/main/java/main/utils/PropertyUtils.java b/src/main/java/main/utils/PropertyUtils.java
@@ -0,0 +1,26 @@
+package main.utils;
+
+import main.exceptions.RPException;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
+
+class PropertyUtils {
+    Properties prop;
+
+    PropertyUtils(AvailableProperties property) {
+        try (InputStream input = PropertyUtils.class.getClassLoader().getResourceAsStream(property.getName())) {
+
+            prop = new Properties();
+
+            if (input == null) {
+                throw new RPException(String.format("Sorry, unable to find %s.", property.getName()));
+            }
+            prop.load(input);
+        }catch (RPException | IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+}
diff --git a/src/main/java/main/view/Administration/UsersServlet.java b/src/main/java/main/view/Administration/UsersServlet.java
@@ -23,12 +23,7 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) {
         try {
             Session session = createSession(req);
             UserDto userTemplate = new UserDto();
-            if(req.getParameterMap().containsKey("unit_coordinator")){
-                userTemplate.setUnit_coordinator(Integer.parseInt(req.getParameter("unit_coordinator")));
-            }
-            if(req.getParameterMap().containsKey("account_manager")){
-                userTemplate.setAccount_manager(Integer.parseInt(req.getParameter("account_manager")));
-            }
+            userTemplate.getSearchTemplateFromRequestParameters(req);
             List<UserDto> users = session.controllerFactory.getHandler(userTemplate).get(userTemplate);
             setJSONContentType(resp);
             resp.getWriter().write(mapper.serialize(users));
diff --git a/src/main/java/main/view/Project/ProjectUserServlet.java b/src/main/java/main/view/Project/ProjectUserServlet.java
@@ -42,8 +42,9 @@ public void doPost(HttpServletRequest req, HttpServletResponse resp) {
         try {
             Session session = createSession(req);
             ProjectUserDto projectUser = mapper.mapObject(ProjectUserDto.class, getRequestJson(req));
-            session.controllerFactory.getHandler(projectUser).create(projectUser);
+            projectUser = session.controllerFactory.getHandler(projectUser).create(projectUser);
             setJSONContentType(resp);
+            resp.getWriter().write(mapper.serialize(projectUser));
         }catch (Exception e) {
             handleException(resp, e);
         }
diff --git a/src/main/resources/appinfo.properties b/src/main/resources/appinfo.properties
@@ -0,0 +1 @@
+name=Aquality Tracking
diff --git a/src/main/resources/db_changelog/changelog.xml b/src/main/resources/db_changelog/changelog.xml
@@ -24,4 +24,5 @@
     <include file="db.changelog-0.4.xml" relativeToChangelogFile="true"/>
     <include file="db.changelog-0.5.xml" relativeToChangelogFile="true"/>
     <include file="db.changelog-0.6.xml" relativeToChangelogFile="true"/>
+    <include file="db.changelog-0.3.1.xml" relativeToChangelogFile="true"/>
 </databaseChangeLog>
diff --git a/src/main/resources/db_changelog/db.changelog-0.3.1.xml b/src/main/resources/db_changelog/db.changelog-0.3.1.xml
diff --git a/src/main/resources/logo.png b/src/main/resources/logo.png
diff --git a/src/main/resources/rp-logo.png b/src/main/resources/rp-logo.png
diff --git a/src/test/java/tests/utils/PropertiesUtilsTest.java b/src/test/java/tests/utils/PropertiesUtilsTest.java

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Reporting portal API`
	`1`	`+# Aquality Tracking API`
`2`	`2`
`3`	`3`	`## Getting started`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-db.name= union_reporting`
	`1`	`+db.name=union_reporting`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`public class UserDao extends DAO<UserDto> {`
`16`	`16`	`public UserDao() {`
`17`	`17`	`super(UserDto.class);`
`18`		`- select = "{call SELECT_USERS(?,?,?,?,?,?)}";`
	`18`	`+ select = "{call SELECT_USERS(?,?,?,?,?,?,?)}";`
`19`	`19`	`insert = "{call INSERT_USER(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)}";`
`20`	`20`	`remove = "{call REMOVE_USER(?)}";`
`21`	`21`	`}`