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/api/http/router.go
+2
View File
@@ -5,6 +5,7 @@ import (
newshttp "legalgo-BE-go/internal/api/http/news"
osshttp "legalgo-BE-go/internal/api/http/oss"
staffhttp "legalgo-BE-go/internal/api/http/staffhttp"
subscribehttp "legalgo-BE-go/internal/api/http/subscribe"
subscribeplanhttp "legalgo-BE-go/internal/api/http/subscribe_plan"
taghttp "legalgo-BE-go/internal/api/http/tag"
userhttp "legalgo-BE-go/internal/api/http/user"
@@ -29,6 +30,7 @@ var Module = fx.Module("router",
newshttp.Module,
osshttp.Module,
userhttp.Module,
subscribehttp.Module,
)
func initRouter() chi.Router {
internal/api/http/subscribe/module.go
+3 -1
View File
@@ -2,4 +2,6 @@ package subscribehttp
import "go.uber.org/fx"
var Module = fx.Module("subscribe", fx.Invoke())
var Module = fx.Module("subscribe", fx.Invoke(
Update,
))
internal/api/http/subscribe/update.go
+12 -4
View File
@@ -1,9 +1,9 @@
package subscribehttp
import (
userrepository "legalgo-BE-go/internal/accessor/user"
authmiddleware "legalgo-BE-go/internal/api/http/middleware/auth"
userdomain "legalgo-BE-go/internal/domain/user"
authsvc "legalgo-BE-go/internal/services/auth"
subscribesvc "legalgo-BE-go/internal/services/subscribe"
"legalgo-BE-go/internal/utilities/response"
"legalgo-BE-go/internal/utilities/utils"
@@ -14,7 +14,7 @@ import (
func Update(
router chi.Router,
authSvc authsvc.Auth,
userRepo userrepository.User,
subSvc subscribesvc.Subscribe,
) {
router.
@@ -60,9 +60,11 @@ func Update(
return
}
user, err := authSvc.GetUserProfile(detail.Email)
user, err := userRepo.GetUserProfile(detail.Email)
if err := subSvc.Update(user.ID, body); err != nil {
body.ID = user.Subscribe.ID
if err := subSvc.Update(body); err != nil {
response.ResponseWithErrorCode(
ctx,
w,
@@ -73,5 +75,11 @@ func Update(
)
return
}
response.RespondJsonSuccess(ctx, w, struct {
Message string
}{
Message: "update user plan success",
})
})
}
internal/api/http/subscribe_plan/create.go
+1 -1
View File
@@ -49,7 +49,7 @@ func CreateSubscribePlan(
return
}
if err := subsSvc.CreatePlan(spec); err != nil {
if err := subsSvc.Create(spec); err != nil {
response.ResponseWithErrorCode(
ctx,
w,
internal/api/http/subscribe_plan/delete.go
+53
View File
@@ -0,0 +1,53 @@
package subscribeplanhttp
import (
"fmt"
authmiddleware "legalgo-BE-go/internal/api/http/middleware/auth"
subscribeplansvc "legalgo-BE-go/internal/services/subscribe_plan"
"legalgo-BE-go/internal/utilities/response"
"net/http"
"github.com/go-chi/chi/v5"
)
func Delete(
router chi.Router,
subscribePlanSvc subscribeplansvc.SubscribePlan,
) {
router.
With(authmiddleware.Authorize()).
Delete("/subscribe-plan/{subsplan_id}/delete", func(w http.ResponseWriter, r *http.Request) {
ctx := r.Context()
subsPlanID := chi.URLParam(r, "subsplan_id")
if subsPlanID == "" {
response.RespondJsonErrorWithCode(
ctx,
w,
fmt.Errorf("subscribe plan id is not provided"),
response.ErrBadRequest.Code,
response.ErrBadRequest.HttpCode,
"subscribe plan id is not provided",
)
return
}
if err := subscribePlanSvc.Delete(subsPlanID); err != nil {
response.RespondJsonErrorWithCode(
ctx,
w,
err,
response.ErrBadRequest.Code,
response.ErrBadRequest.HttpCode,
err.Error(),
)
return
}
response.RespondJsonSuccess(ctx, w, struct {
Message string
}{
Message: "subscribe plan has been deleted",
})
})
}
internal/api/http/subscribe_plan/module.go
+2
View File
@@ -6,5 +6,7 @@ var Module = fx.Module("subscribe-plan",
fx.Invoke(
CreateSubscribePlan,
GetAllPlan,
Update,
Delete,
),
)
internal/api/http/subscribe_plan/update.go
+82
View File
@@ -0,0 +1,82 @@
package subscribeplanhttp
import (
"fmt"
authmiddleware "legalgo-BE-go/internal/api/http/middleware/auth"
subscribeplandomain "legalgo-BE-go/internal/domain/subscribe_plan"
subscribeplansvc "legalgo-BE-go/internal/services/subscribe_plan"
"legalgo-BE-go/internal/utilities/response"
"legalgo-BE-go/internal/utilities/utils"
"net/http"
"github.com/go-chi/chi/v5"
"github.com/go-playground/validator/v10"
)
func Update(
router chi.Router,
validate *validator.Validate,
subsPlanSvc subscribeplansvc.SubscribePlan,
) {
router.
With(authmiddleware.Authorize()).
Put("/subscribe-plan/{subsplan_id}/update", func(w http.ResponseWriter, r *http.Request) {
ctx := r.Context()
tagID := chi.URLParam(r, "subsplan_id")
if tagID == "" {
response.RespondJsonErrorWithCode(
ctx,
w,
fmt.Errorf("subscribe plan id is not provided"),
response.ErrBadRequest.Code,
response.ErrBadRequest.HttpCode,
"subscribe plan id is not provided",
)
return
}
var spec subscribeplandomain.SubscribePlanUpdate
if err := utils.UnmarshalBody(r, &spec); err != nil {
response.RespondJsonErrorWithCode(
ctx,
w,
err,
response.ErrBadRequest.Code,
response.ErrBadRequest.HttpCode,
"failed to unmarshal body",
)
return
}
if err := validate.Struct(spec); err != nil {
response.RespondJsonErrorWithCode(
ctx,
w,
err,
response.ErrBadRequest.Code,
response.ErrBadRequest.HttpCode,
err.(validator.ValidationErrors).Error(),
)
return
}
if err := subsPlanSvc.Update(tagID, spec); err != nil {
response.RespondJsonErrorWithCode(
ctx,
w,
err,
response.ErrBadRequest.Code,
response.ErrBadRequest.HttpCode,
err.Error(),
)
return
}
response.RespondJsonSuccess(ctx, w, struct {
Message string
}{
Message: "update subscribe plan success",
})
})
}
internal/api/http/tag/delete.go
+6 -6
View File
@@ -16,23 +16,23 @@ func Delete(
) {
router.
With(authmiddleware.Authorize()).
Delete("/tag/{category_id}/delete", func(w http.ResponseWriter, r *http.Request) {
Delete("/tag/{tag_id}/delete", func(w http.ResponseWriter, r *http.Request) {
ctx := r.Context()
categoryID := chi.URLParam(r, "category_id")
tagID := chi.URLParam(r, "tag_id")
if categoryID == "" {
if tagID == "" {
response.RespondJsonErrorWithCode(
ctx,
w,
fmt.Errorf("category id is not provided"),
fmt.Errorf("tag id is not provided"),
response.ErrBadRequest.Code,
response.ErrBadRequest.HttpCode,
"category id is not provided",
"tag id is not provided",
)
return
}
if err := tagSvc.Delete(categoryID); err != nil {
if err := tagSvc.Delete(tagID); err != nil {
response.RespondJsonErrorWithCode(
ctx,
w,
internal/api/http/tag/get_all.go
+1 -2
View File
@@ -14,8 +14,7 @@ func GetAll(
) {
router.Get("/tag", func(w http.ResponseWriter, r *http.Request) {
ctx := r.Context()
tags, err := tagSvc.GetAllModel()
// tags, err := tagSvc.GetAll()
tags, err := tagSvc.GetAll()
if err != nil {
response.ResponseWithErrorCode(
ctx,
internal/api/http/user/login.go
+3 -3
View File
@@ -3,7 +3,7 @@ package userhttp
import (
responsedomain "legalgo-BE-go/internal/domain/reponse"
userdomain "legalgo-BE-go/internal/domain/user"
authsvc "legalgo-BE-go/internal/services/auth"
usersvc "legalgo-BE-go/internal/services/user"
"legalgo-BE-go/internal/utilities/response"
"legalgo-BE-go/internal/utilities/utils"
"net/http"
@@ -15,7 +15,7 @@ import (
func Login(
router chi.Router,
authSvc authsvc.Auth,
userSvc usersvc.User,
validate *validator.Validate,
rdb *redis.Client,
) {
@@ -48,7 +48,7 @@ func Login(
return
}
token, err := authSvc.LoginAsUser(spec)
token, err := userSvc.LoginAsUser(spec)
if err != nil {
response.ResponseWithErrorCode(
ctx,
internal/api/http/user/profile.go
+3 -3
View File
@@ -1,7 +1,7 @@
package userhttp
import (
authsvc "legalgo-BE-go/internal/services/auth"
usersvc "legalgo-BE-go/internal/services/user"
"legalgo-BE-go/internal/utilities/response"
"legalgo-BE-go/internal/utilities/utils"
"net/http"
@@ -11,7 +11,7 @@ import (
func GetProfile(
router chi.Router,
authSvc authsvc.Auth,
userSvc usersvc.User,
) {
router.Get("/user/profile", func(w http.ResponseWriter, r *http.Request) {
ctx := r.Context()
@@ -28,7 +28,7 @@ func GetProfile(
return
}
userProfile, err := authSvc.GetUserProfile(destructedToken.Email)
userProfile, err := userSvc.GetUserProfile(destructedToken.Email)
if err != nil {
response.ResponseWithErrorCode(
ctx,
internal/api/http/user/register.go
+2 -2
View File
@@ -3,7 +3,7 @@ package userhttp
import (
responsedomain "legalgo-BE-go/internal/domain/reponse"
userdomain "legalgo-BE-go/internal/domain/user"
authsvc "legalgo-BE-go/internal/services/auth"
usersvc "legalgo-BE-go/internal/services/user"
"legalgo-BE-go/internal/utilities/response"
"legalgo-BE-go/internal/utilities/utils"
"net/http"
@@ -16,7 +16,7 @@ import (
func Register(
router chi.Router,
validate *validator.Validate,
authSvc authsvc.Auth,
authSvc usersvc.User,
rdb *redis.Client,
) {
router.Post("/user/register", func(w http.ResponseWriter, r *http.Request) {