Merge pull request #64 from android-project-46group/refactor

Refactor

Makefile

@@ -5,6 +5,12 @@ DB_URL=postgresql://ubuntu:sakamichi@localhost:5432/sakamichi?sslmode=disable
 server:
 	go run main.go
 
+
+deploy:	## ラズパイ上へのデプロイ
+	go build -o sakamichi-api-bff main.go
+	mv sakamichi-api-bff /home/ubuntu/deploy/
+	sudo systemctl restart sakamichi-api-bff.service
+
 migrateup:
 	migrate -path migrations -database "$(DB_URL)" -verbose up
 

api/blogs.go

@@ -14,8 +14,8 @@ import (
 * /blogs?gn=sakurazaka&key=xxxyyyzzzhogehoge
  */
 func (server *Server) getAllBlogs(w http.ResponseWriter, r *http.Request) {
-
 	ctx := r.Context()
+
 	span, ctx := tracer.StartSpanFromContext(ctx, "api.getAllBlogs")
 	defer span.Finish()
 

api/blogs_test.go

@@ -18,7 +18,6 @@ import (
 )
 
 func TestGetAllBlogsAPI(t *testing.T) {
-
 	groupName := "nogizaka"
 	key := "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
 

api/errors.go

@@ -10,5 +10,6 @@ func ErrorJson(msg string) string {
 			"error": msg,
 		},
 	)
+
 	return string(j)
 }

api/formations.go

@@ -13,9 +13,9 @@ import (
 )
 
 func (server *Server) getAllFormations(w http.ResponseWriter, r *http.Request) {
-
 	ctx := r.Context()
-	span, ctx := tracer.StartSpanFromContext(ctx, "api.getAllBlogs")
+
+	span, ctx := tracer.StartSpanFromContext(ctx, "api.getAllFormations")
 	defer span.Finish()
 
 	// debug log
@@ -93,5 +93,6 @@ func createFormationResponse(dbRes []db.PositionSongsBind) []FormationResponse {
 			}
 		}
 	}
+
 	return res
 }

api/formations_test.go

