Merge pull request SORMAS-Foundation#3547 from hzi-braunschweig/feature-3253-SendSMSToCases

Feature 3253 send sms to cases

Author: BarnaBartha

sormas-api/src/main/java/de/symeda/sormas/api/caze/CaseFacade.java

@@ -27,6 +27,8 @@
 import de.symeda.sormas.api.CaseMeasure;
 import de.symeda.sormas.api.Disease;
 import de.symeda.sormas.api.Language;
+import de.symeda.sormas.api.messaging.ManualMessageLogDto;
+import de.symeda.sormas.api.messaging.MessageType;
 import de.symeda.sormas.api.contact.ContactReferenceDto;
 import de.symeda.sormas.api.contact.DashboardQuarantineDataDto;
 import de.symeda.sormas.api.event.EventParticipantReferenceDto;
@@ -175,4 +177,10 @@ List<DashboardQuarantineDataDto> getQuarantineDataForDashBoard(
 		Date to);
 
 	long countCasesConvertedFromContacts(CaseCriteria caseCriteria);
+
+	void sendMessage(List<String> caseUuids, String subject, String messageContent, MessageType... messageTypes);
+
+	long countCasesWithMissingContactInformation(List<String> caseUuids, MessageType messageType);
+
+	List<ManualMessageLogDto> getMessageLog(String caseUuid, MessageType messageType);
 }

sormas-api/src/main/java/de/symeda/sormas/api/feature/FeatureType.java

@@ -50,6 +50,7 @@ public enum FeatureType {
 		true,
 		new FeatureType[] {
 			TASK_MANAGEMENT }),
+	MANUAL_EXTERNAL_MESSAGES(true, true, null),
 	OTHER_NOTIFICATIONS(true, true, null),
 	DOCUMENTS(true, false, null),
 	OUTBREAKS(true, true, null);

sormas-api/src/main/java/de/symeda/sormas/api/i18n/Captions.java

