From ab521639d41c22e2010ec84c374b7690e782d4d5 Mon Sep 17 00:00:00 2001 From: Janos Dobronszki Date: Tue, 27 Oct 2020 11:45:53 +0100 Subject: [PATCH] Rename users service dao -> domain (#20) --- users/{dao/dao.go => domain/domain.go} | 60 +++++++++++++------------- users/handler/handler.go | 30 ++++++------- 2 files changed, 45 insertions(+), 45 deletions(-) rename users/{dao/dao.go => domain/domain.go} (60%) diff --git a/users/dao/dao.go b/users/domain/domain.go similarity index 60% rename from users/dao/dao.go rename to users/domain/domain.go index 4ecf03f..b522e14 100644 --- a/users/dao/dao.go +++ b/users/domain/domain.go @@ -1,4 +1,4 @@ -package dao +package domain import ( "errors" @@ -15,7 +15,7 @@ type pw struct { Salt string `json:"salt"` } -type Dao struct { +type Domain struct { users model.Table sessions model.Table passwords model.Table @@ -25,7 +25,7 @@ type Dao struct { idIndex model.Index } -func New() *Dao { +func New() *Domain { nameIndex := model.ByEquality("username") nameIndex.Unique = true nameIndex.Order.Type = model.OrderTypeUnordered @@ -39,7 +39,7 @@ func New() *Dao { idIndex := model.ByEquality("id") idIndex.Order.Type = model.OrderTypeUnordered - return &Dao{ + return &Domain{ users: model.NewTable(store.DefaultStore, "users", model.Indexes(nameIndex, emailIndex), nil), sessions: model.NewTable(store.DefaultStore, "sessions", nil, nil), passwords: model.NewTable(store.DefaultStore, "passwords", nil, nil), @@ -49,7 +49,7 @@ func New() *Dao { } } -func (dao *Dao) CreateSession(sess *user.Session) error { +func (domain *Domain) CreateSession(sess *user.Session) error { if sess.Created == 0 { sess.Created = time.Now().Unix() } @@ -58,81 +58,81 @@ func (dao *Dao) CreateSession(sess *user.Session) error { sess.Expires = time.Now().Add(time.Hour * 24 * 7).Unix() } - return dao.sessions.Save(sess) + return domain.sessions.Save(sess) } -func (dao *Dao) DeleteSession(id string) error { - return dao.sessions.Delete(dao.idIndex.ToQuery(id)) +func (domain *Domain) DeleteSession(id string) error { + return domain.sessions.Delete(domain.idIndex.ToQuery(id)) } -func (dao *Dao) ReadSession(id string) (*user.Session, error) { +func (domain *Domain) ReadSession(id string) (*user.Session, error) { sess := &user.Session{} // @todo there should be a Read in the model to get rid of this pattern - return sess, dao.sessions.Read(dao.idIndex.ToQuery(id), &sess) + return sess, domain.sessions.Read(domain.idIndex.ToQuery(id), &sess) } -func (dao *Dao) Create(user *user.User, salt string, password string) error { +func (domain *Domain) Create(user *user.User, salt string, password string) error { user.Created = time.Now().Unix() user.Updated = time.Now().Unix() - err := dao.users.Save(user) + err := domain.users.Save(user) if err != nil { return err } - return dao.passwords.Save(pw{ + return domain.passwords.Save(pw{ ID: user.Id, Password: password, Salt: salt, }) } -func (dao *Dao) Delete(id string) error { - return dao.users.Delete(dao.idIndex.ToQuery(id)) +func (domain *Domain) Delete(id string) error { + return domain.users.Delete(domain.idIndex.ToQuery(id)) } -func (dao *Dao) Update(user *user.User) error { +func (domain *Domain) Update(user *user.User) error { user.Updated = time.Now().Unix() - return dao.users.Save(user) + return domain.users.Save(user) } -func (dao *Dao) Read(id string) (*user.User, error) { +func (domain *Domain) Read(id string) (*user.User, error) { user := &user.User{} - return user, dao.users.Read(dao.idIndex.ToQuery(id), user) + return user, domain.users.Read(domain.idIndex.ToQuery(id), user) } -func (dao *Dao) Search(username, email string, limit, offset int64) ([]*user.User, error) { +func (domain *Domain) Search(username, email string, limit, offset int64) ([]*user.User, error) { var query model.Query if len(username) > 0 { - query = dao.nameIndex.ToQuery(username) + query = domain.nameIndex.ToQuery(username) } else if len(email) > 0 { - query = dao.emailIndex.ToQuery(email) + query = domain.emailIndex.ToQuery(email) } else { return nil, errors.New("username and email cannot be blank") } users := []*user.User{} - return users, dao.users.List(query, &users) + return users, domain.users.List(query, &users) } -func (dao *Dao) UpdatePassword(id string, salt string, password string) error { - return dao.passwords.Save(pw{ +func (domain *Domain) UpdatePassword(id string, salt string, password string) error { + return domain.passwords.Save(pw{ ID: id, Password: password, Salt: salt, }) } -func (dao *Dao) SaltAndPassword(username, email string) (string, string, error) { +func (domain *Domain) SaltAndPassword(username, email string) (string, string, error) { var query model.Query if len(username) > 0 { - query = dao.nameIndex.ToQuery(username) + query = domain.nameIndex.ToQuery(username) } else if len(email) > 0 { - query = dao.emailIndex.ToQuery(email) + query = domain.emailIndex.ToQuery(email) } else { return "", "", errors.New("username and email cannot be blank") } user := &user.User{} - err := dao.users.Read(query, &user) + err := domain.users.Read(query, &user) if err != nil { return "", "", err } @@ -141,7 +141,7 @@ func (dao *Dao) SaltAndPassword(username, email string) (string, string, error) query.Order.Type = model.OrderTypeUnordered password := &pw{} - err = dao.passwords.Read(query, password) + err = domain.passwords.Read(query, password) if err != nil { return "", "", err } diff --git a/users/handler/handler.go b/users/handler/handler.go index 01dbb89..10b7992 100644 --- a/users/handler/handler.go +++ b/users/handler/handler.go @@ -7,7 +7,7 @@ import ( "time" "github.com/micro/micro/v3/service/errors" - "github.com/micro/services/users/dao" + "github.com/micro/services/users/domain" pb "github.com/micro/services/users/proto" "golang.org/x/crypto/bcrypt" "golang.org/x/net/context" @@ -34,12 +34,12 @@ func random(i int) string { } type Users struct { - dao *dao.Dao + domain *domain.Domain } func NewUsers() *Users { return &Users{ - dao: dao.New(), + domain: domain.New(), } } @@ -54,7 +54,7 @@ func (s *Users) Create(ctx context.Context, req *pb.CreateRequest, rsp *pb.Creat } pp := base64.StdEncoding.EncodeToString(h) - return s.dao.Create(&pb.User{ + return s.domain.Create(&pb.User{ Id: req.Id, Username: strings.ToLower(req.Username), Email: strings.ToLower(req.Email), @@ -62,7 +62,7 @@ func (s *Users) Create(ctx context.Context, req *pb.CreateRequest, rsp *pb.Creat } func (s *Users) Read(ctx context.Context, req *pb.ReadRequest, rsp *pb.ReadResponse) error { - user, err := s.dao.Read(req.Id) + user, err := s.domain.Read(req.Id) if err != nil { return err } @@ -71,7 +71,7 @@ func (s *Users) Read(ctx context.Context, req *pb.ReadRequest, rsp *pb.ReadRespo } func (s *Users) Update(ctx context.Context, req *pb.UpdateRequest, rsp *pb.UpdateResponse) error { - return s.dao.Update(&pb.User{ + return s.domain.Update(&pb.User{ Id: req.Id, Username: strings.ToLower(req.Username), Email: strings.ToLower(req.Email), @@ -79,11 +79,11 @@ func (s *Users) Update(ctx context.Context, req *pb.UpdateRequest, rsp *pb.Updat } func (s *Users) Delete(ctx context.Context, req *pb.DeleteRequest, rsp *pb.DeleteResponse) error { - return s.dao.Delete(req.Id) + return s.domain.Delete(req.Id) } func (s *Users) Search(ctx context.Context, req *pb.SearchRequest, rsp *pb.SearchResponse) error { - users, err := s.dao.Search(req.Username, req.Email, req.Limit, req.Offset) + users, err := s.domain.Search(req.Username, req.Email, req.Limit, req.Offset) if err != nil { return err } @@ -92,7 +92,7 @@ func (s *Users) Search(ctx context.Context, req *pb.SearchRequest, rsp *pb.Searc } func (s *Users) UpdatePassword(ctx context.Context, req *pb.UpdatePasswordRequest, rsp *pb.UpdatePasswordResponse) error { - usr, err := s.dao.Read(req.UserId) + usr, err := s.domain.Read(req.UserId) if err != nil { return errors.InternalServerError("users.updatepassword", err.Error()) } @@ -100,7 +100,7 @@ func (s *Users) UpdatePassword(ctx context.Context, req *pb.UpdatePasswordReques return errors.InternalServerError("users.updatepassword", "Passwords don't math") } - salt, hashed, err := s.dao.SaltAndPassword(usr.Username, usr.Email) + salt, hashed, err := s.domain.SaltAndPassword(usr.Username, usr.Email) if err != nil { return errors.InternalServerError("users.updatepassword", err.Error()) } @@ -121,7 +121,7 @@ func (s *Users) UpdatePassword(ctx context.Context, req *pb.UpdatePasswordReques } pp := base64.StdEncoding.EncodeToString(h) - if err := s.dao.UpdatePassword(req.UserId, salt, pp); err != nil { + if err := s.domain.UpdatePassword(req.UserId, salt, pp); err != nil { return errors.InternalServerError("users.updatepassword", err.Error()) } return nil @@ -131,7 +131,7 @@ func (s *Users) Login(ctx context.Context, req *pb.LoginRequest, rsp *pb.LoginRe username := strings.ToLower(req.Username) email := strings.ToLower(req.Email) - salt, hashed, err := s.dao.SaltAndPassword(username, email) + salt, hashed, err := s.domain.SaltAndPassword(username, email) if err != nil { return err } @@ -153,7 +153,7 @@ func (s *Users) Login(ctx context.Context, req *pb.LoginRequest, rsp *pb.LoginRe Expires: time.Now().Add(time.Hour * 24 * 7).Unix(), } - if err := s.dao.CreateSession(sess); err != nil { + if err := s.domain.CreateSession(sess); err != nil { return errors.InternalServerError("users.Login", err.Error()) } rsp.Session = sess @@ -161,11 +161,11 @@ func (s *Users) Login(ctx context.Context, req *pb.LoginRequest, rsp *pb.LoginRe } func (s *Users) Logout(ctx context.Context, req *pb.LogoutRequest, rsp *pb.LogoutResponse) error { - return s.dao.DeleteSession(req.SessionId) + return s.domain.DeleteSession(req.SessionId) } func (s *Users) ReadSession(ctx context.Context, req *pb.ReadSessionRequest, rsp *pb.ReadSessionResponse) error { - sess, err := s.dao.ReadSession(req.SessionId) + sess, err := s.domain.ReadSession(req.SessionId) if err != nil { return err }