@@ -18,7 +18,6 @@ import (
 )
 
 func TestGetAllFormationsAPI(t *testing.T) {
-
 	groupName := "nogizaka"
 	key := "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
 

api/groups.go

@@ -11,8 +11,8 @@ import (
 // Handler function to get all groups.
 // Must have api-key as a query parameter.
 func (server *Server) getAllGroups(w http.ResponseWriter, r *http.Request) {
-
 	ctx := r.Context()
+
 	span, ctx := tracer.StartSpanFromContext(ctx, "api.getAllGroups")
 	defer span.Finish()
 

api/groups_test.go

@@ -17,7 +17,6 @@ import (
 )
 
 func TestGetAllGroupsAPI(t *testing.T) {
-
 	key := "valid_api_key"
 
 	testCases := []struct {

api/members.go

@@ -19,9 +19,9 @@ import (
 * /members?gn=sakurazaka
  */
 func (server *Server) getAllMembers(w http.ResponseWriter, r *http.Request) {
-
 	ctx := r.Context()
-	span, ctx := tracer.StartSpanFromContext(ctx, "api.getAllBlogs")
+
+	span, ctx := tracer.StartSpanFromContext(ctx, "api.getAllMembers")
 	defer span.Finish()
 
 	// debug log

api/members_test.go

@@ -18,7 +18,6 @@ import (
 )
 
 func TestGetAllMembersAPI(t *testing.T) {
-
 	groupName := "nogizaka"
 	key := "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
 

api/other.go

@@ -10,6 +10,7 @@ import (
 
 func (server *Server) Health(w http.ResponseWriter, r *http.Request) {
 	ctx := r.Context()
+
 	span, ctx := tracer.StartSpanFromContext(ctx, "api.Health")
 	defer span.Finish()
 
@@ -25,6 +26,7 @@ func (server *Server) Health(w http.ResponseWriter, r *http.Request) {
 
 func (server *Server) healthGrpc(w http.ResponseWriter, r *http.Request) {
 	ctx := r.Context()
+
 	span, ctx := tracer.StartSpanFromContext(ctx, "api.healthGrpc")
 	defer span.Finish()
 

api/positions.go

@@ -12,9 +12,9 @@ import (
 * /members?gn=sakurazaka
  */
 func (server *Server) getPositions(w http.ResponseWriter, r *http.Request) {
-
 	ctx := r.Context()
-	span, ctx := tracer.StartSpanFromContext(ctx, "api.getAllBlogs")
+
+	span, ctx := tracer.StartSpanFromContext(ctx, "api.getPositions")
 	defer span.Finish()
 
 	// debug log

api/positions_test.go

@@ -17,7 +17,6 @@ import (
 )
 
 func TestGetPositionsAPI(t *testing.T) {
-
 	title := "nogizaka"
 	key := "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
 

api/server.go

@@ -29,7 +29,6 @@ func NewServer(
 	config util.Config, querier db.Querier, matcher language.Matcher,
 	logger util.Logger, grpcClient grpc.GrpcClient,
 ) (*Server, error) {
-
 	server := &Server{
 		config:     config,
 		querier:    querier,
@@ -107,7 +106,6 @@ func (server *Server) setupRouter() error {
 
 // start server depending on the cgi serve or not
 func (server *Server) Start() error {
-
 	if server.config.IsCGI {
 		return cgi.Serve(server.router)
 	}

api/songs.go

@@ -12,9 +12,9 @@ import (
 )
 
 func (server *Server) getAllSongs(w http.ResponseWriter, r *http.Request) {
-
 	ctx := r.Context()
-	span, ctx := tracer.StartSpanFromContext(ctx, "api.getAllBlogs")
+
+	span, ctx := tracer.StartSpanFromContext(ctx, "api.getAllSongs")
 	defer span.Finish()
 
 	// debug log

api/songs_test.go

@@ -17,7 +17,6 @@ import (
 )
 
 func TestGetAllSongsAPI(t *testing.T) {
-
 	groupName := "nogizaka"
 	key := "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
 

api/validations.go

@@ -6,10 +6,10 @@ import (
 )
 
 func (server *Server) isApiKeyValid(ctx context.Context, key string) error {
-
 	if key == "" {
 		return errors.New("API key is empty")
 	}
 	_, err := server.querier.FindApiKeyByName(ctx, key)
+
 	return err
 }

api/validations_test.go

@@ -14,7 +14,6 @@ import (
 )
 
 func TestIsApiKeyValid(t *testing.T) {
-
 	key := "valid_api_key"
 
 	testCases := []struct {

db/apikeys.go

@@ -13,7 +13,6 @@ import (
 )
 
 func (q *SqlQuerier) InsertApiKey(ctx context.Context, key string) error {
-
 	span, ctx := tracer.StartSpanFromContext(ctx, "db.InsertApiKey")
 	defer span.Finish()
 
@@ -27,7 +26,6 @@ func (q *SqlQuerier) InsertApiKey(ctx context.Context, key string) error {
 }
 
 func (q *SqlQuerier) FindApiKeyByName(ctx context.Context, key string) (*models.APIKey, error) {
-
 	span, ctx := tracer.StartSpanFromContext(ctx, "db.FindApiKeyByName")
 	defer span.Finish()
 

db/data/db_init.go

@@ -22,5 +22,6 @@ func DbInit() (*sql.DB, error) {
 
 	Ctx = context.Background()
 	DB, err = sql.Open(config.DBDriver, config.DBSource)
+
 	return DB, err
 }

db/data/db_insert_main.go

@@ -75,5 +75,6 @@ func shouldInsert() bool {
 	if err != nil {
 		return false
 	}
+
 	return count == 0
 }

db/data/find_utils.go

@@ -21,5 +21,6 @@ func FindMemberByNameEn(nameEn string) (int, error) {
 	if err != nil {
 		return 0, err
 	}
+
 	return member_info.MemberID, err
 }

db/data/insert_blog.go

@@ -9,7 +9,6 @@ import (
 )
 
 func InsertBlogs() {
-
 	groups := []string{"nogizaka", "sakurazaka", "hinatazaka"}
 	for _, group := range groups {
 		blogs := LoadBlogInfoFile(group)

db/data/insert_formation.go

@@ -43,5 +43,6 @@ func MakeFormations(positions []Position) []int {
 			firstRowNum += 1
 		}
 	}
+
 	return []int{firstRowNum, secondRowNum, thirdRowNum}
 }

db/data/insert_group.go

@@ -16,10 +16,10 @@ func InsertGroups() {
 }
 
 func FindGroupIdByName(group string) (int, error) {
-
 	ss, err := models.Groups(qm.Where("group_name = ?", group)).One(Ctx, DB)
 	if err != nil {
 		return 0, err
 	}
+
 	return ss.GroupID, nil
 }

db/data/insert_member_tag.go

@@ -75,5 +75,6 @@ func ExistMemberTag(mId int, tId int) bool {
 	if err != nil {
 		return false
 	}
+
 	return true
 }

db/data/insert_song.go

@@ -40,5 +40,6 @@ func FindFormationIdByPositions(positions []Position) (int, error) {
 	if err != nil {
 		return 0, err
 	}
+
 	return ss.FormationID, nil
 }

db/data/insert_tag.go

@@ -21,6 +21,6 @@ func GetTagIdByName(name string) (int, error) {
 	if err != nil {
 		return 0, err
 	}
-	return ss.TagID, nil
 
+	return ss.TagID, nil
 }

db/data/update_blog.go

@@ -57,7 +57,6 @@ func UpdateBlogs() {
 }
 
 func FindBlogByMemberId(id int) (*models.Blog, error) {
-
 	g, err := models.Blogs(
 		qm.Where("member_id = ?", id),
 	).One(Ctx, DB)

db/db_init.go

@@ -15,7 +15,6 @@ type SqlQuerier struct {
 }
 
 func NewQuerier(config util.Config, logger util.Logger) (*SqlQuerier, error) {
-
 	con, err := sql.Open(config.DBDriver, config.DBSource)
 	if err != nil {
 		return nil, fmt.Errorf("NewQuerier: %w", err)

db/groups.go

@@ -13,7 +13,6 @@ import (
 
 // Get all groups from Database.
 func (q *SqlQuerier) GetAllGroups(ctx context.Context) ([]*models.Group, error) {
-
 	span, ctx := tracer.StartSpanFromContext(ctx, "db.FindGroupByName")
 	defer span.Finish()
 
@@ -27,7 +26,6 @@ func (q *SqlQuerier) GetAllGroups(ctx context.Context) ([]*models.Group, error)
 }
 
 func (q *SqlQuerier) FindGroupByName(ctx context.Context, groupName string) (*models.Group, error) {
-
 	span, ctx := tracer.StartSpanFromContext(ctx, "db.FindGroupByName")
 	defer span.Finish()
 

db/locales.go

@@ -13,7 +13,6 @@ import (
 )
 
 func (q *SqlQuerier) InsertLocale(ctx context.Context, name string) error {
-
 	span, ctx := tracer.StartSpanFromContext(ctx, "db.InsertLocale")
 	defer span.Finish()
 
@@ -27,7 +26,6 @@ func (q *SqlQuerier) InsertLocale(ctx context.Context, name string) error {
 }
 
 func (q *SqlQuerier) FindLocaleByName(ctx context.Context, name string) (*models.Locale, error) {
-
 	span, ctx := tracer.StartSpanFromContext(ctx, "db.FindLocaleByName")
 	defer span.Finish()
 

main.go

@@ -9,16 +9,17 @@ import (
 	"github.com/android-project-46group/api-server/db"
 	"github.com/android-project-46group/api-server/repository/grpc"
 	"github.com/android-project-46group/api-server/util"
+	"github.com/opentracing/opentracing-go"
 )
 
 func main() {
-	// tr, closer, err := util.NewJaegerTracer()
-	// if err != nil {
-	// 	log.Fatal("cannot initialize jaeger tracer: ", err)
-	// }
-	// defer closer.Close()
+	tr, closer, err := util.NewJaegerTracer()
+	if err != nil {
+		log.Fatal("cannot initialize jaeger tracer: ", err)
+	}
+	defer closer.Close()
 
-	// opentracing.SetGlobalTracer(tr)
+	opentracing.SetGlobalTracer(tr)
 
 	config, err := util.LoadConfig(".")
 	if err != nil {

repository/grpc/client.go

@@ -27,7 +27,6 @@ type grpcClient struct {
 }
 
 func NewClient(logger util.Logger, config util.Config, downloadClient pb.DownloadClient) GrpcClient {
-
 	return &grpcClient{
 		logger:         logger,
 		grpcURL:        config.GRPCURL,

repository/grpc/health_test.go

@@ -14,7 +14,6 @@ import (
 )
 
 func TestHealthGrpc(t *testing.T) {
-
 	testCases := []struct {
 		name          string
 		buildStubs    func(mock *mockgrpc.MockDownloadClient)