fix: don't filter to just unread notifications when squashing/upserting (#578)

Author: wesleynw

api/internal/db/queries/notifications.sql.go

@@ -84,23 +84,21 @@ WHERE notifications.user_id = $1 AND notifications.viewed = $4 AND notifications
 ORDER BY notifications.created_at DESC
 LIMIT $3;
 
--- name: FindUnreadLikeNotificationForPost :one
+-- name: FindLikeNotificationForPost :one
 SELECT *
 FROM notifications
 WHERE user_id = $1
   AND notification_type = 'like'
-  AND viewed = FALSE
   AND post_id = $2
   AND comment_id IS NULL
 ORDER BY created_at DESC
 LIMIT 1;
 
--- name: FindUnreadLikeNotificationForComment :one
+-- name: FindLikeNotificationForComment :one
 SELECT *
 FROM notifications
 WHERE user_id = $1
   AND notification_type = 'like'
-  AND viewed = FALSE
   AND post_id = $2
   AND comment_id = $3
 ORDER BY created_at DESC

api/internal/db/queries/querier.go

@@ -212,13 +212,12 @@ func (s *Service) AddLikeNotification(ctx context.Context, currentUserId int, po
 		return err
 	}
 
-	existingLikeNotification, err := s.notificationRepository.FindUnreadLikeNotification(ctx, recipientId, postId, commentId)
+	existingLikeNotification, err := s.notificationRepository.FindLikeNotification(ctx, recipientId, postId, commentId)
 	if err != nil {
 		return err
 	}
 
-	// TODO: add a unique constraint on the notifications table (e.g. (user_id, post_id, notification_type) with a
-	// partial index WHERE NOT viewed)
+	// TODO: add a unique constraint on the notifications table (e.g. (user_id, post_id, notification_type))
 	if existingLikeNotification == nil {
 		message, err := s.buildLikedMessage(ctx, []int{currentUser.UserID}, commentId != nil)
 		if err != nil {
@@ -272,7 +271,7 @@ func (s *Service) RemoveLikeNotification(ctx context.Context, currentUserId int,
 		recipientId = comment.UserID
 	}
 
-	existingLikeNotification, err := s.notificationRepository.FindUnreadLikeNotification(ctx, recipientId, postId, commentId)
+	existingLikeNotification, err := s.notificationRepository.FindLikeNotification(ctx, recipientId, postId, commentId)
 	if err != nil || existingLikeNotification == nil {
 		return err
 	}

api/internal/db/sql/notifications.sql

@@ -162,7 +162,7 @@ func TestGetUserUnreadNotificationsCount(t *testing.T) {
 	assert.Equal(t, 1, count)
 }
 
-func TestFindUnreadLikeNotification_PostNotification(t *testing.T) {
+func TestFindLikeNotification_PostNotification(t *testing.T) {
 	env := setupNotificationService(t)
 	user := testutil.CreateTestUser(t, env.userRepository, "testUser")
 
@@ -173,13 +173,13 @@ func TestFindUnreadLikeNotification_PostNotification(t *testing.T) {
 	_, err = env.notificationRepository.InsertNotification(t.Context(), user.UserID, &post.PostID, nil, nil, "@user liked your post.", models.NotificationTypeLike, nil)
 	require.NoError(t, err)
 
-	result, err := env.notificationRepository.FindUnreadLikeNotification(t.Context(), user.UserID, post.PostID, nil)
+	result, err := env.notificationRepository.FindLikeNotification(t.Context(), user.UserID, post.PostID, nil)
 	require.NoError(t, err)
 	require.NotNil(t, result)
 	assert.Equal(t, "@user liked your post.", result.Message)
 }
 
-func TestFindUnreadLikeNotification_CommentNotification(t *testing.T) {
+func TestFindLikeNotification_CommentNotification(t *testing.T) {
 	env := setupNotificationService(t)
 	user := testutil.CreateTestUser(t, env.userRepository, "testUser")
 
@@ -193,7 +193,7 @@ func TestFindUnreadLikeNotification_CommentNotification(t *testing.T) {
 	_, err = env.notificationRepository.InsertNotification(t.Context(), user.UserID, &post.PostID, &comment.CommentID, nil, "@user liked your comment.", models.NotificationTypeLike, nil)
 	require.NoError(t, err)
 
-	result, err := env.notificationRepository.FindUnreadLikeNotification(t.Context(), user.UserID, post.PostID, &comment.CommentID)
+	result, err := env.notificationRepository.FindLikeNotification(t.Context(), user.UserID, post.PostID, &comment.CommentID)
 	require.NoError(t, err)
 	require.NotNil(t, result)
 	assert.Equal(t, "@user liked your comment.", result.Message)

api/internal/notification/service.go

@@ -153,18 +153,18 @@ func (r NotificationStore) GetUnreadNotificationsForUserIdWithTimeOffset(ctx con
 	return result, nil
 }
 
-// FindUnreadLikeNotification finds an unread like notification for a user
-func (r NotificationStore) FindUnreadLikeNotification(ctx context.Context, userId int, postId int, commentId *int) (*models.Notification, error) {
+// FindLikeNotification finds the most recent like notification for a user on a post or comment
+func (r NotificationStore) FindLikeNotification(ctx context.Context, userId int, postId int, commentId *int) (*models.Notification, error) {
 	var notification queries.Notification
 	var err error
 
 	if commentId == nil {
-		notification, err = r.querier.FindUnreadLikeNotificationForPost(ctx, queries.FindUnreadLikeNotificationForPostParams{
+		notification, err = r.querier.FindLikeNotificationForPost(ctx, queries.FindLikeNotificationForPostParams{
 			UserID: userId,
 			PostID: &postId,
 		})
 	} else {
-		notification, err = r.querier.FindUnreadLikeNotificationForComment(ctx, queries.FindUnreadLikeNotificationForCommentParams{
+		notification, err = r.querier.FindLikeNotificationForComment(ctx, queries.FindLikeNotificationForCommentParams{
 			UserID:    userId,
 			PostID:    &postId,
 			CommentID: commentId,