-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into feat/kubosaka/intro-minio-client-go
- Loading branch information
Showing
10 changed files
with
442 additions
and
12 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| package controller | ||
|
|
||
| import ( | ||
| "net/http" | ||
|
|
||
| "github.com/NUTFes/FinanSu/api/generated" | ||
| "github.com/NUTFes/FinanSu/api/internals/usecase" | ||
| "github.com/labstack/echo/v4" | ||
| ) | ||
|
|
||
| type divisionController struct { | ||
| u usecase.DivisionUseCase | ||
| } | ||
|
|
||
| type DivisionController interface { | ||
| IndexDivisions(echo.Context) error | ||
| CreateDivision(echo.Context) error | ||
| UpdateDivision(echo.Context) error | ||
| DestroyDivision(echo.Context) error | ||
| } | ||
|
|
||
| func NewDivisionController(u usecase.DivisionUseCase) DivisionController { | ||
| return &divisionController{u} | ||
| } | ||
|
|
||
| func (d *divisionController) IndexDivisions(c echo.Context) error { | ||
| ctx := c.Request().Context() | ||
| year := c.QueryParam("year") | ||
| financialRecordId := c.QueryParam("financial_record_id") | ||
|
|
||
| divisionDetails, err := d.u.GetDivisions(ctx, year, financialRecordId) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| return c.JSON(http.StatusOK, divisionDetails) | ||
| } | ||
|
|
||
| func (d *divisionController) CreateDivision(c echo.Context) error { | ||
| ctx := c.Request().Context() | ||
| division := new(Division) | ||
|
|
||
| if err := c.Bind(division); err != nil { | ||
| return c.String(http.StatusBadRequest, "Bad Request") | ||
| } | ||
| latestDivision, err := d.u.CreateDivision(ctx, *division) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| return c.JSON(http.StatusOK, latestDivision) | ||
| } | ||
|
|
||
| func (d *divisionController) UpdateDivision(c echo.Context) error { | ||
| ctx := c.Request().Context() | ||
| id := c.Param("id") | ||
| division := new(Division) | ||
|
|
||
| if err := c.Bind(division); err != nil { | ||
| return c.String(http.StatusBadRequest, "Bad Request") | ||
| } | ||
| updatedDivision, err := d.u.UpdateDivision(ctx, id, *division) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| return c.JSON(http.StatusOK, updatedDivision) | ||
| } | ||
|
|
||
| func (d *divisionController) DestroyDivision(c echo.Context) error { | ||
| ctx := c.Request().Context() | ||
| id := c.Param("id") | ||
|
|
||
| err := d.u.DestroyDivision(ctx, id) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| return c.String(http.StatusOK, "Destroy Division") | ||
| } | ||
|
|
||
| type ( | ||
| Division = generated.Division | ||
| DivisionDetails = generated.DivisionDetails | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,140 @@ | ||
| package repository | ||
|
|
||
| import ( | ||
| "context" | ||
| "database/sql" | ||
|
|
||
| "github.com/NUTFes/FinanSu/api/drivers/db" | ||
| "github.com/NUTFes/FinanSu/api/externals/repository/abstract" | ||
| "github.com/NUTFes/FinanSu/api/generated" | ||
| goqu "github.com/doug-martin/goqu/v9" | ||
| ) | ||
|
|
||
| type divisionRepository struct { | ||
| client db.Client | ||
| crud abstract.Crud | ||
| } | ||
|
|
||
| type DivisionRepository interface { | ||
| AllByPeriodAndFinancialRecord(context.Context, string, string) (*sql.Rows, error) | ||
| GetById(context.Context, string) (*sql.Row, error) | ||
| Create(context.Context, Division) error | ||
| Update(context.Context, string, Division) error | ||
| Delete(context.Context, string) error | ||
| FindLatestRecord(context.Context) (*sql.Row, error) | ||
| } | ||
|
|
||
| func NewDivisionRepository(c db.Client, ac abstract.Crud) DivisionRepository { | ||
| return &divisionRepository{c, ac} | ||
| } | ||
|
|
||
| // 年度別と財務記録で取得 | ||
| func (dr *divisionRepository) AllByPeriodAndFinancialRecord( | ||
| c context.Context, | ||
| year string, | ||
| financialRecordId string, | ||
| ) (*sql.Rows, error) { | ||
|
|
||
| ds := selectDivisionQuery | ||
|
|
||
| if year != "" { | ||
| ds = ds.Where(goqu.Ex{"years.year": year}) | ||
| } | ||
| if financialRecordId != "" { | ||
| ds = ds.Where(goqu.Ex{"financial_records.id": financialRecordId}) | ||
| } | ||
|
|
||
| // クエリを構築し、SQLを生成 | ||
| query, _, err := ds.ToSQL() | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| return dr.crud.Read(c, query) | ||
| } | ||
|
|
||
| // IDで取得 | ||
| func (dr *divisionRepository) GetById( | ||
| c context.Context, | ||
| id string, | ||
| ) (*sql.Row, error) { | ||
| ds, _, err := selectDivisionQuery. | ||
| Where(goqu.Ex{"divisions.id": id}). | ||
| ToSQL() | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| return dr.crud.ReadByID(c, ds) | ||
| } | ||
|
|
||
| // 部門作成 | ||
| func (dr *divisionRepository) Create( | ||
| c context.Context, | ||
| division Division, | ||
| ) error { | ||
| ds := dialect.Insert("divisions"). | ||
| Rows(goqu.Record{"name": division.Name, "financial_record_id": division.FinancialRecordID}) | ||
| query, _, err := ds.ToSQL() | ||
| if err != nil { | ||
| return err | ||
| } | ||
| return dr.crud.UpdateDB(c, query) | ||
| } | ||
|
|
||
| // 部門更新 | ||
| func (dr *divisionRepository) Update( | ||
| c context.Context, | ||
| id string, | ||
| division Division, | ||
| ) error { | ||
| ds := dialect.Update("divisions"). | ||
| Set(goqu.Record{"name": division.Name, "financial_record_id": division.FinancialRecordID}). | ||
| Where(goqu.Ex{"id": id}) | ||
| query, _, err := ds.ToSQL() | ||
| if err != nil { | ||
| return err | ||
| } | ||
| return dr.crud.UpdateDB(c, query) | ||
| } | ||
|
|
||
| // 部門削除 | ||
| func (dr *divisionRepository) Delete( | ||
| c context.Context, | ||
| id string, | ||
| ) error { | ||
| ds := dialect.Delete("divisions").Where(goqu.Ex{"id": id}) | ||
| query, _, err := ds.ToSQL() | ||
| if err != nil { | ||
| return err | ||
| } | ||
| return dr.crud.UpdateDB(c, query) | ||
| } | ||
|
|
||
| // 最新の部門を取得する | ||
| func (dr *divisionRepository) FindLatestRecord(c context.Context) (*sql.Row, error) { | ||
| ds := selectDivisionQuery | ||
| query, _, err := ds.Limit(1).ToSQL() | ||
|
|
||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| return dr.crud.ReadByID(c, query) | ||
| } | ||
|
|
||
| type Division = generated.Division | ||
|
|
||
| // NOTE: getの共通部分抜き出し | ||
| var selectDivisionQuery = dialect.From("divisions"). | ||
| Select( | ||
| "divisions.id", | ||
| "divisions.name", | ||
| "financial_records.name", | ||
| goqu.COALESCE(goqu.SUM("item_budgets.amount"), 0).As("budget"), | ||
| goqu.COALESCE(goqu.SUM("buy_reports.amount"), 0).As("expense"), | ||
| goqu.L("COALESCE(SUM(item_budgets.amount), 0) - COALESCE(SUM(buy_reports.amount), 0)").As("balance")). | ||
| InnerJoin(goqu.I("financial_records"), goqu.On(goqu.I("financial_records.id").Eq(goqu.I("divisions.financial_record_id")))). | ||
| InnerJoin(goqu.I("years"), goqu.On(goqu.I("financial_records.year_id").Eq(goqu.I("years.id")))). | ||
| LeftJoin(goqu.I("festival_items"), goqu.On(goqu.I("divisions.id").Eq(goqu.I("festival_items.division_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")))). | ||
| GroupBy(goqu.I("divisions.id")). | ||
| Order(goqu.I("divisions.id").Desc()) |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.