From 0d7b29dd7c9157f6cea1fecaf6b80290bdb11166 Mon Sep 17 00:00:00 2001 From: hanif salafi Date: Fri, 17 Oct 2025 02:32:25 +0700 Subject: [PATCH] fix: update fixing categoryId filter --- app/module/articles/repository/articles.repository.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/module/articles/repository/articles.repository.go b/app/module/articles/repository/articles.repository.go index 20f2f39..0c6cfd6 100644 --- a/app/module/articles/repository/articles.repository.go +++ b/app/module/articles/repository/articles.repository.go @@ -49,11 +49,6 @@ func (_i *articlesRepository) GetAll(clientId *uuid.UUID, userLevelId *uint, req query := _i.DB.DB.Model(&entity.Articles{}) - // Add client filter - if clientId != nil { - query = query.Where("client_id = ?", clientId) - } - _i.Log.Info().Interface("userLevelId", userLevelId).Msg("") // Add approval workflow filtering based on user level if userLevelId != nil { @@ -109,6 +104,11 @@ func (_i *articlesRepository) GetAll(clientId *uuid.UUID, userLevelId *uint, req Where("acd.category_id = ?", req.CategoryId) } query = query.Where("articles.is_active = ?", true) + + // Add client filter + if clientId != nil { + query = query.Where("articles.client_id = ?", clientId) + } if req.Title != nil && *req.Title != "" { title := strings.ToLower(*req.Title)