[マイページ]部門予算・詳細取得 #915

Kubosaka · 2025-01-31T02:29:17Z

resolve #914

概要

ここの一覧表示のAPIです

usecaseの処理が長くなったので、1つだけで出します
GET /festival_items/details/{user_id}
- userが属する部門（division)の予算・支出をなどを返します
- クエリパラメータでyearを渡すと、年度のものを返します

[
  {
    "divisionTotal": {
      "budget": 100000,
      "expense": 10000,
      "balance": 90000
    },
    "financialRecordName": "企画局",
    "divisionName": "ビンゴ部門",
    "festivalItems": [
      {
        "festivalItemTotal": {
          "budget": 100000,
          "expense": 10000,
          "balance": 90000
        },
        "festivalItemName": "ビンゴ景品",
        "buyReports": [
          {
            "id": 1,
            "buyReportName": "段ボール",
            "amount": 1000,
            "reportDate": "2024-01-01",
            "status": "確認中"
          }
        ]
      }
    ]
  }
]

画面スクリーンショット等

URL
スクリーンショット

テスト項目

備考

動作確認のためにテーブルにデータ追加する必要があります
- financial_records
- divisions
- user_groups
- festival_items
- item_budgets
- buy_reports
- buy_status

Kubosaka · 2025-01-31T02:38:49Z

api/externals/repository/festival_item_repository.go

+var selectFestivalItemForMypageQuery = dialect.Select(
+	goqu.I("users.name").As("userName"),
+	goqu.I("financial_records.name").As("financialRecordName"),
+	goqu.I("divisions.id").As("divisionId"),
+	goqu.I("divisions.name").As("divisionName"),
+	goqu.I("festival_items.id").As("festivalItemId"),
+	goqu.I("festival_items.name").As("festivalItemName"),
+	goqu.I("years.year"),
+	goqu.COALESCE(goqu.I("item_budgets.amount"), 0).As("budgetAmount"),
+	goqu.COALESCE(goqu.I("buy_reports.id"), 0).As("buyReportId"),
+	goqu.COALESCE(goqu.I("buy_reports.paid_by"), "").As("paidBy"),
+	goqu.COALESCE(goqu.I("buy_reports.amount"), 0).As("reportAmount"),
+	goqu.COALESCE(goqu.I("buy_reports.created_at"), "2025-01-29 20:53:44").As("reportDate"),
+	goqu.COALESCE(goqu.I("buy_statuses.is_packed"), 0).As("isPacked"),
+	goqu.COALESCE(goqu.I("buy_statuses.is_settled"), 0).As("isSettled")).
+	From("festival_items").
+	InnerJoin(goqu.I("divisions"), goqu.On(goqu.I("festival_items.division_id").Eq(goqu.I("divisions.id")))).
+	InnerJoin(goqu.I("financial_records"), goqu.On(goqu.I("divisions.financial_record_id").Eq(goqu.I("financial_records.id")))).
+	InnerJoin(goqu.I("user_groups"), goqu.On(goqu.I("divisions.id").Eq(goqu.I("user_groups.group_id")))).
+	InnerJoin(goqu.I("users"), goqu.On(goqu.I("users.id").Eq(goqu.I("user_groups.user_id")))).
+	InnerJoin(goqu.I("years"), goqu.On(goqu.I("financial_records.year_id").Eq(goqu.I("years.id")))).
+	LeftJoin(goqu.I("item_budgets"), goqu.On(goqu.I("festival_items.id").Eq(goqu.I("item_budgets.festival_item_id")))).
+	LeftJoin(goqu.I("buy_reports"), goqu.On(goqu.I("festival_items.id").Eq(goqu.I("buy_reports.festival_item_id")))).
+	LeftJoin(goqu.I("buy_statuses"), goqu.On(goqu.I("buy_reports.id").Eq(goqu.I("buy_statuses.buy_report_id")))).
+	Order(goqu.I("festival_items.id").Desc())


