Merge pull request #777 from support-project/feature/issue760_delete_…

…article #760 Add a web api to delete article
support-project · Jul 1, 2017 · cf84713 · cf84713
2 parents e69e02c + c714545
commit cf84713
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 3 deletions.
diff --git a/src/main/java/org/support/project/knowledge/control/api/KnowledgesControl.java b/src/main/java/org/support/project/knowledge/control/api/KnowledgesControl.java
@@ -13,10 +13,12 @@
 import org.support.project.knowledge.vo.api.Knowledge;
 import org.support.project.knowledge.vo.api.KnowledgeDetail;
 import org.support.project.web.bean.ApiParams;
+import org.support.project.web.bean.Msg;
 import org.support.project.web.bean.NameId;
 import org.support.project.web.boundary.Boundary;
 import org.support.project.web.common.HttpStatus;
 import org.support.project.web.control.ApiControl;
+import org.support.project.web.control.service.Delete;
 import org.support.project.web.control.service.Get;
 import org.support.project.web.control.service.Post;
 import org.support.project.web.control.service.Put;
@@ -96,7 +98,7 @@ public Boundary put() {
             KnowledgeDetail data = getJsonObject(KnowledgeDetail.class);
             data.setKnowledgeId(id);
             KnowledgeDataEditLogic.get().update(data, getLoginedUser());
-            return send(HttpStatus.SC_200_OK, new NameId(data.getTitle(), String.valueOf(id)));
+            return send(HttpStatus.SC_200_OK, new Msg("updated"));
         } catch (JSONException e) {
             LOG.debug("json parse error", e);
             return sendError(HttpStatus.SC_400_BAD_REQUEST);
@@ -107,5 +109,27 @@ public Boundary put() {
             return sendError(HttpStatus.SC_500_INTERNAL_SERVER_ERROR);
         }
     }
+
+
+    /**
+     * Delete knowledges
+     */
+    @Delete(path="api/knowledges", checkReferer=false)
+    public Boundary delete() {
+        try {
+            Long id = getPathLong();
+            KnowledgeDataEditLogic.get().delete(id, getLoginedUser());
+            return send(HttpStatus.SC_200_OK, new Msg("deleted"));
+        } catch (JSONException e) {
+            LOG.debug("json parse error", e);
+            return sendError(HttpStatus.SC_400_BAD_REQUEST);
+        } catch (InvalidParamException e) {
+            return sendError(e);
+        } catch (Exception e) {
+            LOG.error("error", e);
+            return sendError(HttpStatus.SC_500_INTERNAL_SERVER_ERROR);
+        }
+    }
+
 
 }
diff --git a/src/main/java/org/support/project/knowledge/logic/KnowledgeDataEditLogic.java b/src/main/java/org/support/project/knowledge/logic/KnowledgeDataEditLogic.java
@@ -145,18 +145,43 @@ public void update(KnowledgeDetail data, LoginedUser loginedUser) throws Excepti
             throw new InvalidParamException(new MessageResult(
                     MessageStatus.Warning, HttpStatus.SC_404_NOT_FOUND, "NOT_FOUND", ""));
         }
-        // 画面での登録と形をあわせる
-        KnowledgeData knowledge = conv(data);
         // 編集権限チェック
         Resources resources = Resources.getInstance(Locale.ENGLISH);
         List<LabelValue> editors = TargetLogic.get().selectEditorsOnKnowledgeId(data.getKnowledgeId());
         if (!KnowledgeLogic.get().isEditor(loginedUser, check, editors)) {
             throw new InvalidParamException(new MessageResult(
                     MessageStatus.Warning, HttpStatus.SC_403_FORBIDDEN, resources.getResource("knowledge.edit.noaccess"), ""));
         }
+        // 画面での登録と形をあわせる
+        KnowledgeData knowledge = conv(data);
         KnowledgeLogic.get().update(knowledge, loginedUser);
     }
 
+    /**
+     * WebAPIからの Knowledge削除
+     * @param data
+     * @param loginedUser
+     * @return
+     * @throws Exception 
+     */
+    public void delete(Long id, LoginedUser loginedUser) throws Exception {
+        LOG.trace("delete");
+        KnowledgesEntity check = KnowledgesDao.get().selectOnKey(id);
+        if (check == null) {
+            throw new InvalidParamException(new MessageResult(
+                    MessageStatus.Warning, HttpStatus.SC_404_NOT_FOUND, "NOT_FOUND", ""));
+        }
+        // 編集権限チェック
+        Resources resources = Resources.getInstance(Locale.ENGLISH);
+        List<LabelValue> editors = TargetLogic.get().selectEditorsOnKnowledgeId(id);
+        if (!KnowledgeLogic.get().isEditor(loginedUser, check, editors)) {
+            throw new InvalidParamException(new MessageResult(
+                    MessageStatus.Warning, HttpStatus.SC_403_FORBIDDEN, resources.getResource("knowledge.edit.noaccess"), ""));
+        }
+        KnowledgeLogic.get().delete(id);
+
+    }
+