fix: status code related to group (#37)

android-project-46group · Nov 26, 2022 · 3f3b43c · 3f3b43c
1 parent 8e778c4
commit 3f3b43c
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 29 deletions.
diff --git a/api/blogs.go b/api/blogs.go
@@ -1,7 +1,9 @@
 package api
 
 import (
+	"database/sql"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"net/http"
 )
@@ -24,12 +26,18 @@ func (server *Server) getAllBlogs(w http.ResponseWriter, r *http.Request) {
 	// get group name from query parameters
 	group := r.FormValue("gn")
 
-	if !server.querier.ExistGroup(group) {
-		// return error message
-		w.WriteHeader(http.StatusBadRequest)
-		fmt.Fprint(w, ErrorJson("Error: No valid group name"))
+	_, err := server.querier.FindGroupByName(group)
+	if err != nil {
+		if errors.Unwrap(err) == sql.ErrNoRows {
+			w.WriteHeader(http.StatusBadRequest)
+			fmt.Fprint(w, ErrorJson("Invalid group name was passed."))
+			return
+		}
+		w.WriteHeader(http.StatusInternalServerError)
+		fmt.Fprint(w, ErrorJson("Error while reading group from DB"))
 		return
 	}
+
 	blogs, err := server.querier.GetAllBlogs(group)
 	if err != nil {
 		// db error

diff --git a/api/formations.go b/api/formations.go
@@ -1,7 +1,9 @@
 package api
 
 import (
+	"database/sql"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"net/http"
 
@@ -24,11 +26,15 @@ func (server *Server) getAllFormations(w http.ResponseWriter, r *http.Request) {
 	// get group name from query parameters
 	group := r.FormValue("gn")
 
-	if !server.querier.ExistGroup(group) {
-		fmt.Printf("getAllFormations: access to invalid group name")
-		// return error message
-		w.WriteHeader(http.StatusBadRequest)
-		fmt.Fprint(w, ErrorJson("Invalid group name"))
+	_, err := server.querier.FindGroupByName(group)
+	if err != nil {
+		if errors.Unwrap(err) == sql.ErrNoRows {
+			w.WriteHeader(http.StatusBadRequest)
+			fmt.Fprint(w, ErrorJson("Invalid group name was passed."))
+			return
+		}
+		w.WriteHeader(http.StatusInternalServerError)
+		fmt.Fprint(w, ErrorJson("Error while reading group from DB"))
 		return
 	}
 

diff --git a/api/members.go b/api/members.go
@@ -1,7 +1,9 @@
 package api
 
 import (
+	"database/sql"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"net/http"
 
@@ -25,24 +27,29 @@ func (server *Server) getAllMembers(w http.ResponseWriter, r *http.Request) {
 
 	if !server.isApiKeyValid(key) {
 		// return error message
-		w.WriteHeader(http.StatusForbidden)
+		w.WriteHeader(http.StatusUnauthorized)
 		fmt.Fprint(w, ErrorJson("No valid api key"))
 		return
 	}
 
 	// get group name from query parameters
 	group := r.FormValue("gn")
 
-	if !server.querier.ExistGroup(group) {
-		// return error message
-		w.WriteHeader(http.StatusBadRequest)
-		fmt.Fprint(w, ErrorJson("Error while"))
+	_, err := server.querier.FindGroupByName(group)
+	if err != nil {
+		if errors.Unwrap(err) == sql.ErrNoRows {
+			w.WriteHeader(http.StatusBadRequest)
+			fmt.Fprint(w, ErrorJson("Invalid group name was passed."))
+			return
+		}
+		w.WriteHeader(http.StatusInternalServerError)
+		fmt.Fprint(w, ErrorJson("Error while reading group from DB"))
 		return
 	}
 
 	// 言語情報を取得する。
 	var l *models.Locale
-	l, err := server.querier.FindLocaleByName(locale)
+	l, err = server.querier.FindLocaleByName(locale)
 	if err != nil {
 		// DB に見つからなかった場合、デフォルトの情報を取得。
 		l, _ = server.querier.FindLocaleByName("ja")

diff --git a/api/songs.go b/api/songs.go
@@ -1,7 +1,9 @@
 package api
 
 import (
+	"database/sql"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"net/http"
 )
@@ -23,14 +25,17 @@ func (server *Server) getAllSongs(w http.ResponseWriter, r *http.Request) {
 	// get group name from query parameters
 	group := r.FormValue("gn")
 
-	if !server.querier.ExistGroup(group) {
-		fmt.Printf("getAllSongs: access to invalid group name")
-		// return error message
-		w.WriteHeader(http.StatusBadRequest)
-		fmt.Fprint(w, ErrorJson("Invalid group name"))
+	_, err := server.querier.FindGroupByName(group)
+	if err != nil {
+		if errors.Unwrap(err) == sql.ErrNoRows {
+			w.WriteHeader(http.StatusBadRequest)
+			fmt.Fprint(w, ErrorJson("Invalid group name was passed."))
+			return
+		}
+		w.WriteHeader(http.StatusInternalServerError)
+		fmt.Fprint(w, ErrorJson("Error while reading group from DB"))
 		return
 	}
-
 	dr, err := server.querier.GetAllSongs(group)
 	if err != nil {
 		fmt.Printf("getAllSongs: %v", err)

diff --git a/db/groups.go b/db/groups.go
@@ -9,13 +9,6 @@ import (
 	models "github.com/android-project-46group/api-server/db/my_models"
 )
 
-func (q *SqlQuerier) ExistGroup(groupName string) bool {
-
-	_, err := models.Groups(qm.Where("group_name = ?", groupName)).One(q.ctx, q.DB)
-
-	return err == nil
-}
-
 func (q *SqlQuerier) FindGroupByName(groupName string) (*models.Group, error) {
 
 	g, err := models.Groups(qm.Where("group_name = ?", groupName)).One(q.ctx, q.DB)

diff --git a/db/querier.go b/db/querier.go
@@ -11,7 +11,6 @@ type Querier interface {
 	GetAllFormations(groupName string) ([]PositionSongsBind, error)
 	GetFormations(groupName string) ([]PositionSongsBind, error)
 	FindGroupByName(groupName string) (*models.Group, error)
-	ExistGroup(groupName string) bool
 	FindLocaleByName(name string) (*models.Locale, error)
 	GetAllMemberInfos(groupName string, localeId int) ([]MemberInfoBind, error)
 	GetAllPositions(groupName string) ([]MemberInfoBind, error)