各棟の各階の教員情報を取得するAPI by hikahana · Pull Request #987 · NUTFes/FinanSu

hikahana · 2025-05-03T09:20:48Z

対応Issue

resolve #0

概要

クリックされた棟にある部屋を取得するAPI
- 画像のように1号棟、2号棟も一緒に表示を行う
- 何号棟か、居室（部屋番号）、教員名、募金金額、ブラックリストかどうかを取得
- 画像右上にあるような感じで階ごとに選べるようにしたいけどこれはフロントとバックどっちで対応するのがいいんだろ？→バックエンド側で階層もパスクエリに含めて取得を書けるように

sqlクエリ
SELECT buildings.name, building_units.unit_number, floors.floor_number, rooms.room_name, teachers.id, teachers.name, teachers.is_black, COALESCE(SUM(fund_informations.price), 0) FROM buildings INNER JOIN building_units ON (building_units.building_id = buildings.id) INNER JOIN floors ON (floors.building_unit_id = building_units.id) INNER JOIN rooms ON (rooms.floor_id = floors.id) INNER JOIN room_teachers ON (room_teachers.room_id = rooms.id) INNER JOIN teachers ON (teachers.id = room_teachers.teacher_id) LEFT JOIN fund_informations ON (fund_informations.teacher_id = teachers.id) WHERE ((buildings.id = '1') AND (floors.id = '1')) GROUP BY buildings.name, building_units.unit_number, floors.floor_number, rooms.room_name, teachers.id, teachers.name, teachers.is_black ORDER BY building_units.unit_number ASC, floors.floor_number ASC, rooms.room_name ASC, teachers.name ASC

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

URL
スクリーンショット

テスト項目

要望通りか
コードレビュー

備考

Kubosaka

とりあえずコメント

Kubosaka · 2025-05-10T08:09:36Z

openapi/openapi.yaml

+    campusDonationByFloor:
+      type: object
+      properties:
+        teacher_id:
+          type: integer
+        building_name:
+          type: string
+        unit_number:
+          type: string
+        floor_number:
+          type: string
+        room_name:
+          type: string
+        teacher_name:
+          type: string
+        price:
+          type: integer
+        is_black:
+          type: boolean
+      required:
+        - teacher_id
+        - building_name
+        - unit_number
+        - floor_number
+        - room_name
+        - teacher_name
+        - price
+        - is_black



[ask]全部まとめて配列で返してるけど、棟ごとにまとめたりするのはフロントですか？
結構しんどそうだなって思って

絶賛作業中なんですけど以下みたいな感じでまとめたいって話で合ってますよね？それは確かにバックエンドで対応したいですね

type CampusDonation struct { IsBlack *bool `json:"is_black,omitempty"` Price int `json:"price"` RoomName string `json:"room_name"` TeacherId int `json:"teacher_id"` TeacherName string `json:"teacher_name"` } // CampusDonationByFloorAndBuilding 棟ごと type CampusDonationByFloorAndBuilding struct { BuildingId int `json:"building_id"` BuildingName *string `json:"building_name,omitempty"` Floors []FloorGroup `json:"floors"` } type FloorGroup struct { Donations []CampusDonation `json:"donations"` FloorId *int `json:"floor_id,omitempty"` FloorNumber string `json:"floor_number"` }

ぱっと見わかんないけど、フロントは表示するだけにしてあげると嬉しいだろうなって思って
ロジックの多いフロントはパフォーマンス低下とかバグの原因にもなりそうだし

テストデータないからわかりづらいけど、棟と階でまとめてみた

api/externals/controller/cmapus_donation_controller.go

Kubosaka · 2025-05-10T08:16:18Z

api/externals/repository/campus_donation_repository.go

+		GroupBy(
+			goqu.I("buildings.name"),
+			goqu.I("building_units.unit_number"),
+			goqu.I("floors.floor_number"),
+			goqu.I("rooms.room_name"),
+			goqu.I("teachers.id"),
+			goqu.I("teachers.name"),
+			goqu.I("teachers.is_black"),
+		).


[ask] このGroup Byってどういう意味で使ってる？
棟の名前とか階層とか同じだと一緒になっちゃわないっけ？

なりましたね。priceをsumで返してたのでgroupByが必要になってたです。
そもそもpriceをsumにする必要がなかったので消しました！

cloudflare-workers-and-pages · 2025-05-12T07:03:47Z

Deploying finansu with Cloudflare Pages

Latest commit:	`5d859d4`
Status:	✅ Deploy successful!
Preview URL:	https://aeb657a3.finansu.pages.dev
Branch Preview URL:	https://feat-hikahana-get-rooms-by-b.finansu.pages.dev

View logs

Kubosaka · 2025-05-12T14:37:51Z

あ、ごめん、push先間違えた、リセットします

This reverts commit 4704f36.

…りの自動生成

…inanSu into feat/hikahana/get-rooms-by-building

…hub:NUTFes/FinanSu into feat/hikahana/get-rooms-by-building

Kubosaka

コメントしますた！

Kubosaka · 2025-05-19T14:33:21Z

openapi/openapi.yaml

+      parameters:
+        - name: building_id
+          in: path
+          required: true
+          schema:
+            type: integer
+          description: ID of the building
+        - name: floor_id
+          in: path
+          required: true
+          schema:
+            type: integer
+          description: ID of the floor


