From 3f7eedb5f219fd160c0bc8b5bdc460fe7992a4d1 Mon Sep 17 00:00:00 2001 From: efrilm Date: Mon, 13 Oct 2025 18:09:56 +0700 Subject: [PATCH] fix incoming archieved --- internal/repository/letter_repository.go | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/internal/repository/letter_repository.go b/internal/repository/letter_repository.go index e18c39d..786c702 100644 --- a/internal/repository/letter_repository.go +++ b/internal/repository/letter_repository.go @@ -197,11 +197,18 @@ func (r *LetterIncomingRepository) List(ctx context.Context, filter ListIncoming } // Apply is_archived filter based on recipient's is_archived field + //if filter.IsArchived != nil { + // if *filter.IsArchived { + // dataQuery = dataQuery.Where("letter_incoming_recipients.is_archived = ?", true) + // } else { + // dataQuery = dataQuery.Where("letter_incoming_recipients.is_archived = ? OR letter_incoming_recipients.is_archived IS NULL", false) + // } + //} if filter.IsArchived != nil { if *filter.IsArchived { - query = query.Where("letters_incoming.is_archived = ?", true) + dataQuery = dataQuery.Where("letters_incoming.is_archived = ?", true) } else { - query = query.Where("letters_incoming.is_archived = ? OR letters_incoming.is_archived IS NULL", false) + dataQuery = dataQuery.Where("letters_incoming.is_archived = ? OR letters_incoming.is_archived IS NULL", false) } }