Update entity tags parsing logic (OWASP#1142)

* Update entity tags parsing logic

* Update code

Author: arkid15r

backend/apps/github/management/commands/github_update_owasp_organization.py

@@ -43,8 +43,6 @@ def handle(self, *_args, **options):
             )
             return
 
-        remote_owasp_repositories_count = gh_owasp_organization.public_repos
-
         owasp_organization = None
         owasp_user = None
 
@@ -93,18 +91,21 @@ def handle(self, *_args, **options):
         Committee.bulk_save(committees)
         Project.bulk_save(projects)
 
-        # Check repository counts.
-        local_owasp_repositories_count = Repository.objects.filter(
-            is_owasp_repository=True
-        ).count()
-        result = (
-            "==" if remote_owasp_repositories_count == local_owasp_repositories_count else "!="
-        )
-        print(
-            "\n"
-            f"OWASP GitHub repositories count {result} synced repositories count: "
-            f"{remote_owasp_repositories_count} {result} {local_owasp_repositories_count}"
-        )
+        if repository is None:
+            # Check repository counts.
+            local_owasp_repositories_count = Repository.objects.filter(
+                is_owasp_repository=True,
+            ).count()
+            remote_owasp_repositories_count = gh_owasp_organization.public_repos
+            has_same_repositories_count = (
+                local_owasp_repositories_count == remote_owasp_repositories_count
+            )
+            result = "==" if has_same_repositories_count else "!="
+            print(
+                "\n"
+                f"OWASP GitHub repositories count {result} synced repositories count: "
+                f"{remote_owasp_repositories_count} {result} {local_owasp_repositories_count}"
+            )
 
         gh.close()
 

backend/apps/owasp/models/common.py

@@ -122,7 +122,7 @@ def from_github(self, field_mapping):
         self.leaders_raw = self.get_leaders()
         self.is_leaders_policy_compliant = len(self.leaders_raw) > 1
 
-        self.tags = self.parse_tags(entity_metadata.get("tags", []))
+        self.tags = self.parse_tags(entity_metadata.get("tags", None) or [])
 
         return entity_metadata
 
@@ -216,7 +216,10 @@ def get_top_contributors(self, repositories=()):
         ]
 
     def parse_tags(self, tags):
-        """Get entity tags."""
+        """Parse entity tags."""
+        if not tags:
+            return []
+
         return (
             [tag.strip(", ") for tag in tags.split("," if "," in tags else " ")]
             if isinstance(tags, str)

backend/tests/owasp/models/common_test.py

@@ -38,6 +38,50 @@ def test_get_leaders(self, content, expected_leaders):
 
         assert leaders == expected_leaders
 
+    @pytest.mark.parametrize(
+        ("content", "expected_metadata"),
+        [
+            (
+                "\n".join(  # noqa: FLY002
+                    (
+                        "---",
+                        "layout: col-sidebar",
+                        "title: OWASP Oklahoma City",
+                        "tags: ",
+                        "level: 0",
+                        "region: North America",
+                        "auto-migrated: 0",
+                        "meetup-group: Oklahoma-City-Chapter-Meetup",
+                        "country: USA",
+                        "postal-code: 73101",
+                        "---",
+                    )
+                ),
+                {
+                    "auto-migrated": 0,
+                    "country": "USA",
+                    "layout": "col-sidebar",
+                    "level": 0,
+                    "meetup-group": "Oklahoma-City-Chapter-Meetup",
+                    "postal-code": 73101,
+                    "region": "North America",
+                    "tags": None,
+                    "title": "OWASP Oklahoma City",
+                },
+            ),
+        ],
+    )
+    def test_get_metadata(self, content, expected_metadata):
+        model = EntityModel()
+        repository = Repository()
+        repository.name = "www-project-example"
+        model.owasp_repository = repository
+
+        with patch("apps.owasp.models.common.get_repository_file_content", return_value=content):
+            metadata = model.get_metadata()
+
+        assert metadata == expected_metadata
+
     @pytest.mark.parametrize(
         ("key", "expected_url"),
         [
@@ -76,14 +120,17 @@ def test_deactivate(self):
         model.save.assert_called_once_with(update_fields=("is_active",))
 
     @pytest.mark.parametrize(
-        ("tags", "expected_normalized_tags"),
+        ("tags", "expected_tags"),
         [
-            ("tag1, tag2, tag3", ["tag1", "tag2", "tag3"]),
             ("tag1 tag2 tag3", ["tag1", "tag2", "tag3"]),
+            ("tag1, tag2, tag3", ["tag1", "tag2", "tag3"]),
             (["tag1", "tag2", "tag3"], ["tag1", "tag2", "tag3"]),
+            ("", []),
+            ([], []),
+            (None, []),
         ],
     )
-    def test_get_tags(self, tags, expected_normalized_tags):
+    def test_parse_tags(self, tags, expected_tags):
         model = EntityModel()
 
         with patch(
@@ -92,4 +139,4 @@ def test_get_tags(self, tags, expected_normalized_tags):
         ):
             tags = model.parse_tags(tags)
 
-        assert tags == expected_normalized_tags
+        assert tags == expected_tags