Fix updateSubscription RestApi issue that prevented subscription to b… (#11)

* Fix updateSubscription RestApi issue that prevented subscription to be updated.

* Changed name on isDuplicateSubscriptions functions to doSubscriptionExist. Fixed impacted unit test due to this change.

Author: tobiasake

src/main/java/com/ericsson/ei/controller/SubscriptionControllerImpl.java

@@ -44,7 +44,7 @@ public class SubscriptionControllerImpl implements SubscriptionController {
     @ApiOperation(value = "Creates the subscription")
     public ResponseEntity<SubscriptionResponse> createSubscription(@RequestBody Subscription subscription) {
         SubscriptionResponse subscriptionResponse = new SubscriptionResponse();
-        if (!subscriptionService.isDuplicatedSubscription(subscription.getSubscriptionName())) {
+        if (!subscriptionService.doSubscriptionExist(subscription.getSubscriptionName())) {
             subscriptionService.addSubscription(subscription);
             LOG.info("Subscription :" + subscription.getSubscriptionName() + " Inserted Successfully");
             subscriptionResponse.setMsg("Inserted Successfully"); subscriptionResponse.setStatusCode(HttpStatus.OK.value());
@@ -80,15 +80,15 @@ public ResponseEntity<Subscription> getSubscriptionById(@PathVariable String sub
     public ResponseEntity<SubscriptionResponse> updateSubscriptionById(@PathVariable String subscriptionName, @RequestBody Subscription subscription) {
         LOG.info("Subscription :" + subscriptionName + " update started");
         SubscriptionResponse subscriptionResponse = new SubscriptionResponse();
-        if (!subscriptionService.isDuplicatedSubscription(subscription.getSubscriptionName())) {
+        if (subscriptionService.doSubscriptionExist(subscription.getSubscriptionName())) {
             subscriptionService.modifySubscription(subscription, subscriptionName);
             LOG.info("Subscription :" + subscriptionName + " update completed");
             subscriptionResponse.setMsg("Updated Successfully"); subscriptionResponse.setStatusCode(HttpStatus.OK.value());
             return new ResponseEntity<SubscriptionResponse>(subscriptionResponse, HttpStatus.OK);
 
         } else {
-            LOG.error("Subscription :" + subscription.getSubscriptionName() + " identified as duplicate subscription");
-            subscriptionResponse.setMsg("Duplicate Subscription"); subscriptionResponse.setStatusCode(HttpStatus.BAD_REQUEST.value());
+            LOG.error("Subscription :" + subscription.getSubscriptionName() + " can't be found.");
+            subscriptionResponse.setMsg("Subscription can't be found"); subscriptionResponse.setStatusCode(HttpStatus.BAD_REQUEST.value());
             return new ResponseEntity<SubscriptionResponse>(subscriptionResponse, HttpStatus.BAD_REQUEST);
         }
 

src/main/java/com/ericsson/ei/services/ISubscriptionService.java

@@ -47,11 +47,11 @@ public interface ISubscriptionService {
     boolean deleteSubscription(String name);
 
     /**
-     * isDuplicatedSubscription method checks the is there any Subscription By Subscription Name
+     * doSubscriptionExist method checks the is there any Subscription By Subscription Name
      * @param name
      * @return true when Subscription available with same name. Otherwise returns false.
      */
-    boolean isDuplicatedSubscription(String name);
+    boolean doSubscriptionExist(String name);
 
 
 }

src/main/java/com/ericsson/ei/services/SubscriptionService.java

@@ -56,7 +56,7 @@ public Subscription getSubscription(String name) throws SubscriptionNotFoundExce
     }
 
     @Override
-    public boolean isDuplicatedSubscription(String name) {
+    public boolean doSubscriptionExist(String name) {
         String query = String.format(SUBSCRIPTION_NAME, name);
         ArrayList<String> list = subscriptionRepository.getSubscription(query);
         if (list.isEmpty()) {

src/test/java/com/ericsson/ei/subscription/SubscriptionRestAPITest.java

@@ -50,7 +50,7 @@ public static void setMongoDB() throws IOException, JSONException {
 
     @Test
     public void addSubscription() throws Exception {
-        Mockito.when(subscriptionService.isDuplicatedSubscription(Mockito.anyString())).thenReturn(false);
+        Mockito.when(subscriptionService.doSubscriptionExist(Mockito.anyString())).thenReturn(false);
         Mockito.when(subscriptionService.addSubscription(Mockito.any(Subscription.class))).thenReturn(false);
         // Send subscription as body to /subscriptions
         RequestBuilder requestBuilder = MockMvcRequestBuilders.post("/subscriptions").accept(MediaType.APPLICATION_JSON)
@@ -66,7 +66,7 @@ public void addSubscription() throws Exception {
 
     @Test
     public void updateSubscription() throws Exception {
-        Mockito.when(subscriptionService.isDuplicatedSubscription(Mockito.anyString())).thenReturn(false);
+        Mockito.when(subscriptionService.doSubscriptionExist(Mockito.anyString())).thenReturn(true);
         Mockito.when(subscriptionService.modifySubscription(Mockito.any(Subscription.class), Mockito.anyString()))
                 .thenReturn(false);
         // Send subscription as body to /subscriptions
@@ -83,8 +83,8 @@ public void updateSubscription() throws Exception {
     }
 
     @Test
-    public void updateSubscriptionDulicate() throws Exception {
-        Mockito.when(subscriptionService.isDuplicatedSubscription(Mockito.anyString())).thenReturn(true);
+    public void updateSubscriptionFailWhenSubscriptionDoNotExist() throws Exception {
+        Mockito.when(subscriptionService.doSubscriptionExist(Mockito.anyString())).thenReturn(false);
         // Send subscription as body to /subscriptions
         RequestBuilder requestBuilder = MockMvcRequestBuilders.put("/subscriptions/Subscription_Test")
                 .accept(MediaType.APPLICATION_JSON).content(jsonArray.getJSONObject(0).toString())
@@ -95,7 +95,7 @@ public void updateSubscriptionDulicate() throws Exception {
         SubscriptionResponse subscriptionResponse = mapper
                 .readValue(result.getResponse().getContentAsString().toString(), SubscriptionResponse.class);
         assertEquals(HttpStatus.BAD_REQUEST.value(), result.getResponse().getStatus());
-        assertEquals("Duplicate Subscription", subscriptionResponse.getMsg());
+        assertEquals("Subscription can't be found", subscriptionResponse.getMsg());
     }
 
     @Test

src/test/java/com/ericsson/ei/subscription/SubscriptionServiceTest.java

@@ -158,16 +158,16 @@ public void testGetSubscriptionsByName() {
     }
 
     @Test
-    public void testIsDuplicatedSubscription() {
-        boolean isDuplicatedSubscription;
+    public void testdoSubscriptionExist() {
+        boolean doSubscriptionExist;
         try {
             // Insert Subscription
             Subscription subscription2 = mapper.readValue(jsonArray.getJSONObject(0).toString(), Subscription.class);
             subscriptionService.addSubscription(subscription2);
 
             subscriptionName = subscription2.getSubscriptionName();
-            isDuplicatedSubscription = subscriptionService.isDuplicatedSubscription(subscriptionName);
-            assertEquals(isDuplicatedSubscription, true);
+            doSubscriptionExist = subscriptionService.doSubscriptionExist(subscriptionName);
+            assertEquals(doSubscriptionExist, true);
             // deleting the test data
             deleteSubscriptionsByName(subscriptionName);
         } catch (IOException | JSONException e) {