tsk-24: Fixed tests (#25)

Closes #24

Reviewed-on: phoenix/textsender-api#25
Co-authored-by: phoenix <kundeng00@pm.me>
Co-committed-by: phoenix <kundeng00@pm.me>

internal/handler/contact_test.go

@@ -15,6 +15,7 @@ import (
 
 	"git.kundeng.us/phoenix/textsender-api/internal/db"
 	"git.kundeng.us/phoenix/textsender-api/internal/handler/endpoint"
+	"git.kundeng.us/phoenix/textsender-api/internal/store/mock"
 )
 
 type Request struct {
@@ -23,7 +24,7 @@ type Request struct {
 }
 
 func TestCreateContactWithMock(t *testing.T) {
-	mockstore := NewMockContactStore()
+	mockstore := mock.NewMockContactStore()
 	handler := NewContactHandler(mockstore)
 
 	testUserId := uuid.New()
@@ -47,7 +48,7 @@ func TestCreateContactWithMock(t *testing.T) {
 }
 
 func TestGetContactWithMock(t *testing.T) {
-	mockstore := NewMockContactStore()
+	mockstore := mock.NewMockContactStore()
 	testUserId := uuid.New()
 
 	testCon := contact.Contact{PhoneNumber: "+12335403383", UserId: testUserId}

internal/handler/message_test.go

@@ -13,6 +13,7 @@ import (
 	"github.com/stretchr/testify/assert"
 
 	"git.kundeng.us/phoenix/textsender-api/internal/handler/endpoint"
+	"git.kundeng.us/phoenix/textsender-api/internal/store/mock"
 )
 
 type CreateMessageRequest struct {
@@ -21,7 +22,7 @@ type CreateMessageRequest struct {
 }
 
 func TestCreateMessageWithMock(t *testing.T) {
-	mockStore := NewMockMessageStore()
+	mockStore := mock.NewMockMessageStore()
 	handler := NewMessageHandler(mockStore)
 
 	testUserId := uuid.New()
@@ -45,7 +46,7 @@ func TestCreateMessageWithMock(t *testing.T) {
 }
 
 func TestGetMessageWithMock(t *testing.T) {
-	mockstore := NewMockMessageStore()
+	mockstore := mock.NewMockMessageStore()
 	testUserId := uuid.New()
 
 	testCon := message.Message{Content: "Who is the one that benefits?", UserId: testUserId}

internal/handler/scheduled_message_event_test.go

@@ -15,6 +15,7 @@ import (
 	"github.com/stretchr/testify/assert"
 
 	"git.kundeng.us/phoenix/textsender-api/internal/handler/endpoint"
+	"git.kundeng.us/phoenix/textsender-api/internal/store/mock"
 )
 
 type CreateScheduledMessageEventRequest struct {
@@ -26,10 +27,11 @@ type CreateScheduledMessageEventRequest struct {
 func TestCreateScheduledMessageEventWithMock(t *testing.T) {
 	now := time.Now()
 
-	mockStore := NewMockScheduledMessageEventStore()
-	contactStore := NewMockContactStore()
-	messageStore := NewMockMessageStore()
-	schMsgStore := NewMockScheduledMessageStore()
+	mockStore := mock.NewMockScheduledMessageEventStore()
+	contactStore := mock.NewMockContactStore()
+	messageStore := mock.NewMockMessageStore()
+	schMsgStore := mock.NewMockScheduledMessageStore()
+
 	handler := NewScheduledMessageEventHandler(mockStore)
 
 	recipientId := uuid.New()
@@ -50,7 +52,7 @@ func TestCreateScheduledMessageEventWithMock(t *testing.T) {
 	schMsg := scheduling.ScheduledMessage{}
 	schMsg.Id = scheduledMessageId
 	schMsg.UserId = testUserId
-	schMsg.Scheduled = now.Add(20*time.Minute)
+	schMsg.Scheduled = now.Add(20 * time.Minute)
 
 	ctx := t.Context()
 

internal/handler/scheduled_message_test.go

@@ -13,6 +13,7 @@ import (
 	"github.com/stretchr/testify/assert"
 
 	"git.kundeng.us/phoenix/textsender-api/internal/handler/endpoint"
+	"git.kundeng.us/phoenix/textsender-api/internal/store/mock"
 )
 
 type CreateScheduledMessageRequest struct {
@@ -23,7 +24,7 @@ type CreateScheduledMessageRequest struct {
 
 func TestCreateScheduledMessageWithMock(t *testing.T) {
 	now := time.Now()
-	mockStore := NewMockScheduledMessageStore()
+	mockStore := mock.NewMockScheduledMessageStore()
 	handler := NewScheduledMessageHandler(mockStore)
 
 	testUserId := uuid.New()

internal/store/mock/mock_store.go

@@ -1,10 +1,11 @@
-package handler
+package mock
 
 import (
 	"context"
 	"errors"
 	"fmt"
 	"sync"
+	"time"
 
 	"github.com/google/uuid"
 
@@ -272,12 +273,12 @@ func (m *MockScheduledMessageEventStore) CreateScheduledMessageEvent(ctx context
 		event.Id = uuid.New()
 	}
 
-	if exists, err := m.Exists(ctx, event); err != nil {
-		return err
-	} else if exists {
+	key := ScheduledMessageEventKey{RecipientId: event.RecipientId, MessageId: event.MessageId, ScheduledMessageId: event.ScheduledMessageId}
+
+	if _, exists := m.ScheduledMessageEventsByKey[key]; exists {
 		return fmt.Errorf("Already exists")
 	} else {
-		key := ScheduledMessageEventKey{RecipientId: event.RecipientId, MessageId: event.MessageId, ScheduledMessageId: event.ScheduledMessageId}
+		event.Created = time.Now()
 		m.ScheduledMessageEvents[event.Id] = event
 		m.ScheduledMessageEventsByKey[key] = event
 		return nil