diff --git a/conversation/repository_mock.go b/conversation/repository_mock.go index a13d179..e06857e 100644 --- a/conversation/repository_mock.go +++ b/conversation/repository_mock.go @@ -15,7 +15,7 @@ func NewMockRepo() *MockRepo { func (m *MockRepo) CheckForConversation(interviewID int) (bool, error) { if m.FailRepo { - return false, errors.New("Mocked DB failure") + return false, errors.New("mocked DB failure") } return true, nil @@ -23,7 +23,7 @@ func (m *MockRepo) CheckForConversation(interviewID int) (bool, error) { func (m *MockRepo) GetConversation(interviewID int) (*Conversation, error) { if m.FailRepo { - return nil, errors.New("Mocked DB failure") + return nil, errors.New("mocked DB failure") } conversationResponse := &Conversation{ @@ -70,7 +70,7 @@ func (m *MockRepo) GetConversation(interviewID int) (*Conversation, error) { func (m *MockRepo) CreateConversation(interviewId int, conversation *Conversation) (int, error) { if m.FailRepo { - return 0, errors.New("Mocked DB failure") + return 0, errors.New("mocked DB failure") } return 0, nil @@ -78,7 +78,7 @@ func (m *MockRepo) CreateConversation(interviewId int, conversation *Conversatio func (m *MockRepo) CreateQuestion(conversation *Conversation, prompt string) (int, error) { if m.FailRepo { - return 0, errors.New("Mocked DB failure") + return 0, errors.New("mocked DB failure") } return 1, nil @@ -86,7 +86,7 @@ func (m *MockRepo) CreateQuestion(conversation *Conversation, prompt string) (in func (m *MockRepo) CreateMessages(conversation *Conversation, messages []Message) error { if m.FailRepo { - return errors.New("Mocked DB failure") + return errors.New("mocked DB failure") } return nil @@ -94,7 +94,7 @@ func (m *MockRepo) CreateMessages(conversation *Conversation, messages []Message func (m *MockRepo) AddMessage(conversationID, topic_id, questionNumber int, message Message) (int, error) { if m.FailRepo { - return 0, errors.New("Mocked DB failure") + return 0, errors.New("mocked DB failure") } return 3, nil @@ -102,7 +102,7 @@ func (m *MockRepo) AddMessage(conversationID, topic_id, questionNumber int, mess func (m *MockRepo) AddQuestion(question *Question) (int, error) { if m.FailRepo { - return 0, errors.New("Mocked DB failure") + return 0, errors.New("mocked DB failure") } return 2, nil @@ -110,7 +110,7 @@ func (m *MockRepo) AddQuestion(question *Question) (int, error) { func (m *MockRepo) GetMessages(conversationID, topic_id, questionNumber int) ([]Message, error) { if m.FailRepo { - return nil, errors.New("Mocked DB failure") + return nil, errors.New("mocked DB failure") } var messages = []Message{} @@ -119,7 +119,7 @@ func (m *MockRepo) GetMessages(conversationID, topic_id, questionNumber int) ([] func (m *MockRepo) GetQuestions(Conversation *Conversation) ([]*Question, error) { if m.FailRepo { - return nil, errors.New("Mocked DB failure") + return nil, errors.New("mocked DB failure") } var questions = []*Question{} @@ -128,7 +128,7 @@ func (m *MockRepo) GetQuestions(Conversation *Conversation) ([]*Question, error) func (m *MockRepo) UpdateConversationCurrents(conversationID, currentQuestionNumber, topicID int, subtopic string) (int, error) { if m.FailRepo { - return 0, errors.New("Mocked DB failure") + return 0, errors.New("mocked DB failure") } return 1, nil diff --git a/interview/repository_mock.go b/interview/repository_mock.go index 4d090c5..ecd1c29 100644 --- a/interview/repository_mock.go +++ b/interview/repository_mock.go @@ -15,7 +15,7 @@ func NewMockRepo() *MockRepo { func (m *MockRepo) CreateInterview(interview *Interview) (int, error) { if m.FailRepo { - return 0, errors.New("Mocked DB failure") + return 0, errors.New("mocked DB failure") } return 1, nil @@ -23,7 +23,7 @@ func (m *MockRepo) CreateInterview(interview *Interview) (int, error) { func (m *MockRepo) GetInterview(interviewID int) (*Interview, error) { if m.FailRepo { - return nil, errors.New("Mocked DB failure") + return nil, errors.New("mocked DB failure") } interview := &Interview{ @@ -45,7 +45,7 @@ func (m *MockRepo) GetInterview(interviewID int) (*Interview, error) { func (m *MockRepo) GetInterviewSummariesByUserID(userID int) ([]Summary, error) { if m.FailRepo { - return nil, errors.New("Mocked DB failure") + return nil, errors.New("mocked DB failure") } var summaries []Summary @@ -63,7 +63,7 @@ func (m *MockRepo) GetInterviewSummariesByUserID(userID int) ([]Summary, error) func (m *MockRepo) UpdateScore(interviewID, pointsEarned int) error { if m.FailRepo { - return errors.New("Mocked DB failure") + return errors.New("mocked DB failure") } return nil @@ -71,7 +71,7 @@ func (m *MockRepo) UpdateScore(interviewID, pointsEarned int) error { func (m *MockRepo) UpdateStatus(interviewID, userID int, status string) error { if m.FailRepo { - return errors.New("Mocked DB failure") + return errors.New("mocked DB failure") } return nil @@ -79,7 +79,7 @@ func (m *MockRepo) UpdateStatus(interviewID, userID int, status string) error { func (m *MockRepo) LinkConversation(interviewID, conversationID int) error { if m.FailRepo { - return errors.New("Mocked DB failure") + return errors.New("mocked DB failure") } return nil @@ -87,7 +87,7 @@ func (m *MockRepo) LinkConversation(interviewID, conversationID int) error { func (m *MockRepo) UpdateCreatedInterview(interview *Interview) error { if m.FailRepo { - return errors.New("Mocked DB failure") + return errors.New("mocked DB failure") } return nil diff --git a/token/repository_mock.go b/token/repository_mock.go index 91cf0e4..0bb0b73 100644 --- a/token/repository_mock.go +++ b/token/repository_mock.go @@ -12,7 +12,7 @@ func NewMockRepo() *MockRepo { func (m *MockRepo) AddRefreshToken(token *RefreshToken) error { if m.failRepo { - return errors.New("Mocked DB failure") + return errors.New("mocked DB failure") } return nil @@ -20,11 +20,11 @@ func (m *MockRepo) AddRefreshToken(token *RefreshToken) error { func (m *MockRepo) GetStoredRefreshToken(userID int) (string, error) { if m.failRepo { - return "", errors.New("Mocked DB failure") + return "", errors.New("mocked DB failure") } if userID != 1 { - return "", errors.New("UserID does not exist") + return "", errors.New("userID does not exist") } return "abc123", nil @@ -32,7 +32,7 @@ func (m *MockRepo) GetStoredRefreshToken(userID int) (string, error) { func (m *MockRepo) DeleteRefreshToken(userID int) error { if m.failRepo { - return errors.New("Mocked DB failure") + return errors.New("mocked DB failure") } return nil diff --git a/user/model.go b/user/model.go index 1945dd7..bdaceed 100644 --- a/user/model.go +++ b/user/model.go @@ -53,5 +53,5 @@ type UserRepo interface { var ( ErrDuplicateEmail = errors.New("duplicate email") ErrDuplicateUser = errors.New("duplicate user") - ErrAccountDeleted = errors.New("Account is no longer active") + ErrAccountDeleted = errors.New("account is no longer active") ) diff --git a/user/repository_mock.go b/user/repository_mock.go index 6dc182a..b0dbbf0 100644 --- a/user/repository_mock.go +++ b/user/repository_mock.go @@ -33,7 +33,7 @@ func NewMockRepo() *MockRepo { func (m *MockRepo) CreateUser(user *User) (int, error) { if m.failRepo { - return 0, errors.New("Mocked DB failure") + return 0, errors.New("mocked DB failure") } return 1, nil @@ -41,7 +41,7 @@ func (m *MockRepo) CreateUser(user *User) (int, error) { func (m *MockRepo) MarkUserDeleted(userID int) error { if m.failRepo { - return errors.New("Mocked DB failure") + return errors.New("mocked DB failure") } return nil @@ -49,7 +49,7 @@ func (m *MockRepo) MarkUserDeleted(userID int) error { func (m *MockRepo) GetUser(userID int) (*User, error) { if m.failRepo { - return nil, errors.New("Mocked DB failure") + return nil, errors.New("mocked DB failure") } mockUser := &User{ @@ -65,7 +65,7 @@ func (m *MockRepo) GetUser(userID int) (*User, error) { func (m *MockRepo) GetPasswordandID(username string) (int, string, error) { if m.failRepo { - return 0, "", errors.New("Mocked DB failure") + return 0, "", errors.New("mocked DB failure") } return 1, string(PasswordHashed), nil @@ -73,10 +73,10 @@ func (m *MockRepo) GetPasswordandID(username string) (int, string, error) { func (m *MockRepo) GetUserByEmail(email string) (*User, error) { if m.FailGetUserByEmail { - return nil, errors.New("Mocked GetUserByEmail failure") + return nil, errors.New("mocked GetUserByEmail failure") } if m.failRepo { - return nil, errors.New("Mocked DB failure") + return nil, errors.New("mocked DB failure") } mockUser := &User{ @@ -91,7 +91,7 @@ func (m *MockRepo) GetUserByEmail(email string) (*User, error) { func (m *MockRepo) GetUserByCustomerID(customerID string) (*User, error) { if m.failRepo { - return nil, errors.New("Mocked DB failure") + return nil, errors.New("mocked DB failure") } mockUser := &User{ @@ -106,7 +106,7 @@ func (m *MockRepo) GetUserByCustomerID(customerID string) (*User, error) { func (m *MockRepo) UpdatePasswordByEmail(email string, password []byte) error { if m.failRepo { - return errors.New("Mocked DB failure") + return errors.New("mocked DB failure") } return nil @@ -114,10 +114,10 @@ func (m *MockRepo) UpdatePasswordByEmail(email string, password []byte) error { func (m *MockRepo) AddCredits(userID, credits int, creditType string) error { if m.FailAddCredits { - return errors.New("Mocked AddCredits failure") + return errors.New("mocked AddCredits failure") } if m.failRepo { - return errors.New("Mocked DB failure") + return errors.New("mocked DB failure") } return nil @@ -125,7 +125,7 @@ func (m *MockRepo) AddCredits(userID, credits int, creditType string) error { func (m *MockRepo) UpdateSubscriptionData(userID int, status, tier, subscriptionID string, startsAt, endsAt time.Time) error { if m.failRepo { - return errors.New("Mocked DB failure") + return errors.New("mocked DB failure") } return nil @@ -133,7 +133,7 @@ func (m *MockRepo) UpdateSubscriptionData(userID int, status, tier, subscription func (m *MockRepo) UpdateSubscriptionStatusData(userID int, status string) error { if m.failRepo { - return errors.New("Mocked DB failure") + return errors.New("mocked DB failure") } return nil @@ -141,7 +141,7 @@ func (m *MockRepo) UpdateSubscriptionStatusData(userID int, status string) error func (m *MockRepo) HasActiveOrCancelledSubscription(email string) (bool, error) { if m.failRepo { - return false, errors.New("Mocked DB failure") + return false, errors.New("mocked DB failure") } return true, nil diff --git a/user/service.go b/user/service.go index fe8be97..85a9583 100644 --- a/user/service.go +++ b/user/service.go @@ -173,7 +173,7 @@ func verifyResetToken(tokenString string) (string, error) { if claims, ok := token.Claims.(*jwt.RegisteredClaims); ok && token.Valid { return claims.Subject, nil } else { - return "", errors.New("Invalid token") + return "", errors.New("invalid token") } }