Skip to content
This repository has been archived by the owner on Dec 11, 2024. It is now read-only.

feat: replyToMessageの配列やめた #77

Merged
merged 3 commits into from
Apr 24, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 10 additions & 12 deletions server/adapter/presenter/message_presenter.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,15 @@ func (p *MessagePresenter) GenerateGetMessagesByChannelIDResponse(messages []*en
Messages: []*presenter.Message{},
}
for _, message := range messages {
replyToMessages := make([]*presenter.ReplyToMessage, 0)
for _, replyToMessage := range message.ReplyToMessage {
replyToMessages = append(replyToMessages, &presenter.ReplyToMessage{
ID: replyToMessage.ID,
User: &presenter.User{
ID: replyToMessage.User.ID,
Name: replyToMessage.User.Name,
ImageURL: replyToMessage.User.ImageURL,
},
Content: replyToMessage.Content,
})
replyToMessage := &presenter.ReplyToMessage{}
if len(message.ReplyToMessage) > 0 {
replyToMessage.ID = message.ReplyToMessage[0].ID
replyToMessage.User = &presenter.User{
ID: message.ReplyToMessage[0].User.ID,
Name: message.ReplyToMessage[0].User.Name,
ImageURL: message.ReplyToMessage[0].User.ImageURL,
}
replyToMessage.Content = message.ReplyToMessage[0].Content
}
messagesResponse.Messages = append(messagesResponse.Messages, &presenter.Message{
ID: message.ID,
Expand All @@ -36,7 +34,7 @@ func (p *MessagePresenter) GenerateGetMessagesByChannelIDResponse(messages []*en
ImageURL: message.User.ImageURL,
},
Content: message.Content,
ReplyToMessage: replyToMessages,
ReplyToMessage: replyToMessage,
CreatedAt: message.CreatedAt.String(),
UpdatedAt: message.UpdatedAt.String(),
})
Expand Down
12 changes: 6 additions & 6 deletions server/usecase/channel_interactor.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,16 @@ type IChannelInteractor interface {
}

type ChannelInteractor struct {
channelRepository repository.IChannelRepository
userRepository repository.IUserRepository
channelPresenter presenter.IChannelPresenter
channelRepository repository.IChannelRepository
userRepository repository.IUserRepository
channelPresenter presenter.IChannelPresenter
}

func NewChannelInteractor(channelRepository repository.IChannelRepository, userRepository repository.IUserRepository, channelPresenter presenter.IChannelPresenter) *ChannelInteractor {
return &ChannelInteractor{
channelRepository: channelRepository,
userRepository: userRepository,
channelPresenter: channelPresenter,
channelRepository: channelRepository,
userRepository: userRepository,
channelPresenter: channelPresenter,
}
}

Expand Down
17 changes: 3 additions & 14 deletions server/usecase/message_interactor_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ func TestMessageInteractor_Success_GetMessagesByChannelID(t *testing.T) {
ImageURL: "https://example.com/image.png",
},
Content: "Hello, World!",
ReplyToMessage: []*presenter.ReplyToMessage{},
ReplyToMessage: &presenter.ReplyToMessage{},
CreatedAt: "0001-01-01 00:00:00 +0000 UTC",
UpdatedAt: "0001-01-01 00:00:00 +0000 UTC",
},
Expand Down Expand Up @@ -324,18 +324,7 @@ func (m *mockMessagePresenter) GenerateGetMessagesByChannelIDResponse(messages [
Messages: []*presenter.Message{},
}
for _, message := range messages {
replyToMessages := make([]*presenter.ReplyToMessage, 0)
for _, replyToMessage := range message.ReplyToMessage {
replyToMessages = append(replyToMessages, &presenter.ReplyToMessage{
ID: replyToMessage.ID,
User: &presenter.User{
ID: replyToMessage.User.ID,
Name: replyToMessage.User.Name,
ImageURL: replyToMessage.User.ImageURL,
},
Content: replyToMessage.Content,
})
}
replyToMessage := &presenter.ReplyToMessage{}
messagesResponse.Messages = append(messagesResponse.Messages, &presenter.Message{
ID: message.ID,
User: &presenter.User{
Expand All @@ -344,7 +333,7 @@ func (m *mockMessagePresenter) GenerateGetMessagesByChannelIDResponse(messages [
ImageURL: message.User.ImageURL,
},
Content: message.Content,
ReplyToMessage: replyToMessages,
ReplyToMessage: replyToMessage,
CreatedAt: message.CreatedAt.String(),
UpdatedAt: message.UpdatedAt.String(),
})
Expand Down
2 changes: 1 addition & 1 deletion server/usecase/presenter/message_presenter.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ type Message struct {
ID string `json:"id"`
User *User `json:"user"`
Content string `json:"content"`
ReplyToMessage []*ReplyToMessage `json:"reply_to_message"`
ReplyToMessage *ReplyToMessage `json:"reply_to_message"`
CreatedAt string `json:"created_at"`
UpdatedAt string `json:"updated_at"`
}
Expand Down
Loading