notification bug fix and refactor

internal/notification/service.go

@@ -5,7 +5,6 @@ import (
 	"errors"
 	"slices"
 	"strings"
-	"time"
 
 	"tm/internal/customer"
 	"tm/internal/user"
@@ -28,6 +27,7 @@ type Service interface {
 // notificationService implements NotificationService interface
 type notificationService struct {
 	sdk             notification.SDK
+	repository      Repository
 	userService     user.Service
 	customerService customer.Service
 	logger          logger.Logger
@@ -36,12 +36,14 @@ type notificationService struct {
 // NewService creates a new notification service
 func NewService(
 	sdk notification.SDK,
+	repository Repository,
 	userService user.Service,
 	customerService customer.Service,
 	logger logger.Logger,
 ) Service {
 	return &notificationService{
 		sdk:             sdk,
+		repository:      repository,
 		userService:     userService,
 		customerService: customerService,
 		logger:          logger,
@@ -192,17 +194,7 @@ func (s *notificationService) GetNotifications(ctx context.Context, req *SearchF
 		"offset":     pagination.Offset,
 	})
 
-	notifications, err := s.sdk.GetNotifications(ctx, &notification.GetNotificationsRequest{
-		Status:    req.Status,
-		Method:    req.Method,
-		EventType: req.EventType,
-		Type:      req.Type,
-		UserID:    req.Recipient,
-		Seen:      req.Seen,
-		Priority:  req.Priority,
-		PerPage:   pagination.Limit,
-		Page:      (pagination.Offset / pagination.Limit) + 1, // Convert 0-based offset to 1-based page number
-	})
+	notifications, total, err := s.repository.GetByUserID(ctx, req.Recipient, req.Status, req.Seen, req.Priority, req.EventType, req.Type, pagination)
 	if err != nil {
 		s.logger.Error("Failed to get notifications", map[string]interface{}{
 			"error": err.Error(),
@@ -211,18 +203,7 @@ func (s *notificationService) GetNotifications(ctx context.Context, req *SearchF
 	}
 
 	notificationsResponse := make([]*NotificationResponse, 0)
-	for _, notification := range notifications.Data {
-		createdAt, _ := time.Parse(time.RFC3339, notification.CreatedAt)
-		createdAtUnix := createdAt.Unix()
-		updatedAt, _ := time.Parse(time.RFC3339, notification.UpdatedAt)
-		updatedAtUnix := updatedAt.Unix()
-		if createdAtUnix < 0 {
-			createdAtUnix = 0
-		}
-		if updatedAtUnix < 0 {
-			updatedAtUnix = 0
-		}
-
+	for _, notification := range notifications {
 		usr, _ := s.userService.GetUserByID(ctx, notification.UserID)
 		cust, _ := s.customerService.GetByID(ctx, notification.UserID)
 
@@ -258,25 +239,31 @@ func (s *notificationService) GetNotifications(ctx context.Context, req *SearchF
 			Status:      notification.Status,
 			Methods:     notification.Methods,
 			Metadata:    notification.Metadata,
-			ScheduleAt:  notification.ScheduledAt,
+			ScheduleAt:  notification.ScheduleAt,
 			IsScheduled: notification.IsScheduled,
 			Image:       imagePtr,
 			Seen:        notification.Seen,
 			SeenAt:      notification.SeenAt,
 			ScheduledAt: notification.ScheduledAt,
-			CreatedAt:   createdAtUnix,
-			UpdatedAt:   updatedAtUnix,
+			CreatedAt:   notification.CreatedAt,
+			UpdatedAt:   notification.UpdatedAt,
 		})
 	}
 
+	// Calculate total pages
+	totalPages := int(total) / pagination.Limit
+	if int(total)%pagination.Limit > 0 {
+		totalPages++
+	}
+
 	return &NotificationListResponse{
 		Notifications: notificationsResponse,
 		Meta: &response.Meta{
-			Total:  notifications.Pagination.Total,
-			Limit:  notifications.Pagination.PerPage,
+			Total:  int(total),
+			Limit:  pagination.Limit,
 			Offset: pagination.Offset,
-			Page:   notifications.Pagination.CurrentPage,
-			Pages:  notifications.Pagination.TotalPages,
+			Page:   (pagination.Offset / pagination.Limit) + 1,
+			Pages:  totalPages,
 		},
 	}, nil
 }
@@ -286,7 +273,7 @@ func (s *notificationService) GetNotification(ctx context.Context, notificationI
 		"notification_id": notificationID,
 	})
 
-	notification, err := s.sdk.GetNotification(ctx, notificationID)
+	notification, err := s.repository.GetByID(ctx, notificationID)
 	if err != nil {
 		s.logger.Error("Failed to get notification", map[string]interface{}{
 			"error":           err.Error(),
@@ -297,17 +284,17 @@ func (s *notificationService) GetNotification(ctx context.Context, notificationI
 
 	// Convert to detailed response format
 	var linkPtr *string
-	if notification.Data.Link != "" {
-		linkPtr = &notification.Data.Link
+	if notification.Link != "" {
+		linkPtr = &notification.Link
 	}
 
 	var imagePtr *string
-	if notification.Data.Image != "" {
-		imagePtr = &notification.Data.Image
+	if notification.Image != "" {
+		imagePtr = &notification.Image
 	}
 
-	usr, _ := s.userService.GetUserByID(ctx, notification.Data.UserID)
-	cust, _ := s.customerService.GetByID(ctx, notification.Data.UserID)
+	usr, _ := s.userService.GetUserByID(ctx, notification.UserID)
+	cust, _ := s.customerService.GetByID(ctx, notification.UserID)
 
 	var recipient any
 	if usr != nil {
@@ -316,35 +303,26 @@ func (s *notificationService) GetNotification(ctx context.Context, notificationI
 		recipient = cust
 	}
 
-	createdAt := notification.Data.CreatedAt.Unix()
-	updatedAt := notification.Data.UpdatedAt.Unix()
-	if createdAt < 0 {
-		createdAt = 0
-	}
-	if updatedAt < 0 {
-		updatedAt = 0
-	}
-
 	detailedResponse := &NotificationResponse{
-		ID:          notification.Data.ID,
-		UserID:      notification.Data.UserID,
+		ID:          notification.ID,
+		UserID:      notification.UserID,
 		Recipient:   recipient,
-		Title:       notification.Data.Title,
-		Message:     notification.Data.Message,
+		Title:       notification.Title,
+		Message:     notification.Message,
 		Link:        linkPtr,
 		Image:       imagePtr,
-		Type:        notification.Data.Type,
-		Priority:    notification.Data.Priority,
-		EventType:   notification.Data.EventType,
-		CreatedAt:   createdAt,
-		UpdatedAt:   updatedAt,
-		Methods:     notification.Data.Methods,
-		Metadata:    notification.Data.Metadata,
-		Status:      notification.Data.Status,
-		Seen:        notification.Data.Seen,
-		SeenAt:      notification.Data.SeenAt,
-		ScheduledAt: notification.Data.ScheduledAt,
-		IsScheduled: notification.Data.IsScheduled,
+		Type:        notification.Type,
+		Priority:    notification.Priority,
+		EventType:   notification.EventType,
+		CreatedAt:   notification.CreatedAt,
+		UpdatedAt:   notification.UpdatedAt,
+		Methods:     notification.Methods,
+		Metadata:    notification.Metadata,
+		Status:      notification.Status,
+		Seen:        notification.Seen,
+		SeenAt:      notification.SeenAt,
+		ScheduledAt: notification.ScheduledAt,
+		IsScheduled: notification.IsScheduled,
 	}
 
 	return detailedResponse, nil
@@ -355,23 +333,14 @@ func (s *notificationService) MarkSeen(ctx context.Context, notificationID, user
 		"notification_id": notificationID,
 	})
 
-	notif, err := s.sdk.GetNotification(ctx, notificationID)
+	err := s.repository.MarkAsSeen(ctx, notificationID, userID)
 	if err != nil {
-		s.logger.Error("Failed to get notification", map[string]interface{}{
+		s.logger.Error("Failed to mark notification as seen", map[string]interface{}{
 			"error":           err.Error(),
 			"notification_id": notificationID,
 		})
 		return err
 	}
-
-	if notif.Data.UserID != userID {
-		return errors.New("notification not found")
-	}
-
-	_, err = s.sdk.MarkSeen(ctx, notificationID)
-	if err != nil {
-		return err
-	}
 	return nil
 }
 
@@ -380,8 +349,12 @@ func (s *notificationService) AllMarkSeen(ctx context.Context, userID string) er
 		"user_id": userID,
 	})
 
-	_, err := s.sdk.AllMarkSeen(ctx, userID)
+	err := s.repository.MarkAllAsSeen(ctx, userID)
 	if err != nil {
+		s.logger.Error("Failed to mark all notifications as seen", map[string]interface{}{
+			"error":   err.Error(),
+			"user_id": userID,
+		})
 		return err
 	}
 	return nil