Skip to content

Mock Db test framework Option A #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
zingales wants to merge 3 commits into from
Closed

Mock Db test framework Option A #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
07a25f8
refactor into Env/datastore format
Sep 16, 2018
26c2790
fixed small type issue
Sep 16, 2018
23e528c
login test
Sep 16, 2018
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
191 changes: 0 additions & 191 deletions databaseutil/databaseutil.go
View file
Open in desktop

This file was deleted.

28 changes: 18 additions & 10 deletions handlers/handlers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ import (

"github.com/atmiguel/cerealnotes/models"
"github.com/atmiguel/cerealnotes/paths"
"github.com/atmiguel/cerealnotes/services/noteservice"
"github.com/atmiguel/cerealnotes/services/userservice"
"github.com/dgrijalva/jwt-go"
)

Expand All @@ -28,12 +26,22 @@ type JwtTokenClaim struct {
jwt.StandardClaims
}

type Environment struct {
Db models.Datastore
}

var tokenSigningKey []byte

func SetTokenSigningKey(key []byte) {
tokenSigningKey = key
}

var environment *Environment

func SetEnvironment(env *Environment) {
environment = env
}

// UNAUTHENTICATED HANDLERS

// HandleLoginOrSignupPageRequest responds to unauthenticated GET requests with the login or signup page.
Expand Down Expand Up @@ -86,12 +94,12 @@ func HandleUserApiRequest(
}

var statusCode int
if err := userservice.StoreNewUser(
if err := environment.Db.StoreNewUser(
signupForm.DisplayName,
models.NewEmailAddress(signupForm.EmailAddress),
signupForm.Password,
); err != nil {
if err == userservice.EmailAddressAlreadyInUseError {
if err == models.EmailAddressAlreadyInUseError {
statusCode = http.StatusConflict
} else {
http.Error(responseWriter, err.Error(), http.StatusInternalServerError)
Expand Down Expand Up @@ -153,12 +161,12 @@ func HandleSessionApiRequest(
return
}

if err := userservice.AuthenticateUserCredentials(
if err := environment.Db.AuthenticateUserCredentials(
models.NewEmailAddress(loginForm.EmailAddress),
loginForm.Password,
); err != nil {
statusCode := http.StatusInternalServerError
if err == userservice.CredentialsNotAuthorizedError {
if err == models.CredentialsNotAuthorizedError {
statusCode = http.StatusUnauthorized
}
http.Error(responseWriter, err.Error(), statusCode)
Expand All @@ -167,7 +175,7 @@ func HandleSessionApiRequest(

// Set our cookie to have a valid JWT Token as the value
{
userId, err := userservice.GetIdForUserWithEmailAddress(models.NewEmailAddress(loginForm.EmailAddress))
userId, err := environment.Db.GetIdForUserWithEmailAddress(models.NewEmailAddress(loginForm.EmailAddress))
if err != nil {
http.Error(responseWriter, err.Error(), http.StatusInternalServerError)
return
Expand Down Expand Up @@ -224,7 +232,7 @@ func HandleNoteApiRequest(
switch request.Method {
case http.MethodGet:

var notesById noteservice.NoteMap = make(map[models.NoteId]*models.Note, 2)
var notesById models.NoteMap = make(map[models.NoteId]*models.Note, 2)

notesById[models.NoteId(1)] = &models.Note{
AuthorId: 1,
Expand Down Expand Up @@ -272,7 +280,7 @@ func HandleNoteApiRequest(
CreationTime: time.Now().UTC(),
}

noteId, err := noteservice.StoreNewNote(note)
noteId, err := environment.Db.StoreNewNote(note)
if err != nil {
http.Error(responseWriter, err.Error(), http.StatusInternalServerError)
return
Expand Down Expand Up @@ -313,7 +321,7 @@ func HandleCategoryApiRequest(
return
}

if err := noteservice.StoreNewNoteCategoryRelationship(models.NoteId(noteForm.NoteId), category); err != nil {
if err := environment.Db.StoreNewNoteCategoryRelationship(models.NoteId(noteForm.NoteId), category); err != nil {
http.Error(responseWriter, err.Error(), http.StatusInternalServerError)
return
}
Expand Down
Loading