From 36e7e4187509c8b6090f3b0f5b3e215b0634cf89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E1=84=8B=E1=85=B5=E1=84=8C=E1=85=B5=E1=86=AB=E1=84=89?=
 =?UTF-8?q?=E1=85=A5=E1=86=A8?= <leejinseok@wemakeprice.com>
Date: Tue, 4 Feb 2020 11:19:21 +0900
Subject: [PATCH] =?UTF-8?q?detail=20=ED=8E=98=EC=9D=B4=EC=A7=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/front/src/api/articleApi.js               | 10 +++++
 src/front/src/pages/articles/Detail.vue       | 38 +++++++++++++++++++
 src/front/src/pages/articles/List.vue         |  3 +-
 src/front/src/routes/index.js                 |  6 +++
 .../example/vue/domain/article/Article.java   |  6 ++-
 .../vue/domain/article/ArticleController.java |  8 ++++
 .../vue/domain/article/ArticleException.java  | 20 ++++++++++
 .../vue/domain/article/ArticleRepository.java |  5 +++
 .../domain/article/ArticleResponseDto.java    |  5 ++-
 .../vue/domain/article/ArticleService.java    |  8 ++++
 10 files changed, 105 insertions(+), 4 deletions(-)
 create mode 100644 src/front/src/pages/articles/Detail.vue
 create mode 100644 src/main/java/com/example/vue/domain/article/ArticleException.java

diff --git a/src/front/src/api/articleApi.js b/src/front/src/api/articleApi.js
index 75d772a..6dc4372 100644
--- a/src/front/src/api/articleApi.js
+++ b/src/front/src/api/articleApi.js
@@ -16,6 +16,15 @@ function getArticles({page = 0, size = 10, q = ''}) {
   });
 }
 
