This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit 9a678d887993b1b74465824bf84f94ddce22246b Author: jcouteau <couteau@codelutin.com> Date: Mon Jun 18 11:19:39 2018 +0200 Remove archived from computeQuantities --- .../franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java | 8 ++++++-- .../franciaflex/faxtomail/services/service/EmailServiceTest.java | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java index 11cf37a6..a9a5eb18 100644 --- a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java +++ b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java @@ -1211,7 +1211,8 @@ public class EmailTopiaDao extends AbstractEmailTopiaDao<Email> { " INNER JOIN email." + Email.PROPERTY_RANGE_ROW + " AS rangeRow" + " INNER JOIN rangeRow." + RangeRow.PROPERTY_RANGE + " AS range" + " WHERE email." + Email.PROPERTY_MAIL_FOLDER + " IN :folders" + - " AND email." + Email.PROPERTY_WAITING_STATE + " IS NULL"; + " AND email." + Email.PROPERTY_WAITING_STATE + " IS NULL" + + " AND email." + Email.PROPERTY_DEMAND_STATUS + " <> '" + DemandStatus.ARCHIVED + "'"; Map<String, Object> args = new HashMap<>(); args.put("folders", folders); @@ -1234,6 +1235,7 @@ public class EmailTopiaDao extends AbstractEmailTopiaDao<Email> { " INNER JOIN rangeRow." + RangeRow.PROPERTY_RANGE + " AS range" + " WHERE email." + Email.PROPERTY_MAIL_FOLDER + " IN :folders" + " AND email." + Email.PROPERTY_WAITING_STATE + " IS NULL" + + " AND email." + Email.PROPERTY_DEMAND_STATUS + " <> '" + DemandStatus.ARCHIVED + "'" + " GROUP BY range"; args = new HashMap<>(); @@ -1282,7 +1284,8 @@ public class EmailTopiaDao extends AbstractEmailTopiaDao<Email> { " INNER JOIN email." + Email.PROPERTY_RANGE_ROW + " AS rangeRow" + " INNER JOIN rangeRow." + RangeRow.PROPERTY_RANGE + " AS range" + " WHERE email." + Email.PROPERTY_MAIL_FOLDER + " IN :folders" + - " AND email." + Email.PROPERTY_WAITING_STATE + " IS NOT NULL"; + " AND email." + Email.PROPERTY_WAITING_STATE + " IS NOT NULL" + + " AND email." + Email.PROPERTY_DEMAND_STATUS + " <> '" + DemandStatus.ARCHIVED + "'" ; args = new HashMap<>(); args.put("folders", folders); @@ -1306,6 +1309,7 @@ public class EmailTopiaDao extends AbstractEmailTopiaDao<Email> { " WHERE email." + Email.PROPERTY_MAIL_FOLDER + " IN :folders" + // " AND email." + Email.PROPERTY_TAKEN_BY + " IS NOT NULL" + " AND email." + Email.PROPERTY_WAITING_STATE + " IS NOT NULL" + + " AND email." + Email.PROPERTY_DEMAND_STATUS + " <> '" + DemandStatus.ARCHIVED + "'" + " GROUP BY range"; args = new HashMap<>(); diff --git a/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java b/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java index 071ddc25..c6d77781 100644 --- a/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java +++ b/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java @@ -230,8 +230,8 @@ public class EmailServiceTest extends AbstractFaxToMailServiceTest { // recupere la premiere lignes Entry<Range, Quantities> entry = quantitiesByRange.getInProgressQuantitiesByRange().entrySet().iterator().next(); Assert.assertEquals("Bas de gamme", entry.getKey().getLabel()); - Assert.assertEquals(500, entry.getValue().getProductQuantity().longValue()); - Assert.assertEquals(600, entry.getValue().getSavQuantity().longValue()); + Assert.assertEquals(250, entry.getValue().getProductQuantity().longValue()); + Assert.assertEquals(300, entry.getValue().getSavQuantity().longValue()); // NPE : Assert.assertEquals(600, entry.getValue()[2].longValue()); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.