Merge pull request #1162 from thunderstore-io/hotfix-visibility-system

Deactivate visibility system update logic

Author: MythicManiac

django/thunderstore/community/models/package_listing.py

@@ -424,11 +424,13 @@ def set_visibility_from_review_status(self):
 
     @transaction.atomic
     def update_visibility(self):
-        self.visibility.copy_from(self.package.visibility)
-
-        self.set_visibility_from_review_status()
-
-        self.visibility.save()
+        return
+        # TODO: Re-enable once visibility system fixed
+        # self.visibility.copy_from(self.package.visibility)
+        #
+        # self.set_visibility_from_review_status()
+        #
+        # self.visibility.save()
 
 
 signals.post_save.connect(PackageListing.post_save, sender=PackageListing)

django/thunderstore/community/tests/test_package_listing.py

@@ -435,170 +435,171 @@ def test_package_listing_has_mod_manager_support(mod_manager_support: bool) -> N
     assert package_listing.has_mod_manager_support == mod_manager_support
 
 
-@pytest.mark.django_db
-def test_package_listing_visibility_inherits_package_is_active(
-    active_package_listing: PackageListing,
-) -> None:
-    assert_visibility_is_public(active_package_listing.visibility)
-
-    package = active_package_listing.package
-
-    package.is_active = False
-    package.save()
-
-    active_package_listing.refresh_from_db()
-    assert_visibility_is_not_visible(active_package_listing.visibility)
-
-    package.is_active = True
-    package.save()
-
-    active_package_listing.refresh_from_db()
-    assert_visibility_is_public(active_package_listing.visibility)
-
-
-@pytest.mark.django_db
-def test_package_listing_visibility_inherits_union_of_package_versions_visibility(
-    active_package_listing: PackageListing,
-) -> None:
-    assert_visibility_is_public(active_package_listing.visibility)
-
-    package = active_package_listing.package
-
-    for version in package.versions.all():
-        version.review_status = PackageVersionReviewStatus.rejected
-        version.save()
-
-    active_package_listing.refresh_from_db()
-    assert_visibility_is_not_public(active_package_listing.visibility)
-
-    for version in package.versions.all():
-        version.is_active = False
-        version.save()
-
-    active_package_listing.refresh_from_db()
-    assert_visibility_is_not_visible(active_package_listing.visibility)
-
-    for version in package.versions.all():
-        version.review_status = PackageVersionReviewStatus.approved
-        version.is_active = True
-        version.save()
-
-    active_package_listing.refresh_from_db()
-    assert_visibility_is_public(active_package_listing.visibility)
-
-
-@pytest.mark.django_db
-def test_set_visibility_from_review_status():
-    listing = PackageListingFactory()
-
-    listing.review_status = PackageListingReviewStatus.rejected
-    listing.set_visibility_from_review_status()
-    listing.visibility.save()
-
-    assert_visibility_is_not_public(listing.visibility)
-
-    listing.visibility.copy_from(listing.package.visibility)
-
-    listing.review_status = PackageListingReviewStatus.unreviewed
-    listing.set_visibility_from_review_status()
-    listing.visibility.save()
-
-    assert_default_visibility(listing.visibility)
-
-    listing.visibility.copy_from(listing.package.visibility)
-
-    listing.community.require_package_listing_approval = True
-    listing.set_visibility_from_review_status()
-    listing.visibility.save()
-
-    assert_visibility_is_not_public(listing.visibility)
-
-
-@pytest.mark.django_db
-def test_is_visible_to_user():
-    listing = PackageListingFactory()
-
-    user = UserFactory.create()
-
-    owner = UserFactory.create()
-    TeamMember.objects.create(
-        user=owner,
-        team=listing.package.owner,
-        role=TeamMemberRole.owner,
-    )
-
-    moderator = UserFactory.create()
-    CommunityMembership.objects.create(
-        user=moderator,
-        community=listing.community,
-        role=CommunityMemberRole.moderator,
-    )
-
-    admin = UserFactory.create(is_superuser=True)
-
-    agents = {
-        "anonymous": None,
-        "user": user,
-        "owner": owner,
-        "moderator": moderator,
-        "admin": admin,
-    }
-
-    flags = [
-        "public_detail",
-        "owner_detail",
-        "moderator_detail",
-        "admin_detail",
-    ]
-
-    # Admins are also moderators but not owners
-    expected = {
-        "public_detail": {
-            "anonymous": True,
-            "user": True,
-            "owner": True,
-            "moderator": True,
-            "admin": True,
-        },
-        "owner_detail": {
-            "anonymous": False,
-            "user": False,
-            "owner": True,
-            "moderator": False,
-            "admin": False,
-        },
-        "moderator_detail": {
-            "anonymous": False,
-            "user": False,
-            "owner": False,
-            "moderator": True,
-            "admin": True,
-        },
-        "admin_detail": {
-            "anonymous": False,
-            "user": False,
-            "owner": False,
-            "moderator": False,
-            "admin": True,
-        },
-    }
-
-    for flag in flags:
-        listing.visibility.public_detail = False
-        listing.visibility.owner_detail = False
-        listing.visibility.moderator_detail = False
-        listing.visibility.admin_detail = False
-
-        setattr(listing.visibility, flag, True)
-        listing.visibility.save()
-
-        for role, subject in agents.items():
-            result = listing.is_visible_to_user(subject)
-            assert result == expected[flag][role], (
-                f"Expected {flag} visibility for {role} to be "
-                f"{expected[flag][role]}, got {result}"
-            )
-
-    listing.visibility = None
-
-    assert not listing.is_visible_to_user(admin)
+# TODO: Re-enable once visibility system fixed
+# @pytest.mark.django_db
+# def test_package_listing_visibility_inherits_package_is_active(
+#     active_package_listing: PackageListing,
+# ) -> None:
+#     assert_visibility_is_public(active_package_listing.visibility)
+#
+#     package = active_package_listing.package
+#
+#     package.is_active = False
+#     package.save()
+#
+#     active_package_listing.refresh_from_db()
+#     assert_visibility_is_not_visible(active_package_listing.visibility)
+#
+#     package.is_active = True
+#     package.save()
+#
+#     active_package_listing.refresh_from_db()
+#     assert_visibility_is_public(active_package_listing.visibility)
+#
+#
+# @pytest.mark.django_db
+# def test_package_listing_visibility_inherits_union_of_package_versions_visibility(
+#     active_package_listing: PackageListing,
+# ) -> None:
+#     assert_visibility_is_public(active_package_listing.visibility)
+#
+#     package = active_package_listing.package
+#
+#     for version in package.versions.all():
+#         version.review_status = PackageVersionReviewStatus.rejected
+#         version.save()
+#
+#     active_package_listing.refresh_from_db()
+#     assert_visibility_is_not_public(active_package_listing.visibility)
+#
+#     for version in package.versions.all():
+#         version.is_active = False
+#         version.save()
+#
+#     active_package_listing.refresh_from_db()
+#     assert_visibility_is_not_visible(active_package_listing.visibility)
+#
+#     for version in package.versions.all():
+#         version.review_status = PackageVersionReviewStatus.approved
+#         version.is_active = True
+#         version.save()
+#
+#     active_package_listing.refresh_from_db()
+#     assert_visibility_is_public(active_package_listing.visibility)
+#
+#
+# @pytest.mark.django_db
+# def test_set_visibility_from_review_status():
+#     listing = PackageListingFactory()
+#
+#     listing.review_status = PackageListingReviewStatus.rejected
+#     listing.set_visibility_from_review_status()
+#     listing.visibility.save()
+#
+#     assert_visibility_is_not_public(listing.visibility)
+#
+#     listing.visibility.copy_from(listing.package.visibility)
+#
+#     listing.review_status = PackageListingReviewStatus.unreviewed
+#     listing.set_visibility_from_review_status()
+#     listing.visibility.save()
+#
+#     assert_default_visibility(listing.visibility)
+#
+#     listing.visibility.copy_from(listing.package.visibility)
+#
+#     listing.community.require_package_listing_approval = True
+#     listing.set_visibility_from_review_status()
+#     listing.visibility.save()
+#
+#     assert_visibility_is_not_public(listing.visibility)
+#
+#
+# @pytest.mark.django_db
+# def test_is_visible_to_user():
+#     listing = PackageListingFactory()
+#
+#     user = UserFactory.create()
+#
+#     owner = UserFactory.create()
+#     TeamMember.objects.create(
+#         user=owner,
+#         team=listing.package.owner,
+#         role=TeamMemberRole.owner,
+#     )
+#
+#     moderator = UserFactory.create()
+#     CommunityMembership.objects.create(
+#         user=moderator,
+#         community=listing.community,
+#         role=CommunityMemberRole.moderator,
+#     )
+#
+#     admin = UserFactory.create(is_superuser=True)
+#
+#     agents = {
+#         "anonymous": None,
+#         "user": user,
+#         "owner": owner,
+#         "moderator": moderator,
+#         "admin": admin,
+#     }
+#
+#     flags = [
+#         "public_detail",
+#         "owner_detail",
+#         "moderator_detail",
+#         "admin_detail",
+#     ]
+#
+#     # Admins are also moderators but not owners
+#     expected = {
+#         "public_detail": {
+#             "anonymous": True,
+#             "user": True,
+#             "owner": True,
+#             "moderator": True,
+#             "admin": True,
+#         },
+#         "owner_detail": {
+#             "anonymous": False,
+#             "user": False,
+#             "owner": True,
+#             "moderator": False,
+#             "admin": False,
+#         },
+#         "moderator_detail": {
+#             "anonymous": False,
+#             "user": False,
+#             "owner": False,
+#             "moderator": True,
+#             "admin": True,
+#         },
+#         "admin_detail": {
+#             "anonymous": False,
+#             "user": False,
+#             "owner": False,
+#             "moderator": False,
+#             "admin": True,
+#         },
+#     }
+#
+#     for flag in flags:
+#         listing.visibility.public_detail = False
+#         listing.visibility.owner_detail = False
+#         listing.visibility.moderator_detail = False
+#         listing.visibility.admin_detail = False
+#
+#         setattr(listing.visibility, flag, True)
+#         listing.visibility.save()
+#
+#         for role, subject in agents.items():
+#             result = listing.is_visible_to_user(subject)
+#             assert result == expected[flag][role], (
+#                 f"Expected {flag} visibility for {role} to be "
+#                 f"{expected[flag][role]}, got {result}"
+#             )
+#
+#     listing.visibility = None
+#
+#     assert not listing.is_visible_to_user(admin)