legalgonews/legalgo-BE-go
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: update user plan and rearrange structur project

Browse Source
This commit is contained in:
ericprd
2025-03-08 22:46:05 +08:00
parent a47b7b7d3d
commit 13c976dcbf
54 changed files with 508 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/services/auth/get_user.go
-14
View File
@@ -1,14 +0,0 @@
package authsvc
import (
userdomain "legalgo-BE-go/internal/domain/user"
)
func (as *impl) GetUserProfile(email string) (*userdomain.UserProfile, error) {
user, err := as.userRepo.GetUserProfile(email)
if err != nil {
return nil, err
}
return user, nil
}
internal/services/auth/impl.go
+5 -9
View File
@@ -3,7 +3,7 @@ package authsvc
import (
staffrepository "legalgo-BE-go/internal/accessor/staff"
subscriberepository "legalgo-BE-go/internal/accessor/subscribe"
subscribeplanrepository "legalgo-BE-go/internal/accessor/subscribeplan"
subscribeplanrepository "legalgo-BE-go/internal/accessor/subscribe_plan"
userrepository "legalgo-BE-go/internal/accessor/user"
staffdomain "legalgo-BE-go/internal/domain/staff"
userdomain "legalgo-BE-go/internal/domain/user"
@@ -12,8 +12,8 @@ import (
type impl struct {
staffRepo staffrepository.Staff
userRepo userrepository.User
subsRepo subscriberepository.SubsIntf
subsPlanRepo subscribeplanrepository.SubsPlanIntf
subsRepo subscriberepository.Subscribe
subsPlanRepo subscribeplanrepository.SubscribePlan
}
type Auth interface {
@@ -22,17 +22,13 @@ type Auth interface {
GetStaffProfile(string) (*staffdomain.StaffProfile, error)
GetUsers() ([]userdomain.UserProfile, error)
UpdateStaff(staffdomain.Staff) error
LoginAsUser(userdomain.UserLogin) (string, error)
RegisterUser(userdomain.UserRegister) (string, error)
GetUserProfile(string) (*userdomain.UserProfile, error)
}
func New(
staffRepo staffrepository.Staff,
userRepo userrepository.User,
subsRepo subscriberepository.SubsIntf,
subsPlanRepo subscribeplanrepository.SubsPlanIntf,
subsRepo subscriberepository.Subscribe,
subsPlanRepo subscribeplanrepository.SubscribePlan,
) Auth {
return &impl{
staffRepo: staffRepo,
internal/services/auth/login_as_staff.go
+1 -1
View File
@@ -16,7 +16,7 @@ func (sv *impl) LoginAsStaff(spec staffdomain.StaffLogin) (string, error) {
return "", errors.New(err.Error())
}
matchPassword := ComparePassword(staff.Password, spec.Password)
matchPassword := utils.ComparePassword(staff.Password, spec.Password)
if !matchPassword {
return "", errors.New("wrong password")
}
internal/services/auth/register_staff.go
+1 -1
View File
@@ -15,7 +15,7 @@ func (a *impl) RegisterStaff(spec staffdomain.StaffRegister) (string, error) {
if err == nil {
return "", errors.New("this email address is already in use")
}
hashedPwd, err := HashPassword(spec.Password)
hashedPwd, err := utils.HashPassword(spec.Password)
if err != nil {
return "", err
}
internal/services/auth/utils.go
-32
View File
@@ -1,32 +0,0 @@
package authsvc
import (
"fmt"
"github.com/golang-jwt/jwt/v5"
"golang.org/x/crypto/bcrypt"
)
func VerifyToken(signature string) jwt.Keyfunc {
return func(token *jwt.Token) (any, error) {
if _, ok := token.Method.(*jwt.SigningMethodHMAC); !ok {
return nil, fmt.Errorf("unexpected signing method: %v", token.Header["alg"])
}
return []byte(signature), nil
}
}
func HashPassword(password string) (string, error) {
// Hashing the password with a cost of 14 (default)
hash, err := bcrypt.GenerateFromPassword([]byte(password), bcrypt.DefaultCost)
if err != nil {
return "", err
}
return string(hash), nil
}
func ComparePassword(storedPassword, inputPassword string) bool {
err := bcrypt.CompareHashAndPassword([]byte(storedPassword), []byte(inputPassword))
return err == nil
}
internal/services/module.go
+2
View File
@@ -8,6 +8,7 @@ import (
subscribesvc "legalgo-BE-go/internal/services/subscribe"
subscribeplansvc "legalgo-BE-go/internal/services/subscribe_plan"
tagsvc "legalgo-BE-go/internal/services/tag"
usersvc "legalgo-BE-go/internal/services/user"
"go.uber.org/fx"
)
@@ -21,5 +22,6 @@ var Module = fx.Module("services",
categorysvc.New,
newssvc.New,
oss.NewOSSService,
usersvc.New,
),
)
internal/services/subscribe/impl.go
+3 -3
View File
@@ -6,14 +6,14 @@ import (
)
type impl struct {
subsRepo subscriberepository.SubsIntf
subsRepo subscriberepository.Subscribe
}
type Subscribe interface {
Create(string) (string, error)
Update(string, userdomain.UserSubsUpdate) error
Update(userdomain.UserSubsUpdate) error
}
func New(subsRepo subscriberepository.SubsIntf) Subscribe {
func New(subsRepo subscriberepository.Subscribe) Subscribe {
return &impl{subsRepo}
}
internal/services/subscribe/update.go
+13 -2
View File
@@ -1,9 +1,20 @@
package subscribesvc
import (
subscribedomain "legalgo-BE-go/internal/domain/subscribe"
userdomain "legalgo-BE-go/internal/domain/user"
timeutils "legalgo-BE-go/internal/utilities/time_utils"
)
func (i *impl) Update(id string, spec userdomain.UserSubsUpdate) error {
return nil
func (i *impl) Update(spec userdomain.UserSubsUpdate) error {
newSpec := subscribedomain.Subscribe{
ID: spec.ID,
AutoRenew: spec.AutoRenew,
StartDate: timeutils.Now(),
EndDate: spec.EndDate,
Status: spec.Status,
SubscribePlanID: spec.SubscribePlanID,
UpdatedAt: timeutils.Now(),
}
return i.subsRepo.Update(newSpec)
}
internal/services/subscribe_plan/create.go
+16
View File
@@ -0,0 +1,16 @@
package subscribeplansvc
import (
subscribeplandomain "legalgo-BE-go/internal/domain/subscribe_plan"
"github.com/google/uuid"
)
func (sb *impl) Create(spec subscribeplandomain.SubscribePlanReq) error {
data := subscribeplandomain.SubscribePlan{
ID: uuid.NewString(),
Code: spec.Code,
Name: spec.Name,
}
return sb.subsRepo.Create(data)
}
internal/services/subscribe_plan/create_plan.go
-7
View File
@@ -1,7 +0,0 @@
package subscribeplansvc
import subscribeplandomain "legalgo-BE-go/internal/domain/subscribe_plan"
func (sb *impl) CreatePlan(spec subscribeplandomain.SubscribePlanReq) error {
return sb.subsAccs.Create(spec)
}
internal/services/subscribe_plan/delete.go
+5
View File
@@ -0,0 +1,5 @@
package subscribeplansvc
func (i *impl) Delete(id string) error {
return i.subsRepo.Delete(id)
}
internal/services/subscribe_plan/get_all_plan.go → internal/services/subscribe_plan/get_all.go
+1 -1
View File
@@ -5,5 +5,5 @@ import (
)
func (s *impl) GetAllPlan() ([]subscribeplandomain.SubscribePlan, error) {
return s.subsAccs.GetAll()
return s.subsRepo.GetAll()
}
internal/services/subscribe_plan/impl.go
+6 -4
View File
@@ -1,21 +1,23 @@
package subscribeplansvc
import (
subscribeplanrepository "legalgo-BE-go/internal/accessor/subscribeplan"
subscribeplanrepository "legalgo-BE-go/internal/accessor/subscribe_plan"
subscribeplandomain "legalgo-BE-go/internal/domain/subscribe_plan"
)
type impl struct {
subsAccs subscribeplanrepository.SubsPlanIntf
subsRepo subscribeplanrepository.SubscribePlan
}
type SubscribePlan interface {
CreatePlan(subscribeplandomain.SubscribePlanReq) error
Create(subscribeplandomain.SubscribePlanReq) error
Update(string, subscribeplandomain.SubscribePlanUpdate) error
GetAllPlan() ([]subscribeplandomain.SubscribePlan, error)
Delete(string) error
}
func New(
subsAccs subscribeplanrepository.SubsPlanIntf,
subsAccs subscribeplanrepository.SubscribePlan,
) SubscribePlan {
return &impl{subsAccs}
}
internal/services/subscribe_plan/update.go
+16
View File
@@ -0,0 +1,16 @@
package subscribeplansvc
import (
subscribeplandomain "legalgo-BE-go/internal/domain/subscribe_plan"
timeutils "legalgo-BE-go/internal/utilities/time_utils"
)
func (i *impl) Update(id string, spec subscribeplandomain.SubscribePlanUpdate) error {
newData := subscribeplandomain.SubscribePlan{
ID: id,
Code: spec.Code,
Name: spec.Name,
UpdatedAt: timeutils.Now(),
}
return i.subsRepo.Update(newData)
}
internal/services/tag/get_all_model.go
-9
View File
@@ -1,9 +0,0 @@
package tagsvc
import (
tagdomain "legalgo-BE-go/internal/domain/tag"
)
func (i *impl) GetAllModel() ([]tagdomain.Tag, error) {
return i.tagRepo.GetAll()
}
internal/services/tag/impl.go
-1
View File
@@ -12,7 +12,6 @@ type impl struct {
type Tag interface {
Create(tagdomain.TagReq) error
GetAll() ([]tagdomain.Tag, error)
GetAllModel() ([]tagdomain.Tag, error)
Update(string, tagdomain.TagReq) error
Delete(string) error
}
internal/services/user/get_user.go
+14
View File
@@ -0,0 +1,14 @@
package usersvc
import (
userdomain "legalgo-BE-go/internal/domain/user"
)
func (i *impl) GetUserProfile(email string) (*userdomain.UserProfile, error) {
user, err := i.userRepo.GetUserProfile(email)
if err != nil {
return nil, err
}
return user, nil
}
internal/services/user/impl.go
+32
View File
@@ -0,0 +1,32 @@
package usersvc
import (
subscriberepository "legalgo-BE-go/internal/accessor/subscribe"
subscribeplanrepository "legalgo-BE-go/internal/accessor/subscribe_plan"
userrepository "legalgo-BE-go/internal/accessor/user"
userdomain "legalgo-BE-go/internal/domain/user"
)
type impl struct {
subsRepo subscriberepository.Subscribe
userRepo userrepository.User
subsPlanRepo subscribeplanrepository.SubscribePlan
}
type User interface {
GetUserProfile(string) (*userdomain.UserProfile, error)
LoginAsUser(userdomain.UserLogin) (string, error)
RegisterUser(userdomain.UserRegister) (string, error)
}
func New(
subsRepo subscriberepository.Subscribe,
userRepo userrepository.User,
subsPlanRepo subscribeplanrepository.SubscribePlan,
) User {
return &impl{
subsRepo,
userRepo,
subsPlanRepo,
}
}
internal/services/auth/login_as_user.go → internal/services/user/login_as_user.go
+4 -4
View File
@@ -1,4 +1,4 @@
package authsvc
package usersvc
import (
"errors"
@@ -10,13 +10,13 @@ import (
"github.com/google/uuid"
)
func (a *impl) LoginAsUser(spec userdomain.UserLogin) (string, error) {
user, err := a.userRepo.GetUserByEmail(spec.Email)
func (i *impl) LoginAsUser(spec userdomain.UserLogin) (string, error) {
user, err := i.userRepo.GetUserByEmail(spec.Email)
if err != nil {
return "", errors.New(err.Error())
}
matchPassword := ComparePassword(user.Password, spec.Password)
matchPassword := utils.ComparePassword(user.Password, spec.Password)
if !matchPassword {
return "", errors.New("wrong password")
}
internal/services/auth/register_user.go → internal/services/user/register_user.go
+8 -8
View File
@@ -1,4 +1,4 @@
package authsvc
package usersvc
import (
"errors"
@@ -10,15 +10,15 @@ import (
"github.com/google/uuid"
)
func (a *impl) RegisterUser(spec userdomain.UserRegister) (string, error) {
_, err := a.userRepo.GetUserByEmail(spec.Email)
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")
}
if spec.SubscribePlanID == "" {
subsPlan, err := a.subsPlanRepo.GetDefault()
subsPlan, err := i.subsPlanRepo.GetDefault()
if err != nil {
return "", err
}
@@ -26,17 +26,17 @@ func (a *impl) RegisterUser(spec userdomain.UserRegister) (string, error) {
spec.SubscribePlanID = subsPlan.ID
}
_, err = a.subsPlanRepo.GetByID(spec.SubscribePlanID)
_, err = i.subsPlanRepo.GetByID(spec.SubscribePlanID)
if err != nil {
return "", errors.New(err.Error())
}
subsId, err := a.subsRepo.Create(spec.SubscribePlanID)
subsId, err := i.subsRepo.Create(spec.SubscribePlanID)
if err != nil {
return "", err
}
hashedPwd, err := HashPassword(spec.Password)
hashedPwd, err := utils.HashPassword(spec.Password)
if err != nil {
return "", err
}
@@ -49,7 +49,7 @@ func (a *impl) RegisterUser(spec userdomain.UserRegister) (string, error) {
Phone: spec.Phone,
}
err = a.userRepo.CreateUser(user)
err = i.userRepo.CreateUser(user)
if err != nil {
return "", errors.New(err.Error())
}