views: fix include in attention set and review interest count

Author: DATVenancio

patchwork/templatetags/patch.py

@@ -79,7 +79,7 @@ def patch_commit_display(patch):
 
 @register.filter(name='patch_interest')
 def patch_interest(patch):
-    reviews = patch.attention_set.count()
+    reviews = patch.patchattentionset_set.filter(removed=False).count()
     review_title = (
         f'has {reviews} interested reviewers'
         if reviews > 0

patchwork/views/patch.py

@@ -90,9 +90,7 @@ def patch_detail(request, project_id, msgid):
         elif action in ['add-interest', 'remove-interest']:
             if request.user.is_authenticated:
                 if action == 'add-interest':
-                    PatchAttentionSet.objects.get_or_create(
-                        patch=patch, user=request.user
-                    )
+                    PatchAttentionSet.objects.upsert(patch, [request.user.id])
                     message = (
                         'You have declared interest in reviewing this patch'
                     )