auto-create recipients only for probands matching the massmail department

Author: rkrenn

core/src/main/java/org/phoenixctms/ctsms/service/massmail/MassMailServiceImpl.java

@@ -828,17 +828,20 @@ protected long handlePrepareRecipients(AuthenticationVO auth, Long departmentId)
 										count++;
 									}
 								} else {
-									MassMailRecipientInVO newMassMailRecipient = new MassMailRecipientInVO();
-									newMassMailRecipient.setMassMailId(massMail.getId());
-									newMassMailRecipient.setProbandId(probandId);
-									newMassMailRecipient.setToken(token);
-									//try {
-									ServiceUtil.addMassMailRecipient(newMassMailRecipient, now, user, this.getMassMailDao(), this.getProbandDao(), this.getTrialDao(),
-											massMailRecipientDao,
-											this.getJournalEntryDao());
-									count++;
-									//} catch (ServiceException e) {
-									//}
+									Proband proband = listEntry != null ? listEntry.getProband() : this.getProbandDao().load(probandId);
+									if (massMail.getDepartment().equals(proband.getDepartment())) {
+										MassMailRecipientInVO newMassMailRecipient = new MassMailRecipientInVO();
+										newMassMailRecipient.setMassMailId(massMail.getId());
+										newMassMailRecipient.setProbandId(probandId);
+										newMassMailRecipient.setToken(token);
+										//try {
+										ServiceUtil.addMassMailRecipient(newMassMailRecipient, now, user, this.getMassMailDao(), this.getProbandDao(), this.getTrialDao(),
+												massMailRecipientDao,
+												this.getJournalEntryDao());
+										count++;
+										//} catch (ServiceException e) {
+										//}
+									}
 								}
 							} catch (ServiceException e) {
 							}

core/src/main/java/org/phoenixctms/ctsms/service/trial/TrialServiceImpl.java

@@ -530,8 +530,11 @@ private ProbandListEntryOutVO addProbandListEntry(ProbandListEntryInVO newProban
 				Iterator<MassMail> massMailsIt = this.getMassMailDao().findByTrialProbandListStatusTypeLocked(trial.getId(), statusType.getId(), new HashSet<Long>(), false, null)
 						.iterator();
 				while (massMailsIt.hasNext()) {
-					ServiceUtil.addResetMassMailRecipient(massMailsIt.next(), proband, now, user, massMailDao, probandDao, trialDao,
-							massMailRecipientDao, journalEntryDao);
+					MassMail massMail = massMailsIt.next();
+					if (massMail.getDepartment().equals(proband.getDepartment())) {
+						ServiceUtil.addResetMassMailRecipient(massMail, proband, now, user, massMailDao, probandDao, trialDao,
+								massMailRecipientDao, journalEntryDao);
+					}
 				}
 			}
 		}

core/src/main/java/org/phoenixctms/ctsms/util/ServiceUtil.java

@@ -320,8 +320,12 @@ public static ProbandListStatusEntryOutVO addProbandListStatusEntry(ProbandListS
 					.iterator();
 		}
 		while (massMailsIt.hasNext()) {
-			addResetMassMailRecipient(massMailsIt.next(), listEntry.getProband(), now, user, massMailDao, probandDao, trialDao,
-					massMailRecipientDao, journalEntryDao);
+			MassMail massMail = massMailsIt.next();
+			Proband proband = listEntry.getProband();
+			if (massMail.getDepartment().equals(proband.getDepartment())) {
+				addResetMassMailRecipient(massMail, proband, now, user, massMailDao, probandDao, trialDao,
+						massMailRecipientDao, journalEntryDao);
+			}
 		}
 		ProbandListStatusEntryOutVO result = probandListStatusEntryDao.toProbandListStatusEntryOutVO(probandListStatusEntry);
 		if (logProband) {