Correction webhook eventhandler

router/transaction.go

@@ -14,7 +14,18 @@ import (
 	"go.uber.org/zap"
 )
 
-type Transaction struct {
+type TransactionNewCreate struct {
+	ID        uuid.UUID      `json:"id"`
+	Amount    int            `json:"amount"`
+	Target    string         `json:"target"`
+	Request   *uuid.UUID     `json:"request"`
+	Tags      []*TagOverview `json:"tags"`
+	Group     *GroupOverview `json:"group"`
+	CreatedAt time.Time      `json:"created_at"`
+	UpdatedAt time.Time      `json:"updated_at"`
+}
+
+type TransactionCorrestion struct {
 	ID        uuid.UUID      `json:"id"`
 	Amount    int            `json:"amount"`
 	Target    string         `json:"target"`
@@ -137,7 +148,7 @@ func (h Handlers) GetTransactions(c echo.Context) error {
 		return echo.NewHTTPError(http.StatusInternalServerError, err)
 	}
 
-	res := lo.Map(txs, func(tx *model.TransactionResponse, _ int) *Transaction {
+	res := lo.Map(txs, func(tx *model.TransactionResponse, _ int) *TransactionNewCreate {
 		tags := lo.Map(tx.Tags, func(tag *model.Tag, _ int) *TagOverview {
 			return &TagOverview{
 				ID:        tag.ID,
@@ -158,7 +169,7 @@ func (h Handlers) GetTransactions(c echo.Context) error {
 				UpdatedAt:   tx.Group.UpdatedAt,
 			}
 		}
-		return &Transaction{
+		return &TransactionNewCreate{
 			ID:        tx.ID,
 			Amount:    tx.Amount,
 			Target:    tx.Target,
@@ -180,7 +191,7 @@ func (h Handlers) PostTransaction(c echo.Context) error {
 		return echo.NewHTTPError(http.StatusBadRequest, err)
 	}
 
-	transactions := []*Transaction{}
+	transactions := []*TransactionNewCreate{}
 	ctx := c.Request().Context()
 	for _, target := range tx.Targets {
 		if target == nil {
@@ -215,7 +226,7 @@ func (h Handlers) PostTransaction(c echo.Context) error {
 				UpdatedAt:   created.Group.UpdatedAt,
 			}
 		}
-		res := Transaction{
+		res := TransactionNewCreate{
 			ID:        created.ID,
 			Amount:    created.Amount,
 			Target:    created.Target,
@@ -265,7 +276,7 @@ func (h Handlers) GetTransaction(c echo.Context) error {
 			UpdatedAt:   tx.Group.UpdatedAt,
 		}
 	}
-	res := Transaction{
+	res := TransactionCorrestion{
 		ID:        tx.ID,
 		Amount:    tx.Amount,
 		Target:    tx.Target,
@@ -323,7 +334,7 @@ func (h Handlers) PutTransaction(c echo.Context) error {
 			UpdatedAt:   updated.Group.UpdatedAt,
 		}
 	}
-	res := Transaction{
+	res := TransactionCorrestion{
 		ID:        updated.ID,
 		Amount:    updated.Amount,
 		Target:    updated.Target,

router/transaction_test.go

@@ -100,7 +100,7 @@ func TestHandlers_GetTransactions(t *testing.T) {
 			}).
 			Return(txs, nil)
 
-		res := lo.Map(txs, func(tx *model.TransactionResponse, _ int) *Transaction {
+		res := lo.Map(txs, func(tx *model.TransactionResponse, _ int) *TransactionNewCreate {
 			tag := lo.Map(tx.Tags, func(modelTag *model.Tag, _ int) *TagOverview {
 				return &TagOverview{
 					ID:        modelTag.ID,
@@ -118,7 +118,7 @@ func TestHandlers_GetTransactions(t *testing.T) {
 				CreatedAt:   tx.Group.CreatedAt,
 				UpdatedAt:   tx.Group.UpdatedAt,
 			}
-			return &Transaction{
+			return &TransactionNewCreate{
 				ID:        tx.ID,
 				Amount:    tx.Amount,
 				Target:    tx.Target,
@@ -213,7 +213,7 @@ func TestHandlers_GetTransactions(t *testing.T) {
 			}).
 			Return(txs, nil)
 
-		res := lo.Map(txs, func(tx *model.TransactionResponse, _ int) *Transaction {
+		res := lo.Map(txs, func(tx *model.TransactionResponse, _ int) *TransactionNewCreate {
 			tag := lo.Map(tx.Tags, func(modelTag *model.Tag, _ int) *TagOverview {
 				return &TagOverview{
 					ID:        modelTag.ID,
@@ -231,7 +231,7 @@ func TestHandlers_GetTransactions(t *testing.T) {
 				CreatedAt:   tx.Group.CreatedAt,
 				UpdatedAt:   tx.Group.UpdatedAt,
 			}
-			return &Transaction{
+			return &TransactionNewCreate{
 				ID:        tx.ID,
 				Amount:    tx.Amount,
 				Target:    tx.Target,
@@ -327,7 +327,7 @@ func TestHandlers_GetTransactions(t *testing.T) {
 			}).
 			Return(txs, nil)
 
-		res := lo.Map(txs, func(tx *model.TransactionResponse, _ int) *Transaction {
+		res := lo.Map(txs, func(tx *model.TransactionResponse, _ int) *TransactionNewCreate {
 			tag := lo.Map(tx.Tags, func(modelTag *model.Tag, _ int) *TagOverview {
 				return &TagOverview{
 					ID:        modelTag.ID,
@@ -345,7 +345,7 @@ func TestHandlers_GetTransactions(t *testing.T) {
 				CreatedAt:   tx.Group.CreatedAt,
 				UpdatedAt:   tx.Group.UpdatedAt,
 			}
-			return &Transaction{
+			return &TransactionNewCreate{
 				ID:        tx.ID,
 				Amount:    tx.Amount,
 				Target:    tx.Target,
@@ -446,7 +446,7 @@ func TestHandlers_GetTransactions(t *testing.T) {
 			}).
 			Return(txs, nil)
 
-		res := lo.Map(txs, func(tx *model.TransactionResponse, _ int) *Transaction {
+		res := lo.Map(txs, func(tx *model.TransactionResponse, _ int) *TransactionNewCreate {
 			tag := lo.Map(tx.Tags, func(modelTag *model.Tag, _ int) *TagOverview {
 				return &TagOverview{
 					ID:        modelTag.ID,
@@ -464,7 +464,7 @@ func TestHandlers_GetTransactions(t *testing.T) {
 				CreatedAt:   tx.Group.CreatedAt,
 				UpdatedAt:   tx.Group.UpdatedAt,
 			}
-			return &Transaction{
+			return &TransactionNewCreate{
 				ID:        tx.ID,
 				Amount:    tx.Amount,
 				Target:    tx.Target,
@@ -549,7 +549,7 @@ func TestHandlers_GetTransactions(t *testing.T) {
 			}).
 			Return(txs, nil)
 
-		res := lo.Map(txs, func(tx *model.TransactionResponse, _ int) *Transaction {
+		res := lo.Map(txs, func(tx *model.TransactionResponse, _ int) *TransactionNewCreate {
 			tag := lo.Map(tx.Tags, func(modelTag *model.Tag, _ int) *TagOverview {
 				return &TagOverview{
 					ID:        modelTag.ID,
@@ -567,7 +567,7 @@ func TestHandlers_GetTransactions(t *testing.T) {
 				CreatedAt:   tx.Group.CreatedAt,
 				UpdatedAt:   tx.Group.UpdatedAt,
 			}
-			return &Transaction{
+			return &TransactionNewCreate{
 				ID:        tx.ID,
 				Amount:    tx.Amount,
 				Target:    tx.Target,
@@ -655,7 +655,7 @@ func TestHandlers_PostTransaction(t *testing.T) {
 			CreateTransaction(c.Request().Context(), tx1.Amount, tx1.Target, tags, &group, nil).
 			Return(tx1, nil)
 
-		res := lo.Map(txs, func(tx *model.TransactionResponse, _ int) *Transaction {
+		res := lo.Map(txs, func(tx *model.TransactionResponse, _ int) *TransactionNewCreate {
 			tag := lo.Map(tx.Tags, func(modelTag *model.Tag, _ int) *TagOverview {
 				return &TagOverview{
 					ID:        modelTag.ID,
@@ -673,7 +673,7 @@ func TestHandlers_PostTransaction(t *testing.T) {
 				CreatedAt:   tx.Group.CreatedAt,
 				UpdatedAt:   tx.Group.UpdatedAt,
 			}
-			return &Transaction{
+			return &TransactionNewCreate{
 				ID:        tx.ID,
 				Amount:    tx.Amount,
 				Target:    tx.Target,
@@ -788,7 +788,7 @@ func TestHandlers_PostTransaction(t *testing.T) {
 			CreatedAt:   tx.Group.CreatedAt,
 			UpdatedAt:   tx.Group.UpdatedAt,
 		}
-		res := []*Transaction{
+		res := []*TransactionNewCreate{
 			{
 				ID:        tx.ID,
 				Amount:    tx.Amount,
@@ -861,7 +861,7 @@ func TestHandlers_GetTransaction(t *testing.T) {
 			GetTransaction(c.Request().Context(), tx.ID).
 			Return(tx, nil)
 
-		var resOverview Transaction
+		var resOverview TransactionCorrestion
 		to := lo.Map(tx.Tags, func(modelTag *model.Tag, _ int) *TagOverview {
 			return &TagOverview{
 				ID:        modelTag.ID,
@@ -879,7 +879,7 @@ func TestHandlers_GetTransaction(t *testing.T) {
 			CreatedAt:   tx.Group.CreatedAt,
 			UpdatedAt:   tx.Group.UpdatedAt,
 		}
-		resOverview = Transaction{
+		resOverview = TransactionCorrestion{
 			ID:        tx.ID,
 			Amount:    tx.Amount,
 			Target:    tx.Target,
@@ -990,7 +990,7 @@ func TestHandlers_PutTransaction(t *testing.T) {
 				updatedTags, nil, nil).
 			Return(updated, nil)
 
-		var resOverview Transaction
+		var resOverview TransactionCorrestion
 		to := lo.Map(updated.Tags, func(modelTag *model.Tag, _ int) *TagOverview {
 			return &TagOverview{
 				ID:        modelTag.ID,
@@ -1007,7 +1007,7 @@ func TestHandlers_PutTransaction(t *testing.T) {
 			CreatedAt:   updated.Group.CreatedAt,
 			UpdatedAt:   updated.Group.UpdatedAt,
 		}
-		resOverview = Transaction{
+		resOverview = TransactionCorrestion{
 			ID:        tx.ID,
 			Amount:    updated.Amount,
 			Target:    updated.Target,

service/webhook.go

@@ -36,7 +36,15 @@
 	Comment string    `json:"comment"`
 }
 
-type TransactionRequestApplication struct {
+type TransactionPostRequestApplication struct {
+	ID     uuid.UUID `json:"id"`
+	Amount int       `json:"amount"`
+	Target string    `json:"target"`
+	Tags   []*Tag    `json:"tags"`
+	Group  *Group    `json:"group"`
+}
+
+type TransactionPutRequestApplication struct {
 	ID     uuid.UUID `json:"id"`
 	Amount int       `json:"amount"`
 	Target string    `json:"target"`
@@ -136,24 +144,52 @@
 			message += resApp.Content + "\n"
 		}
 	} else if strings.Contains(c.Request().URL.Path, "/api/transactions") {
-		var resApps []TransactionRequestApplication
-		err := json.Unmarshal(resBody, &resApps)
-		resApp := resApps[0]
-		if err != nil {
-			return
-		}
 		if c.Request().Method == http.MethodPost {
+			var resApps []TransactionPostRequestApplication
+			err := json.Unmarshal(resBody, &resApps)
+			if err != nil {
+				return
+			}
 			message += fmt.Sprintf(
 				"## :scroll:[入出金記録](%s/transactions/%s)が新規作成されました\n",
 				"https://jomon.trap.jp",
-				resApp.ID)
+				resApps[0].ID)
+			targets := lo.Map(
+				resApps, func(resApp TransactionPostRequestApplication, _ int) string {
+					return resApp.Target
+				})
+			if resApps[0].Amount < 0 {
+				message += fmt.Sprintf(
+					"- %sへの支払い\n    - 支払い金額: 計%d円(一人当たりへの支払い金額: %d円)\n",
+					strings.Join(targets, " "),
+					-len(resApps)*resApps[0].Amount,
+					-resApps[0].Amount)
+			} else {
+				message += fmt.Sprintf(
+					"- %sからの振込\n    - 受け取り金額: 計%d円(一人当たりからの受け取り金額: %d円)\n",
+					strings.Join(targets, " "),
+					len(resApps)*resApps[0].Amount,
+					resApps[0].Amount)
+			}
+			if resApps[0].Group != nil {
+				message += fmt.Sprintf("- 関連するグループ: %s\n", resApps[0].Group.Name)
+			}
+			if len(resApps[0].Tags) != 0 {
+				tags := lo.Map(resApps[0].Tags, func(tag *Tag, _ int) string {
+					return tag.Name
+				})
+				message += fmt.Sprintf("- タグ: %s", strings.Join(tags, ", "))
+			}
 		} else if c.Request().Method == http.MethodPut {
+			var resApp TransactionPutRequestApplication
+			err := json.Unmarshal(resBody, &resApp)
+			if err != nil {
+				return
+			}
 			message += fmt.Sprintf(
 				"## :scroll:[入出金記録](%s/transactions/%s)が修正されました\n",
 				"https://jomon.trap.jp",
 				resApp.ID)
-		}
-		if len(resApps) == 1 {
 			if resApp.Amount < 0 {
 				message += fmt.Sprintf(
 					"- `%s`への支払い\n    - 支払い金額: %d円\n",
@@ -165,36 +201,17 @@
 					resApp.Target,
 					resApp.Amount)
 			}
-		} else {
-			targets := lo.Map(
-				resApps, func(resApp TransactionRequestApplication, _ int) string {
-					return resApp.Target
+			if resApp.Group != nil {
+				message += fmt.Sprintf("- 関連するグループ: %s\n", resApp.Group.Name)
+			}
+			if len(resApp.Tags) != 0 {
+				tags := lo.Map(resApp.Tags, func(tag *Tag, _ int) string {
+					return tag.Name
 				})
-			if resApp.Amount < 0 {
-				message += fmt.Sprintf(
-					"- %sへの支払い\n    - 支払い金額: 計%d円(一人当たりへの支払い金額: %d円)\n",
-					strings.Join(targets, " "),
-					-len(resApps)*resApp.Amount,
-					-resApp.Amount)
-			} else {
-				message += fmt.Sprintf(
-					"- %sからの振込\n    - 受け取り金額: 計%d円(一人当たりからの受け取り金額: %d円)\n",
-					strings.Join(targets, " "),
-					len(resApps)*resApp.Amount,
-					resApp.Amount)
+				message += fmt.Sprintf("- タグ: %s", strings.Join(tags, ", "))
 			}
 		}
-		if resApp.Group != nil {
-			message += fmt.Sprintf("- 関連するグループ: %s\n", resApp.Group.Name)
-		}
-		if len(resApp.Tags) != 0 {
-			tags := lo.Map(resApp.Tags, func(tag *Tag, _ int) string {
-				return tag.Name
-			})
-			message += fmt.Sprintf("- タグ: %s", strings.Join(tags, ", "))
-		}
 	}
-
 	_ = RequestWebhook(message, webhookSecret, webhookChannelId, webhookId, 1)
 }