tsk-57: Change schema of scheduled_message_events (#65)
Closes #57 Reviewed-on: phoenix/textsender-api#65 Co-authored-by: phoenix <kundeng00@pm.me> Co-committed-by: phoenix <kundeng00@pm.me>
This commit is contained in:
@@ -9,8 +9,6 @@ import (
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"git.kundeng.us/phoenix/textsender-models/tx0/contact"
|
||||
"git.kundeng.us/phoenix/textsender-models/tx0/message"
|
||||
"git.kundeng.us/phoenix/textsender-models/tx0/message/scheduling"
|
||||
"github.com/google/uuid"
|
||||
"github.com/stretchr/testify/assert"
|
||||
@@ -20,14 +18,14 @@ import (
|
||||
)
|
||||
|
||||
var (
|
||||
recipientId = uuid.New()
|
||||
contactId = uuid.New()
|
||||
messageId = uuid.New()
|
||||
scheduledMessageId = uuid.New()
|
||||
testUserId = uuid.New()
|
||||
)
|
||||
|
||||
type CreateScheduledMessageEventRequest struct {
|
||||
RecipientId uuid.UUID `json:"recipient_id"`
|
||||
ContactId uuid.UUID `json:"recipient_id"`
|
||||
MessageId uuid.UUID `json:"message_id"`
|
||||
ScheduledMessageId uuid.UUID `json:"scheduled_message_id"`
|
||||
}
|
||||
@@ -44,14 +42,14 @@ func TestCreateScheduledMessageEventWithMock(t *testing.T) {
|
||||
assert.NoError(t, err, "Error getting app")
|
||||
handler := NewScheduledMessageEventHandler(apiApp, mockStore, schMsgStore)
|
||||
|
||||
recipientId := uuid.New()
|
||||
contactId := uuid.New()
|
||||
messageId := uuid.New()
|
||||
scheduledMessageId := uuid.New()
|
||||
testUserId := uuid.New()
|
||||
|
||||
con := testContact(recipientId, testUserId)
|
||||
msg := testMessage(messageId, testUserId)
|
||||
schMsg := testScheduledMessage(scheduledMessageId, testUserId, now)
|
||||
con := TestContact(contactId, testUserId)
|
||||
msg := TestMessage(messageId, testUserId)
|
||||
schMsg := TestScheduledMessage(scheduledMessageId, testUserId, now)
|
||||
|
||||
ctx := t.Context()
|
||||
|
||||
@@ -63,7 +61,7 @@ func TestCreateScheduledMessageEventWithMock(t *testing.T) {
|
||||
assert.NoError(t, err, "Error creating scheduled message: %v", err)
|
||||
}
|
||||
|
||||
testReq := CreateScheduledMessageEventRequest{RecipientId: recipientId, MessageId: messageId, ScheduledMessageId: scheduledMessageId}
|
||||
testReq := CreateScheduledMessageEventRequest{ContactId: contactId, MessageId: messageId, ScheduledMessageId: scheduledMessageId}
|
||||
jsonValue, _ := json.Marshal(testReq)
|
||||
|
||||
req, _ := http.NewRequest("POST", endpoint.AddEventToScheduledMessageEndpoint, strings.NewReader(string(jsonValue)))
|
||||
@@ -96,15 +94,15 @@ func TestGetScheduledMessageEventWithMock(t *testing.T) {
|
||||
assert.NoError(t, err, "Error getting app")
|
||||
handler := NewScheduledMessageEventHandler(apiApp, schMsgEventStore, schMsgStore)
|
||||
|
||||
recipientId := uuid.New()
|
||||
contactId := uuid.New()
|
||||
messageId := uuid.New()
|
||||
scheduledMessageId := uuid.New()
|
||||
testUserId := uuid.New()
|
||||
|
||||
con := testContact(recipientId, testUserId)
|
||||
msg := testMessage(messageId, testUserId)
|
||||
schMsg := testScheduledMessage(scheduledMessageId, testUserId, now)
|
||||
event := testScheduledMessageEvent(msg.Id, *con.Id, schMsg.Id)
|
||||
con := TestContact(contactId, testUserId)
|
||||
msg := TestMessage(messageId, testUserId)
|
||||
schMsg := TestScheduledMessage(scheduledMessageId, testUserId, now)
|
||||
event := TestScheduledMessageEvent(msg.Id, *con.Id, schMsg.Id)
|
||||
|
||||
ctx := t.Context()
|
||||
|
||||
@@ -147,10 +145,10 @@ func TestDeleteScheduledMessageEventWithMock(t *testing.T) {
|
||||
assert.NoError(t, err, "Error getting app")
|
||||
handler := NewScheduledMessageEventHandler(apiApp, schMsgEventStore, schMsgStore)
|
||||
|
||||
con := testContact(recipientId, testUserId)
|
||||
msg := testMessage(messageId, testUserId)
|
||||
schMsg := testScheduledMessage(scheduledMessageId, testUserId, now)
|
||||
event := testScheduledMessageEvent(msg.Id, *con.Id, schMsg.Id)
|
||||
con := TestContact(contactId, testUserId)
|
||||
msg := TestMessage(messageId, testUserId)
|
||||
schMsg := TestScheduledMessage(scheduledMessageId, testUserId, now)
|
||||
event := TestScheduledMessageEvent(msg.Id, *con.Id, schMsg.Id)
|
||||
|
||||
ctx := t.Context()
|
||||
|
||||
@@ -182,32 +180,3 @@ func TestDeleteScheduledMessageEventWithMock(t *testing.T) {
|
||||
|
||||
assert.NotEmpty(t, msgEvent.Created, "Created date should not be empty")
|
||||
}
|
||||
|
||||
func testContact(id uuid.UUID, userId uuid.UUID) contact.Contact {
|
||||
if id == uuid.Nil {
|
||||
id = uuid.New()
|
||||
return contact.Contact{Id: &id, PhoneNumber: "+10123456789", UserId: &userId}
|
||||
} else {
|
||||
return contact.Contact{Id: &id, PhoneNumber: "+10123456789", UserId: &userId}
|
||||
}
|
||||
}
|
||||
|
||||
func testMessage(id uuid.UUID, userId uuid.UUID) message.Message {
|
||||
if id == uuid.Nil {
|
||||
return message.Message{Id: uuid.New(), Content: "Oh how the mighty have fallen", UserId: userId}
|
||||
} else {
|
||||
return message.Message{Id: id, Content: "Oh how the mighty have fallen", UserId: userId}
|
||||
}
|
||||
}
|
||||
|
||||
func testScheduledMessage(id uuid.UUID, userId uuid.UUID, now time.Time) scheduling.ScheduledMessage {
|
||||
if id == uuid.Nil {
|
||||
return scheduling.ScheduledMessage{Id: uuid.New(), UserId: userId, Scheduled: now.Add(20 * time.Minute), Status: scheduling.Pending}
|
||||
} else {
|
||||
return scheduling.ScheduledMessage{Id: id, UserId: userId, Scheduled: now.Add(20 * time.Minute), Status: scheduling.Pending}
|
||||
}
|
||||
}
|
||||
|
||||
func testScheduledMessageEvent(messageId, recipientId, scheduledMessageId uuid.UUID) scheduling.ScheduledMessageEvent {
|
||||
return scheduling.ScheduledMessageEvent{MessageId: messageId, RecipientId: recipientId, ScheduledMessageId: scheduledMessageId}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user