Merge pull request #13 from TAMULib/sprint2-b03258-dynamic-shortlist

Sprint2 b03258 dynamic shortlist

Author: jcreel

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

@@ -6,20 +6,26 @@
 import static edu.tamu.framework.enums.BusinessValidationType.EXISTS;
 import static edu.tamu.framework.enums.BusinessValidationType.NONEXISTS;
 import static edu.tamu.framework.enums.BusinessValidationType.UPDATE;
+import static edu.tamu.app.enums.AppRole.ROLE_ANONYMOUS;
+import static edu.tamu.app.enums.AppRole.ROLE_USER;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.messaging.simp.SimpMessagingTemplate;
 import org.springframework.web.bind.annotation.RestController;
 
+import edu.tamu.app.model.AppUser;
 import edu.tamu.app.model.Service;
+import edu.tamu.app.model.repo.AppUserRepo;
 import edu.tamu.app.model.repo.ServiceRepo;
 import edu.tamu.app.service.SystemMonitorService;
+import edu.tamu.framework.aspect.annotation.ApiCredentials;
 import edu.tamu.framework.aspect.annotation.ApiMapping;
 import edu.tamu.framework.aspect.annotation.ApiValidatedModel;
 import edu.tamu.framework.aspect.annotation.ApiValidation;
 import edu.tamu.framework.aspect.annotation.ApiVariable;
 import edu.tamu.framework.aspect.annotation.Auth;
 import edu.tamu.framework.model.ApiResponse;
+import edu.tamu.framework.model.Credentials;
 
 @RestController
 @ApiMapping("/service")
@@ -34,6 +40,9 @@ public class ServiceController {
     @Autowired
     private SystemMonitorService systemMonitorService;
 
+    @Autowired
+    private AppUserRepo userRepo;
+
     @ApiMapping("/all")
     @Auth(role="ROLE_ANONYMOUS")
     public ApiResponse getAllServices() {
@@ -56,23 +65,32 @@ public ApiResponse getService(@ApiVariable Long id) {
     @ApiMapping("/create")
     @Auth(role = "ROLE_SERVICE_MANAGER")
     @ApiValidation(business = { @ApiValidation.Business(value = CREATE), @ApiValidation.Business(value = EXISTS) })
-    public ApiResponse createService(@ApiValidatedModel Service service) {
+    public ApiResponse createService(@ApiValidatedModel Service service, @ApiCredentials Credentials credentials) {
         service = serviceRepo.create(service.getName(), service.getStatus(), service.getIsAuto(), service.getIsPublic(), service.getOnShortList(), service.getServiceUrl(), service.getDescription());
         simpMessagingTemplate.convertAndSend("/channel/service", new ApiResponse(SUCCESS, serviceRepo.findAll()));
-        systemMonitorService.updateAll();
+        sendStatusUpdate(service, credentials);
         return new ApiResponse(SUCCESS, service);
     }
 
     @ApiMapping("/update")
     @Auth(role = "ROLE_SERVICE_MANAGER")
     @ApiValidation(business = { @ApiValidation.Business(value = UPDATE), @ApiValidation.Business(value = NONEXISTS) })
-    public ApiResponse updateService(@ApiValidatedModel Service service) {
+    public ApiResponse updateService(@ApiValidatedModel Service service, @ApiCredentials Credentials credentials) {
         service = serviceRepo.save(service);
         simpMessagingTemplate.convertAndSend("/channel/service/" + service.getId(), new ApiResponse(SUCCESS, service));
-        systemMonitorService.updateAll();
+        sendStatusUpdate(service, credentials);
         return new ApiResponse(SUCCESS, service);
     }
 
+    private void sendStatusUpdate(Service service, Credentials credentials) {
+        AppUser user = userRepo.findByUin(credentials.getUin());
+        if (user.getRole() == ROLE_ANONYMOUS || user.getRole() == ROLE_USER) {
+            simpMessagingTemplate.convertAndSend("/channel/status/overall-public", new ApiResponse(SUCCESS, systemMonitorService.getOverallStatusPublic()));
+        } else {
+            simpMessagingTemplate.convertAndSend("/channel/status/overall-full", new ApiResponse(SUCCESS, systemMonitorService.getOverallStatus()));
+        }
+    }
+    
     @ApiMapping("/remove")
     @Auth(role = "ROLE_SERVICE_MANAGER")
     @ApiValidation(business = { @ApiValidation.Business(value = DELETE), @ApiValidation.Business(value = NONEXISTS) })

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

@@ -79,5 +79,4 @@ protected Status getServiceStatus(String serviceUrl) throws MalformedURLExceptio
 		List<Map<String,String>> mappedStatusResponse  = objectMapper.readValue(rawStatusResponse, new TypeReference<List<Map<String, String>>>(){});
 		return Status.valueOf(mappedStatusResponse.get(0).get("service").toUpperCase());
 	}
-
 }

src/test/java/controller/ServiceControllerTest.java

@@ -23,9 +23,14 @@
 
 import edu.tamu.app.controller.ServiceController;
 import edu.tamu.app.enums.Status;
+import edu.tamu.app.model.AppUser;
+import edu.tamu.app.model.OverallStatus;
 import edu.tamu.app.model.Service;
+import edu.tamu.app.model.repo.AppUserRepo;
 import edu.tamu.app.model.repo.ServiceRepo;
+import edu.tamu.app.service.SystemMonitorService;
 import edu.tamu.framework.model.ApiResponse;
+import edu.tamu.framework.model.Credentials;
 
 @ActiveProfiles("test")
 @RunWith(SpringRunner.class)
@@ -50,6 +55,8 @@ public class ServiceControllerTest {
 
     protected static ApiResponse response;
 
+    protected static AppUser user = new AppUser("123456789");
+    
     @Mock
     protected ServiceRepo serviceRepo;
 
@@ -59,9 +66,21 @@ public class ServiceControllerTest {
     @InjectMocks
     protected ServiceController serviceController;
 
+    @Mock
+    protected static Credentials credentials;
+    
+    @Mock
+    protected AppUserRepo userRepo;
+    
+    @Mock
+    protected SystemMonitorService systemMonitorService;
+    
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
+        when(credentials.getUin()).thenReturn("123456789");
+        when(userRepo.findByUin(any(String.class))).thenReturn(user);
+        when(systemMonitorService.getOverallStatus()).thenReturn(new OverallStatus(edu.tamu.app.enums.OverallMessageType.SUCCESS, "Success"));
         when(serviceRepo.findAll()).thenReturn(mockServiceList);
         when(serviceRepo.findByIsPublic(true)).thenReturn(mockPublicServiceList);
         when(serviceRepo.findOne(any(Long.class))).thenReturn(TEST_SERVICE1);
@@ -109,15 +128,15 @@ public void testService() {
 
     @Test
     public void testCreate() {
-        response = serviceController.createService(TEST_SERVICE1);
+        response = serviceController.createService(TEST_SERVICE1, credentials);
         assertEquals("Not sucessful at creating Service", SUCCESS, response.getMeta().getType());
         Service service = (Service) response.getPayload().get("Service");
         assertEquals("Incorrect service returned", TEST_SERVICE1.getName(), service.getName());
     }
 
     @Test
     public void testUpdate() {
-        response = serviceController.updateService(TEST_MODIFIED_SERVICE1);
+        response = serviceController.updateService(TEST_MODIFIED_SERVICE1, credentials);
         assertEquals("Not successful at updating service", SUCCESS, response.getMeta().getType());
         Service service = (Service) response.getPayload().get("Service");
         assertEquals("Service name was not properly updated", TEST_MODIFIED_SERVICE1.getName(), service.getName());