Process deleted node correctly

.jshintrc

@@ -35,6 +35,7 @@
         "getLength": true,
         "getExport": true,
         "isPrintLog": true,
+        "getUrlPath": true,
         "editQuestionInstanceCtrl": true
     }
 }

src/main/java/com/epam/eighty/repository/TopicRepository.java

@@ -1,5 +1,7 @@
 package com.epam.eighty.repository;
 
+import org.springframework.data.domain.Slice;
+import org.springframework.data.neo4j.annotation.Query;
 import org.springframework.stereotype.Repository;
 
 import com.epam.eighty.domain.Topic;
@@ -10,4 +12,6 @@
 @Repository("topicRepo")
 public interface TopicRepository extends BaseRepository<Topic, Long> {
 
+    @Query(value = "MATCH (root:`Topic`) WHERE ID(root) = {0} return root UNION ALL MATCH (root:`Topic`)-[:`contains`*]->(topic:`Topic`) WHERE ID(topic) = {0} RETURN root", elementClass = Topic.class)
+    Slice<Topic> getRootTopicsForTopic(Long id);
 }

src/main/java/com/epam/eighty/service/TopicService.java

@@ -1,5 +1,6 @@
 package com.epam.eighty.service;
 
+import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 
@@ -16,4 +17,6 @@ public interface TopicService {
     void updateTopic(Topic topic);
     void deleteTopic(Long id);
     Topic createTopic(Topic topic, Long id);
+    Long getIdOfLastNotDeletedTopic(List<Long> topicIds);
+    Topic getTopicWithChildsTillTopicWithId(Long id);
 }

src/main/java/com/epam/eighty/service/impl/TopicServiceImpl.java

@@ -1,5 +1,6 @@
 package com.epam.eighty.service.impl;
 
+import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 
@@ -70,4 +71,33 @@ public Topic createTopic(final Topic topic, final Long id) {
         return topic;
     }
 