@@ -67,6 +67,7 @@ public interface Captions {
 	String actionSave = "actionSave";
 	String actionSaveChanges = "actionSaveChanges";
 	String actionSelectAll = "actionSelectAll";
+	String actionSend = "actionSend";
 	String actionSettings = "actionSettings";
 	String actionShowLessFilters = "actionShowLessFilters";
 	String actionShowMoreFilters = "actionShowMoreFilters";
@@ -1076,6 +1077,16 @@ public interface Captions {
 	String MaternalHistory_swollenLymphsMonth = "MaternalHistory.swollenLymphsMonth";
 	String MaternalHistory_swollenLymphsOnset = "MaternalHistory.swollenLymphsOnset";
 	String menu = "menu";
+	String messagesCharacters = "messagesCharacters";
+	String messagesEmail = "messagesEmail";
+	String messagesNoPhoneNumberForCasePerson = "messagesNoPhoneNumberForCasePerson";
+	String messagesNoSmsSentForCase = "messagesNoSmsSentForCase";
+	String messagesNumberOfMessages = "messagesNumberOfMessages";
+	String messagesNumberOfMissingPhoneNumbers = "messagesNumberOfMissingPhoneNumbers";
+	String messagesSendingSms = "messagesSendingSms";
+	String messagesSendSMS = "messagesSendSMS";
+	String messagesSentBy = "messagesSentBy";
+	String messagesSms = "messagesSms";
 	String moreActions = "moreActions";
 	String name = "name";
 	String nationalHealthId = "nationalHealthId";

sormas-api/src/main/java/de/symeda/sormas/api/i18n/Strings.java

@@ -629,6 +629,7 @@ public interface Strings {
 	String messageDistrictsArchivingNotPossible = "messageDistrictsArchivingNotPossible";
 	String messageDistrictsDearchived = "messageDistrictsDearchived";
 	String messageDistrictsDearchivingNotPossible = "messageDistrictsDearchivingNotPossible";
+	String messageEnterSms = "messageEnterSms";
 	String messageEntryCreated = "messageEntryCreated";
 	String messageEpiDataHint = "messageEpiDataHint";
 	String messageEpidNumberWarning = "messageEpidNumberWarning";
@@ -769,6 +770,7 @@ public interface Strings {
 	String notificationLabSampleShippedShort = "notificationLabSampleShippedShort";
 	String notificationLabSampleShippedShortForContact = "notificationLabSampleShippedShortForContact";
 	String notificationLabSampleShippedShortForEventParticipant = "notificationLabSampleShippedShortForEventParticipant";
+	String notificationSmsSent = "notificationSmsSent";
 	String notificationTaskDueGeneral = "notificationTaskDueGeneral";
 	String notificationTaskDueSpecific = "notificationTaskDueSpecific";
 	String notificationTaskStartGeneral = "notificationTaskStartGeneral";

sormas-api/src/main/java/de/symeda/sormas/api/messaging/ManualMessageLogDto.java

@@ -0,0 +1,57 @@
+package de.symeda.sormas.api.messaging;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import de.symeda.sormas.api.person.PersonReferenceDto;
+import de.symeda.sormas.api.user.UserReferenceDto;
+
+public class ManualMessageLogDto implements Serializable {
+
+	private MessageType messageType;
+	private Date sentDate;
+	private UserReferenceDto sendingUser;
+	private PersonReferenceDto recipientPerson;
+
+	public ManualMessageLogDto() {
+	}
+
+	public ManualMessageLogDto(MessageType messageType, Date sentDate, UserReferenceDto sendingUser, PersonReferenceDto recipientPerson) {
+		this.messageType = messageType;
+		this.sentDate = sentDate;
+		this.sendingUser = sendingUser;
+		this.recipientPerson = recipientPerson;
+	}
+
+	public MessageType getMessageType() {
+		return messageType;
+	}
+
+	public void setMessageType(MessageType messageType) {
+		this.messageType = messageType;
+	}
+
+	public Date getSentDate() {
+		return sentDate;
+	}
+
+	public void setSentDate(Date sentDate) {
+		this.sentDate = sentDate;
+	}
+
+	public UserReferenceDto getSendingUser() {
+		return sendingUser;
+	}
+
+	public void setSendingUser(UserReferenceDto sendingUser) {
+		this.sendingUser = sendingUser;
+	}
+
+	public PersonReferenceDto getRecipientPerson() {
+		return recipientPerson;
+	}
+
+	public void setRecipientPerson(PersonReferenceDto recipientPerson) {
+		this.recipientPerson = recipientPerson;
+	}
+}

…a/sormas/backend/common/MessageType.java …da/sormas/api/messaging/MessageType.javasormas-backend/src/main/java/de/symeda/sormas/backend/common/MessageType.java renamed to sormas-api/src/main/java/de/symeda/sormas/api/messaging/MessageType.java sormas-backend/src/main/java/de/symeda/sormas/backend/common/MessageType.java renamed to sormas-api/src/main/java/de/symeda/sormas/api/messaging/MessageType.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  *******************************************************************************/
-package de.symeda.sormas.backend.common;
+package de.symeda.sormas.api.messaging;
 
 public enum MessageType {
 

sormas-api/src/main/java/de/symeda/sormas/api/user/UserReferenceDto.java

@@ -21,27 +21,32 @@
 
 import de.symeda.sormas.api.ReferenceDto;
 import de.symeda.sormas.api.utils.DataHelper;
+import de.symeda.sormas.api.utils.PersonalData;
+import de.symeda.sormas.api.utils.SensitiveData;
 
 public class UserReferenceDto extends ReferenceDto {
 
 	private static final long serialVersionUID = -8558187171374254398L;
 
-	public UserReferenceDto() {
+	@PersonalData(mandatoryField = true)
+	@SensitiveData(mandatoryField = true)
+	private String firstName;
+	@PersonalData(mandatoryField = true)
+	@SensitiveData(mandatoryField = true)
+	private String lastName;
 
+	public UserReferenceDto() {
 	}
 
 	public UserReferenceDto(String uuid) {
 		setUuid(uuid);
 	}
 
-	public UserReferenceDto(String uuid, String caption) {
-		setUuid(uuid);
-		setCaption(caption);
-	}
-
 	public UserReferenceDto(String uuid, String firstName, String lastName, Set<UserRole> userRoles) {
 		setUuid(uuid);
 		setCaption(buildCaption(firstName, lastName, userRoles));
+		this.firstName = firstName;
+		this.lastName = lastName;
 	}
 
 	public static String buildCaption(String firstName, String lastName, Set<UserRole> userRoles) {
@@ -62,4 +67,12 @@ public static String buildCaption(String firstName, String lastName, Set<UserRol
 		}
 		return result.toString();
 	}
+
+	public String getFirstName() {
+		return firstName;
+	}
+
+	public String getLastName() {
+		return lastName;
+	}
 }

sormas-api/src/main/java/de/symeda/sormas/api/user/UserRight.java

@@ -784,6 +784,10 @@ public enum UserRight {
 			SURVEILLANCE_SUPERVISOR,
 			ADMIN_SUPERVISOR
 	),
+	SEND_MANUAL_EXTERNAL_MESSAGES(
+			ADMIN,
+			NATIONAL_USER
+	),
 	STATISTICS_ACCESS(
 			ADMIN,
 			NATIONAL_USER,

sormas-api/src/main/resources/captions.properties

@@ -87,6 +87,7 @@ Action.actionStatus=Action status
 actionApplyDateFilter=Apply date filter
 actionArchive=Archive
 actionAssignNewEpidNumber=Assign new epid number
+actionSend = Send
 actionCancel=Cancel
 actionClear=Clear
 actionClearAll=Clear all
@@ -1149,6 +1150,18 @@ LoginSidebar.diseasePrevention=Disease Prevention
 LoginSidebar.outbreakResponse=Outbreak Response
 LoginSidebar.poweredBy=Powered By
 
+# Messaging
+messagesSendSMS=Send SMS
+messagesSentBy=Sent by
+messagesNoSmsSentForCase=No SMS sent to case person
+messagesNoPhoneNumberForCasePerson=Case person has no phone number
+messagesSms = SMS
+messagesEmail = Email
+messagesSendingSms = Send new SMS
+messagesNumberOfMissingPhoneNumbers = Number of selected cases without phone number: %s
+messagesCharacters = Characters: %d / 160
+messagesNumberOfMessages = Nr. of messages: %d
+
 # Main Menu
 mainMenuAbout=About
 mainMenuCampaigns=Campaigns

sormas-api/src/main/resources/strings.properties

@@ -787,6 +787,7 @@ messageSampleOpened = Opened sample found for search string
 messageSystemFollowUpCanceled = [System] Follow-up automatically canceled because contact was converted to a case
 messageSetContactRegionAndDistrict = Please choose a responsible region and responsible district and save the contact before removing the source case.
 messageAllCampaignFormsValid = All campaign forms have been successfully validated
+messageEnterSms = Please enter your SMS message here:
 
 # Notifications
 notificationCaseClassificationChanged = The classification of case %s has changed to %s.
@@ -811,6 +812,7 @@ notificationTaskDueSpecific = Your %s task for %s is overdue.
 notificationTaskStartGeneral = Your %s task should be started today.
 notificationTaskStartSpecific = Your %s task for %s should be started today.
 notificationVisitCompleted = A follow-up visit for contact %s assigned to user %s has been completed.
+notificationSmsSent = Message sent
 
 #Labels
 labelNumberOfUsers = No. of users
@@ -921,4 +923,4 @@ SurvnetGateway.notificationEntrySent = Entry has been sent
 SurvnetGateway.notificationEntryNotSent = Entry could not be sent
 SurvnetGateway.notificationErrorSending = Error when sending entry
 
-warningDashboardMapTooManyMarkers = There are %d places to display and it is possible that your browser will freeze while displaying them.
+warningDashboardMapTooManyMarkers = There are %d places to display and it is possible that your browser will freeze while displaying them.