これで必要なデータとってくる

Kubosaka · 2025-01-31T02:39:13Z

api/internals/domain/festival_item.go

+type FestivalItemForMyPageColumn struct {
+	UserName            string
+	FinancialRecordName string
+	DivisionId          int
+	DivisionName        string
+	FestivalItemId      int
+	FestivalItemName    string
+	Year                int
+	BudgetAmount        int
+	BuyReportId         int
+	PaidBy              string
+	ReportAmount        int
+	ReportDate          string
+	IsPacked            bool
+	IsSettled           bool
+}


取得したdbのデータを入れる用の型

Kubosaka · 2025-01-31T02:39:35Z

api/internals/usecase/festival_item_usecase.go

+		festivalItemForMyPageColumns = append(festivalItemForMyPageColumns, festivalItemForMyPageColumn)
+	}
+
+	festivalItemDetailsList = convertColumnToGenerated(festivalItemForMyPageColumns)


この関数内でdbから取得したデータを整形

これコード内にもコメント残しておいて欲しいかも
半年後とか忘れてそう。

例：ColumnsをDetailsListの型に合わせてマッピングする。値が無い場合は初期化し、ゼロ値を挿入。

hikahana

コードレビューしました！
この動作確認ってuserにdvisionID持たせないとできないですか？

ps.備考欄見落としてました。動作確認良さげでした！

api/internals/usecase/festival_item_usecase.go

hikahana · 2025-02-02T08:20:55Z

api/internals/usecase/festival_item_usecase.go

+		festivalItemForMyPageColumns = append(festivalItemForMyPageColumns, festivalItemForMyPageColumn)
+	}
+
+	festivalItemDetailsList = convertColumnToGenerated(festivalItemForMyPageColumns)


これコード内にもコメント残しておいて欲しいかも
半年後とか忘れてそう。

例：ColumnsをDetailsListの型に合わせてマッピングする。値が無い場合は初期化し、ゼロ値を挿入。

api/externals/repository/festival_item_repository.go

hikahana · 2025-02-02T08:38:02Z

api/externals/repository/festival_item_repository.go

+	goqu.COALESCE(goqu.I("buy_reports.id"), 0).As("buyReportId"),
+	goqu.COALESCE(goqu.I("buy_reports.paid_by"), "").As("paidBy"),
+	goqu.COALESCE(goqu.I("buy_reports.amount"), 0).As("reportAmount"),
+	goqu.COALESCE(goqu.I("buy_reports.created_at"), "2025-01-29 20:53:44").As("reportDate"),


[imo]
ここありえない数値とかの方いいかも
したとか？

"2000-01-01 00:00:00"

nil時の日時を変更

hikahana · 2025-02-02T08:54:50Z

api/internals/usecase/festival_item_usecase.go

+
+		// 予算と支出データ集計
+		festivalItemMap := festivalItemMaps[festivalItemForMyPageColumn.DivisionName]
+		if festivalItemMap == nil {


[imo]
下みたいな方がスッキリしそう。変わんないか？

festivalItemMap, ok := festivalItemMaps[festivalItemForMyPageColumn.DivisionName] if !ok { festivalItemMap = make(map[string]FestivalItemWithReport) }

キーの有無判定に使えるならこっち使ったほうが綺麗なので修正しマスタ
mapのキー判定を2つ目の変数で行う

hikahana · 2025-02-02T09:07:11Z

api/internals/usecase/festival_item_usecase.go

+		if buyReports == nil {
+			var buyReportSlice []generated.BuyReportInformation
+			buyReports = &buyReportSlice
+		}


[imo]
slice定義しなくてもいいかも

Suggested change

}

buyReports = &[]generated.BuyReportInformation{}

ポインタでの変数代入するには、変数あらかじめ定義しないけないと思ってた！
ありがとう！だいぶスッキリできた🙌
構造体定義部分リファクタリング

