Skip to content

Refactored project structure #6

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.

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

Merged
merged 4 commits into from
Jan 20, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
11 changes: 11 additions & 0 deletions internal/criteria/criteria.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package criteria

// CoStyle ..
type CoStyle int

const (
Team CoStyle = iota + 1
Pair
Mob
)

17 changes: 17 additions & 0 deletions internal/filter/filter.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
package filter

import (
"github.com/clean-code-projects/co-coders-api/internal/criteria"
"github.com/clean-code-projects/co-coders-api/internal/user"
)

// OnCoStyle ..
func OnCoStyle(users []user.User, coStyle criteria.CoStyle) (matchedUsers []user.User) {
matchedUsers = []user.User{}
for _, aUser := range users {
if aUser.HasCoStyle(coStyle) {
matchedUsers = append(matchedUsers, aUser)
}
}
return matchedUsers
}
41 changes: 41 additions & 0 deletions internal/filter/filter_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
package filter_test

import (
"github.com/clean-code-projects/co-coders-api/internal/criteria"
"github.com/clean-code-projects/co-coders-api/internal/filter"
"github.com/clean-code-projects/co-coders-api/internal/user"
"github.com/clean-code-projects/co-coders-api/pkg/assert"

"testing"
)

func TestFilterOnCoStyleReturnsEmpty(t *testing.T) {
style := criteria.Team
actual := filter.OnCoStyle([]user.User{}, style)
assert.Equals(t, []user.User{}, actual)
}

func TestFilterOnCoStyleReturnsNoMatch(t *testing.T) {
aUser := user.New([]criteria.CoStyle{criteria.Team})
users := []user.User{aUser}
style := criteria.Mob
actual := filter.OnCoStyle(users, style)
assert.Equals(t, []user.User{}, actual)
}

func TestFilterOnCoStyleReturnsAMatch(t *testing.T) {
aUser := user.New([]criteria.CoStyle{criteria.Team})
users := []user.User{aUser}
style := criteria.Team
actual := filter.OnCoStyle(users, style)
assert.Equals(t, []user.User{aUser}, actual)
}

func TestFilterOnCoStyleSubsetReturnsAMatch(t *testing.T) {
aUser := user.New([]criteria.CoStyle{criteria.Team, criteria.Pair})
users := []user.User{aUser}
criterion := criteria.Team
actual := filter.OnCoStyle(users, criterion)
assert.Equals(t, []user.User{aUser}, actual)
}

23 changes: 23 additions & 0 deletions internal/user/user.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package user

import "github.com/clean-code-projects/co-coders-api/internal/criteria"

// User ..
type User struct {
CoStyles []criteria.CoStyle
}

// HasCoStyle ..
func (u User) HasCoStyle(coStyle criteria.CoStyle) bool {
for _, style := range u.CoStyles {
if style == coStyle {
return true
}
}
return false
}

// New ..
func New(coStyles []criteria.CoStyle) User {
return User{CoStyles:coStyles}
}
79 changes: 0 additions & 79 deletions match_test.go

This file was deleted.

12 changes: 12 additions & 0 deletions pkg/assert/assert.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package assert

import (
"reflect"
"testing"
)

func Equals(t *testing.T, expected interface{}, actual interface{}) {
if !reflect.DeepEqual(expected, actual) {
t.Errorf("%+v is not equal to %+v", expected, actual)
}
}