resolved merge conflicts

Author: tamu-sad-iii

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

@@ -7,16 +7,23 @@
 import static edu.tamu.framework.enums.BusinessValidationType.NONEXISTS;
 import static edu.tamu.framework.enums.BusinessValidationType.UPDATE;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import edu.tamu.app.enums.NotificationLocation;
 import edu.tamu.app.model.Notification;
 import edu.tamu.app.model.repo.NotificationRepo;
 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.aspect.annotation.SkipAop;
 import edu.tamu.framework.model.ApiResponse;
 
 @RestController
@@ -61,4 +68,27 @@ public ApiResponse remove(@ApiValidatedModel Notification notification) {
         notificationRepo.delete(notification);
         return new ApiResponse(SUCCESS);
     }
+
+    @SkipAop
+    @RequestMapping("/notification/active")
+    public String getActiveNotifications(@RequestParam(value = "location", defaultValue = "ALL") String locationString) {
+        String notificationString = "";
+        List<Notification> notificationList;
+        if (locationString.equals("ALL")) {
+            notificationList = notificationRepo.findByActive(true);
+        } else {
+            try {
+                NotificationLocation location = NotificationLocation.valueOf(locationString);
+                notificationList = notificationRepo.findByActiveAndLocations(true, location);
+            } catch (IllegalArgumentException e) {
+                notificationList = new ArrayList<Notification>();
+            }
+        }
+        for (Notification notification : notificationList) {
+            notificationString += "<p>" + notification.getBody() + "</p>";
+        }
+
+        return notificationString;
+    }
+
 }

src/main/java/edu/tamu/app/enums/NotificationLocation.java

@@ -2,8 +2,10 @@
 
 public enum NotificationLocation {
 
-    EVANS,
+    MAIN,
     CUSHING,
     MSL,
-    WCL
+    WCL,
+    PSEL,
+    QATAR
 }

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

@@ -1,12 +1,19 @@
 package edu.tamu.app.model.repo;
 
+import java.util.List;
+
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import edu.tamu.app.enums.NotificationLocation;
 import edu.tamu.app.model.Notification;
 import edu.tamu.app.model.repo.custom.NotificationRepoCustom;
 
 public interface NotificationRepo extends JpaRepository<Notification, Long>, NotificationRepoCustom {
 
+    public List<Notification> findByActive(Boolean active);
+
+    public List<Notification> findByActiveAndLocations(Boolean active, NotificationLocation location);
+
     public void delete(Notification notification);
 
 }

src/test/java/controller/NotificationControllerTest.java

@@ -39,6 +39,12 @@ public class NotificationControllerTest {
     protected static final String TEST_NOTIFICATION2_BODY = "Test Notification Body 2";
     protected static final String TEST_NOTIFICATION3_BODY = "Test Notification Body 3";
     protected static final String TEST_MODIFIED_NOTIFICATION_BODY = "Test Modified Notification Body";
+
+    protected static final String TEST_QUERY_PARAM = "CUSHING";
+    protected static final String TEST_NOTIFICATION_TEXT = "<p>Test Notification Body 1</p><p>Test Notification Body 2</p><p>Test Notification Body 3</p>";
+    protected static final boolean TEST_IS_ACTIVE = true;
+    protected static final boolean TEST_ALTERNATIVE_IS_ACTIVE = false;
+
     protected static final List<NotificationLocation> TEST_LOCATIONS = Arrays.asList(new NotificationLocation[] { NotificationLocation.CUSHING });
 
     protected static Notification TEST_NOTIFICATION1 = new Notification(TEST_NOTIFICATION1_NAME, TEST_NOTIFICATION1_BODY, TEST_LOCATIONS);
@@ -67,6 +73,7 @@ public void setUp() {
         when(notificationRepo.findOne(any(Long.class))).thenReturn(TEST_NOTIFICATION1);
         when(notificationRepo.create(any(Notification.class))).thenReturn(TEST_NOTIFICATION1);
         when(notificationRepo.update(any(Notification.class))).thenReturn(TEST_MODIFIED_NOTIFICATION);
+        when(notificationRepo.findByActiveAndLocations(any(Boolean.class), any(NotificationLocation.class))).thenReturn(mockNotificationList);
         doNothing().when(notificationRepo).delete(any(Notification.class));
     }
 
@@ -110,6 +117,12 @@ public void testRemove() {
         assertEquals("Not successful at removing Notification", SUCCESS, response.getMeta().getType());
     }
 
+    @Test
+    public void testActiveNotifications() {
+        String notifications = notificationController.getActiveNotifications(TEST_QUERY_PARAM);
+        assertEquals("Active Notifications not returned correctly", TEST_NOTIFICATION_TEXT, notifications);
+    }
+
     @After
     public void cleanUp() {
         response = null;