change model

moneyforward · Oct 26, 2022 · 227b344 · 227b344
1 parent 31ab33e
commit 227b344
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/app/internal/domain/service/slack_reaction_users.go b/app/internal/domain/service/slack_reaction_users.go
@@ -53,9 +53,9 @@ func (s *slackReactionUsersService) ListUsersEmailByReaction(ctx context.Context
 }
 
 // getReactionUserIDs get reaction users by reactionName
-func (s *slackReactionUsersService) getReactionUserIDs(ctx context.Context, reactions []*model.SlackReactions, reactionName string) []string {
+func (s *slackReactionUsersService) getReactionUserIDs(ctx context.Context, reactions []*model.SlackReaction, reactionName string) []string {
 	var userIDs []string
-	var targetReaction *model.SlackReactions
+	var targetReaction *model.SlackReaction
 	for _, reaction := range reactions {
 		for _, st := range model.ReactionSkinTones {
 			if reaction.Name == reactionName+st {

diff --git a/app/internal/domain/service/slack_reaction_users_test.go b/app/internal/domain/service/slack_reaction_users_test.go
@@ -37,7 +37,7 @@ func Test_slackReactionUsersService_ListUsersEmailByReaction(t *testing.T) {
 	}
 	sampleMessage := &model.SlackMessage{
 		ChannelID: "sampleCID",
-		Reactions: []*model.SlackReactions{
+		Reactions: []*model.SlackReaction{
 			{
 				Name:    "join",
 				UserIDs: []string{"user01", "user02"},
@@ -130,10 +130,10 @@ func Test_slackReactionUsersService_ListUsersEmailByReaction(t *testing.T) {
 
 func Test_slackReactionUsersService_getReactionUserIDs(t *testing.T) {
 	type args struct {
-		reactions    []*model.SlackReactions
+		reactions    []*model.SlackReaction
 		reactionName string
 	}
-	slackReactions := []*model.SlackReactions{
+	slackReactions := []*model.SlackReaction{
 		{
 			Name:    "join",
 			UserIDs: []string{"user01", "user02"},

diff --git a/app/internal/model/skin_colors.go b/app/internal/model/skin_colors.go
@@ -20,9 +20,9 @@ package model
 // A reaction with skin-tone can be expressed by combining the following array elements with the reaction specified by the user
 var ReactionSkinTones []string = []string{
 	"", // this value is used to express reactions without skin-tone
-	":skin-tone-2:",
-	":skin-tone-3:",
-	":skin-tone-4:",
-	":skin-tone-5:",
-	":skin-tone-6:",
+	"skin-tone-2",
+	"skin-tone-3",
+	"skin-tone-4",
+	"skin-tone-5",
+	"skin-tone-6",
 }
diff --git a/app/internal/model/slack_message.go b/app/internal/model/slack_message.go
@@ -18,10 +18,10 @@ package model
 
 type SlackMessage struct {
 	ChannelID string
-	Reactions []*SlackReactions
+	Reactions []*SlackReaction
 }
 
-type SlackReactions struct {
+type SlackReaction struct {
 	Name    string
 	UserIDs []string
 }

diff --git a/app/internal/repository/slack.go b/app/internal/repository/slack.go
@@ -59,9 +59,9 @@ func (r *slackRepository) GetParentMessage(ctx context.Context, channelID, ts st
 	if len(msgs) > 0 {
 		fmt.Printf("%#v \n", msgs[0])
 		parentMessage := msgs[0]
-		var reactions []*model.SlackReactions
+		var reactions []*model.SlackReaction
 		for _, reaction := range parentMessage.Reactions {
-			reactions = append(reactions, &model.SlackReactions{
+			reactions = append(reactions, &model.SlackReaction{
 				Name:    reaction.Name,
 				UserIDs: reaction.Users,
 			})