feat: update staff data

internal/services/auth/update_staff.go

@@ -1,17 +0,0 @@
-package authsvc
-
-import (
-	staffdomain "legalgo-BE-go/internal/domain/staff"
-)
-
-func (as *impl) UpdateStaff(spec staffdomain.Staff) error {
-	if _, err := as.staffRepo.GetStaffByID(spec.ID); err != nil {
-		return err
-	}
-
-	if err := as.staffRepo.Update(spec); err != nil {
-		return err
-	}
-
-	return nil
-}

internal/services/module.go

@@ -2,10 +2,10 @@ package services
 
 import (
 	adssvc "legalgo-BE-go/internal/services/ads"
-	serviceauth "legalgo-BE-go/internal/services/auth"
 	categorysvc "legalgo-BE-go/internal/services/category"
 	newssvc "legalgo-BE-go/internal/services/news"
 	"legalgo-BE-go/internal/services/oss"
+	staffsvc "legalgo-BE-go/internal/services/staffsvc"
 	subscribesvc "legalgo-BE-go/internal/services/subscribe"
 	subscribeplansvc "legalgo-BE-go/internal/services/subscribe_plan"
 	tagsvc "legalgo-BE-go/internal/services/tag"
@@ -16,7 +16,7 @@ import (
 
 var Module = fx.Module("services",
 	fx.Provide(
-		serviceauth.New,
+		staffsvc.New,
 		subscribeplansvc.New,
 		subscribesvc.New,
 		tagsvc.New,

internal/services/staffsvc/get.go

@@ -1,10 +1,10 @@
-package authsvc
+package staffsvc
 
 import (
 	staffdomain "legalgo-BE-go/internal/domain/staff"
 )
 
-func (as *impl) GetStaffProfile(email string) (*staffdomain.StaffProfile, error) {
+func (as *impl) GetProfile(email string) (*staffdomain.StaffProfile, error) {
 	staff, err := as.staffRepo.GetStaffByEmail(email)
 	if err != nil {
 		return nil, err

internal/services/staffsvc/get_users.go

@@ -1,4 +1,4 @@
-package authsvc
+package staffsvc
 
 import userdomain "legalgo-BE-go/internal/domain/user"
 

internal/services/staffsvc/impl.go

@@ -1,4 +1,4 @@
-package authsvc
+package staffsvc
 
 import (
 	staffrepository "legalgo-BE-go/internal/accessor/staff"
@@ -17,11 +17,11 @@ type impl struct {
 }
 
 type Auth interface {
-	LoginAsStaff(staffdomain.StaffLogin) (string, error)
-	RegisterStaff(staffdomain.StaffRegister) (string, error)
-	GetStaffProfile(string) (*staffdomain.StaffProfile, error)
+	Login(staffdomain.StaffLogin) (string, error)
+	Register(staffdomain.StaffRegister) (string, error)
+	GetProfile(string) (*staffdomain.StaffProfile, error)
 	GetUsers() ([]userdomain.UserProfile, error)
-	UpdateStaff(staffdomain.Staff) error
+	Update(string, staffdomain.StaffUpdate) error
 }
 
 func New(

internal/services/staffsvc/login.go

@@ -1,8 +1,7 @@
-package authsvc
+package staffsvc
 
 import (
-	"errors"
-
+	"fmt"
 	authdomain "legalgo-BE-go/internal/domain/auth"
 	staffdomain "legalgo-BE-go/internal/domain/staff"
 	"legalgo-BE-go/internal/utilities/utils"
@@ -10,26 +9,27 @@ import (
 	"github.com/google/uuid"
 )
 
-func (sv *impl) LoginAsStaff(spec staffdomain.StaffLogin) (string, error) {
+func (sv *impl) Login(spec staffdomain.StaffLogin) (string, error) {
 	staff, err := sv.staffRepo.GetStaffByEmail(spec.Email)
 	if err != nil {
-		return "", errors.New(err.Error())
+		return "", err
 	}
 
 	matchPassword := utils.ComparePassword(staff.Password, spec.Password)
 	if !matchPassword {
-		return "", errors.New("wrong password")
+		return "", fmt.Errorf("wrong password")
 	}
 
 	authToken := authdomain.AuthToken{
 		Email:     staff.Email,
 		SessionID: uuid.NewString(),
 		Role:      "staff",
+		ID:        staff.ID,
 	}
 
 	token, err := utils.GenerateToken(authToken)
 	if err != nil {
-		return "", errors.New(err.Error())
+		return "", err
 	}
 
 	return token, nil

internal/services/staffsvc/register.go

@@ -1,8 +1,7 @@
-package authsvc
+package staffsvc
 
 import (
-	"errors"
-
+	"fmt"
 	authdomain "legalgo-BE-go/internal/domain/auth"
 	staffdomain "legalgo-BE-go/internal/domain/staff"
 	"legalgo-BE-go/internal/utilities/utils"
@@ -10,10 +9,10 @@ import (
 	"github.com/google/uuid"
 )
 
-func (a *impl) RegisterStaff(spec staffdomain.StaffRegister) (string, error) {
+func (a *impl) Register(spec staffdomain.StaffRegister) (string, error) {
 	_, err := a.staffRepo.GetStaffByEmail(spec.Email)
 	if err == nil {
-		return "", errors.New("this email address is already in use")
+		return "", fmt.Errorf("this email address is already in use")
 	}
 	hashedPwd, err := utils.HashPassword(spec.Password)
 	if err != nil {
@@ -30,18 +29,19 @@ func (a *impl) RegisterStaff(spec staffdomain.StaffRegister) (string, error) {
 
 	err = a.staffRepo.Create(staff)
 	if err != nil {
-		return "", errors.New(err.Error())
+		return "", err
 	}
 
 	authToken := authdomain.AuthToken{
 		Email:     staff.Email,
 		SessionID: uuid.NewString(),
 		Role:      "staff",
+		ID:        staff.ID,
 	}
 
 	token, err := utils.GenerateToken(authToken)
 	if err != nil {
-		return "", errors.New(err.Error())
+		return "", err
 	}
 	return token, nil
 }

internal/services/staffsvc/update.go

@@ -0,0 +1,24 @@
+package staffsvc
+
+import (
+	staffdomain "legalgo-BE-go/internal/domain/staff"
+)
+
+func (as *impl) Update(id string, spec staffdomain.StaffUpdate) error {
+	if _, err := as.staffRepo.GetStaffByID(id); err != nil {
+		return err
+	}
+
+	newSpec := staffdomain.Staff{
+		ID:             id,
+		Email:          spec.Email,
+		Name:           spec.Name,
+		ProfilePicture: spec.ProfilePicture,
+	}
+
+	if err := as.staffRepo.Update(newSpec); err != nil {
+		return err
+	}
+
+	return nil
+}

internal/services/user/login.go

@@ -1,8 +1,7 @@
 package usersvc
 
 import (
-	"errors"
-
+	"fmt"
 	authdomain "legalgo-BE-go/internal/domain/auth"
 	userdomain "legalgo-BE-go/internal/domain/user"
 	"legalgo-BE-go/internal/utilities/utils"
@@ -13,23 +12,24 @@ import (
 func (i *impl) LoginAsUser(spec userdomain.UserLogin) (string, error) {
 	user, err := i.userRepo.GetUserByEmail(spec.Email)
 	if err != nil {
-		return "", errors.New(err.Error())
+		return "", err
 	}
 
 	matchPassword := utils.ComparePassword(user.Password, spec.Password)
 	if !matchPassword {
-		return "", errors.New("wrong password")
+		return "", fmt.Errorf("wrong password")
 	}
 
 	authToken := authdomain.AuthToken{
 		Email:     user.Email,
 		SessionID: uuid.NewString(),
 		Role:      "user",
+		ID:        user.ID,
 	}
 
 	token, err := utils.GenerateToken(authToken)
 	if err != nil {
-		return "", errors.New(err.Error())
+		return "", err
 	}
 
 	return token, nil

internal/services/user/register.go

@@ -1,8 +1,7 @@
 package usersvc
 
 import (
-	"errors"
-
+	"fmt"
 	authdomain "legalgo-BE-go/internal/domain/auth"
 	userdomain "legalgo-BE-go/internal/domain/user"
 	"legalgo-BE-go/internal/utilities/utils"
@@ -14,7 +13,7 @@ func (i *impl) RegisterUser(spec userdomain.UserRegister) (string, error) {
 	_, err := i.userRepo.GetUserByEmail(spec.Email)
 
 	if err == nil {
-		return "", errors.New("this email address is already in use")
+		return "", fmt.Errorf("this email address is already in use")
 	}
 
 	if spec.SubscribePlanID == "" {
@@ -28,7 +27,7 @@ func (i *impl) RegisterUser(spec userdomain.UserRegister) (string, error) {
 
 	_, err = i.subsPlanRepo.GetByID(spec.SubscribePlanID)
 	if err != nil {
-		return "", errors.New(err.Error())
+		return "", err
 	}
 
 	subsId, err := i.subsRepo.Create(spec.SubscribePlanID)
@@ -51,18 +50,19 @@ func (i *impl) RegisterUser(spec userdomain.UserRegister) (string, error) {
 
 	err = i.userRepo.CreateUser(user)
 	if err != nil {
-		return "", errors.New(err.Error())
+		return "", fmt.Errorf(err.Error())
 	}
 
 	authToken := authdomain.AuthToken{
 		Email:     user.Email,
 		SessionID: uuid.NewString(),
 		Role:      "user",
+		ID:        user.ID,
 	}
 
 	token, err := utils.GenerateToken(authToken)
 	if err != nil {
-		return "", errors.New(err.Error())
+		return "", fmt.Errorf(err.Error())
 	}
 	return token, nil
 }