Skip to content

Commit 5fadf6f

Browse files
AchoArnoldAchoArnold
committed
Rename from/to to owner and contact
1 parent e59b97e commit 5fadf6f

15 files changed

Lines changed: 73 additions & 75 deletions

‎api/pkg/entities/message.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ const (
4848
// Message represents a message sent between 2 phone numbers
4949
type Message struct {
5050
ID uuid.UUID `json:"id" gorm:"primaryKey;type:uuid;" example:"32343a19-da5e-4b1b-a767-3298a73703cb"`
51-
From string `json:"from" gorm:"index:idx_messages_from__to" example:"+18005550199"`
52-
To string `json:"to" gorm:"index:idx_messages_from__to" example:"+18005550100"`
51+
Owner string `json:"owner" gorm:"index:idx_messages_owner__contact" example:"+18005550199"`
52+
Contact string `json:"contact" gorm:"index:idx_messages_owner__contact" example:"+18005550100"`
5353
Content string `json:"content" example:"This is a sample text message"`
5454
Type MessageType `json:"type" example:"mobile-terminated"`
5555
Status MessageStatus `json:"status" gorm:"index:idx_messages_status" example:"pending"`

‎api/pkg/events/message_api_sent_event.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ const EventTypeMessageAPISent = "message.api.sent"
1212
// MessageAPISentPayload is the payload of the EventTypeMessageSent event
1313
type MessageAPISentPayload struct {
1414
ID uuid.UUID `json:"id"`
15-
From string `json:"from"`
16-
To string `json:"to"`
15+
Owner string `json:"owner"`
16+
Contact string `json:"contact"`
1717
RequestReceivedAt time.Time `json:"request_received_at"`
1818
Content string `json:"content"`
1919
}

‎api/pkg/events/message_phone_received_event.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ const EventTypeMessagePhoneReceived = "message.phone.received"
1212
// MessagePhoneReceivedPayload is the payload of the EventTypeMessagePhoneReceived event
1313
type MessagePhoneReceivedPayload struct {
1414
ID uuid.UUID `json:"id"`
15-
From string `json:"from"`
16-
To string `json:"to"`
15+
Owner string `json:"owner"`
16+
Contact string `json:"contact"`
1717
Timestamp time.Time `json:"timestamp"`
1818
Content string `json:"content"`
1919
}

‎api/pkg/events/message_phone_sending_event.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const EventTypeMessagePhoneSending = "message.phone.sending"
1010
// MessagePhoneSendingPayload is the payload of the EventTypeMessageSent event
1111
type MessagePhoneSendingPayload struct {
1212
ID uuid.UUID `json:"id"`
13-
From string `json:"from"`
14-
To string `json:"to"`
13+
Owner string `json:"owner"`
14+
Contact string `json:"contact"`
1515
Content string `json:"content"`
1616
}

‎api/pkg/events/message_phone_sent_event.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ const EventTypeMessagePhoneSent = "message.phone.sent"
1212
// MessagePhoneSentPayload is the payload of the EventTypeMessagePhoneSent event
1313
type MessagePhoneSentPayload struct {
1414
ID uuid.UUID `json:"id"`
15-
From string `json:"from"`
16-
To string `json:"to"`
15+
Owner string `json:"owner"`
16+
Contact string `json:"contact"`
1717
Timestamp time.Time `json:"timestamp"`
1818
Content string `json:"content"`
1919
}

‎api/pkg/handlers/message_handler.go‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ func NewMessageHandler(
4242
// RegisterRoutes registers the routes for the MessageHandler
4343
func (h *MessageHandler) RegisterRoutes(router fiber.Router) {
4444
router.Post("/messages/send", h.PostSend)
45+
router.Post("/messages/receive", h.PostReceive)
4546
router.Get("/messages/outstanding", h.GetOutstanding)
4647
router.Get("/messages", h.Index)
4748
router.Post("/messages/:messageID/events", h.PostEvent)
@@ -135,15 +136,15 @@ func (h *MessageHandler) GetOutstanding(c *fiber.Ctx) error {
135136
// @Tags Messages
136137
// @Accept json
137138
// @Produce json
138-
// @Param from query string true "from phone number" default(+18005550199)
139-
// @Param to query string true "to phone number" default(+18005550100)
140-
// @Param skip query int false "number of messages to skip" minimum(0)
141-
// @Param query query string false "filter messages containing query"
142-
// @Param limit query int false "number of messages to return" minimum(1) maximum(20)
143-
// @Success 200 {object} responses.MessagesResponse
144-
// @Failure 400 {object} responses.BadRequest
145-
// @Failure 422 {object} responses.UnprocessableEntity
146-
// @Failure 500 {object} responses.InternalServerError
139+
// @Param owner query string true "the owner's phone number" default(+18005550199)
140+
// @Param contact query string true "the contact's phone number" default(+18005550100)
141+
// @Param skip query int false "number of messages to skip" minimum(0)
142+
// @Param query query string false "filter messages containing query"
143+
// @Param limit query int false "number of messages to return" minimum(1) maximum(20)
144+
// @Success 200 {object} responses.MessagesResponse
145+
// @Failure 400 {object} responses.BadRequest
146+
// @Failure 422 {object} responses.UnprocessableEntity
147+
// @Failure 500 {object} responses.InternalServerError
147148
// @Router /messages [get]
148149
func (h *MessageHandler) Index(c *fiber.Ctx) error {
149150
ctx, span := h.tracer.StartFromFiberCtx(c)

‎api/pkg/listeners/message_listener.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ func (listener *MessageListener) OnMessageAPISent(ctx context.Context, event clo
6969
}
7070

7171
storeParams := services.MessageStoreParams{
72-
From: payload.From,
73-
To: payload.To,
72+
Owner: payload.Owner,
73+
Contact: payload.Contact,
7474
Content: payload.Content,
7575
ID: payload.ID,
7676
Timestamp: payload.RequestReceivedAt,
@@ -176,18 +176,18 @@ func (listener *MessageListener) OnMessagePhoneReceived(ctx context.Context, eve
176176
return nil
177177
}
178178

179-
var payload events.MessageAPISentPayload
179+
var payload events.MessagePhoneReceivedPayload
180180
if err = event.DataAs(&payload); err != nil {
181181
msg := fmt.Sprintf("cannot decode [%s] into [%T]", event.Data(), payload)
182182
return listener.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
183183
}
184184

185185
storeParams := services.MessageStoreParams{
186-
From: payload.From,
187-
To: payload.To,
186+
Owner: payload.Owner,
187+
Contact: payload.Contact,
188188
Content: payload.Content,
189189
ID: payload.ID,
190-
Timestamp: payload.RequestReceivedAt,
190+
Timestamp: payload.Timestamp,
191191
}
192192

193193
if _, err = listener.service.StoreReceivedMessage(ctx, storeParams); err != nil {

‎api/pkg/listeners/message_thread_listener.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ func (listener *MessageThreadListener) OnMessageAPISent(ctx context.Context, eve
5656
}
5757

5858
updateParams := services.MessageThreadUpdateParams{
59-
Owner: payload.From,
60-
Contact: payload.To,
59+
Owner: payload.Owner,
60+
Contact: payload.Contact,
6161
Timestamp: payload.RequestReceivedAt,
6262
Content: payload.Content,
6363
MessageID: payload.ID,
@@ -83,8 +83,8 @@ func (listener *MessageThreadListener) OnMessagePhoneSending(ctx context.Context
8383
}
8484

8585
updateParams := services.MessageThreadUpdateParams{
86-
Owner: payload.From,
87-
Contact: payload.To,
86+
Owner: payload.Owner,
87+
Contact: payload.Contact,
8888
Timestamp: event.Time(),
8989
Content: payload.Content,
9090
MessageID: payload.ID,
@@ -110,8 +110,8 @@ func (listener *MessageThreadListener) OnMessagePhoneSent(ctx context.Context, e
110110
}
111111

112112
updateParams := services.MessageThreadUpdateParams{
113-
Owner: payload.From,
114-
Contact: payload.To,
113+
Owner: payload.Owner,
114+
Contact: payload.Contact,
115115
Timestamp: payload.Timestamp,
116116
Content: payload.Content,
117117
MessageID: payload.ID,
@@ -137,8 +137,8 @@ func (listener *MessageThreadListener) OnMessagePhoneReceived(ctx context.Contex
137137
}
138138

139139
updateParams := services.MessageThreadUpdateParams{
140-
Owner: payload.To,
141-
Contact: payload.From,
140+
Owner: payload.Contact,
141+
Contact: payload.Owner,
142142
Timestamp: event.Time(),
143143
Content: payload.Content,
144144
MessageID: payload.ID,

‎api/pkg/repositories/gorm_message_repository.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,19 +36,19 @@ func NewGormMessageRepository(
3636
}
3737

3838
// Index entities.Message between 2 parties
39-
func (repository *gormMessageRepository) Index(ctx context.Context, from string, to string, params IndexParams) (*[]entities.Message, error) {
39+
func (repository *gormMessageRepository) Index(ctx context.Context, owner string, contact string, params IndexParams) (*[]entities.Message, error) {
4040
ctx, span := repository.tracer.Start(ctx)
4141
defer span.End()
4242

43-
query := repository.db.Where("\"from\" = ?", from).Where("\"to\" = ?", to)
43+
query := repository.db.Where("owner = ?", owner).Where("contact = ?", contact)
4444
if len(params.Query) > 0 {
4545
queryPattern := "%" + params.Query + "%"
46-
query = query.Where("content ILIKE ?", queryPattern)
46+
query.Where("content ILIKE ?", queryPattern)
4747
}
4848

4949
messages := new([]entities.Message)
5050
if err := query.Order("order_timestamp DESC").Limit(params.Limit).Offset(params.Skip).Find(&messages).Error; err != nil {
51-
msg := fmt.Sprintf("cannot fetch messges from [%s] to [%s] and params [%+#v]", from, to, params)
51+
msg := fmt.Sprintf("cannot fetch messges with owner [%s] and contact [%s] and params [%+#v]", owner, contact, params)
5252
return nil, repository.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
5353
}
5454

‎api/pkg/repositories/message_repository.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ type MessageRepository interface {
1919
Load(ctx context.Context, messageID uuid.UUID) (*entities.Message, error)
2020

2121
// Index entities.Message between 2 phone numbers
22-
Index(ctx context.Context, from string, to string, params IndexParams) (*[]entities.Message, error)
22+
Index(ctx context.Context, owner string, contact string, params IndexParams) (*[]entities.Message, error)
2323

2424
// GetOutstanding fetches list of outstanding []entities.Message
2525
GetOutstanding(ctx context.Context, limit int) (*[]entities.Message, error)

0 commit comments

Comments
 (0)