Merge pull request #225 from SIT-DigiCre/fix/nil-array

fix: 空配列レスポンスがnullになるバグの修正

Author: newt239

pkg/budget/get_budget.go

@@ -51,18 +51,15 @@ func getBudgetList(dbClient db.Client, offset *int, proposerId *string) ([]budge
 		Offset:     offset,
 		ProposerId: proposerId,
 	}
-	budget := []budget{}
-	err := dbClient.Select(&budget, "sql/budget/select_budget.sql", &params)
+	budgets := []budget{}
+	err := dbClient.Select(&budgets, "sql/budget/select_budget.sql", &params)
 	if err != nil {
-		return nil, &response.Error{Code: http.StatusInternalServerError, Level: "Error", Message: "稟議一覧の取得に失敗しました", Log: err.Error()}
+		return []budget{}, &response.Error{Code: http.StatusInternalServerError, Level: "Error", Message: "稟議一覧の取得に失敗しました", Log: err.Error()}
 	}
-	if len(budget) == 0 {
-		return nil, &response.Error{Code: http.StatusNotFound, Level: "Info", Message: "稟議がありません。", Log: "no rows in result"}
+	for i := range budgets {
+		budgets[i].Proposer.IconUrl = budgets[i].IconUrl
+		budgets[i].Proposer.UserId = budgets[i].UserId
+		budgets[i].Proposer.Username = budgets[i].Username
 	}
-	for i := range budget {
-		budget[i].Proposer.IconUrl = budget[i].IconUrl
-		budget[i].Proposer.UserId = budget[i].UserId
-		budget[i].Proposer.Username = budget[i].Username
-	}
-	return budget, nil
+	return budgets, nil
 }

pkg/event/get_event.go

@@ -44,10 +44,7 @@ func getEventList(dbClient db.Client, userId string, offset *int) ([]event, *res
 	events := []event{}
 	err := dbClient.Select(&events, "sql/event/select_event.sql", &params)
 	if err != nil {
-		return nil, &response.Error{Code: http.StatusInternalServerError, Level: "Error", Message: "イベント一覧の取得に失敗しました", Log: err.Error()}
-	}
-	if len(events) == 0 {
-		return nil, &response.Error{Code: http.StatusNotFound, Level: "Info", Message: "イベントがありません。", Log: "no rows in result"}
+		return []event{}, &response.Error{Code: http.StatusInternalServerError, Level: "Error", Message: "イベント一覧の取得に失敗しました", Log: err.Error()}
 	}
 	return events, nil
 }

pkg/group/get_group.go

@@ -13,11 +13,11 @@ import (
 func GetGroup(ctx echo.Context, dbClient db.Client, params api.GetGroupParams) (api.ResGetGroup, *response.Error) {
 	res := api.ResGetGroup{}
 	userId := ctx.Get("user_id").(string)
-	events, err := getGroupList(dbClient, userId, params.Offset)
+	groups, err := getGroupList(dbClient, userId, params.Offset)
 	if err != nil {
 		return api.ResGetGroup{}, err
 	}
-	rerr := copier.Copy(&res.Groups, &events)
+	rerr := copier.Copy(&res.Groups, &groups)
 	if rerr != nil {
 		return api.ResGetGroup{}, &response.Error{Code: http.StatusInternalServerError, Level: "Error", Message: "グループ一覧の取得に失敗しました", Log: rerr.Error()}
 	}
@@ -44,10 +44,7 @@ func getGroupList(dbClient db.Client, userId string, offset *int) ([]group, *res
 	groups := []group{}
 	err := dbClient.Select(&groups, "sql/group/select_group.sql", &params)
 	if err != nil {
-		return nil, &response.Error{Code: http.StatusInternalServerError, Level: "Error", Message: "グループ一覧の取得に失敗しました", Log: err.Error()}
-	}
-	if len(groups) == 0 {
-		return nil, &response.Error{Code: http.StatusNotFound, Level: "Info", Message: "グループがありません。", Log: "no rows in result"}
+		return []group{}, &response.Error{Code: http.StatusInternalServerError, Level: "Error", Message: "グループ一覧の取得に失敗しました", Log: err.Error()}
 	}
 	return groups, nil
 }

pkg/payment/get_payment.go

@@ -39,8 +39,5 @@ func getPaymentList(dbClient db.Client, year *int) ([]paymtent, *response.Error)
 	if err != nil {
 		return []paymtent{}, &response.Error{Code: http.StatusInternalServerError, Level: "Error", Message: "不明なエラーが発生しました", Log: err.Error()}
 	}
-	if len(paymtents) == 0 {
-		return []paymtent{}, &response.Error{Code: http.StatusNotFound, Level: "Info", Message: "支払いが存在しません", Log: "no rows in result"}
-	}
 	return paymtents, nil
 }

pkg/storage/get_storage_myfile.go

@@ -21,9 +21,6 @@ func GetStorageMyfile(ctx echo.Context, dbClient db.Client) (api.ResGetStorageMy
 	if rerr != nil {
 		return api.ResGetStorageMyfile{}, &response.Error{Code: http.StatusInternalServerError, Level: "Error", Message: "不明なエラーが発生しました", Log: rerr.Error()}
 	}
-	if res.Files == nil {
-		res.Files = []api.ResGetStorageMyfileObjectFile{}
-	}
 	return res, nil
 }
 
@@ -49,8 +46,5 @@ func getFileListFromUserID(dbClient db.Client, userId string) ([]file, *response
 	if err != nil {
 		return []file{}, &response.Error{Code: http.StatusInternalServerError, Level: "Error", Message: "不明なエラーが発生しました", Log: err.Error()}
 	}
-	if len(files) == 0 {
-		return []file{}, nil
-	}
 	return files, nil
 }

pkg/user/get_user.go

@@ -43,8 +43,5 @@ func getUserList(dbClient db.Client, offset *int, seed *int) ([]userOverview, *r
 	if err != nil {
 		return []userOverview{}, &response.Error{Code: http.StatusInternalServerError, Level: "Error", Message: "不明なエラーが発生しました", Log: err.Error()}
 	}
-	if len(userOverviews) == 0 {
-		return []userOverview{}, &response.Error{Code: http.StatusNotFound, Level: "Info", Message: "ユーザーが存在しません", Log: "no rows in result"}
-	}
 	return userOverviews, nil
 }

pkg/work/get_work_tag.go

@@ -39,8 +39,5 @@ func getWorkTagList(dbClient db.Client, offset *int) ([]tagOverview, *response.E
 	if err != nil {
 		return []tagOverview{}, &response.Error{Code: http.StatusInternalServerError, Level: "Error", Message: "不明なエラーが発生しました", Log: err.Error()}
 	}
-	if len(tagOverviews) == 0 {
-		return []tagOverview{}, &response.Error{Code: http.StatusNotFound, Level: "Info", Message: "タグが存在しません", Log: "no rows in result"}
-	}
 	return tagOverviews, nil
 }

pkg/work/get_work_work.go

@@ -43,9 +43,6 @@ func getWorkList(dbClient db.Client, offset *int, authorId *string) ([]workOverv
 	if err != nil {
 		return []workOverview{}, &response.Error{Code: http.StatusInternalServerError, Level: "Error", Message: "不明なエラーが発生しました", Log: err.Error()}
 	}
-	if len(workOverviews) == 0 {
-		return []workOverview{}, &response.Error{Code: http.StatusNotFound, Level: "Info", Message: "作品が存在しません", Log: "no rows in result"}
-	}
 	for i := range workOverviews {
 		workId := workOverviews[i].WorkId
 		workAuthors, err := getWorkWorkAuthorList(dbClient, workId)