added fields updated tests

Author: abhayymishraa

backend/apps/owasp/management/commands/owasp_update_leaders.py

@@ -64,27 +64,26 @@ def process_entities(self, model_class, users_list, threshold):
 
         entity_type = ContentType.objects.get_for_model(model_class)
 
-        for entity in model_class.objects.all():
+        for entity in model_class.objects.filter(is_active=True, has_active_repositories=True):
             if not entity.leaders_raw:
                 continue
 
             for index, leader_name in enumerate(entity.leaders_raw):
-                matched_user = self.find_single_user_matches(leader_name, users_list, threshold)
+                matched_users = self.find_all_user_matches(leader_name, users_list, threshold)
 
-                if not matched_user:
+                if not matched_users:
                     continue
 
-                self.stdout.write(f"Match for '{leader_name}': {matched_user['login']}")
-
-                new_members_to_create.append(
+                new_members_to_create.extend(
                     EntityMember(
                         entity_type=entity_type,
                         entity_id=entity.pk,
-                        member_id=matched_user["id"],
+                        member_id=user["id"],
                         kind=EntityMember.MemberKind.LEADER,
                         is_reviewed=False,
                         order=((index + 1) * 10),
                     )
+                    for user in matched_users
                 )
 
         if new_members_to_create:
@@ -106,29 +105,27 @@ def is_valid_user(self, login, name):
         """Check if GitHub user meets minimum requirements."""
         return len(login) >= ID_MIN_LENGTH and len(name or "") >= ID_MIN_LENGTH
 
-    def find_single_user_matches(self, leader_name, users_list, threshold):
+    def find_all_user_matches(self, leader_name, users_list, threshold):
         """Find user matches for a list of raw leader names."""
         if not leader_name:
-            return None
+            return []
 
         leader_lower = leader_name.lower()
 
-        for user in users_list:
-            if user["login"].lower() == leader_lower or (
-                user["name"] and user["name"].lower() == leader_lower
-            ):
-                return user
-
-        best_fuzzy_match = None
-        highest_score = threshold - 1
+        matches = [
+            user
+            for user in users_list
+            if user["login"].lower() == leader_lower
+            or (user["name"] and user["name"].lower() == leader_lower)
+        ]
 
-        for user in users_list:
-            score = fuzz.token_sort_ratio(leader_lower, user["login"].lower())
-            if user["name"]:
-                score = max(score, fuzz.token_sort_ratio(leader_lower, user["name"].lower()))
+        if not matches:
+            for user in users_list:
+                score = fuzz.token_sort_ratio(leader_lower, user["login"].lower())
+                if user["name"]:
+                    score = max(score, fuzz.token_sort_ratio(leader_lower, user["name"].lower()))
 
-            if score > highest_score:
-                highest_score = score
-                best_fuzzy_match = user
+                if score >= threshold:
+                    matches.append(user)
 
-        return best_fuzzy_match
+        return list({user["id"]: user for user in matches}.values())

backend/apps/owasp/migrations/0048_entitymember.py

@@ -31,7 +31,13 @@ class Migration(migrations.Migration):
                 (
                     "is_reviewed",
                     models.BooleanField(
-                        default=False, help_text="Indicates if the membership is verified"
+                        default=False, help_text="Indicates if the membership is reviewed"
+                    ),
+                ),
+                (
+                    "is_active",
+                    models.BooleanField(
+                        default=False, help_text="Indicates if the membership is active"
                     ),
                 ),
                 (

backend/apps/owasp/models/entity_member.py

@@ -35,9 +35,13 @@ class Meta:
     entity = GenericForeignKey("entity_type", "entity_id")
     entity_id = models.PositiveIntegerField()
     entity_type = models.ForeignKey(ContentType, on_delete=models.CASCADE)
+    is_active = models.BooleanField(
+        default=False,
+        help_text="Indicates if the membership is active",
+    )
     is_reviewed = models.BooleanField(
         default=False,
-        help_text="Indicates if the membership is verified",
+        help_text="Indicates if the membership is reviewed",
     )
     kind = models.CharField(
         max_length=6,

backend/tests/apps/owasp/management/commands/owasp_update_leaders_test.py

@@ -42,7 +42,7 @@ def test_command_creates_members_with_correct_order(
         active_users = [u for u in mock_users_data if u["id"] != 4]
         mock_user.objects.values.return_value = active_users
 
-        mock_chapter.objects.all.return_value = [
+        mock_chapter.objects.filter.return_value = [
             self._create_mock_entity(1, "Ordered Chapter", ["jane.doe", "john.doe", "peter_jones"])
         ]
         mock_chapter.__name__ = "Chapter"
@@ -65,6 +65,10 @@ def entity_member_constructor(*_, **kwargs):
         out = io.StringIO()
         call_command("owasp_update_leaders", "chapter", stdout=out)
 
+        mock_chapter.objects.filter.assert_called_once_with(
+            is_active=True, has_active_repositories=True
+        )
+
         mock_em.objects.bulk_create.assert_called_once()
         created_members = mock_em.objects.bulk_create.call_args[0][0]
 
@@ -87,7 +91,7 @@ def test_fuzzy_match_below_threshold(
         self, mock_user, mock_chapter, mock_ct, mock_em, mock_users_data
     ):
         mock_user.objects.values.return_value = mock_users_data
-        mock_chapter.objects.all.return_value = [
+        mock_chapter.objects.filter.return_value = [
             self._create_mock_entity(1, "Fuzzy Chapter", ["Jone Doe"])
         ]
         mock_chapter.__name__ = "Chapter"
@@ -107,7 +111,7 @@ def test_is_valid_user_filtering(
         self, mock_chapter, mock_user, mock_ct, mock_em, mock_users_data
     ):
         mock_user.objects.values.return_value = mock_users_data
-        mock_chapter.objects.all.return_value = [
+        mock_chapter.objects.filter.return_value = [
             self._create_mock_entity(99, "Invalid Chapter", ["a"])
         ]
         mock_chapter.__name__ = "Chapter"
@@ -129,7 +133,7 @@ def test_exact_match_is_preferred_over_fuzzy(
         self, mock_chapter, mock_user, mock_ct, mock_em, mock_fuzz, mock_users_data
     ):
         mock_user.objects.values.return_value = mock_users_data
-        mock_chapter.objects.all.return_value = [
+        mock_chapter.objects.filter.return_value = [
             self._create_mock_entity(1, "Exact Chapter", ["john.doe"])
         ]
         mock_chapter.__name__ = "Chapter"