[imo]
dbでもコメントしたけどyear_idも指定できたほうが良さそう

Kubosaka · 2025-05-19T14:34:23Z

api/internals/usecase/campus_donation_usecase.go

+	groupMap := make(map[int]*generated.CampusDonationByFloorAndBuilding)
+	for _, r := range campusDonationRecords {


[imo] 型の変換処置関数に切り分けても良さそう
時間あればやってもろて

slackで特定の棟をまとめるみたいなのあったけど、ああいうロジック周りを構造体に持たせてメソッドにするといい感じにドメインロジックを集約できそうだなって思った

Kubosaka · 2025-05-19T14:37:34Z

api/internals/usecase/campus_donation_usecase.go

+			IsBlack:     r.IsBlack,
+		})
+	}
+	// map→slice


このパッケージ使ってもいいかも
配列の処理とかいい感じに書ける
https://github.com/samber/lo?tab=readme-ov-file#maptoslice

5d859d4

こんな感じなの？？なんかうまく使えてない感じする

良さそう

…hub:NUTFes/FinanSu into feat/hikahana/get-rooms-by-building

…oor/{floor_id}

…ations by floor

Kubosaka · 2025-06-04T12:52:20Z

api/externals/repository/campus_donation_repository.go

+			goqu.I("teachers.id").As("teacher_id"),
+			goqu.I("teachers.name").As("teacher_name"),
+			goqu.I("rooms.room_name").As("room_name"),
+			goqu.I("campus_donations.price").As("price"),


[ask] これって値入ってない時エラーならない？

あ、確かになるかも
collapseみたいなのも一緒に消しちゃってた

hikahana added 5 commits May 3, 2025 16:17

feat: 各階の教師データを取得するOAS定義

0e24cbc

generated: 各棟の教師データを取得

f8ffb0a

fix: tags追加

c070fa4

generated: description

4215d21

feat: 各棟、各階の教師情報をパスクエリ形式で取得するAPIの作成

09f14b4

github-actions bot assigned hikahana May 3, 2025

hikahana changed the title ~~各棟の教員情報を取得するAPI~~ 各棟の各階の教員情報を取得するAPI May 3, 2025

hikahana requested review from Chikuwa0141, KazumaSun, Kubosaka and TkymHrt May 3, 2025 09:23

Kubosaka reviewed May 10, 2025

View reviewed changes

Base automatically changed from fix/hikahana/er to develop May 11, 2025 21:05

fix: building_idの存在チェックを追加

836d96f

[wip]go-migration導入

4704f36

Kubosaka and others added 11 commits May 12, 2025 23:38

Revert "[wip]go-migration導入"

9d2e24b

This reverts commit 4704f36.

refactor: campusDonationスキーマを更新し、棟ごとの教員情報を追加

b74016a

generated: /campus_donations/building/{building_id}/floor/{floor_id}周…

048ceec

…りの自動生成

feat: クエリ返り値用の型定義

c69626e

fix: fix error message

9b45028

refactor: クエリの選択項目を整理し、グループ化を削除

7503c95

refactor: GetCampusDonationByFloorsメソッドを更新し、返り値の型を変更

5b2c327

Merge branch 'feat/hikahana/get-rooms-by-building' of github:NUTFes/F…

6ee1b32

…inanSu into feat/hikahana/get-rooms-by-building

Merge branch 'fix/hikahana/change-table-name-campus-donations' of git…

538175a

…hub:NUTFes/FinanSu into feat/hikahana/get-rooms-by-building

Merge branch 'fix/hikahana/change-table-name-campus-donations' of git…

606ac41

…hub:NUTFes/FinanSu into feat/hikahana/get-rooms-by-building

campus_donationsテーブルに基づいてfund_informationsの参照を更新

a0d1d9d

hikahana changed the base branch from develop to fix/hikahana/change-table-name-campus-donations May 16, 2025 07:55

Kubosaka reviewed May 19, 2025

View reviewed changes

hikahana added 6 commits May 24, 2025 16:49

Merge branch 'fix/hikahana/change-table-name-campus-donations' of git…

b64c089

…hub:NUTFes/FinanSu into feat/hikahana/get-rooms-by-building

fix: year_idを考慮する

25534d4

generated: /campus_donations/year/{year_id}/building/{building_id}/fl…

eb1ff5d

…oor/{floor_id}

fix: パス修正

79f58aa

refactor: 型変換を関数に切り分け

5d859d4

feat: add campus donation controller with endpoint for retrieving don…

1f6fa2d

…ations by floor

hikahana requested a review from Kubosaka May 25, 2025 10:33

Kubosaka reviewed Jun 4, 2025

View reviewed changes

fix: handle NULL values in campus donations price with COALESCE

3efc607

Base automatically changed from fix/hikahana/change-table-name-campus-donations to develop September 22, 2025 06:00

		groupMap := make(map[int]*generated.CampusDonationByFloorAndBuilding)
		for _, r := range campusDonationRecords {

Conversation

hikahana commented May 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

対応Issue

概要

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

テスト項目

備考

Uh oh!

Kubosaka left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

cloudflare-workers-and-pages bot commented May 12, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Deploying finansu with Cloudflare Pages

Uh oh!

Kubosaka commented May 12, 2025

Uh oh!

Kubosaka left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

hikahana commented May 3, 2025 •

edited

Loading

cloudflare-workers-and-pages bot commented May 12, 2025 •

edited

Loading