fix front

backend/README.md

@@ -1,12 +1,20 @@
+# Slide
+
+https://go-talks.appspot.com/github.com/voyagegroup/talks/2019/treasure-go-day2/intro.slide#1
+
 # Getting Started
 
 ## 1. Database 立ち上げ
 
 `../database` に構成などが定義されているので、読んでみてください。
 
+以下のターゲットを叩くと、databaseの準備をします。
+
 ```console
 ❯ make -f integration.mk database-init
-make -C ../database init
+```
+
+```console
 which goose || GO111MODULE=off go get -u github.com/pressly/goose/cmd/goose
 /Users/j-chikamori/go/bin/goose
 docker-compose up -d
@@ -72,9 +80,14 @@ PORT=1991
 使っているAPI: [Exchange custom token for an ID and refresh token](https://firebase.google.com/docs/reference/rest/auth/#section-refresh-token)  
 それぞれのキーについては、上記リンクを見れば大体分かる。
 
+トークンの作成
+
 ```console
 ❯ make -f integration.mk create-token UID=demo
 go run ./cmd/customtoken/main.go demo .idToken
+```
+
+```console
 {
   "kind": "identitytoolkit#VerifyCustomTokenResponse",
   "idToken": "idtoken",
@@ -88,17 +101,27 @@ go run ./cmd/customtoken/main.go demo .idToken
 
 ## 5. Hello World
 
+*サーバー立ち上げ*
+
 ```console
 ❯ make run
 go run cmd/api/main.go
+```
+
+```console
 2019/08/08 11:32:47 server.go:51: Listening on port 1991
 ```
 
 サーバーを立ち上げた状態で、別シェルから以下を叩く。
 
+*認証ありエンドポイントへのリクエスト*
+
 ```console
 ❯ make -f integration.mk req-private
 curl -v -H "Authorization: Bearer Hoge" localhost:1991/private
+```
+
+```console
 *   Trying ::1...
 * TCP_NODELAY set
 * Connected to localhost (::1) port 1991 (#0)
@@ -116,10 +139,16 @@ curl -v -H "Authorization: Bearer Hoge" localhost:1991/private
 <
 * Connection #0 to host localhost left intact
 {"message":"Hello  from private endpoint! Your firebase uuid is demo"}
+```
 
+*認証なしエンドポイントへのリクエスト*
 
+```console
 ❯ make -f integration.mk req-public
 curl -v localhost:1991/public
+```
+
+```console
 *   Trying ::1...
 * TCP_NODELAY set
 * Connected to localhost (::1) port 1991 (#0)
@@ -149,16 +178,29 @@ curl -v localhost:1991/public
 
 コードを書き換える度に `go run` し直すのは面倒くさいので、書き換えるとrebuildしてくれるコマンドを用意しているので活用してください。
 
+realizeをgo getする
+
 ```console
 ❯ make dev-deps                     
   GO111MODULE=off go get -u -v \
                   github.com/oxequa/realize
+```
+
+```
   github.com/oxequa/realize (download)
   github.com/oxequa/interact (download)
   github.com/fatih/color (download)
   github.com/fsnotify/fsnotify (download)
+```
+
+realizeを使って実行する
+
+```console
 ❯ make refresh-run
 realize start
+```
+
+``` console
 [11:36:48][BACKEND] : Watching 21 file/s 14 folder/s
 [11:36:48][BACKEND] : Install started
 [11:36:51][BACKEND] : Install completed in 3.653 s

backend/controller/article.go

@@ -18,15 +18,15 @@ import (
 )
 
 type Article struct {
-	dbx *sqlx.DB
+	db *sqlx.DB
 }
 
-func NewArticle(dbx *sqlx.DB) *Article {
-	return &Article{dbx: dbx}
+func NewArticle(db *sqlx.DB) *Article {
+	return &Article{db: db}
 }
 
 func (a *Article) Index(w http.ResponseWriter, r *http.Request) (int, interface{}, error) {
-	articles, err := repository.AllArticle(a.dbx)
+	articles, err := repository.AllArticle(a.db)
 	if err != nil {
 		return http.StatusInternalServerError, nil, err
 	}
@@ -45,17 +45,19 @@ func (a *Article) Show(w http.ResponseWriter, r *http.Request) (int, interface{}
 		return http.StatusBadRequest, nil, err
 	}
 
-	article, err := repository.FindArticle(a.dbx, aid)
+	articleService := service.NewArticle(a.db)
+	articleDetail, err := articleService.FindArticleDetail(aid)
 	if err != nil && err == sql.ErrNoRows {
 		return http.StatusNotFound, nil, err
 	} else if err != nil {
 		return http.StatusInternalServerError, nil, err
 	}
 
-	return http.StatusCreated, article, nil
+	return http.StatusCreated, articleDetail, nil
 }
 
 func (a *Article) Create(w http.ResponseWriter, r *http.Request) (int, interface{}, error) {
+
 	newArticle := &model.Article{}
 	contextUser, err := httputil.GetUserFromContext(r.Context())
 	if err != nil {
@@ -73,17 +75,36 @@ func (a *Article) Create(w http.ResponseWriter, r *http.Request) (int, interface
 
 	if err := json.NewDecoder(r.Body).Decode(&newArticle); err != nil {
 		fmt.Println("Decode")
+
 		return http.StatusBadRequest, nil, err
 	}
 
-	articleService := service.NewArticleService(a.dbx)
-	id, err := articleService.Create(newArticle)
+	user, err := httputil.GetUserFromContext(r.Context())
+	if err != nil {
+		return http.StatusInternalServerError, nil, err
+	}
+
+	createArticle := &model.Article{
+		Title:  reqParam.Title,
+		Body:   reqParam.Body,
+		UserID: &user.ID,
+	}
+
+	articleService := service.NewArticle(a.db)
+	id, err := articleService.Create(createArticle, reqParam.TagIDs)
 	if err != nil {
 		return http.StatusInternalServerError, nil, err
 	}
-	newArticle.ID = id
 
-	return http.StatusCreated, newArticle, nil
+	respParam := &model.ResponseCreateArticle{
+		ID:     id,
+		Title:  createArticle.Title,
+		Body:   createArticle.Body,
+		UserID: createArticle.UserID,
+		TagIDs: reqParam.TagIDs,
+	}
+
+	return http.StatusCreated, respParam, nil
 }
 
 func (a *Article) Update(w http.ResponseWriter, r *http.Request) (int, interface{}, error) {
@@ -98,13 +119,13 @@ func (a *Article) Update(w http.ResponseWriter, r *http.Request) (int, interface
 		return http.StatusBadRequest, nil, err
 	}
 
-	reqArticle := &model.Article{}
-	if err := json.NewDecoder(r.Body).Decode(&reqArticle); err != nil {
+	reqParam := &model.Article{}
+	if err := json.NewDecoder(r.Body).Decode(&reqParam); err != nil {
 		return http.StatusBadRequest, nil, err
 	}
 
-	articleService := service.NewArticleService(a.dbx)
-	err = articleService.Update(aid, reqArticle)
+	articleService := service.NewArticle(a.db)
+	err = articleService.Update(aid, reqParam)
 	if err != nil && errors.Cause(err) == sql.ErrNoRows {
 		return http.StatusNotFound, nil, err
 	} else if err != nil {
@@ -126,7 +147,7 @@ func (a *Article) Destroy(w http.ResponseWriter, r *http.Request) (int, interfac
 		return http.StatusBadRequest, nil, err
 	}
 
-	articleService := service.NewArticleService(a.dbx)
+	articleService := service.NewArticle(a.db)
 	err = articleService.Destroy(aid)
 	if err != nil && errors.Cause(err) == sql.ErrNoRows {
 		return http.StatusNotFound, nil, err

backend/controller/article_comment.go

@@ -0,0 +1,62 @@
+package controller
+
+import (
+	"database/sql"
+	"encoding/json"
+	"net/http"
+	"strconv"
+
+	"github.com/gorilla/mux"
+	"github.com/jmoiron/sqlx"
+	"github.com/pkg/errors"
+	"github.com/voyagegroup/treasure-app/httputil"
+	"github.com/voyagegroup/treasure-app/model"
+	"github.com/voyagegroup/treasure-app/service"
+)
+
+type ArticleComment struct {
+	dbx *sqlx.DB
+}
+
+func NewArticleComment(dbx *sqlx.DB) *ArticleComment {
+	return &ArticleComment{dbx: dbx}
+}
+
+func (ac *ArticleComment) Create(w http.ResponseWriter, r *http.Request) (int, interface{}, error) {
+	vars := mux.Vars(r)
+	id, ok := vars["article_id"]
+	if !ok {
+		return http.StatusBadRequest, nil, &httputil.HTTPError{Message: "invalid path parameter"}
+	}
+
+	aid, err := strconv.ParseInt(id, 10, 64)
+	if err != nil {
+		return http.StatusBadRequest, nil, err
+	}
+	reqParam := &model.CreateRequestArticleComment{}
+	if err := json.NewDecoder(r.Body).Decode(&reqParam); err != nil {
+		return http.StatusBadRequest, nil, err
+	}
+
+	user, err := httputil.GetUserFromContext(r.Context())
+	if err != nil {
+		return http.StatusInternalServerError, nil, err
+	}
+
+	createArticleComment := &model.ArticleComment{
+		UserID:    user.ID,
+		ArticleID: aid,
+		Body:      reqParam.Body,
+	}
+
+	articleCommentService := service.NewArticleCommentService(ac.dbx)
+	createdId, err := articleCommentService.Create(createArticleComment)
+	if err != nil && errors.Cause(err) == sql.ErrNoRows {
+		return http.StatusNotFound, nil, err
+	} else if err != nil {
+		return http.StatusInternalServerError, nil, err
+	}
+	createArticleComment.ID = createdId
+
+	return http.StatusCreated, createArticleComment, nil
+}