kontenhumas
/
kontenhumas-be
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: update fixing bookmarks

This commit is contained in:
hanif salafi 2025-10-12 23:58:11 +07:00
parent 0a2991d618
commit 719cadc1b4
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/module/bookmarks/bookmarks.module.go
View File

@ -1,7 +1,6 @@
package bookmarks package bookmarks
import ( import (
"netidhub-saas-be/app/middleware"
"netidhub-saas-be/app/module/bookmarks/controller" "netidhub-saas-be/app/module/bookmarks/controller"
"netidhub-saas-be/app/module/bookmarks/repository" "netidhub-saas-be/app/module/bookmarks/repository"
"netidhub-saas-be/app/module/bookmarks/service" "netidhub-saas-be/app/module/bookmarks/service"
@ -49,9 +48,6 @@ func (_i *BookmarksRouter) RegisterBookmarksRoutes() {
// define routes // define routes
_i.App.Route("/bookmarks", func(router fiber.Router) { _i.App.Route("/bookmarks", func(router fiber.Router) {
// Add user middleware to extract user level from JWT token
router.Use(middleware.UserMiddleware(_i.UsersRepo))
// Public routes (require authentication) // Public routes (require authentication)
router.Get("/", bookmarksController.All) router.Get("/", bookmarksController.All)
router.Get("/:id", bookmarksController.Show) router.Get("/:id", bookmarksController.Show)

7
app/module/bookmarks/repository/bookmarks.repository.go
View File

@ -4,6 +4,7 @@ import (
"netidhub-saas-be/app/database" "netidhub-saas-be/app/database"
"netidhub-saas-be/app/database/entity" "netidhub-saas-be/app/database/entity"
"netidhub-saas-be/app/module/bookmarks/request" "netidhub-saas-be/app/module/bookmarks/request"
"netidhub-saas-be/config/config"
"netidhub-saas-be/utils/paginator" "netidhub-saas-be/utils/paginator"
"github.com/google/uuid" "github.com/google/uuid"
@ -13,6 +14,7 @@ import (
type bookmarksRepository struct { type bookmarksRepository struct {
DB *database.Database DB *database.Database
Log zerolog.Logger Log zerolog.Logger
Cfg *config.Config
} }
// BookmarksRepository define interface of IBookmarksRepository // BookmarksRepository define interface of IBookmarksRepository
@ -27,10 +29,11 @@ type BookmarksRepository interface {
CountByUserId(clientId *uuid.UUID, userId uint) (count int64, err error) CountByUserId(clientId *uuid.UUID, userId uint) (count int64, err error)
} }
func NewBookmarksRepository(db *database.Database, log zerolog.Logger) BookmarksRepository { func NewBookmarksRepository(db *database.Database, log zerolog.Logger, cfg *config.Config) BookmarksRepository {
return &bookmarksRepository{ return &bookmarksRepository{
DB: db, DB: db,
Log: log, Log: log,
Cfg: cfg,
} }
} }
@ -41,7 +44,7 @@ func (_i *bookmarksRepository) GetAll(clientId *uuid.UUID, req request.Bookmarks
query := _i.DB.DB.Model(&entity.Bookmarks{}).Preload("User").Preload("Article") query := _i.DB.DB.Model(&entity.Bookmarks{}).Preload("User").Preload("Article")
// Apply client filter // Apply client filter
if clientId != nil { if clientId != nil && _i.Cfg.App.PrimaryClientKey != clientId.String() {
query = query.Where("client_id = ?", clientId) query = query.Where("client_id = ?", clientId)
} }