SORMAS-Foundation#3488 use system events, migrate since-time management to sormas

Author: FredrikSchäferVitagroup

sormas-api/src/main/java/de/symeda/sormas/api/labmessage/ExternalLabResultsFacade.java

@@ -2,12 +2,13 @@
 
 import javax.ejb.Remote;
 import javax.ejb.Stateless;
+import java.util.Date;
 import java.util.List;
 
 @Remote
 public interface ExternalLabResultsFacade {
 
-	List<LabMessageDto> getExternalLabMessages(boolean getOnlyNew);
+	List<LabMessageDto> getExternalLabMessages(Date since);
 
 	String convertToHTML(LabMessageDto message);
 }

sormas-api/src/main/java/de/symeda/sormas/api/labmessage/LabMessageFacade.java

@@ -1,5 +1,6 @@
 package de.symeda.sormas.api.labmessage;
 
+import java.util.Date;
 import java.util.List;
 
 import javax.ejb.Remote;
@@ -17,5 +18,5 @@ public interface LabMessageFacade {
 
 	List<LabMessageIndexDto> getIndexList(LabMessageCriteria criteria, Integer first, Integer max, List<SortProperty> sortProperties);
 
-	void fetchExternalLabMessages(boolean onlyNew);
+	void fetchExternalLabMessages();
 }

sormas-backend/src/main/java/de/symeda/sormas/backend/labmessage/LabMessageFacadeEjb.java

@@ -1,6 +1,8 @@
 package de.symeda.sormas.backend.labmessage;
 
+import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 import javax.ejb.EJB;
@@ -23,10 +25,15 @@
 import de.symeda.sormas.api.labmessage.LabMessageDto;
 import de.symeda.sormas.api.labmessage.LabMessageFacade;
 import de.symeda.sormas.api.labmessage.LabMessageIndexDto;
+import de.symeda.sormas.api.systemevents.SystemEventDto;
+import de.symeda.sormas.api.systemevents.SystemEventStatus;
+import de.symeda.sormas.api.systemevents.SystemEventType;
+import de.symeda.sormas.api.utils.DateHelper;
 import de.symeda.sormas.api.utils.SortProperty;
 import de.symeda.sormas.backend.common.BaseAdoService;
 import de.symeda.sormas.backend.common.ConfigFacadeEjb;
 import de.symeda.sormas.backend.common.CriteriaBuilderHelper;
+import de.symeda.sormas.backend.systemevent.SystemEventFacadeEjb;
 import de.symeda.sormas.backend.util.DtoHelper;
 import de.symeda.sormas.backend.util.ModelConstants;
 
@@ -40,6 +47,8 @@ public class LabMessageFacadeEjb implements LabMessageFacade {
 	private LabMessageService labMessageService;
 	@EJB
 	private ConfigFacadeEjb.ConfigFacadeEjbLocal configFacade;
+	@EJB
+	private SystemEventFacadeEjb.SystemEventFacadeEjbLocal systemEventFacade;
 
 	private LabMessage fromDto(@NotNull LabMessageDto source, LabMessage target) {
 
@@ -214,21 +223,45 @@ public List<LabMessageIndexDto> getIndexList(LabMessageCriteria criteria, Intege
 	}
 
 	@Override
-	public void fetchExternalLabMessages(boolean onlyNew) {
+	public void fetchExternalLabMessages() {
+		Date now = new Date(DateHelper.now());
+		SystemEventDto systemEvent = SystemEventDto.build();
+		systemEvent.setType(SystemEventType.FETCH_LAB_MESSAGES);
+		systemEvent.setStatus(SystemEventStatus.STARTED);
+		systemEvent.setStartDate(now);
+		systemEventFacade.saveSystemEvent(systemEvent);
+
+		Date since = null;
+		since = systemEventFacade.getLatestSuccessByType(SystemEventType.FETCH_LAB_MESSAGES);
+
+		if (since == null) {
+			since = new Date(0);
+		}
+
 		List<LabMessageDto> newMessages = null;
 		try {
 			InitialContext ic = new InitialContext();
 			String jndiName = configFacade.getDemisJndiName();
-			// Maybe catch that jndiName can be null
 			ExternalLabResultsFacade labResultsFacade = (ExternalLabResultsFacade) ic.lookup(jndiName);
-			newMessages = labResultsFacade.getExternalLabMessages(onlyNew);
-		} catch (NamingException e) {
-			// That should be handled properly
+			newMessages = labResultsFacade.getExternalLabMessages(since);
+			if (newMessages != null) {
+				newMessages.stream().forEach(labMessageDto -> save(labMessageDto));
+			}
+		} catch (Exception e) {
+			systemEvent.setStatus(SystemEventStatus.ERROR);
+			systemEvent.setAdditionalInfo(e.getMessage());
+			now.setTime(DateHelper.now());
+			systemEvent.setEndDate(now);
+			systemEvent.setChangeDate(now);
+			systemEventFacade.saveSystemEvent(systemEvent);
 			e.printStackTrace();
+			return;
 		}
-		if (newMessages != null) {
-			newMessages.stream().forEach(labMessageDto -> save(labMessageDto));
-		}
+		systemEvent.setStatus(SystemEventStatus.SUCCESS);
+		now.setTime(DateHelper.now());
+		systemEvent.setEndDate(now);
+		systemEvent.setChangeDate(now);
+		systemEventFacade.saveSystemEvent(systemEvent);
 	}
 
 	@LocalBean

sormas-ui/src/main/java/de/symeda/sormas/ui/labmessage/LabMessagesView.java

@@ -17,6 +17,8 @@
 import de.symeda.sormas.ui.utils.ButtonHelper;
 import de.symeda.sormas.ui.utils.CssStyles;
 
+import java.util.Date;
+
 public class LabMessagesView extends AbstractView {
 
 	public static final String VIEW_NAME = "labMessages";
@@ -51,7 +53,7 @@ public LabMessagesView() {
 		addHeaderComponent(samplesViewSwitcher);
 
 		addHeaderComponent(ButtonHelper.createIconButton(Captions.labMessageFetch, VaadinIcons.REFRESH, e -> {
-			FacadeProvider.getLabMessageFacade().fetchExternalLabMessages(true);
+			FacadeProvider.getLabMessageFacade().fetchExternalLabMessages();
 			listComponent.getGrid().reload();
 		}, ValoTheme.BUTTON_PRIMARY));
 	}