+function getArticle(id) {
+  return axios({
+    url: '/api/articles/' + id,
+    headers: {
+      'Authorization': commonUtil.getAuthenticationHeaderBearer.bind(this)()
+    }
+  });
+}
+
 function postArticle({title = '', content = ''}) {
 
   return axios({
@@ -33,5 +42,6 @@ function postArticle({title = '', content = ''}) {
 
 export default {
   getArticles,
+  getArticle,
   postArticle
 }
\ No newline at end of file
diff --git a/src/front/src/pages/articles/Detail.vue b/src/front/src/pages/articles/Detail.vue
new file mode 100644
index 0000000..dd93d40
--- /dev/null
+++ b/src/front/src/pages/articles/Detail.vue
@@ -0,0 +1,38 @@
+<template>
+    <div>
+        <div>
+            title : <span v-if="!pending">{{ article.title }}</span>
+        </div>
+        <div>
+            content: <p v-if="!pending">{{ article.content }}</p>
+        </div>
+
+    </div>
+</template>
+
+<script>
+  import articleApi from "../../api/articleApi";
+
+  export default {
+    name: "Detail",
+    data() {
+      return {
+        article: null,
+        pending: true
+      }
+    },
+    async beforeCreate() {
+      try {
+        const result = await articleApi.getArticle.bind(this)(this.$route.params.id);
+        this.article = result.data;
+        this.pending = false;
+      } catch (e) {
+        console.log(e);
+      }
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/src/front/src/pages/articles/List.vue b/src/front/src/pages/articles/List.vue
index f57db7a..5cdb8c4 100644
--- a/src/front/src/pages/articles/List.vue
+++ b/src/front/src/pages/articles/List.vue
@@ -1,8 +1,7 @@
 <template>
     <div v-if="!pending">
         <article v-for="article in articles" v-bind:key="article.id">
-            <span>{{ article.title }}</span>
-            <span>{{ article }}</span>
+            <router-link :to="{name: 'DetailArticle', params: {id: article.id}}"><span>{{ article.title }}</span></router-link>
         </article>
 
         <div>
diff --git a/src/front/src/routes/index.js b/src/front/src/routes/index.js
index 164cc89..a94e0a5 100644
--- a/src/front/src/routes/index.js
+++ b/src/front/src/routes/index.js
@@ -6,6 +6,7 @@ import Login from "../pages/auth/Login";
 import Register from "../pages/auth/Register";
 import Articles from "../pages/articles/List";
 import WriteArticle from '../pages/articles/Write';
+import DetailArticle from '../pages/articles/Detail';
 
 Vue.use(VueRouter);
 
@@ -31,6 +32,11 @@ export const router = new VueRouter({
     {
       path: '/articles/write',
       component: WriteArticle
+    },
+    {
+      path: '/articles/:id',
+      name: 'DetailArticle',
+      component: DetailArticle
     }
   ]
 });
diff --git a/src/main/java/com/example/vue/domain/article/Article.java b/src/main/java/com/example/vue/domain/article/Article.java
index 56bda6f..a65e9d4 100644
--- a/src/main/java/com/example/vue/domain/article/Article.java
+++ b/src/main/java/com/example/vue/domain/article/Article.java
@@ -1,5 +1,6 @@
 package com.example.vue.domain.article;
 
+import com.example.vue.domain.user.User;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import org.springframework.data.annotation.CreatedDate;
@@ -15,7 +16,7 @@ import java.time.LocalDateTime;
 public class Article {
 
     @Id @GeneratedValue
-    Long id;
+    private Long id;
 
     @Column(name = "title")
     private String title;
@@ -23,6 +24,9 @@ public class Article {
     @Column(name = "content")
     private String content;
 
+    @ManyToOne
+    private User user;
+
     @CreatedDate
     private LocalDateTime createdAt;
 
diff --git a/src/main/java/com/example/vue/domain/article/ArticleController.java b/src/main/java/com/example/vue/domain/article/ArticleController.java
index 95d67bc..a6667b9 100644
--- a/src/main/java/com/example/vue/domain/article/ArticleController.java
+++ b/src/main/java/com/example/vue/domain/article/ArticleController.java
@@ -1,7 +1,9 @@
 package com.example.vue.domain.article;
 
+import com.example.vue.domain.user.User;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Pageable;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
@@ -20,6 +22,12 @@ public class ArticleController {
         return articleService.findAll(pageable);
     }
 
+    @GetMapping(value = "/{articleId}")
+    @Transactional(readOnly = true)
+    public ArticleResponseDto getArticle(@PathVariable Long articleId, @AuthenticationPrincipal User user) {
+        return articleService.findById(articleId, user);
+    }
+
     @PostMapping
     @Transactional
     public ArticleResponseDto postArticles(@RequestBody @Valid ArticleRequestDto articleRequestDto) {
diff --git a/src/main/java/com/example/vue/domain/article/ArticleException.java b/src/main/java/com/example/vue/domain/article/ArticleException.java
new file mode 100644
index 0000000..21cf07b
--- /dev/null
+++ b/src/main/java/com/example/vue/domain/article/ArticleException.java
@@ -0,0 +1,20 @@
+package com.example.vue.domain.article;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+import java.util.function.Supplier;
+
+public class ArticleException {
+
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    public static class NoExist extends RuntimeException {
+        public NoExist(Long id) {
+            super("존재하지 않는 게시글입니다. [articleId=" + id + "]");
+        }
+    }
+
+    public static Supplier<NoExist> passNoExistException(Long id) {
+        return () -> new NoExist(id);
+    }
+}
diff --git a/src/main/java/com/example/vue/domain/article/ArticleRepository.java b/src/main/java/com/example/vue/domain/article/ArticleRepository.java
index ea05720..d0edfbc 100644
--- a/src/main/java/com/example/vue/domain/article/ArticleRepository.java
+++ b/src/main/java/com/example/vue/domain/article/ArticleRepository.java
@@ -7,6 +7,7 @@ import org.springframework.stereotype.Repository;
 
 import javax.persistence.EntityManager;
 import java.util.List;
+import java.util.Optional;
 
 @Repository
 @RequiredArgsConstructor
@@ -29,4 +30,8 @@ public class ArticleRepository {
             .getResultList();
     }
 
+    public Optional<Article> findById(Long id) {
+        return Optional.ofNullable(em.find(Article.class, id));
+    }
+
 }
diff --git a/src/main/java/com/example/vue/domain/article/ArticleResponseDto.java b/src/main/java/com/example/vue/domain/article/ArticleResponseDto.java
index e95e844..da6db30 100644
--- a/src/main/java/com/example/vue/domain/article/ArticleResponseDto.java
+++ b/src/main/java/com/example/vue/domain/article/ArticleResponseDto.java
@@ -1,8 +1,8 @@
 package com.example.vue.domain.article;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 @Data
@@ -11,6 +11,9 @@ public class ArticleResponseDto {
     private Long id;
     private String title;
     private String content;
+
+    @JsonProperty("isOwn")
+    private boolean isOwn;
     private LocalDateTime createdAt;
     private LocalDateTime updatedAt;
 
diff --git a/src/main/java/com/example/vue/domain/article/ArticleService.java b/src/main/java/com/example/vue/domain/article/ArticleService.java
index f315817..7f3e878 100644
--- a/src/main/java/com/example/vue/domain/article/ArticleService.java
+++ b/src/main/java/com/example/vue/domain/article/ArticleService.java
@@ -1,5 +1,6 @@
 package com.example.vue.domain.article;
 
+import com.example.vue.domain.user.User;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
@@ -24,4 +25,11 @@ public class ArticleService {
             .map(ArticleResponseDto::new)
             .collect(Collectors.toList());
     }
+
+    public ArticleResponseDto findById(Long id, User user) {
+        Article article = articleRepository.findById(id).orElseThrow(ArticleException.passNoExistException(id));
+        ArticleResponseDto articleResponseDto = new ArticleResponseDto(article);
+        articleResponseDto.setOwn(article.getUser().getId().equals(user.getId()));
+        return articleResponseDto;
+    }
 }