[Faxtomail-commits] 01/02: fix sample data init

16 Nov 2015

This is an automated email from the git hooks/post-receive script.

New commit to branch develop-1.1.x in repository faxtomail.

See http://git.codelutin.com/faxtomail.git

commit d54edd078ba5565baf07ced6909f815e9746eda7
Author: Kevin Morin <morin@codelutin.com>
Date:   Mon Nov 16 15:07:36 2015 +0100

    fix sample data init
---
 .../services/service/InitFaxToMailServiceImpl.java | 48 +++++++---------------
 1 file changed, 14 insertions(+), 34 deletions(-)

diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailServiceImpl.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailServiceImpl.java
index 4d39849..55b2399 100644
--- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailServiceImpl.java
+++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailServiceImpl.java
@@ -24,30 +24,7 @@ package com.franciaflex.faxtomail.services.service;
  * #L%
  */
 
-import com.franciaflex.faxtomail.persistence.entities.Client;
-import com.franciaflex.faxtomail.persistence.entities.DemandStatus;
-import com.franciaflex.faxtomail.persistence.entities.DemandType;
-import com.franciaflex.faxtomail.persistence.entities.DemandTypeTopiaDao;
-import com.franciaflex.faxtomail.persistence.entities.Email;
-import com.franciaflex.faxtomail.persistence.entities.EmailTopiaDao;
-import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser;
-import com.franciaflex.faxtomail.persistence.entities.FaxToMailUserGroup;
-import com.franciaflex.faxtomail.persistence.entities.FaxToMailUserGroupTopiaDao;
-import com.franciaflex.faxtomail.persistence.entities.FaxToMailUserTopiaDao;
-import com.franciaflex.faxtomail.persistence.entities.History;
-import com.franciaflex.faxtomail.persistence.entities.HistoryTopiaDao;
-import com.franciaflex.faxtomail.persistence.entities.HistoryType;
-import com.franciaflex.faxtomail.persistence.entities.MailField;
-import com.franciaflex.faxtomail.persistence.entities.MailFolder;
-import com.franciaflex.faxtomail.persistence.entities.MailFolderTopiaDao;
-import com.franciaflex.faxtomail.persistence.entities.Priority;
-import com.franciaflex.faxtomail.persistence.entities.PriorityTopiaDao;
-import com.franciaflex.faxtomail.persistence.entities.Range;
-import com.franciaflex.faxtomail.persistence.entities.RangeRow;
-import com.franciaflex.faxtomail.persistence.entities.RangeRowTopiaDao;
-import com.franciaflex.faxtomail.persistence.entities.RangeTopiaDao;
-import com.franciaflex.faxtomail.persistence.entities.WaitingState;
-import com.franciaflex.faxtomail.persistence.entities.WaitingStateTopiaDao;
+import com.franciaflex.faxtomail.persistence.entities.*;
 import com.franciaflex.faxtomail.services.DecoratorService;
 import com.franciaflex.faxtomail.services.FaxToMailServiceSupport;
 import com.franciaflex.faxtomail.services.FaxToMailServiceUtils;
@@ -209,6 +186,7 @@ public class InitFaxToMailServiceImpl extends FaxToMailServiceSupport implements
             // fixme seed to be used in test
             Random random = new Random(1234);
             EmailTopiaDao emailDao = getPersistenceContext().getEmailDao();
+            OriginalEmailTopiaDao originalEmailDao = getPersistenceContext().getOriginalEmailDao();
             HistoryTopiaDao historyDao = getPersistenceContext().getHistoryDao();
             RangeRowTopiaDao rangeRowDao = getPersistenceContext().getRangeRowDao();
 
