From 08658b99f4c937decbcd7bb98b5f864b018a4bef Mon Sep 17 00:00:00 2001 From: Kubosaka Date: Thu, 9 Jan 2025 14:13:55 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=E5=9E=8B=E5=90=8D=E7=9C=81=E7=95=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../usecase/financial_record_usecase.go | 49 ++++++++++--------- 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/api/internals/usecase/financial_record_usecase.go b/api/internals/usecase/financial_record_usecase.go index d470483e..384e382c 100644 --- a/api/internals/usecase/financial_record_usecase.go +++ b/api/internals/usecase/financial_record_usecase.go @@ -13,17 +13,17 @@ type financialRecordUseCase struct { } type FinancialRecordUseCase interface { - GetFinancialRecords(context.Context) (generated.FinancialRecordDetails, error) - GetFinancialRecordsByYears(context.Context, string) (generated.FinancialRecordDetails, error) + GetFinancialRecords(context.Context) (FinancialRecordDetails, error) + GetFinancialRecordsByYears(context.Context, string) (FinancialRecordDetails, error) CreateFinancialRecord( context.Context, - generated.FinancialRecord, - ) (generated.FinancialRecordWithBalance, error) + FinancialRecord, + ) (FinancialRecordWithBalance, error) UpdateFinancialRecord( context.Context, string, - generated.FinancialRecord, - ) (generated.FinancialRecordWithBalance, error) + FinancialRecord, + ) (FinancialRecordWithBalance, error) DestroyFinancialRecord(context.Context, string) error } @@ -31,12 +31,17 @@ func NewFinancialRecordUseCase(rep rep.FinancialRecordRepository) FinancialRecor return &financialRecordUseCase{rep} } +type FinancialRecordDetails = generated.FinancialRecordDetails +type FinancialRecord = generated.FinancialRecord +type FinancialRecordWithBalance = generated.FinancialRecordWithBalance +type Total = generated.Total + func (fru *financialRecordUseCase) GetFinancialRecords( c context.Context, -) (generated.FinancialRecordDetails, error) { - var financialRecordDetails generated.FinancialRecordDetails - var financialRecordList []generated.FinancialRecordWithBalance - var total generated.Total +) (FinancialRecordDetails, error) { + var financialRecordDetails FinancialRecordDetails + var financialRecordList []FinancialRecordWithBalance + var total Total rows, err := fru.rep.All(c) if err != nil { @@ -46,7 +51,7 @@ func (fru *financialRecordUseCase) GetFinancialRecords( defer rows.Close() for rows.Next() { - var financialRecord generated.FinancialRecordWithBalance + var financialRecord FinancialRecordWithBalance err := rows.Scan( &financialRecord.Id, &financialRecord.Name, @@ -86,10 +91,10 @@ func (fru *financialRecordUseCase) GetFinancialRecords( func (fru *financialRecordUseCase) GetFinancialRecordsByYears( c context.Context, year string, -) (generated.FinancialRecordDetails, error) { - var financialRecordDetails generated.FinancialRecordDetails - var financialRecordList []generated.FinancialRecordWithBalance - var total generated.Total +) (FinancialRecordDetails, error) { + var financialRecordDetails FinancialRecordDetails + var financialRecordList []FinancialRecordWithBalance + var total Total rows, err := fru.rep.AllByPeriod(c, year) if err != nil { @@ -99,7 +104,7 @@ func (fru *financialRecordUseCase) GetFinancialRecordsByYears( defer rows.Close() for rows.Next() { - var financialRecord generated.FinancialRecordWithBalance + var financialRecord FinancialRecordWithBalance err := rows.Scan( &financialRecord.Id, &financialRecord.Name, @@ -138,9 +143,9 @@ func (fru *financialRecordUseCase) GetFinancialRecordsByYears( func (fru *financialRecordUseCase) CreateFinancialRecord( c context.Context, - financialRecord generated.FinancialRecord, -) (generated.FinancialRecordWithBalance, error) { - latastFinancialRecordWithBalance := generated.FinancialRecordWithBalance{} + financialRecord FinancialRecord, +) (FinancialRecordWithBalance, error) { + latastFinancialRecordWithBalance := FinancialRecordWithBalance{} err := fru.rep.Create(c, financialRecord) if err != nil { return latastFinancialRecordWithBalance, err @@ -166,9 +171,9 @@ func (fru *financialRecordUseCase) CreateFinancialRecord( func (fru *financialRecordUseCase) UpdateFinancialRecord( c context.Context, id string, - financialRecord generated.FinancialRecord, -) (generated.FinancialRecordWithBalance, error) { - updateFinancialRecord := generated.FinancialRecordWithBalance{} + financialRecord FinancialRecord, +) (FinancialRecordWithBalance, error) { + updateFinancialRecord := FinancialRecordWithBalance{} if err := fru.rep.Update(c, id, financialRecord); err != nil { return updateFinancialRecord, err From 38c277bd658664ef96d6a61cbb06baf3d5bbecef Mon Sep 17 00:00:00 2001 From: Kubosaka Date: Thu, 9 Jan 2025 14:15:25 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=E5=A4=89=E6=95=B0=E5=90=8D=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3financialRecordList?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../usecase/financial_record_usecase.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/api/internals/usecase/financial_record_usecase.go b/api/internals/usecase/financial_record_usecase.go index 384e382c..1686a3be 100644 --- a/api/internals/usecase/financial_record_usecase.go +++ b/api/internals/usecase/financial_record_usecase.go @@ -40,7 +40,7 @@ func (fru *financialRecordUseCase) GetFinancialRecords( c context.Context, ) (FinancialRecordDetails, error) { var financialRecordDetails FinancialRecordDetails - var financialRecordList []FinancialRecordWithBalance + var financialRecords []FinancialRecordWithBalance var total Total rows, err := fru.rep.All(c) @@ -64,7 +64,7 @@ func (fru *financialRecordUseCase) GetFinancialRecords( if err != nil { return financialRecordDetails, errors.Wrapf(err, "can not connect SQL") } - financialRecordList = append(financialRecordList, financialRecord) + financialRecords = append(financialRecords, financialRecord) } // totalを求める @@ -72,7 +72,7 @@ func (fru *financialRecordUseCase) GetFinancialRecords( expenseTotal := 0 balanceTotal := 0 - for _, financialRecord := range financialRecordList { + for _, financialRecord := range financialRecords { budgetTotal += *financialRecord.Budget expenseTotal += *financialRecord.Expense balanceTotal += *financialRecord.Balance @@ -83,7 +83,7 @@ func (fru *financialRecordUseCase) GetFinancialRecords( total.Balance = &balanceTotal financialRecordDetails.Total = &total - financialRecordDetails.FinancialRecords = &financialRecordList + financialRecordDetails.FinancialRecords = &financialRecords return financialRecordDetails, err } @@ -93,7 +93,7 @@ func (fru *financialRecordUseCase) GetFinancialRecordsByYears( year string, ) (FinancialRecordDetails, error) { var financialRecordDetails FinancialRecordDetails - var financialRecordList []FinancialRecordWithBalance + var financialRecords []FinancialRecordWithBalance var total Total rows, err := fru.rep.AllByPeriod(c, year) @@ -117,7 +117,7 @@ func (fru *financialRecordUseCase) GetFinancialRecordsByYears( if err != nil { return financialRecordDetails, errors.Wrapf(err, "can not connect SQL") } - financialRecordList = append(financialRecordList, financialRecord) + financialRecords = append(financialRecords, financialRecord) } // totalを求める @@ -125,7 +125,7 @@ func (fru *financialRecordUseCase) GetFinancialRecordsByYears( expenseTotal := 0 balanceTotal := 0 - for _, financialRecord := range financialRecordList { + for _, financialRecord := range financialRecords { budgetTotal += *financialRecord.Budget expenseTotal += *financialRecord.Expense balanceTotal += *financialRecord.Balance @@ -136,7 +136,7 @@ func (fru *financialRecordUseCase) GetFinancialRecordsByYears( total.Balance = &balanceTotal financialRecordDetails.Total = &total - financialRecordDetails.FinancialRecords = &financialRecordList + financialRecordDetails.FinancialRecords = &financialRecords return financialRecordDetails, err }