From 61e9b491f6a14b4500442d91aa593aff80fd7482 Mon Sep 17 00:00:00 2001 From: efrilm Date: Fri, 17 Oct 2025 21:44:17 +0700 Subject: [PATCH] fix is_read --- internal/repository/letter_outgoing_repository.go | 1 + internal/repository/letter_repository.go | 1 + internal/service/letter_service.go | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/internal/repository/letter_outgoing_repository.go b/internal/repository/letter_outgoing_repository.go index dacd487..2ffeaba 100644 --- a/internal/repository/letter_outgoing_repository.go +++ b/internal/repository/letter_outgoing_repository.go @@ -542,6 +542,7 @@ func (r *LetterOutgoingRecipientRepository) GetByLetterIDsAndUser(ctx context.Co var recipients []entities.LetterOutgoingRecipient if err := db.WithContext(ctx). Where("letter_id IN ? AND user_id = ?", letterIDs, userID). + Order("created_by DESC"). Find(&recipients).Error; err != nil { return nil, err } diff --git a/internal/repository/letter_repository.go b/internal/repository/letter_repository.go index 7d4da4b..9bcf295 100644 --- a/internal/repository/letter_repository.go +++ b/internal/repository/letter_repository.go @@ -892,6 +892,7 @@ func (r *LetterIncomingRecipientRepository) GetByLetterIDsAndUser(ctx context.Co var recipients []entities.LetterIncomingRecipient if err := db.WithContext(ctx). Where("letter_id IN ? AND recipient_user_id = ?", letterIDs, userID). + Order("created_by DESC"). Find(&recipients).Error; err != nil { return nil, err } diff --git a/internal/service/letter_service.go b/internal/service/letter_service.go index 9ebbd39..5944645 100644 --- a/internal/service/letter_service.go +++ b/internal/service/letter_service.go @@ -431,6 +431,7 @@ func (s *LetterServiceImpl) ListIncomingLetters(ctx context.Context, req *contra isRead := false if recipient, exists := batchData.recipients[letter.ID]; exists && recipient != nil { isRead = recipient.ReadAt != nil + log.Printf("Recipient: %+v\n", recipient) } resp := transformer.LetterEntityToContract(&letter, attachments, dispositions, priority, institution) @@ -832,7 +833,7 @@ func (s *LetterServiceImpl) GetLetterCTA(ctx context.Context, letterID uuid.UUID func (s *LetterServiceImpl) BulkArchiveIncomingLetters(ctx context.Context, letterIDs []uuid.UUID) (*contract.BulkArchiveLettersResponse, error) { userID := appcontext.FromGinContext(ctx).UserID - + // Archive the letters themselves archivedCount, err := s.processor.BulkArchiveIncomingLettersForUser(ctx, letterIDs, userID) if err != nil {