Cleanup of SubscriptionRepeatHandlerDB Subscription is updated (#91)

tobiasake · web-flow · commit c04dbf732f0a · 2018-05-03T12:19:20.000+02:00
* Added SubscriptionRepeatHandlerDB cleanup when Subscription is updated or removed.

* Added unit tests.

* Added one stacktrace to log error message.

* Added one stacktrace to log error message.

* Fix merge conflicts.

* Changed one varaible name.

* Updated according to review comments.

* Fix issues after merge.

* Fixed more merge issues.

* Solved more merge issues.

* Fixed more merge issues.

* Updates according to review comments.
diff --git a/src/main/java/com/ericsson/ei/repository/ISubscriptionRepository.java b/src/main/java/com/ericsson/ei/repository/ISubscriptionRepository.java
@@ -18,6 +18,8 @@
 
 import java.util.ArrayList;
 
+import com.ericsson.ei.mongodbhandler.MongoDBHandler;
+
 public interface ISubscriptionRepository {
     
     ArrayList<String> getSubscription(String name);
@@ -28,4 +30,6 @@ public interface ISubscriptionRepository {
     
     boolean addSubscription(String subscription);
     
+    MongoDBHandler getMongoDbHandler();
+    
 }
diff --git a/src/main/java/com/ericsson/ei/repository/SubscriptionRepository.java b/src/main/java/com/ericsson/ei/repository/SubscriptionRepository.java
@@ -24,6 +24,7 @@
 
 import com.ericsson.ei.mongodbhandler.MongoDBHandler;
 
+
 @Component
 public class SubscriptionRepository implements ISubscriptionRepository {
     
@@ -57,4 +58,8 @@ public boolean deleteSubscription(String query) {
         return mongoDBHandler.dropDocument(dataBaseName, collectionName, query);
     }
     
+    @Override
+    public MongoDBHandler getMongoDbHandler() {
+        return mongoDBHandler;
+    }
 }
diff --git a/src/main/java/com/ericsson/ei/services/SubscriptionService.java b/src/main/java/com/ericsson/ei/services/SubscriptionService.java
@@ -28,17 +28,22 @@
 
 import com.ericsson.ei.controller.model.Subscription;
 import com.ericsson.ei.exception.SubscriptionNotFoundException;
+import com.ericsson.ei.mongodbhandler.MongoDBHandler;
 import com.ericsson.ei.repository.ISubscriptionRepository;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 @Component
 public class SubscriptionService implements ISubscriptionService {
 
-    @Value("${spring.application.name}")
-    private String SpringApplicationName;
+    @Value("${spring.application.name}") private String SpringApplicationName;
+    
+    @Value("${spring.data.mongodb.database}") private String dataBaseName;
+    
+    @Value("${subscription.collection.repeatFlagHandlerName}") private String repeatFlagHandlerCollection;
 
     private static final String SUBSCRIPTION_NAME = "{'subscriptionName':'%s'}";
+    private static final String SUBSCRIPTION_ID = "{'subscriptionId':'%s'}";
     private static final String USER_NAME = "{'userName':'%s'}";
 
     @Autowired
@@ -93,19 +98,38 @@ public boolean doSubscriptionExist(String name, String userName) {
     @Override
     public boolean modifySubscription(Subscription subscription, String name, String userName) {
         ObjectMapper mapper = new ObjectMapper();
+        boolean result = false;
         try {
             String StringSubscription = mapper.writeValueAsString(subscription);
+ 
             String query = generateQuery(name, userName);
-            return subscriptionRepository.modifySubscription(query, StringSubscription);
+            result = subscriptionRepository.modifySubscription(query, StringSubscription);
+            if (result) {
+            	String subscriptionIdQuery = String.format(SUBSCRIPTION_ID, name);
+            	if (!cleanSubscriptionRepeatFlagHandlerDb(subscriptionIdQuery)) {
+            		LOG.error("Failed to clean subscription \"" + name + "\" matched AggregatedObjIds from RepeatFlagHandler database");
+            	}
+            }
+          
         } catch (JsonProcessingException e) {
+        	LOG.error(e.getMessage(), e);
             return false;
         }
+        return result;
     }
 
     @Override
     public boolean deleteSubscription(String name, String userName) {
         String query = generateQuery(name, userName);
-        return subscriptionRepository.deleteSubscription(query);
+        boolean result = subscriptionRepository.deleteSubscription(query);
+  
+        if (result) {
+        	String subscriptionIdQuery = String.format(SUBSCRIPTION_ID, name);
+        	if(!cleanSubscriptionRepeatFlagHandlerDb(subscriptionIdQuery)) {
+        		LOG.error("Failed to clean subscription \"" + name + "\" matched AggregatedObjIds from RepeatFlagHandler database");
+         }
+        }
+        return result;
     }
 
     @Override
@@ -130,6 +154,12 @@ public List<Subscription> getSubscription() throws SubscriptionNotFoundException
         }
         return subscriptions;
     }
+
+    private boolean cleanSubscriptionRepeatFlagHandlerDb(String subscriptionNameQuery) {
+    	LOG.debug("Cleaning and removing matched subscriptions AggrObjIds in ReapeatHandlerFlag database with query: " + subscriptionNameQuery);
+    	MongoDBHandler mongoDbHandler = subscriptionRepository.getMongoDbHandler();
+    	return mongoDbHandler.dropDocument(dataBaseName, repeatFlagHandlerCollection, subscriptionNameQuery);
+    }
     
     /**
      * This method generate query for mongoDB
diff --git a/src/test/java/com/ericsson/ei/subscription/SubscriptionServiceTest.java b/src/test/java/com/ericsson/ei/subscription/SubscriptionServiceTest.java
@@ -36,6 +36,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
@@ -45,6 +46,7 @@
 import com.ericsson.ei.mongodbhandler.MongoDBHandler;
 import com.ericsson.ei.services.ISubscriptionService;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.mongodb.BasicDBObject;
 import com.mongodb.MongoClient;
 
 import de.flapdoodle.embed.mongo.distribution.Version;
@@ -56,6 +58,10 @@ public class SubscriptionServiceTest {
 
     final static Logger LOGGER = (Logger) LoggerFactory.getLogger(SubscriptionServiceTest.class);
 
+    @Value("${spring.data.mongodb.database}") private String dataBaseName;
+    
+    @Value("${subscription.collection.repeatFlagHandlerName}") private String repeatFlagHandlerCollection;
+    
     String subscriptionName;
     String userName = "ABC"; // initialized with "ABC", as test json file has this name as userName
 
@@ -226,6 +232,82 @@ public void testDeleteSubscriptionsByName() {
         } catch (IOException | JSONException e) {
         }
     }
+    
+    @Test
+    public void testDeleteSubscriptionsByNameAndCleanUpOfRepeatHandlerDb() {
+        // Insert Subscription
+        Subscription subscription2;
+        try {
+            subscription2 = mapper.readValue(jsonArray.getJSONObject(0).toString(), Subscription.class);
+            
+            
+            subscriptionService.addSubscription(subscription2);
+            String expectedSubscriptionName = subscription2.getSubscriptionName();
+            
+            // Inserting a matched subscription AggrObjIds document to RepeatHandlerDb database collection.
+            BasicDBObject docInput = new BasicDBObject();
+            docInput.put("subscriptionId", expectedSubscriptionName);
+            mongoDBHandler.insertDocument(dataBaseName, repeatFlagHandlerCollection, docInput.toString());
+            
+            boolean deleteSubscription = subscriptionService.deleteSubscription(expectedSubscriptionName, "");
+            assertEquals(deleteSubscription, true);
+            
+            // Checking if it removes the Subscription Matched AggrObjIds document from RepeatHandlerDb database collection.
+            String subscriptionIdMatchedAggrIdObjQuery =  "{ \"subscriptionId\" : \"" + expectedSubscriptionName + "\"}";
+            ArrayList<String> result = mongoDBHandler.find(dataBaseName, repeatFlagHandlerCollection, subscriptionIdMatchedAggrIdObjQuery);
+
+            assertEquals("[]", result.toString());
+        } catch (IOException | JSONException e) {
+        	LOGGER.error(e.getMessage(), e);
+        }
+    }
+    
+  @Test
+  public void testUpdateSubscriptionAndCleanUpOfRepeatHandlerDb() {
+      Subscription subscription;
+      try {
+          // Insert Subscription
+          Subscription subscription2 = mapper.readValue(jsonArray.getJSONObject(0).toString(), Subscription.class);
+          String expectedSubscriptionName = subscription2.getSubscriptionName();
+          subscriptionService.addSubscription(subscription2);
+          // Fetch the inserted subscription
+          subscription2 = null;
+          subscription2 = subscriptionService.getSubscription(expectedSubscriptionName, null);
+          subscriptionName = subscription2.getSubscriptionName();
+          String subscriptionUserName = subscription2.getUserName();
+
+          assertEquals(subscriptionName, expectedSubscriptionName);
+          
+          // Inserting a matched subscription AggrObjIds document to RepeatHandlerDb database collection.
+          BasicDBObject docInput = new BasicDBObject();
+          docInput.put("subscriptionId", subscriptionName);
+          mongoDBHandler.insertDocument(dataBaseName, repeatFlagHandlerCollection, docInput.toString());
+          
+          // Updating subscription2(subscriptionName=Subscription_Test) with
+          // the subscription(subscriptionName=Subscription_Test_Modify)
+          subscription = mapper.readValue(jsonArray.getJSONObject(1).toString(), Subscription.class);
+          String expectedModifiedSubscriptionName = subscription2.getSubscriptionName();
+          boolean addSubscription = subscriptionService.modifySubscription(subscription, subscriptionName, null);
+
+          // test update done successfully
+          assertEquals(addSubscription, true);
+          subscription = null;
+          subscription = subscriptionService.getSubscription(expectedModifiedSubscriptionName, null);
+          subscriptionName = subscription.getSubscriptionName();
+          assertEquals(subscriptionName, expectedModifiedSubscriptionName);
+          
+          // Checking if it removes the Subscription Matched AggrObjIds document from RepeatHandlerDb database collection.
+          String subscriptionIdMatchedAggrIdObjQuery =  "{ \"subscriptionId\" : \"" + subscriptionName + "\"}";
+          List<String> result = mongoDBHandler.find(dataBaseName, repeatFlagHandlerCollection, subscriptionIdMatchedAggrIdObjQuery);
+
+          assertEquals("[]", result.toString());
+
+          // deleting the test data
+          deleteSubscriptionsByName(subscriptionName, "");
+      } catch (Exception e) {
+      }
+  }
+    
 
     @Test(expected = SubscriptionNotFoundException.class)
     public void testExceptionGetSubscriptionsByName() throws SubscriptionNotFoundException {

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@`
`24`	`24`
`25`	`25`	`import com.ericsson.ei.mongodbhandler.MongoDBHandler;`
`26`	`26`
	`27`	`+`
`27`	`28`	`@Component`
`28`	`29`	`public class SubscriptionRepository implements ISubscriptionRepository {`
`29`	`30`
`@@ -57,4 +58,8 @@ public boolean deleteSubscription(String query) {`
`57`	`58`	`return mongoDBHandler.dropDocument(dataBaseName, collectionName, query);`
`58`	`59`	`}`
`59`	`60`
	`61`	`+ @Override`
	`62`	`+ public MongoDBHandler getMongoDbHandler() {`
	`63`	`+ return mongoDBHandler;`
	`64`	`+ }`
`60`	`65`	`}`