@@ -309,12 +287,12 @@ public class InitFaxToMailServiceImpl extends FaxToMailServiceSupport implements
                 if (fxClientsStream != null) {
                     List<Client> clients = getReferentielService().importClients(fxClientsStream);
 
-                    createEmails(random, historyDao, rangeRowDao, emailDao, ranges, clients, types, priorities, cyrilFolder, cyril);
-                    createEmails(random, historyDao, rangeRowDao, emailDao, ranges, clients, types, priorities, claireFolder, claire);
-                    createEmails(random, historyDao, rangeRowDao, emailDao, ranges, clients, types, priorities, agatheFolder, agathe);
-                    createEmails(random, historyDao, rangeRowDao, emailDao, ranges, clients, types, priorities, marcFolder, marc);
-                    createEmails(random, historyDao, rangeRowDao, emailDao, ranges, clients, types, priorities, fredericFolder, frederic);
-                    createEmails(random, historyDao, rangeRowDao, emailDao, ranges, clients, types, priorities, jeanneFolder, jeanne);
+                    createEmails(random, historyDao, rangeRowDao, emailDao, originalEmailDao, ranges, clients, types, priorities, cyrilFolder, cyril);
+                    createEmails(random, historyDao, rangeRowDao, emailDao, originalEmailDao, ranges, clients, types, priorities, claireFolder, claire);
+                    createEmails(random, historyDao, rangeRowDao, emailDao, originalEmailDao, ranges, clients, types, priorities, agatheFolder, agathe);
+                    createEmails(random, historyDao, rangeRowDao, emailDao, originalEmailDao, ranges, clients, types, priorities, marcFolder, marc);
+                    createEmails(random, historyDao, rangeRowDao, emailDao, originalEmailDao, ranges, clients, types, priorities, fredericFolder, frederic);
+                    createEmails(random, historyDao, rangeRowDao, emailDao, originalEmailDao, ranges, clients, types, priorities, jeanneFolder, jeanne);
                 }
 
             } catch(Exception e) {
@@ -325,12 +303,13 @@ public class InitFaxToMailServiceImpl extends FaxToMailServiceSupport implements
         }
     }
 
-    protected void createEmails(Random random, HistoryTopiaDao historyDao, RangeRowTopiaDao rangeRowDao, EmailTopiaDao emailDao,
+    protected void createEmails(Random random, HistoryTopiaDao historyDao, RangeRowTopiaDao rangeRowDao,
+                                EmailTopiaDao emailDao, OriginalEmailTopiaDao originalEmailDao,
                                 List<Range> ranges, List<Client> clients, List<DemandType> types, List<Priority> priorities,
                                 MailFolder folder, FaxToMailUser user) throws InvalidClientException {
         int r = random.nextInt(100) + 50;
         for (int i = 0 ; i < r ; i++) {
-            createEmail(random, historyDao, rangeRowDao, emailDao, ranges, clients, types, priorities, folder, user);
+            createEmail(random, historyDao, rangeRowDao, emailDao, originalEmailDao, ranges, clients, types, priorities, folder, user);
         }
     }
 
@@ -338,6 +317,7 @@ public class InitFaxToMailServiceImpl extends FaxToMailServiceSupport implements
                                HistoryTopiaDao historyDao,
                                RangeRowTopiaDao rangeRowDao,
                                EmailTopiaDao emailDao,
+                               OriginalEmailTopiaDao originalEmailDao,
                                List<Range> ranges,
                                List<Client> clients,
                                List<DemandType> types,
@@ -389,7 +369,7 @@ public class InitFaxToMailServiceImpl extends FaxToMailServiceSupport implements
                                       Email.PROPERTY_MAIL_FOLDER, folder,
                                       Email.PROPERTY_DEMAND_STATUS, opened ? DemandStatus.IN_PROGRESS : DemandStatus.UNTREATED,
                                       Email.PROPERTY_HISTORY, Lists.newArrayList(history),
-                                      Email.PROPERTY_ORIGINAL_EMAIL, "Demo data");
+                                      Email.PROPERTY_ORIGINAL_EMAIL, originalEmailDao.create(OriginalEmail.PROPERTY_CONTENT, "Demo data"));
 
 
         if (opened) {
@@ -437,7 +417,7 @@ public class InitFaxToMailServiceImpl extends FaxToMailServiceSupport implements
                                 Email.PROPERTY_MAIL_FOLDER, folder,
                                 Email.PROPERTY_DEMAND_STATUS, opened ? DemandStatus.IN_PROGRESS : DemandStatus.UNTREATED,
                                 Email.PROPERTY_HISTORY, Lists.newArrayList(history),
-                                Email.PROPERTY_ORIGINAL_EMAIL, "Demo data");
+                                Email.PROPERTY_ORIGINAL_EMAIL, originalEmailDao.create(OriginalEmail.PROPERTY_CONTENT, "Demo data"));
 
 
         if (opened) {

-- 
To stop receiving notification emails like this one, please contact
codelutin.com SCM administrator <admin+scm@codelutin.com>.

    

[Faxtomail-commits] 01/02: fix sample data init

codelutin.com scm