From ee8e8e140d6fd42b452751b6507c90b8156c45e7 Mon Sep 17 00:00:00 2001
From: ericprd <ericprd_@outlook.com>
Date: Fri, 14 Mar 2025 13:00:12 +0800
Subject: [PATCH] fix: improvement access data

---
 internal/accessor/user/get_user_profile.go |  6 +++---
 internal/api/http/news/create.go           | 15 +--------------
 internal/api/http/news/update.go           | 15 +--------------
 internal/api/http/staff/profile.go         |  2 +-
 internal/api/http/subscribe/update.go      |  2 +-
 internal/api/http/user/profile.go          |  2 +-
 internal/services/staffsvc/get.go          |  4 ++--
 7 files changed, 10 insertions(+), 36 deletions(-)

diff --git a/internal/accessor/user/get_user_profile.go b/internal/accessor/user/get_user_profile.go
index b1dfacc..8aa5dfa 100644
--- a/internal/accessor/user/get_user_profile.go
+++ b/internal/accessor/user/get_user_profile.go
@@ -5,17 +5,17 @@ import (
 	userdomain "legalgo-BE-go/internal/domain/user"
 )
 
-func (ur *accessor) GetUserProfile(email string) (*userdomain.UserProfile, error) {
+func (ur *accessor) GetUserProfile(id string) (*userdomain.UserProfile, error) {
 	var user *userdomain.User
 
-	if email == "" {
+	if id == "" {
 		return nil, fmt.Errorf("email is empty")
 	}
 
 	if err := ur.db.
 		Preload("Subscribe").
 		Preload("Subscribe.SubscribePlan").
-		First(&user, "email = ?", email).
+		First(&user, "id = ?", id).
 		Error; err != nil {
 		return nil, err
 	}
diff --git a/internal/api/http/news/create.go b/internal/api/http/news/create.go
index c01463d..0cd7a3a 100644
--- a/internal/api/http/news/create.go
+++ b/internal/api/http/news/create.go
@@ -59,20 +59,7 @@ func Create(
 			return
 		}
 
-		staffProfile, err := staffRepo.GetStaffByEmail(destructedToken.Email)
-		if err != nil {
-			response.ResponseWithErrorCode(
-				ctx,
-				w,
-				err,
-				response.ErrBadRequest.Code,
-				response.ErrBadRequest.HttpCode,
-				err.Error(),
-			)
-			return
-		}
-
-		if err := newsSvc.Create(spec, staffProfile.ID); err != nil {
+		if err := newsSvc.Create(spec, destructedToken.ID); err != nil {
 			response.ResponseWithErrorCode(
 				ctx,
 				w,
diff --git a/internal/api/http/news/update.go b/internal/api/http/news/update.go
index 1b193cf..dec6777 100644
--- a/internal/api/http/news/update.go
+++ b/internal/api/http/news/update.go
@@ -48,19 +48,6 @@ func Update(
 				return
 			}
 
-			staff, err := authSvc.GetProfile(destructedToken.Email)
-			if err != nil {
-				response.ResponseWithErrorCode(
-					ctx,
-					w,
-					err,
-					response.ErrBadRequest.Code,
-					response.ErrBadRequest.HttpCode,
-					err.Error(),
-				)
-				return
-			}
-
 			var spec newsdomain.NewsUpdate
 			if err := utils.UnmarshalBody(r, &spec); err != nil {
 				response.ResponseWithErrorCode(
@@ -76,7 +63,7 @@ func Update(
 
 			spec.ID = newsID
 
-			if err := newsSvc.Update(staff.ID, spec); err != nil {
+			if err := newsSvc.Update(destructedToken.ID, spec); err != nil {
 				response.ResponseWithErrorCode(
 					ctx,
 					w,
diff --git a/internal/api/http/staff/profile.go b/internal/api/http/staff/profile.go
index 117329c..56fb943 100644
--- a/internal/api/http/staff/profile.go
+++ b/internal/api/http/staff/profile.go
@@ -28,7 +28,7 @@ func GetProfile(
 			return
 		}
 
-		staffProfile, err := authSvc.GetProfile(destructedToken.Email)
+		staffProfile, err := authSvc.GetProfile(destructedToken.ID)
 		if err != nil {
 			response.ResponseWithErrorCode(
 				ctx,
diff --git a/internal/api/http/subscribe/update.go b/internal/api/http/subscribe/update.go
index 3414127..2796675 100644
--- a/internal/api/http/subscribe/update.go
+++ b/internal/api/http/subscribe/update.go
@@ -60,7 +60,7 @@ func Update(
 				return
 			}
 
-			user, err := userRepo.GetUserProfile(detail.Email)
+			user, err := userRepo.GetUserProfile(detail.ID)
 
 			body.ID = user.Subscribe.ID
 
diff --git a/internal/api/http/user/profile.go b/internal/api/http/user/profile.go
index 6e3a2d1..cbc526e 100644
--- a/internal/api/http/user/profile.go
+++ b/internal/api/http/user/profile.go
@@ -28,7 +28,7 @@ func GetProfile(
 			return
 		}
 
-		userProfile, err := userSvc.GetUserProfile(destructedToken.Email)
+		userProfile, err := userSvc.GetUserProfile(destructedToken.ID)
 		if err != nil {
 			response.ResponseWithErrorCode(
 				ctx,
diff --git a/internal/services/staffsvc/get.go b/internal/services/staffsvc/get.go
index c4e2aaa..f21dfc5 100644
--- a/internal/services/staffsvc/get.go
+++ b/internal/services/staffsvc/get.go
@@ -4,8 +4,8 @@ import (
 	staffdomain "legalgo-BE-go/internal/domain/staff"
 )
 
-func (as *impl) GetProfile(email string) (*staffdomain.StaffProfile, error) {
-	staff, err := as.staffRepo.GetStaffByEmail(email)
+func (as *impl) GetProfile(id string) (*staffdomain.StaffProfile, error) {
+	staff, err := as.staffRepo.GetStaffByID(id)
 	if err != nil {
 		return nil, err
 	}