diff --git a/id.go b/id.go index 4ebe2b3..3743385 100644 --- a/id.go +++ b/id.go @@ -5,5 +5,5 @@ type ID [16]byte // IDGenerator generates new IDs type IDGenerator interface { - New() ID + New() string } diff --git a/postgres/users.sql b/postgres/users.sql index d6eebc7..7af8ba4 100644 --- a/postgres/users.sql +++ b/postgres/users.sql @@ -1,5 +1,5 @@ CREATE TABLE users ( - id uuid, + id char(26), email text, name text, password text diff --git a/postgres/userservice.go b/postgres/userservice.go index 9d11926..8273540 100644 --- a/postgres/userservice.go +++ b/postgres/userservice.go @@ -12,7 +12,7 @@ type UserService struct { } // User returns a user for a given id. -func (s *UserService) User(id budgeteer.ID) (*budgeteer.User, error) { +func (s *UserService) User(id string) (*budgeteer.User, error) { u := &budgeteer.User{ID: id} err := s.DB.Select(&u) if err != nil { diff --git a/ulid/ulid.go b/ulid/ulid.go index 9f55c48..9888149 100644 --- a/ulid/ulid.go +++ b/ulid/ulid.go @@ -4,7 +4,6 @@ import ( "math/rand" "time" - "git.javil.eu/jacob1123/budgeteer" "github.com/oklog/ulid" ) @@ -22,7 +21,7 @@ func NewGenerator() (*UlidGenerator, error) { return ug, nil } -func (ug *UlidGenerator) New() budgeteer.ID { +func (ug *UlidGenerator) New() string { id := ulid.MustNew(ulid.Timestamp(time.Now()), ug.entropy) - return budgeteer.ID(id) + return id.String() } diff --git a/user.go b/user.go index 5bf20c3..8f9c1a8 100644 --- a/user.go +++ b/user.go @@ -2,7 +2,7 @@ package budgeteer // User struct contains Login information type User struct { - ID ID + ID string Email string Password string Name string @@ -10,7 +10,7 @@ type User struct { // UserService provides Methods for CRUD of Users type UserService interface { - User(id ID) (*User, error) + User(id string) (*User, error) UserByUsername(username string) (*User, error) //Users() ([]*User, error) CreateUser(u *User) error