Merge ~ines-almeida/launchpad:reverse-prevent-bug-in-disabled-product into launchpad:master

[Ines Almeida]

Reverse "Exclude bugs from inactive product series in queries"

Merge commit e150495474baa068650ebee69f4df3a11151e555

Merge this is reversing: https://code.launchpad.net/~ines-almeida/launchpad/+git/launchpad/+merge/440317

[Otto Co-Pilot (otto-copilot)]

Voting criteria not met
https://jenkins.ols.canonical.com/online-services/job/launchpad/3199/

[Clinton Fung (clinton-fung)]

review: Approve

diff --git a/lib/lp/bugs/model/bugtasksearch.py b/lib/lp/bugs/model/bugtasksearch.py
index b34f433..19598bc 100644
--- a/lib/lp/bugs/model/bugtasksearch.py
+++ b/lib/lp/bugs/model/bugtasksearch.py
@@ -72,7 +72,7 @@ from lp.registry.model.distribution import Distribution
 from lp.registry.model.milestone import Milestone
 from lp.registry.model.milestonetag import MilestoneTag
 from lp.registry.model.person import Person
-from lp.registry.model.product import Product, ProductSeries, ProductSet
+from lp.registry.model.product import Product, ProductSet
 from lp.registry.model.teammembership import TeamParticipation
 from lp.services.database.bulk import load
 from lp.services.database.decoratedresultset import DecoratedResultSet
@@ -84,7 +84,6 @@ from lp.services.database.sqlbase import (
 from lp.services.database.stormexpr import (
     ArrayAgg,
     ArrayIntersects,
-    IsTrue,
     Unnest,
     WithMaterialized,
     fti_search,
@@ -611,37 +610,14 @@ def _build_query(params):
         and params.distroseries is None
     ):
         extra_clauses.append(
-            Or(
-                And(
-                    BugTaskFlat.product == None,
-                    BugTaskFlat.productseries == None,
-                ),
-                IsTrue(Product.active),
-            )
+            Or(BugTaskFlat.product == None, Product.active == True)
         )
-
-        join_tables.append(
-            (
-                ProductSeries,
-                LeftJoin(
-                    ProductSeries,
-                    BugTaskFlat.productseries_id == ProductSeries.id,
-                ),
-            )
-        )
-
         join_tables.append(
             (
                 Product,
                 LeftJoin(
                     Product,
-                    And(
-                        Or(
-                            BugTaskFlat.product_id == Product.id,
-                            ProductSeries.productID == Product.id,
-                        ),
-                        Product.active,
-                    ),
+                    And(BugTaskFlat.product_id == Product.id, Product.active),
                 ),
             )
         )
diff --git a/lib/lp/registry/tests/test_private_team_visibility.py b/lib/lp/registry/tests/test_private_team_visibility.py
index 8a4102f..6f68e2f 100644
--- a/lib/lp/registry/tests/test_private_team_visibility.py
+++ b/lib/lp/registry/tests/test_private_team_visibility.py
@@ -24,7 +24,6 @@ from lp.registry.interfaces.teammembership import (
     ITeamMembershipSet,
     TeamMembershipStatus,
 )
-from lp.services.propertycache import clear_property_cache
 from lp.services.webapp.authorization import (
     check_permission,
     clear_cache,
@@ -34,7 +33,6 @@ from lp.services.webapp.interaction import ANONYMOUS
 from lp.services.webapp.servers import LaunchpadTestRequest
 from lp.testing import (
     TestCaseWithFactory,
-    admin_logged_in,
     login,
     login_celebrity,
     login_person,
@@ -414,56 +412,3 @@ class TestPrivateTeamVisibility(TestCaseWithFactory):
 
     def test_team_assigned_to_private_bug(self):
         self._test_team_assigned_to_bug()
-
-    def test_user_cant_see_bug_disabled_product(self, product_series=False):
-        """A user that reports a bug in a private project, can't see the bug
-        once the project is deactivated
-        """
-        private_product = self.factory.makeProduct(
-            owner=self.priv_team,
-            information_type=InformationType.PROPRIETARY,
-            registrant=self.priv_owner,
-        )
-        if product_series:
-            private_series = self.factory.makeProductSeries(
-                product=private_product
-            )
-        # Report a bug within the private product
-        login_person(self.priv_member)
-        bug = self.factory.makeBug(
-            owner=self.priv_member, target=private_product
-        )
-
-        # Change target to the product series
-        if product_series:
-            nomination = bug.addNomination(
-                target=private_series, owner=self.priv_member
-            )
-            nomination.approve(self.priv_owner)
-
-        # Bug reporter user should be able to see the bug initially
-        self.assertTrue(bug.userCanView(self.priv_member))
-
-        # Remove bug reporter from the team
-        with admin_logged_in():
-            private_product.active = False
-        clear_property_cache(bug)
-        # Bug reporter user should no longer have access to the bug
-        self.assertFalse(bug.userCanView(self.priv_member))
-
-    def test_user_cant_see_bug_disabled_product_series(self):
-        """A user that reports a bug in a private project series, can't see
-        the bug once the series's project is deactivated
-        """
-        self.test_user_cant_see_bug_disabled_product(product_series=True)
-
-    def test_user_can_see_bug_without_product(self):
-        """A user that reports a bug withough targetting a product or
-        productseries, can see the bug
-        """
-        # Report a bug within a distribution and set it to private
-        distribution = self.factory.makeDistribution()
-        login_person(self.priv_member)
-        bug = self.factory.makeBug(owner=self.priv_member, target=distribution)
-        bug.setPrivate(True, self.priv_member)
-        self.assertTrue(bug.userCanView(self.priv_member))