各棟ごとの合計募金額を取得するAPIの作成

api/externals/controller/fund_information_controller.go

@@ -20,6 +20,7 @@ type FundInformationController interface {
 	IndexFundInformationDetails(echo.Context) error
 	ShowFundInformationDetailByID(echo.Context) error
 	IndexFundInformationDetailsByPeriod(echo.Context) error
+	IndexFundInformationBuildingsByPeriod(echo.Context) error
 }
 
 func NewFundInformationController(u usecase.FundInformationUseCase) FundInformationController {
@@ -117,3 +118,13 @@ func (f *fundInformationController) IndexFundInformationDetailsByPeriod(c echo.C
 	}
 	return c.JSON(http.StatusOK, fundInformationDetailsByPeriod)
 }
+
+func (f *fundInformationController) IndexFundInformationBuildingsByPeriod(c echo.Context) error {
+	ctx := c.Request().Context()
+	year := c.Param("year")
+	fundInformationBuildingByPeriod, err := f.u.GetFundInformationBuildingsByPeriod(ctx, year)
+	if err != nil {
+		return err
+	}
+	return c.JSON(http.StatusOK, fundInformationBuildingByPeriod)
+}

api/externals/repository/fund_information_repository.go

@@ -6,6 +6,7 @@ import (
 
 	"github.com/NUTFes/FinanSu/api/drivers/db"
 	"github.com/NUTFes/FinanSu/api/externals/repository/abstract"
+	goqu "github.com/doug-martin/goqu/v9"
 )
 
 type fundInformationRepository struct {
@@ -23,6 +24,7 @@ type FundInformationRepository interface {
 	FindDetailByID(context.Context, string) (*sql.Row, error)
 	FindLatestRecord(context.Context) (*sql.Row, error)
 	AllDetailsByPeriod(context.Context, string) (*sql.Rows, error)
+	AllBuildingsByPeriod(context.Context, string) (*sql.Rows, error)
 }
 
 func NewFundInformationRepository(c db.Client, ac abstract.Crud) FundInformationRepository {
@@ -63,12 +65,12 @@ func (fir *fundInformationRepository) Create(
 				received_at
 			) VALUES (
 				` + userID +
-				"," + teacherID +
-				"," + price +
-				",'" + remark +
-				"'," + isFirstCheck +
-				"," + isLastCheck +
-				",'" + receivedAt + "')"
+		"," + teacherID +
+		"," + price +
+		",'" + remark +
+		"'," + isFirstCheck +
+		"," + isLastCheck +
+		",'" + receivedAt + "')"
 	return fir.crud.UpdateDB(c, query)
 }
 
@@ -198,6 +200,61 @@ func (fir *fundInformationRepository) AllDetailsByPeriod(c context.Context, year
 			year_periods.year_id = years.id
 		WHERE
 			years.year = ` + year +
-			" ORDER BY fund_informations.updated_at DESC;"
+		" ORDER BY fund_informations.updated_at DESC;"
+	return fir.crud.Read(c, query)
+}
+
+func (fir *fundInformationRepository) AllBuildingsByPeriod(c context.Context, year string) (*sql.Rows, error) {
+
+	db := goqu.Dialect("mysql")
+
+	ds := db.From("fund_informations").
+		Select(
+			goqu.I("buildings.id").As("building_id"),
+			goqu.I("buildings.name").As("building_name"),
+			goqu.I("fund_informations.price").As("price"),
+			goqu.I("years.year").As("year"),
+		).
+		Join(goqu.T("teachers"), goqu.On(goqu.Ex{
+			"fund_informations.teacher_id": goqu.I("teachers.id"),
+		})).
+		Join(goqu.T("users"), goqu.On(goqu.Ex{
+			"fund_informations.user_id": goqu.I("users.id"),
+		})).
+		Join(goqu.T("departments"), goqu.On(goqu.Ex{
+			"teachers.department_id": goqu.I("departments.id"),
+		})).
+		Join(goqu.T("room_teachers"), goqu.On(goqu.Ex{
+			"room_teachers.teacher_id": goqu.I("teachers.id"),
+		})).
+		Join(goqu.T("rooms"), goqu.On(goqu.Ex{
+			"room_teachers.room_id": goqu.I("rooms.id"),
+		})).
+		Join(goqu.T("floors"), goqu.On(goqu.Ex{
+			"rooms.floor_id": goqu.I("floors.id"),
+		})).
+		Join(goqu.T("building_units"), goqu.On(goqu.Ex{
+			"floors.building_unit_id": goqu.I("building_units.id"),
+		})).
+		Join(goqu.T("buildings"), goqu.On(goqu.Ex{
+			"building_units.building_id": goqu.I("buildings.id"),
+		})).
+		Join(goqu.T("year_periods"),
+			goqu.On(goqu.And(
+				goqu.I("fund_informations.created_at").Gt(goqu.I("year_periods.started_at")),
+				goqu.I("fund_informations.created_at").Lt(goqu.I("year_periods.ended_at")),
+			)),
+		).
+		Join(goqu.T("years"), goqu.On(goqu.Ex{
+			"year_periods.year_id": goqu.I("years.id"),
+		})).
+		Where(goqu.Ex{"years.year": year}).
+		Order(goqu.I("fund_informations.updated_at").Desc())
+
+	query, _, err := ds.ToSQL()
+	if err != nil {
+		panic(err)
+	}
+
 	return fir.crud.Read(c, query)
 }

api/internals/domain/fund_information.go

@@ -21,5 +21,12 @@ type FundInformationDetail struct {
 	FundInformation FundInformation `json:"fundInformation"`
 	User            User            `json:"user"`
 	Teacher         Teacher         `json:"teacher"`
-	Department		Department		`json:"department"`
+	Department      Department      `json:"department"`
+}
+
+type FundInformationBuilding struct {
+	BuildingID   int    `json:"buildingId"`
+	BuildingName string `json:"buildingName"`
+	Price        int    `json:"price"`
+	Year         int    `json:"year"`
 }

api/internals/usecase/fund_information_usecase.go

@@ -21,6 +21,7 @@ type FundInformationUseCase interface {
 	GetFundInformationDetails(context.Context) ([]domain.FundInformationDetail, error)
 	GetFundInformationDetailByID(context.Context, string) (domain.FundInformationDetail, error)
 	GetFundInformationDetailsByPeriod(context.Context, string) ([]domain.FundInformationDetail, error)
+	GetFundInformationBuildingsByPeriod(context.Context, string) ([]domain.FundInformationBuilding, error)
 }
 
 func NewFundInformationUseCase(rep rep.FundInformationRepository) FundInformationUseCase {
@@ -325,3 +326,33 @@ func (f *fundInformationUseCase) GetFundInformationDetailsByPeriod(c context.Con
 	}
 	return fundInformationDetails, nil
 }
+
+func (f *fundInformationUseCase) GetFundInformationBuildingsByPeriod(c context.Context, year string) ([]domain.FundInformationBuilding, error) {
+	var fundInformationBuildings []domain.FundInformationBuilding
+
+	rows, err := f.rep.AllBuildingsByPeriod(c, year)
+	if err != nil {
+		return nil, err
+	}
+	defer func() {
+		if err := rows.Close(); err != nil {
+			log.Println(err)
+		}
+	}()
+
+	for rows.Next() {
+		fundInformationBuilding := domain.FundInformationBuilding{}
+		err := rows.Scan(
+			&fundInformationBuilding.BuildingID,
+			&fundInformationBuilding.BuildingName,
+			&fundInformationBuilding.Price,
+			&fundInformationBuilding.Year,
+		)
+		if err != nil {
+			return fundInformationBuildings, err
+		}
+		fundInformationBuildings = append(fundInformationBuildings, fundInformationBuilding)
+	}
+
+	return fundInformationBuildings, nil
+}

api/router/router.go

@@ -224,6 +224,7 @@ func (r router) ProvideRouter(e *echo.Echo) {
 		"/fund_informations/details/:year",
 		r.fundInformationController.IndexFundInformationDetailsByPeriod,
 	)
+	e.GET("/fund_informations/buildings/:year", r.fundInformationController.IndexFundInformationBuildingsByPeriod)
 
 	// incomes
 	e.GET("/incomes", r.incomeController.IndexIncome)

openapi/openapi.yaml

@@ -1693,6 +1693,25 @@ paths:
             application/json:
               schema:
                 type: object
+  /fund_informations/buildings/{year}:
+    get:
+      tags:
+        - fund_information
+      description: 年度で指定されたfund_informationsに紐づくデータを取得
+      parameters:
+        - name: year
+          in: path
+          description: year
+          required: true
+          schema:
+            type: integer
+      responses:
+        "200":
+          description: 年度で指定されたfund_informationsに紐づくデータを取得
+          content:
+            application/json:
+              schema:
+                type: object
   /incomes:
     get:
       tags:
@@ -3475,5 +3494,17 @@ components:
         - room_number
         - is_black
         - remark
+    buildingTotal:
+      type: object
+      properties:
+        id:
+          type: integer
+          example: 1
+        name:
+          type: string
+          example: 技大太郎
+        totalPrice:
+          type: integer
+          example: 10000
 
 x-original-swagger-version: "2.0"