Skip to content

Commit 9df7ce0

Browse files
ichiki-mfwichiki-mfw
authored
Merge pull request #24 from moneyforward/revert-20-change-message-ephemeral
Revert "Change message ephemeral"
2 parents 4f1f9c3 + a322c96 commit 9df7ce0

File tree

3 files changed

+24
-30
lines changed

3 files changed

+24
-30
lines changed

‎.goreleaser.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@ checksum:
3030
snapshot:
3131
name_template: "{{ .Tag }}-next"
3232
release:
33-
prerelease: auto
33+
prerelease: auto

‎app/internal/domain/service/slack_response.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,14 @@ const (
5757
// postEmailList method posts emailList using slack postMessageAPI.
5858
// The chunkedLines are generated and requested for each chunk,
5959
// because of considering the limit the number of characters of slackAPI.
60-
func (s *slackResponseService) postEmailList(ctx context.Context, channelID string, emails []*model.SlackUserEmail, ts string, userID string) error {
60+
func (s *slackResponseService) postEmailList(ctx context.Context, channelID string, emails []*model.SlackUserEmail, ts string) error {
6161
lines := append(make([]string, 0, len(emails)+1), "参加者一覧")
6262
for _, email := range emails {
6363
lines = append(lines, email.Email)
6464
}
6565
chunkedLines := slice.SplitStringSliceInChunks(lines, lineSizeOfPostEmailList)
6666
for _, chunkedLine := range chunkedLines {
67-
err := s.slackRepository.PostEphemeral(ctx, channelID, strings.Join(chunkedLine, "\n"), ts, userID)
67+
err := s.slackRepository.PostMessage(ctx, channelID, strings.Join(chunkedLine, "\n"), ts)
6868
if err != nil {
6969
return err
7070
}
@@ -79,10 +79,10 @@ func (s *slackResponseService) ReplyEmailList(ctx context.Context, event *slacke
7979
for _, email := range emails {
8080
b.WriteString("\n" + email.Email)
8181
}
82-
return s.slackRepository.PostEphemeral(ctx, event.Channel, b.String(), event.ThreadTimeStamp, event.User)
82+
return s.slackRepository.PostMessage(ctx, event.Channel, b.String(), event.ThreadTimeStamp)
8383
}
8484

85-
return s.postEmailList(ctx, event.Channel, emails, event.ThreadTimeStamp, event.User)
85+
return s.postEmailList(ctx, event.Channel, emails, event.ThreadTimeStamp)
8686
}
8787

8888
func (s *slackResponseService) ReplyError(ctx context.Context, event *slackevents.AppMentionEvent, err error) error {
@@ -95,8 +95,8 @@ func (s *slackResponseService) ReplyError(ctx context.Context, event *slackevent
9595
}
9696
if s.errorRepository.ErrUserNotFound(err) {
9797
msg += "参加者はいないようです:neko_namida:"
98-
return s.slackRepository.PostEphemeral(
99-
ctx, event.Channel, msg, event.ThreadTimeStamp, event.User,
98+
return s.slackRepository.PostMessage(
99+
ctx, event.Channel, msg, event.ThreadTimeStamp,
100100
)
101101
}
102102
return err

‎app/internal/domain/service/slack_response_test.go‎

Lines changed: 17 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ func Test_slackResponseService_postEmailList(t *testing.T) {
6262
emails []*model.SlackUserEmail
6363
cid string
6464
ts string
65-
userID string
6665
}
6766
tests := []struct {
6867
name string
@@ -76,12 +75,11 @@ func Test_slackResponseService_postEmailList(t *testing.T) {
7675
emails: createEmails(0, 1),
7776
ts: "ts",
7877
cid: "cid",
79-
userID: "sampleUser",
8078
},
8179
prepare: func(msr *mock_repository.MockSlackRepository) {
8280
gomock.InOrder(
83-
msr.EXPECT().PostEphemeral(
84-
gomock.Any(), "cid", createMessage("参加者一覧", createEmails(0, 1)), "ts", "sampleUser").
81+
msr.EXPECT().PostMessage(
82+
gomock.Any(), "cid", createMessage("参加者一覧", createEmails(0, 1)), "ts").
8583
Return(nil),
8684
)
8785
},
@@ -92,12 +90,11 @@ func Test_slackResponseService_postEmailList(t *testing.T) {
9290
emails: createEmails(0, lineSizeOfPostEmailList-1),
9391
ts: "ts",
9492
cid: "cid",
95-
userID: "sampleUser",
9693
},
9794
prepare: func(msr *mock_repository.MockSlackRepository) {
9895
gomock.InOrder(
99-
msr.EXPECT().PostEphemeral(
100-
gomock.Any(), "cid", createMessage("参加者一覧", createEmails(0, lineSizeOfPostEmailList-1)), "ts", "sampleUser").
96+
msr.EXPECT().PostMessage(
97+
gomock.Any(), "cid", createMessage("参加者一覧", createEmails(0, lineSizeOfPostEmailList-1)), "ts").
10198
Return(nil),
10299
)
103100
},
@@ -108,15 +105,14 @@ func Test_slackResponseService_postEmailList(t *testing.T) {
108105
emails: createEmails(0, lineSizeOfPostEmailList),
109106
ts: "ts",
110107
cid: "cid",
111-
userID: "sampleUser",
112108
},
113109
prepare: func(msr *mock_repository.MockSlackRepository) {
114110
gomock.InOrder(
115-
msr.EXPECT().PostEphemeral(
116-
gomock.Any(), "cid", createMessage("参加者一覧", createEmails(0, lineSizeOfPostEmailList-1)), "ts", "sampleUser").
111+
msr.EXPECT().PostMessage(
112+
gomock.Any(), "cid", createMessage("参加者一覧", createEmails(0, lineSizeOfPostEmailList-1)), "ts").
117113
Return(nil),
118-
msr.EXPECT().PostEphemeral(
119-
gomock.Any(), "cid", createMessage("", createEmails(lineSizeOfPostEmailList-1, 1)), "ts", "sampleUser").
114+
msr.EXPECT().PostMessage(
115+
gomock.Any(), "cid", createMessage("", createEmails(lineSizeOfPostEmailList-1, 1)), "ts").
120116
Return(nil),
121117
)
122118
},
@@ -136,7 +132,7 @@ func Test_slackResponseService_postEmailList(t *testing.T) {
136132
slackRepository: msr,
137133
errorRepository: mer,
138134
}
139-
if err := s.postEmailList(ctx, tt.args.cid, tt.args.emails, tt.args.ts, tt.args.userID); (err != nil) != tt.wantErr {
135+
if err := s.postEmailList(ctx, tt.args.cid, tt.args.emails, tt.args.ts); (err != nil) != tt.wantErr {
140136
t.Errorf("postEmailList() error = %v, wantErr %v", err, tt.wantErr)
141137
}
142138
})
@@ -160,17 +156,16 @@ func Test_slackErrorResponseService_ReplyEmailList(t *testing.T) {
160156
event: &slackevents.AppMentionEvent{
161157
Channel: "sampleChannel",
162158
ThreadTimeStamp: "sampleThreadTimeStamp",
163-
User: "sampleUser",
164159
},
165160
emails: []*model.SlackUserEmail{
166161
{Email: "sample01@example.com"},
167162
{Email: "sample02@example.com"},
168163
},
169164
},
170165
prepare: func(msr *mock_repository.MockSlackRepository) {
171-
msr.EXPECT().PostEphemeral(gomock.Any(), "sampleChannel",
166+
msr.EXPECT().PostMessage(gomock.Any(), "sampleChannel",
172167
"参加者一覧\nsample01@example.com\nsample02@example.com",
173-
"sampleThreadTimeStamp", "sampleUser").Return(nil)
168+
"sampleThreadTimeStamp").Return(nil)
174169
},
175170
},
176171
{
@@ -179,17 +174,16 @@ func Test_slackErrorResponseService_ReplyEmailList(t *testing.T) {
179174
event: &slackevents.AppMentionEvent{
180175
Channel: "sampleChannel",
181176
ThreadTimeStamp: "sampleThreadTimeStamp",
182-
User: "sampleUser",
183177
},
184178
emails: []*model.SlackUserEmail{
185179
{Email: "sample01@example.com"},
186180
{Email: "sample02@example.com"},
187181
},
188182
},
189183
prepare: func(msr *mock_repository.MockSlackRepository) {
190-
msr.EXPECT().PostEphemeral(gomock.Any(), "sampleChannel",
184+
msr.EXPECT().PostMessage(gomock.Any(), "sampleChannel",
191185
"参加者一覧\nsample01@example.com\nsample02@example.com",
192-
"sampleThreadTimeStamp", "sampleUser").Return(errors.New("sample error"))
186+
"sampleThreadTimeStamp").Return(errors.New("sample error"))
193187
},
194188
wantErr: true,
195189
},
@@ -258,9 +252,9 @@ func Test_slackErrorResponseService_ReplyError(t *testing.T) {
258252
gomock.InOrder(
259253
mer.EXPECT().ErrThreadNotFound(errors.New("user_not_found")).Return(false),
260254
mer.EXPECT().ErrUserNotFound(errors.New("user_not_found")).Return(true),
261-
msr.EXPECT().PostEphemeral(gomock.Any(), "sampleChannel",
255+
msr.EXPECT().PostMessage(gomock.Any(), "sampleChannel",
262256
"参加者はいないようです:neko_namida:",
263-
"sampleThreadTimeStamp", "sampleUser").Return(nil),
257+
"sampleThreadTimeStamp").Return(nil),
264258
)
265259
},
266260
},
@@ -298,9 +292,9 @@ func Test_slackErrorResponseService_ReplyError(t *testing.T) {
298292
gomock.InOrder(
299293
mer.EXPECT().ErrThreadNotFound(errors.New("user_not_found")).Return(false),
300294
mer.EXPECT().ErrUserNotFound(errors.New("user_not_found")).Return(true),
301-
msr.EXPECT().PostEphemeral(gomock.Any(), "sampleChannel",
295+
msr.EXPECT().PostMessage(gomock.Any(), "sampleChannel",
302296
"参加者はいないようです:neko_namida:",
303-
"sampleThreadTimeStamp", "sampleUser").Return(errors.New("sample_error")),
297+
"sampleThreadTimeStamp").Return(errors.New("sample_error")),
304298
)
305299
},
306300
wantErr: true,

0 commit comments

Comments
 (0)