Use string instead of ID type
This commit is contained in:
2
id.go
2
id.go
@ -5,5 +5,5 @@ type ID [16]byte
|
|||||||
|
|
||||||
// IDGenerator generates new IDs
|
// IDGenerator generates new IDs
|
||||||
type IDGenerator interface {
|
type IDGenerator interface {
|
||||||
New() ID
|
New() string
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
CREATE TABLE users (
|
CREATE TABLE users (
|
||||||
id uuid,
|
id char(26),
|
||||||
email text,
|
email text,
|
||||||
name text,
|
name text,
|
||||||
password text
|
password text
|
||||||
|
@ -12,7 +12,7 @@ type UserService struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// User returns a user for a given id.
|
// 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}
|
u := &budgeteer.User{ID: id}
|
||||||
err := s.DB.Select(&u)
|
err := s.DB.Select(&u)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -4,7 +4,6 @@ import (
|
|||||||
"math/rand"
|
"math/rand"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"git.javil.eu/jacob1123/budgeteer"
|
|
||||||
"github.com/oklog/ulid"
|
"github.com/oklog/ulid"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -22,7 +21,7 @@ func NewGenerator() (*UlidGenerator, error) {
|
|||||||
return ug, nil
|
return ug, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (ug *UlidGenerator) New() budgeteer.ID {
|
func (ug *UlidGenerator) New() string {
|
||||||
id := ulid.MustNew(ulid.Timestamp(time.Now()), ug.entropy)
|
id := ulid.MustNew(ulid.Timestamp(time.Now()), ug.entropy)
|
||||||
return budgeteer.ID(id)
|
return id.String()
|
||||||
}
|
}
|
||||||
|
4
user.go
4
user.go
@ -2,7 +2,7 @@ package budgeteer
|
|||||||
|
|
||||||
// User struct contains Login information
|
// User struct contains Login information
|
||||||
type User struct {
|
type User struct {
|
||||||
ID ID
|
ID string
|
||||||
Email string
|
Email string
|
||||||
Password string
|
Password string
|
||||||
Name string
|
Name string
|
||||||
@ -10,7 +10,7 @@ type User struct {
|
|||||||
|
|
||||||
// UserService provides Methods for CRUD of Users
|
// UserService provides Methods for CRUD of Users
|
||||||
type UserService interface {
|
type UserService interface {
|
||||||
User(id ID) (*User, error)
|
User(id string) (*User, error)
|
||||||
UserByUsername(username string) (*User, error)
|
UserByUsername(username string) (*User, error)
|
||||||
//Users() ([]*User, error)
|
//Users() ([]*User, error)
|
||||||
CreateUser(u *User) error
|
CreateUser(u *User) error
|
||||||
|
Reference in New Issue
Block a user