amy/donetick
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Implement chore completion logic and user assignment validation

Browse source
This commit is contained in:
Mo Tarbin 2025-02-15 00:07:34 -05:00
parent 99453d0869
commit 41be361463
4 changed files with 159 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
internal/user/repo/repository.go
View file

@ -140,9 +140,10 @@ func (r *UserRepository) StoreAPIToken(c context.Context, userID int, name strin
return token, nil
}
func (r *UserRepository) GetUserByToken(c context.Context, token string) (*uModel.User, error) {
var user *uModel.User
if err := r.db.WithContext(c).Table("users u").Select("u.*").Joins("left join api_tokens at on at.user_id = u.id").Where("at.token = ?", token).First(&user).Error; err != nil {
func (r *UserRepository) GetUserByToken(c context.Context, token string) (*uModel.UserDetails, error) {
var user *uModel.UserDetails
if err := r.db.WithContext(c).Table("users u").Select("u.*, c.webhook_url as webhook_url").Joins("left join api_tokens at on at.user_id = u.id").Joins("left join circles c on c.id = u.circle_id").Where("at.token = ?", token).First(&user).Error; err != nil {
return nil, err
}
return user, nil