Merge pull request #681 from NUTFes/feat/kubosaka/676-budgets-by-years

[feat]予算支出ページの年度切り替え実装
NUTFes · Feb 24, 2024 · aab6b57 · aab6b57
2 parents 3a1d5c0 + 77feb1c
commit aab6b57
Show file tree

Hide file tree

Showing 6 changed files with 237 additions and 120 deletions.
diff --git a/api/docs/docs.go b/api/docs/docs.go
@@ -283,6 +283,26 @@ const docTemplate = `{
                 }
             },
         },
+        "/budgets/details/{year}": {
+            "get": {
+                tags: ["budget"],
+                "description": "年度で指定されたbudgetsに紐づく年度とソースを取得",
+                "parameters": [
+                    {
+                        "name": "year",
+                        "in": "path",
+                        "description": "year",
+                        "required": true,
+                        "type": "integer"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "年度で指定されたbudgetsに紐づく年度とソースを取得",
+                    }
+                }
+            },
+        },
         "/budgets/{id}": {
             "get": {
                 tags: ["budget"],

diff --git a/api/externals/controller/budget_controller.go b/api/externals/controller/budget_controller.go
@@ -19,6 +19,7 @@ type BudgetController interface {
 	DestroyBudget(echo.Context) error
 	ShowBudgetDetailById(echo.Context) error
 	ShowBudgetDetails(echo.Context) error
+	ShowBudgetDetailsByPeriods(echo.Context) error
 }
 
 func NewBudgetController(u usecase.BudgetUseCase) BudgetController {
@@ -97,3 +98,13 @@ func (b *budgetController) ShowBudgetDetails(c echo.Context) error {
 	}
 	return c.JSON(http.StatusOK, budgetDetails)
 }
+
+// 年度ごとにBudgetと紐づくデータ全件取得
+func (b *budgetController) ShowBudgetDetailsByPeriods(c echo.Context) error {
+	year := c.Param("year")
+	budgetDetails, err := b.u.GetBudgetDetailsByPeriod(c.Request().Context(), year)
+	if err != nil {
+		return err
+	}
+	return c.JSON(http.StatusOK, budgetDetails)
+}
diff --git a/api/externals/repository/budget_repository.go b/api/externals/repository/budget_repository.go
@@ -22,6 +22,7 @@ type BudgetRepository interface {
 	FindDetailByID(context.Context, string) (*sql.Row, error)
 	FindLatestRecord(context.Context) (*sql.Row, error)
 	FindDetail(context.Context) (*sql.Rows, error)
+	FindDetailsByPeriod(context.Context, string) (*sql.Rows, error)
 }
 
 func NewBudgetRepository(c db.Client, ac abstract.Crud) BudgetRepository {
@@ -128,3 +129,25 @@ func (br *budgetRepository) FindLatestRecord(c context.Context) (*sql.Row, error
 	`
 	return br.crud.ReadByID(c, query)
 }
+
+// yearで切り替えるBudgetに紐づくyearとsourceを全件取得する
+func (br *budgetRepository) FindDetailsByPeriod(c context.Context, year string) (*sql.Rows, error) {
+	query := `
+		SELECT
+			*
+		FROM
+			budgets
+		INNER JOIN
+			years
+		ON
+			budgets.year_id = years.id
+		INNER JOIN
+			sources
+		ON
+			budgets.source_id = sources.id
+		WHERE
+			years.year = ` + year +
+		" ORDER BY budgets.id;"
+
+	return br.crud.Read(c, query)
+}
diff --git a/api/internals/usecase/budget_usecase.go b/api/internals/usecase/budget_usecase.go
@@ -20,6 +20,7 @@ type BudgetUseCase interface {
 	DestroyBudget(context.Context, string) error
 	GetBudgetDetailByID(context.Context, string) (domain.BudgetDetail, error)
 	GetBudgetDetails(c context.Context) ([]domain.BudgetDetail, error)
+	GetBudgetDetailsByPeriod(context.Context, string) ([]domain.BudgetDetail, error)
 }
 
 func NewBudgetUseCase(rep rep.BudgetRepository) BudgetUseCase {
@@ -175,3 +176,39 @@ func (b *budgetUseCase) GetBudgetDetails(c context.Context) ([]domain.BudgetDeta
 	}
 	return budgetDetails, nil
 }
+
+
+func (b *budgetUseCase) GetBudgetDetailsByPeriod(c context.Context, year string) ([]domain.BudgetDetail, error) {
+	budgetDetail := domain.BudgetDetail{}
+	var budgetDetails []domain.BudgetDetail
+
+	rows, err := b.rep.FindDetailsByPeriod(c, year)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+
+	for rows.Next() {
+		err := rows.Scan(
+			&budgetDetail.Budget.ID,
+			&budgetDetail.Budget.Price,
+			&budgetDetail.Budget.YearID,
+			&budgetDetail.Budget.SourceID,
+			&budgetDetail.Budget.CreatedAt,
+			&budgetDetail.Budget.UpdatedAt,
+			&budgetDetail.Year.ID,
+			&budgetDetail.Year.Year,
+			&budgetDetail.Year.CreatedAt,
+			&budgetDetail.Year.UpdatedAt,
+			&budgetDetail.Source.ID,
+			&budgetDetail.Source.Name,
+			&budgetDetail.Source.CreatedAt,
+			&budgetDetail.Source.UpdatedAt,
+		)
+		if err != nil {
+			return nil, errors.Wrapf(err, "cannot connect SQL")
+		}
+		budgetDetails = append(budgetDetails, budgetDetail)
+	}
+	return budgetDetails, nil
+}
diff --git a/api/router/router.go b/api/router/router.go
@@ -100,6 +100,7 @@ func (r router) ProvideRouter(e *echo.Echo) {
 	e.DELETE("/budgets/:id", r.budgetController.DestroyBudget)
 	e.GET("/budgets/:id/details", r.budgetController.ShowBudgetDetailById)
 	e.GET("/budgets/details", r.budgetController.ShowBudgetDetails)
+	e.GET("/budgets/details/:year", r.budgetController.ShowBudgetDetailsByPeriods)
 
 	//bureauのRoute
 	e.GET("/bureaus", r.bureauController.IndexBureau)