+    @Override
+    public Long getIdOfLastNotDeletedTopic(List<Long> topicIds) {
+        for(Long id: topicIds) {
+            Optional<Topic> topic = topicRepo.findOne(id);
+            if(topic.isPresent()) {
+                return id;
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public Topic getTopicWithChildsTillTopicWithId(Long id) {
+        Optional<Topic> root = topicRepo.findBySchemaPropertyValue("title", "root");
+        List<Topic> path = topicRepo.getRootTopicsForTopic(id).getContent();
+        root.ifPresent(r -> {
+            topicsFetchIfNeeded(r, path);
+        });
+        return root.get();
+    }
+
+    private void topicsFetchIfNeeded(Topic topic, List<Topic> path) {
+        topic.getTopics().forEach(t -> {
+            template.fetch(t);
+            if(path.contains(t)) {
+                topicsFetchIfNeeded(t, path);
+            }
+        });
+    }
 }

src/main/java/com/epam/eighty/web/api/TopicController.java

@@ -1,6 +1,7 @@
 package com.epam.eighty.web.api;
 
 import java.io.IOException;
+import java.util.List;
 import java.util.Optional;
 
 import javax.servlet.http.HttpServletResponse;
@@ -101,6 +102,19 @@ public Topic createTopic(@ApiParam(name = "topic", required = true, value = "top
         return topicService.createTopic(topic, id);
     }
 
+    @ApiOperation(value = "Create topic", notes = "Create topic", httpMethod = "POST", response = Topic.class, consumes = "application/json")
+    @ApiResponses(value = {
+            @ApiResponse(code = 200, message = "application/json question"),
+            @ApiResponse(code = 400, message = "Bad request"), })
+    @Timed
+    @RequestMapping(value = "/notRemoved", method = RequestMethod.POST)
+    @ResponseBody
+    @CacheEvict(value = "topic", allEntries = true)
+    public Long getIdOfLastNotDeletedTopic(@ApiParam(name = "topicIds", required = true, value = "topicIds") @RequestBody final List<Long> topicIds,
+            final HttpServletResponse response) {
+        return topicService.getIdOfLastNotDeletedTopic(topicIds);
+    }
+
     @ApiOperation(value = "Update topic", notes = "Update topic", httpMethod = "PUT", response = Topic.class, consumes = "application/json")
     @ApiResponses(value = {
             @ApiResponse(code = 200, message = "application/json question"),
@@ -115,4 +129,16 @@ public Topic updateTopic(@ApiParam(name = "topic", required = true, value = "top
         return topic;
     }
 
+    @ApiOperation(value = "Find path for topic by id", notes = "Get path for topic by id", httpMethod = "GET", response = Topic.class, produces = "application/json")
+    @ApiResponses(value = {
+            @ApiResponse(code = 200, message = "application/json topic"),
+            @ApiResponse(code = 400, message = "Bad request"),
+            @ApiResponse(code = 404, message = "Not found") })
+    @Timed
+    @RequestMapping(value = "/path/{id}", method = RequestMethod.GET)
+    @ResponseBody
+    @Cacheable(value = "topic", key = "'path.' + #id")
+    public Topic getPath(@ApiParam(name = "topicId", required = true, value = "topic id") @PathVariable("id") final Long id) {
+        return topicService.getTopicWithChildsTillTopicWithId(id);
+    }
 }

src/main/webapp/js/app.js

@@ -103,18 +103,18 @@ angular.module('eightyControllers', ['ui.router', 'ui.bootstrap']);
         return customersFactory.getCustomers();
     }
 
-    getAllQuestionsWithTag.$inject = ['$stateParams', 'crudFactory'];
-    function getAllQuestionsWithTag($stateParams, crudFactory) {
-        var questions = crudFactory.questions().allQuestionsWithTag({tagName: replaceDOT($stateParams.tagName)}).$promise;
+    getAllQuestionsWithTag.$inject = ['$stateParams', 'questionsFactory'];
+    function getAllQuestionsWithTag($stateParams, questionsFactory) {
+        var questions = questionsFactory.getAllQuestionsWithTag($stateParams);
         questions.then(undefined, function (error) {
             printLog(error);
         });
         return questions;
     }
 
-    getAllQuestionsFromCustomer.$inject = ['$stateParams', 'crudFactory'];
-    function getAllQuestionsFromCustomer($stateParams, crudFactory) {
-        var questions = crudFactory.questions().allQuestionsFromCustomer({customerName: replaceDOT($stateParams.customerName)}).$promise;
+    getAllQuestionsFromCustomer.$inject = ['$stateParams', 'questionsFactory'];
+    function getAllQuestionsFromCustomer($stateParams, questionsFactory) {
+        var questions = questionsFactory.getAllQuestionsFromCustomer($stateParams);
         questions.then(undefined, function (error) {
             printLog(error);
         });

src/main/webapp/js/dataService/crud.factory.js

@@ -38,11 +38,13 @@
          * - `{object}` `get({Number} id)` — Request for topic with given id.
          * - `{object}` `update({object} topic)` — Request for update the given topic.
          */
-        function topic () {
+        function topic() {
             return $resource('topics/:id', {}, {
                 get: {method: 'GET', params: {id: '@id'}},
+                getLastNotRemoved: { method: 'POST', url: 'topics/notRemoved' },
                 update: { method: 'PUT', url: 'topics' },
-                create: { method: 'POST', params: {id: '@id'}}
+                create: { method: 'POST', params: {id: '@id'}},
+                getPath: { method: 'GET', url: 'topics/path/:id', params: {id: '@id'}}
             });
         }
 

src/main/webapp/js/questions/filteredQuestions.controller.js

@@ -37,7 +37,7 @@
         }
 
         function rateUp(questionUI) {
-            questionsFactory.rateUp(questionUI);
+            questionsFactory.rateUp(questionUI, vm);
         }
 
         function editQuestion(question) {

src/main/webapp/js/questions/questions.controller.js

@@ -63,7 +63,7 @@
         }
 
         function rateUp(questionUI) {
-            questionsFactory.rateUp(questionUI);
+            questionsFactory.rateUp(questionUI, vm);
         }
 
         function exportQuestion(question) {

src/main/webapp/js/questions/questions.factory.js

@@ -12,10 +12,9 @@
         .module('eightyFactories')
         .factory('questionsFactory', questionsFactory);
 
-        questionsFactory.$inject = ['$modal', '$stateParams', '$rootScope', 'crudFactory', 'modalData', 'utility'];
-
-        function questionsFactory($modal, $stateParams, $rootScope, crudFactory, modalData, utility) {
+        questionsFactory.$inject = ['$document', '$modal', '$stateParams', '$rootScope', 'crudFactory', 'modalData', 'utility'];
 
+        function questionsFactory($document, $modal, $stateParams, $rootScope, crudFactory, modalData, utility) {
             var publicMethods = {
                 checkCollapsed: checkCollapsed,
                 checkInSet: checkInSet,
@@ -32,7 +31,9 @@
                 loadTagsAndCustomersByTopic: loadTagsAndCustomersByTopic,
                 getTopic: getTopic,
                 saveQuestionChanges: saveQuestionChanges,
-                deleteQuestion: deleteQuestion
+                deleteQuestion: deleteQuestion,
+                getAllQuestionsWithTag: getAllQuestionsWithTag,
+                getAllQuestionsFromCustomer: getAllQuestionsFromCustomer
             };
             return publicMethods;
 
@@ -47,7 +48,7 @@
             function checkInSet(key, obj) {
                 return utility.containsInSet(key, obj);
             }
-            function rateUp(questionUI) {
+            function rateUp(questionUI, vm) {
                 if (questionUI.like === null) {
                     questionUI.like = 0;
                 }
@@ -62,9 +63,74 @@
                         utility.updateInSet('exportSet', question);
                     }
                 }, function(error) {
-                    printLog(error);
+                    if (error.status === 404) {
+                        errorAlert('Question is not found!', $modal);
+                        reloadPageAfterQuestionWasRemoved(vm);
+                    }
                 });
             }
+
+            function reloadPageAfterQuestionWasRemoved(vm) {
+                $rootScope.$broadcast('topTags-update');
+                var str_url = $document[0].URL;
+                var topics_url = '#/topics/';
+                var tags_url = '#/questionsWithTag/';
+                var customers_url = '#/questionsFromCustomer/';
+                if(str_url.search(topics_url) !== -1) {
+                    reloadQuestionsAndTopicTagsOnTopicsPage(vm, getUrlPath(str_url, topics_url));
+                }
+                if(str_url.search(tags_url) !== -1) {
+                    reloadQuestionsOnQuestionsWithTagPage(vm, getUrlPath(str_url, tags_url));
+                }
+                if(str_url.search(customers_url) !== -1) {
+                    reloadQuestionsOnQuestionsFromCustomerPage(vm, getUrlPath(str_url, customers_url));
+                }
+                if(vm.questionsForExport) {
+                    reloadQuestionsForExport(vm);
+                }
+            }
+
+            function reloadQuestionsAndTopicTagsOnTopicsPage(vm, topicId) {
+                $rootScope.$broadcast('topicTags-update');
+                $stateParams.id = topicId;
+                loadQuestions(vm, 0);
+            }
+            function reloadQuestionsOnQuestionsWithTagPage(vm, tagName) {
+                $stateParams.tagName = tagName;
+                getAllQuestionsWithTag($stateParams).then(function(set) {
+                    vm.questions = set;
+                });
+            }
+            function reloadQuestionsOnQuestionsFromCustomerPage(vm, customer) {
+                $stateParams.customerName = customer;
+                getAllQuestionsFromCustomer($stateParams).then(function(set) {
+                    vm.questions = set;
+                });
+            }
+            function reloadQuestionsForExport(vm) {
+                crudFactory.questions().query().$promise.then(function(allQuestions) {
+                    for(var i = vm.questionsForExport.length - 1; i >= 0; i--) {
+                        var question = vm.questionsForExport[i];
+                        if(!containsInSet(allQuestions, question)) {
+                            vm.questionsForExport.splice(i, 1);
+                            utility.removeFromSet('exportSet', question);
+                        } else {
+                            var questionFromAllQuestions = allQuestions[getIndex(allQuestions, question)];
+                            if(questionFromAllQuestions !== question) {
+                                vm.questionsForExport[i] = allQuestions[getIndex(allQuestions, question)];
+                                utility.updateInSet('exportSet', questionFromAllQuestions);
+                            }
+                        }
+                      }
+                });
+            }
+            function getAllQuestionsWithTag($stateParams) {
+                return crudFactory.questions().allQuestionsWithTag({tagName: replaceDOT($stateParams.tagName)}).$promise;
+            }
+            function getAllQuestionsFromCustomer($stateParams) {
+                return  crudFactory.questions().allQuestionsFromCustomer({customerName: replaceDOT($stateParams.customerName)}).$promise;
+            }
+
             function editQuestion(question, vm) {
                 modalData.setShouldBeOpen(true);
 
@@ -140,6 +206,7 @@
                 if ($stateParams.id) {
                     crudFactory.questions().allQuestions({id: $stateParams.id, page: page, size: scrollAddOption.count, sort: scrollAddOption.sort})
                         .$promise.then(function (set) {
+                            scope.questions = [];
                             if ((page === 0) && (set.length === 0)) {
                                 page = -1;
                                 scope.message = 'No questions';

src/main/webapp/js/topicTree/treeNavigation.controller.js

@@ -23,7 +23,7 @@
 
         function activate() {
             crudFactory.topic().get({id: ''}).$promise.then(function(topic) {
-                vm.treedata = treeNavigationFactory.getTreeTopics(topic);
+               vm.treedata = treeNavigationFactory.getTreeTopics(topic);
             }, function(error) {
                 printLog(error);
             });
@@ -39,13 +39,15 @@
                 treeNode.topics = treeNavigationFactory.getTreeTopics(topic);
                 vm.treeControl.expand_branch(treeNode);
             }, function(error) {
-                printLog(error);
+                if (error.status === 404) {
+                    treeNavigationFactory.reloadTopics(treeNode, vm);
+                }
             });
         }
 
         function editTopic(node) {
             modalData.setShouldBeOpen(true);
-            treeNavigationFactory.editTopic(node);
+            treeNavigationFactory.editTopic(node, vm);
         }
 
         function addTopic(node) {