Skip to content

Commit

Permalink
trim
Browse files Browse the repository at this point in the history
  • Loading branch information
raahii committed May 5, 2024
1 parent 4d8f5cb commit 1211e73
Show file tree
Hide file tree
Showing 4 changed files with 53 additions and 6 deletions.
10 changes: 6 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,23 @@ clean:
rm -rf $(FUNC_BOT)/vendor
rm -rf $(FUNC_BOT)/messaging
rm -rf pkg/mock
rm -rf pkg/wire/wire_gen.go

prepare:
cd pkg \
&& go install go.uber.org/mock/mockgen@latest \
&& go install github.com/gotesttools/gotestfmt/v2/cmd/gotestfmt@latest \
&& go install github.com/google/wire/cmd/wire@latest

generate: clean
generate:
cd pkg \
&& GOFLAGS=-mod=mod go generate ./...
&& go generate ./... \
&& cd wire && wire gen

test: generate
test: clean generate
cd pkg && PHASE=test gotest -v ./... $(ARGS)

ci-test: prepare build
ci-test: build
cd pkg && PHASE=test go test -json ./... | tee /tmp/gotest.log | gotestfmt

develop:
Expand Down
4 changes: 3 additions & 1 deletion pkg/messaging/handler/bot_message.go
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,9 @@ func (bh *BotHandlerImpl) extractMemberName(text string) string {
return ""
}

return strings.TrimSuffix(trimmed, JOIN_MESSAGE_SUFFIX)
name := strings.TrimSuffix(trimmed, JOIN_MESSAGE_SUFFIX)
name = strings.Trim(name, "  ")
return name
}

func (bh *BotHandlerImpl) addNewMember(event *linebot.Event, group *store.Group, memberName string) error {
Expand Down
2 changes: 1 addition & 1 deletion pkg/messaging/handler/bot_message_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ func TestHandleTextMessage_addNewMember_secondPerson_success(t *testing.T) {

// Test handler.handleTextMessage call.
event := newTestMessageEvent(REPLY_TOKEN, linebot.EventSourceTypeGroup, GROUP_ID, SENDER_ID)
message := newTextMessage("花子だよ〜!")
message := newTextMessage("花子 だよ〜!")
err := target.handleTextMessage(event, message)

assert.Nil(t, err)
Expand Down
43 changes: 43 additions & 0 deletions pkg/wire/wire_gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 1211e73

Please sign in to comment.