kratisto/hamster-tycoon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add missing path property handling

Browse Source
This commit is contained in:
Jeffrey Duroyon
2020-05-18 00:56:43 +02:00
parent ca8e42388b
commit f6e0a826a1
21 changed files with 292 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
service/user_service.go
View File

@@ -14,10 +14,10 @@ func NewUserService(database dao.Database) *UserService {
return &UserService{serviceContext{db: database}}
}
func (us *UserService) GetUserFromGoogleId(googleUserId string) (*model.User, error) {
user, err := us.db.GetUsersByGoogleID(googleUserId)
func (us *UserService) GetUserFromGoogleID(googleUserID string) (*model.User, error) {
user, err := us.db.GetUsersByGoogleID(googleUserID)
if err != nil {
if castedError, ok := err.(*dao.DAOError); ok {
if castedError, ok := err.(*dao.Error); ok {
switch castedError.Type {
case dao.ErrTypeNotFound:
return nil, &model.ErrNotFound
@@ -32,7 +32,7 @@ func (us *UserService) GetUserFromGoogleId(googleUserId string) (*model.User, er
func (us *UserService) CreateUserFromGoogleToken(id string, email string) (*model.User, error) {
randNick := utils.String(20)
user := &model.User{UserEditable: model.UserEditable{Nickname: "player-" + randNick}, GoogleId: id}
user := &model.User{UserEditable: model.UserEditable{Nickname: "player-" + randNick}, GoogleID: id}
err := us.db.CreateUser(user)
return user, err