combine the SystemMonitor and OverallStatus Services

Author: jsavell

src/main/java/edu/tamu/app/controller/StatusController.java

@@ -2,7 +2,7 @@
 
 import edu.tamu.app.model.OverallStatus;
 import edu.tamu.app.service.AppRoleService;
-import edu.tamu.app.service.OverallStatusService;
+import edu.tamu.app.service.MonitorService;
 import edu.tamu.framework.aspect.annotation.ApiCredentials;
 import edu.tamu.framework.aspect.annotation.ApiMapping;
 import edu.tamu.framework.aspect.annotation.Auth;
@@ -19,22 +19,22 @@
 public class StatusController {
 
 	@Autowired
-	OverallStatusService overallStatusService;
+	MonitorService monitorService;
 
 	@Autowired
 	AppRoleService appRoleService;
 
 	@ApiMapping("/overall-full")
 	@Auth(role = "ROLE_STAFF")
 	public ApiResponse overallFull(@ApiCredentials Credentials credentials) {
-		OverallStatus overallStatus = overallStatusService.getOverallStatusFull();		
+		OverallStatus overallStatus = monitorService.getOverallStatus();		
         return new ApiResponse(SUCCESS, overallStatus);
 	}
 
 	@ApiMapping("/overall-public")
 	@Auth(role = "ROLE_ANONYMOUS")
 	public ApiResponse overallPublic(@ApiCredentials Credentials credentials) {		
-		OverallStatus overallStatus = overallStatusService.getOverallStatusPublic();
+		OverallStatus overallStatus = monitorService.getOverallStatusPublic();
         return new ApiResponse(SUCCESS, overallStatus);
 	}
 

…u/tamu/app/job/UpdateOveralStatuses.java …/tamu/app/job/UpdateServiceStatuses.javasrc/main/java/edu/tamu/app/job/UpdateOveralStatuses.java renamed to src/main/java/edu/tamu/app/job/UpdateServiceStatuses.java src/main/java/edu/tamu/app/job/UpdateOveralStatuses.java renamed to src/main/java/edu/tamu/app/job/UpdateServiceStatuses.java

@@ -1,30 +1,30 @@
 package edu.tamu.app.job;
 
+import static edu.tamu.framework.enums.ApiResponseType.SUCCESS;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.messaging.simp.SimpMessagingTemplate;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 
-import edu.tamu.app.service.OverallStatusService;
+import edu.tamu.app.service.MonitorService;
 import edu.tamu.framework.model.ApiResponse;
 
-import static edu.tamu.framework.enums.ApiResponseType.SUCCESS;
-
 @Service
-public class UpdateOveralStatuses {
+public class UpdateServiceStatuses {
 
 	@Autowired
-	OverallStatusService overallStatusService;
+	MonitorService monitorService;
 
 	@Autowired
 	SimpMessagingTemplate simpMessagingTemplate;
 
-	@Scheduled(fixedRate=(1 * 30 * 1000))
+	@Scheduled(fixedRate=(10*60*1000))
 	public void updateOveralStatuses() {
-		overallStatusService.updateStatuses();
+		monitorService.updateAll();
 
-		simpMessagingTemplate.convertAndSend("/channel/status/overall-full", new ApiResponse(SUCCESS, overallStatusService.getOverallStatusFull()));
-		simpMessagingTemplate.convertAndSend("/channel/status/overall-public", new ApiResponse(SUCCESS, overallStatusService.getOverallStatusPublic()));
+		simpMessagingTemplate.convertAndSend("/channel/status/overall-full", new ApiResponse(SUCCESS, monitorService.getOverallStatus()));
+		simpMessagingTemplate.convertAndSend("/channel/status/overall-public", new ApiResponse(SUCCESS, monitorService.getOverallStatusPublic()));
 
 	}
 

src/main/java/edu/tamu/app/model/Service.java

@@ -89,11 +89,6 @@ public Boolean getIsAuto() {
         return isAuto;
     }
 
-    public boolean isCurrentlyUp() {
-    	//TODO: Implement this method to return true, false or the resolution of 'auto' 
-    	return true;
-    }
-
     public void setIsAuto(Boolean isAuto) {
         this.isAuto = isAuto;
     }

src/main/java/edu/tamu/app/model/repo/ServiceRepo.java

@@ -4,11 +4,14 @@
 
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import edu.tamu.app.enums.Status;
 import edu.tamu.app.model.Service;
 import edu.tamu.app.model.repo.custom.ServiceRepoCustom;
 
 public interface ServiceRepo extends JpaRepository<Service, Long>, ServiceRepoCustom {
 
     public List<Service> findByIsPublic(Boolean isPublic);
     public List<Service> findByIsAuto(Boolean isAuto);
+    public Long countByStatus(Status status);
+    public Long countByStatusAndIsPublic(Status status, Boolean isPublic);
 }

src/main/java/edu/tamu/app/service/MonitorService.java

@@ -1,5 +1,9 @@
 package edu.tamu.app.service;
 
+import edu.tamu.app.model.OverallStatus;
+
 public interface MonitorService {
 	public void updateAll();
+	public OverallStatus getOverallStatus();
+	public OverallStatus getOverallStatusPublic();
 }

src/main/java/edu/tamu/app/service/OverallStatusService.java

@@ -1,5 +1,8 @@
 package edu.tamu.app.service;
 
+import static edu.tamu.app.enums.OverallMessageType.ERROR;
+import static edu.tamu.app.enums.OverallMessageType.SUCCESS;
+
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.util.List;
@@ -14,6 +17,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 import edu.tamu.app.enums.Status;
+import edu.tamu.app.model.OverallStatus;
 import edu.tamu.app.model.repo.ServiceRepo;
 import edu.tamu.framework.util.HttpUtility;
 
@@ -27,6 +31,9 @@ public class SystemMonitorService implements MonitorService {
 
 	@Autowired
 	ObjectMapper objectMapper;
+	
+	private static final String SUCCESS_MESSAGE = "All services are working.";
+	private static final String ERROR_MESSAGE = "Some services are experiencing problems.";
 
 	private Logger logger = LoggerFactory.getLogger(this.getClass());
 
@@ -49,6 +56,21 @@ public void updateAll() {
 		});
 	}
 
+	public OverallStatus getOverallStatus() {
+		Long downCount = serviceRepo.countByStatus(Status.DOWN);
+		if (downCount == 0) {
+			return new OverallStatus(SUCCESS, SUCCESS_MESSAGE);
+		}
+		return new OverallStatus(ERROR, ERROR_MESSAGE);
+	}
+	
+	public OverallStatus getOverallStatusPublic() {		
+		Long downCount = serviceRepo.countByStatusAndIsPublic(Status.DOWN,true);
+		if (downCount == 0) {
+			return new OverallStatus(SUCCESS, SUCCESS_MESSAGE);
+		}
+		return new OverallStatus(ERROR, ERROR_MESSAGE);
+	}	
 	protected Status getServiceStatus(String serviceUrl) throws MalformedURLException,IOException {
 		String rawStatusResponse = httpUtility.makeHttpRequest(serviceUrl, "GET");
 		List<Map<String,String>> mappedStatusResponse  = objectMapper.readValue(rawStatusResponse, new TypeReference<List<Map<String, String>>>(){});