Merge pull request #6 from TeamPickle:fix-all-domestic-result

cra1nbow · web-flow · commit f1433597e245 · 2022-09-07T14:02:40.000+09:00
fix: all domestic result
diff --git a/function/commands/status/command.go b/function/commands/status/command.go
@@ -21,7 +21,7 @@ import (
 func handleDomesticRegion(ctx context.Context, regionName string, boardData *coronaboard.CoronaBoardData) *api.InteractionResponse {
 	var status *coronaboard.DomesticNowStatus
 	for _, v := range boardData.StatDomesticNow {
-		if v.Region == regionName || (regionName == "전국" && v.Region == "합계") {
+		if v.Region == regionName {
 			status = &v
 			break
 		}
@@ -146,7 +146,7 @@ func handleDomestic(ctx context.Context, rawRequest discord.InteractionEvent) *a
 }
 
 func (c *StatusCommand) Handle(ctx context.Context, interaction *discord.CommandInteraction, rawRequest discord.InteractionEvent) *api.InteractionResponse {
-	if len(interaction.Options) == 0 {
+	if len(interaction.Options) == 0 || interaction.Options[0].String() == "전국" {
 		return handleDomestic(ctx, rawRequest)
 	}
 	return handleRegion(ctx, interaction.Options[0].String())

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ import (`
`21`	`21`	`func handleDomesticRegion(ctx context.Context, regionName string, boardData coronaboard.CoronaBoardData) api.InteractionResponse {`
`22`	`22`	`var status *coronaboard.DomesticNowStatus`
`23`	`23`	`for _, v := range boardData.StatDomesticNow {`
`24`		`- if v.Region == regionName \|\| (regionName == "전국" && v.Region == "합계") {`
	`24`	`+ if v.Region == regionName {`
`25`	`25`	`status = &v`
`26`	`26`	`break`
`27`	`27`	`}`
`@@ -146,7 +146,7 @@ func handleDomestic(ctx context.Context, rawRequest discord.InteractionEvent) *a`
`146`	`146`	`}`
`147`	`147`
`148`	`148`	`func (c StatusCommand) Handle(ctx context.Context, interaction discord.CommandInteraction, rawRequest discord.InteractionEvent) *api.InteractionResponse {`
`149`		`- if len(interaction.Options) == 0 {`
	`149`	`+ if len(interaction.Options) == 0 \|\| interaction.Options[0].String() == "전국" {`
`150`	`150`	`return handleDomestic(ctx, rawRequest)`
`151`	`151`	`}`
`152`	`152`	`return handleRegion(ctx, interaction.Options[0].String())`