hikahana · 2025-02-02T09:09:31Z

api/internals/usecase/festival_item_usecase.go

+		buyReport.Amount = &festivalItemForMyPageColumn.ReportAmount
+		buyReport.ReportDate = &festivalItemForMyPageColumn.ReportDate
+
+		if festivalItemForMyPageColumn.IsSettled {


[imo]
switchの方がかっこいい！

Suggested change

if festivalItemForMyPageColumn.IsSettled {

switch {

case festivalItemForMyPageColumn.IsSettled:

buyReport.Status = &isSettled

case festivalItemForMyPageColumn.IsPacked:

buyReport.Status = &isPacked

default:

buyReport.Status = &empty

}

個人的にはifの方が直感的な気もして、可読性は高そう
でもswitchの方が簡潔に書けるのでそっちにしました
条件分岐をifに変更

hikahana

Kubosaka added 3 commits January 29, 2025 21:34

openapi修正、ユーザーごとに取得

179a5d1

データ取得と整形

22849e9

整理

367fb63

Kubosaka changed the base branch from develop to feat/kubosaka/intro-minio-client-go January 31, 2025 02:37

Kubosaka requested review from hikahana and KazumaSun January 31, 2025 02:37

Kubosaka self-assigned this Jan 31, 2025

Kubosaka commented Jan 31, 2025

View reviewed changes

Base automatically changed from feat/kubosaka/intro-minio-client-go to develop January 31, 2025 07:17

Kubosaka added the backend label Jan 31, 2025

hikahana reviewed Feb 2, 2025

View reviewed changes

Kubosaka added 7 commits February 2, 2025 19:20

タイポ消し忘れ修正

2682416

関数名修正

e375f6d

mapのキー判定を2つ目の変数で行う

99df7b5

nil時の日時を変更

52fc506

構造体定義部分リファクタリング

c118a2f

条件分岐をifに変更

9def7ba

コメント追加

e9f3a66

Kubosaka requested a review from hikahana February 2, 2025 10:58

hikahana approved these changes Feb 2, 2025

View reviewed changes

Kubosaka merged commit ab57691 into develop Feb 3, 2025
2 checks passed

Kubosaka deleted the feat/kuboska/create_buy-_report_api branch February 3, 2025 08:56

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[マイページ]部門予算・詳細取得 #915

[マイページ]部門予算・詳細取得 #915

Kubosaka commented Jan 31, 2025 •

edited

Loading

Kubosaka Jan 31, 2025

Kubosaka Jan 31, 2025

Kubosaka Jan 31, 2025

hikahana Feb 2, 2025

hikahana left a comment •

edited

Loading

hikahana Feb 2, 2025

hikahana Feb 2, 2025

Kubosaka Feb 2, 2025

hikahana Feb 2, 2025

Kubosaka Feb 2, 2025

hikahana Feb 2, 2025

Kubosaka Feb 2, 2025 •

edited

Loading

hikahana Feb 2, 2025

Kubosaka Feb 2, 2025

hikahana left a comment

-		if festivalItemForMyPageColumn.IsSettled {
+		switch {
+		case festivalItemForMyPageColumn.IsSettled:
+				buyReport.Status = &isSettled
+		case festivalItemForMyPageColumn.IsPacked:
+				buyReport.Status = &isPacked
+		default:
+				buyReport.Status = &empty
+		}

[マイページ]部門予算・詳細取得 #915

[マイページ]部門予算・詳細取得 #915

Conversation

Kubosaka commented Jan 31, 2025 • edited Loading

概要

画面スクリーンショット等

テスト項目

備考

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

hikahana left a comment • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Kubosaka Feb 2, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

hikahana left a comment

Choose a reason for hiding this comment

Kubosaka commented Jan 31, 2025 •

edited

Loading

hikahana left a comment •

edited

Loading

Kubosaka Feb 2, 2025 •

edited

Loading