feat: add Telegram bot with notifications and scheduler
This commit is contained in:
@@ -82,11 +82,6 @@ func (s *AuthService) Login(req *model.LoginRequest) (*model.AuthResponse, error
|
||||
return nil, ErrInvalidCredentials
|
||||
}
|
||||
|
||||
// Optional: require email verification
|
||||
// if !user.EmailVerified {
|
||||
// return nil, ErrEmailNotVerified
|
||||
// }
|
||||
|
||||
return s.generateAuthResponse(user)
|
||||
}
|
||||
|
||||
@@ -110,7 +105,12 @@ func (s *AuthService) Refresh(refreshToken string) (*model.AuthResponse, error)
|
||||
}
|
||||
|
||||
func (s *AuthService) GetUser(userID int64) (*model.User, error) {
|
||||
return s.userRepo.GetByID(userID)
|
||||
user, err := s.userRepo.GetByID(userID)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
user.ProcessForJSON()
|
||||
return user, nil
|
||||
}
|
||||
|
||||
func (s *AuthService) UpdateProfile(userID int64, req *model.UpdateProfileRequest) (*model.User, error) {
|
||||
@@ -119,14 +119,15 @@ func (s *AuthService) UpdateProfile(userID int64, req *model.UpdateProfileReques
|
||||
return nil, err
|
||||
}
|
||||
|
||||
if req.Username != "" {
|
||||
user.Username = req.Username
|
||||
if req.Username != nil && *req.Username != "" {
|
||||
user.Username = *req.Username
|
||||
}
|
||||
|
||||
if err := s.userRepo.Update(user); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
user.ProcessForJSON()
|
||||
return user, nil
|
||||
}
|
||||
|
||||
@@ -248,6 +249,8 @@ func (s *AuthService) generateAuthResponse(user *model.User) (*model.AuthRespons
|
||||
return nil, err
|
||||
}
|
||||
|
||||
user.ProcessForJSON()
|
||||
|
||||
return &model.AuthResponse{
|
||||
User: user,
|
||||
AccessToken: accessToken,
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package service
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
"time"
|
||||
|
||||
"github.com/daniil/homelab-api/internal/model"
|
||||
@@ -27,10 +28,15 @@ func (s *HabitService) Create(userID int64, req *model.CreateHabitRequest) (*mod
|
||||
TargetCount: defaultInt(req.TargetCount, 1),
|
||||
}
|
||||
|
||||
if req.ReminderTime != nil && *req.ReminderTime != "" {
|
||||
habit.ReminderTime = sql.NullString{String: *req.ReminderTime, Valid: true}
|
||||
}
|
||||
|
||||
if err := s.habitRepo.Create(habit); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
habit.ProcessForJSON()
|
||||
return habit, nil
|
||||
}
|
||||
|
||||
@@ -76,6 +82,13 @@ func (s *HabitService) Update(id, userID int64, req *model.UpdateHabitRequest) (
|
||||
if req.TargetCount != nil {
|
||||
habit.TargetCount = *req.TargetCount
|
||||
}
|
||||
if req.ReminderTime != nil {
|
||||
if *req.ReminderTime == "" {
|
||||
habit.ReminderTime = sql.NullString{Valid: false}
|
||||
} else {
|
||||
habit.ReminderTime = sql.NullString{String: *req.ReminderTime, Valid: true}
|
||||
}
|
||||
}
|
||||
if req.IsArchived != nil {
|
||||
habit.IsArchived = *req.IsArchived
|
||||
}
|
||||
@@ -84,6 +97,7 @@ func (s *HabitService) Update(id, userID int64, req *model.UpdateHabitRequest) (
|
||||
return nil, err
|
||||
}
|
||||
|
||||
habit.ProcessForJSON()
|
||||
return habit, nil
|
||||
}
|
||||
|
||||
|
||||
@@ -33,6 +33,10 @@ func (s *TaskService) Create(userID int64, req *model.CreateTaskRequest) (*model
|
||||
}
|
||||
}
|
||||
|
||||
if req.ReminderTime != nil && *req.ReminderTime != "" {
|
||||
task.ReminderTime = sql.NullString{String: *req.ReminderTime, Valid: true}
|
||||
}
|
||||
|
||||
if err := s.taskRepo.Create(task); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -98,6 +102,13 @@ func (s *TaskService) Update(id, userID int64, req *model.UpdateTaskRequest) (*m
|
||||
}
|
||||
}
|
||||
}
|
||||
if req.ReminderTime != nil {
|
||||
if *req.ReminderTime == "" {
|
||||
task.ReminderTime = sql.NullString{Valid: false}
|
||||
} else {
|
||||
task.ReminderTime = sql.NullString{String: *req.ReminderTime, Valid: true}
|
||||
}
|
||||
}
|
||||
|
||||
if err := s.taskRepo.Update(task); err != nil {
|
||||
return nil, err
|
||||
|
||||
Reference in New Issue
Block a user