rename promoted_group, promoted

Author: chrstinalin

src/olympia/abuse/actions.py

@@ -256,7 +256,7 @@ def should_hold_action(self):
                 or self.target.groups_list  # has any permissions
                 # owns a high profile add-on
                 or any(
-                    any(addon.promoted_group(currently_approved=False).high_profile)
+                    any(addon.promoted_groups(currently_approved=False).high_profile)
                     for addon in self.target.addons.all()
                 )
             )
@@ -287,7 +287,7 @@ def should_hold_action(self):
         return bool(
             self.target.status != amo.STATUS_DISABLED
             # is a high profile add-on
-            and any(self.target.promoted_group(currently_approved=False).high_profile)
+            and any(self.target.promoted_groups(currently_approved=False).high_profile)
         )
 
     def log_action(self, activity_log_action, *extra_args, extra_details=None):
@@ -518,7 +518,7 @@ def should_hold_action(self):
             not self.target.deleted
             and self.target.reply_to
             and any(
-                self.target.addon.promoted_group(
+                self.target.addon.promoted_groups(
                     currently_approved=False
                 ).high_profile_rating
             )

src/olympia/abuse/cinder.py

@@ -351,7 +351,7 @@ def get_attributes(self):
         # promoted in any way, but we don't care about the promotion being
         # approved for the current version, it would make more queries and it's
         # not useful for moderation purposes anyway.
-        promoted_group = self.addon.promoted_group(currently_approved=False)
+        promoted_group = self.addon.promoted_groups(currently_approved=False)
         data = {
             'id': self.id,
             'average_daily_users': self.addon.average_daily_users,

src/olympia/addons/indexers.py

@@ -664,7 +664,7 @@ def extract_document(cls, obj):
 
         data['is_recommended'] = any(
             PROMOTED_GROUP_CHOICES.RECOMMENDED == promotion.group_id
-            for promotion in obj.promoted
+            for promotion in obj.cached_promoted_groups
         )
 
         data['previews'] = [
@@ -685,7 +685,7 @@ def extract_document(cls, obj):
                     app.id for app in obj.approved_applications_for(promotion)
                 ],
             }
-            for promotion in obj.promoted
+            for promotion in obj.cached_promoted_groups
         )
 
         data['ratings'] = {

src/olympia/addons/models.py

@@ -1556,7 +1556,7 @@ def _is_recommended_theme(self):
             ).exists()
         )
 
-    def promoted_group(self, *, currently_approved=True):
+    def promoted_groups(self, *, currently_approved=True):
         """Is the addon currently promoted for the current applications?
 
         Returns the group constant, or NOT_PROMOTED (which is falsey)
@@ -1576,8 +1576,8 @@ def promoted_group(self, *, currently_approved=True):
         )
 
     @cached_property
-    def promoted(self):
-        promoted_group = self.promoted_group()
+    def cached_promoted_groups(self):
+        promoted_group = self.promoted_groups()
         if promoted_group:
             return promoted_group.all()
         else:
@@ -1658,7 +1658,7 @@ def can_set_compatibility(self):
     def can_be_compatible_with_all_fenix_versions(self):
         """Whether or not the addon is allowed to be compatible with all Fenix
         versions (i.e. it's a recommended/line extension for Android)."""
-        promotions = self.promoted
+        promotions = self.cached_promoted_groups
         approved_applications = self.approved_applications
 
         return (

src/olympia/addons/serializers.py

@@ -513,7 +513,7 @@ def validate_is_disabled(self, disable):
             ):
                 raise exceptions.ValidationError(gettext('File is already disabled.'))
             if not version.can_be_disabled_and_deleted():
-                group = version.addon.promoted_group()
+                group = version.addon.promoted_groups()
                 msg = gettext(
                     'The latest approved version of this %s add-on cannot be deleted '
                     'because the previous version was not approved for %s promotion. '
@@ -1026,7 +1026,7 @@ class AddonSerializer(AMOModelSerializer):
         ],
     )
     previews = PreviewSerializer(many=True, source='current_previews', read_only=True)
-    promoted = serializers.SerializerMethodField()
+    promoted = serializers.SerializerMethodField(source='cached_promoted_groups')
     ratings = serializers.SerializerMethodField()
     ratings_url = serializers.SerializerMethodField()
     review_url = serializers.SerializerMethodField()
@@ -1148,7 +1148,7 @@ def to_representation(self, obj):
         return data
 
     def get_promoted(self, obj):
-        promoted = obj.promoted
+        promoted = obj.cached_promoted_groups
         return PromotedGroupSerializer(
             many=True, read_only=True, instance=promoted, addon=obj
         ).data
@@ -1163,7 +1163,7 @@ def is_recommended(obj):
             try:
                 return any(
                     PROMOTED_GROUP_CHOICES.RECOMMENDED == promotion.group_id
-                    for promotion in obj.promoted
+                    for promotion in obj.cached_promoted_groups
                 )
             except TypeError:
                 return PROMOTED_GROUP_CHOICES.RECOMMENDED == obj.promoted.group_id

src/olympia/addons/tests/test_models.py

@@ -1635,88 +1635,88 @@ def test_attach_previews(self):
         vp = VersionPreview.objects.create(version=addons[3].current_version)
         assert addons[3].current_previews == [vp]
 
-    def test_promoted_group(self):
+    def test_promoted_groups(self):
         addon = addon_factory()
         # default case - no group so not recommended
-        assert not addon.promoted_group()
-        assert not addon.promoted_group(currently_approved=False)
+        assert not addon.promoted_groups()
+        assert not addon.promoted_groups(currently_approved=False)
 
         # It's promoted but nothing has been approved
         promoted = PromotedAddon.objects.create(
             addon=addon, group_id=PROMOTED_GROUP_CHOICES.LINE
         )
-        assert addon.promoted_group(currently_approved=False)
-        assert not addon.promoted_group()
+        assert addon.promoted_groups(currently_approved=False)
+        assert not addon.promoted_groups()
 
         # The latest version is approved for the same group.
         promoted.approve_for_version(version=addon.current_version)
-        assert addon.promoted_group()
-        assert PROMOTED_GROUP_CHOICES.LINE in addon.promoted_group().group_id
+        assert addon.promoted_groups()
+        assert PROMOTED_GROUP_CHOICES.LINE in addon.promoted_groups().group_id
 
         # if the group has changes the approval for the current version isn't
         # valid
         promoted.update(group_id=PROMOTED_GROUP_CHOICES.SPOTLIGHT)
-        assert not addon.promoted_group()
-        assert addon.promoted_group(currently_approved=False)
+        assert not addon.promoted_groups()
+        assert addon.promoted_groups(currently_approved=False)
         assert (
             PROMOTED_GROUP_CHOICES.SPOTLIGHT
-            in addon.promoted_group(currently_approved=False).group_id
+            in addon.promoted_groups(currently_approved=False).group_id
         )
 
         promoted.approve_for_version(version=addon.current_version)
-        assert PROMOTED_GROUP_CHOICES.SPOTLIGHT in addon.promoted_group().group_id
+        assert PROMOTED_GROUP_CHOICES.SPOTLIGHT in addon.promoted_groups().group_id
 
         # Application specific group membership should work too
         # if no app is specifed in the PromotedAddon everything should match
-        assert PROMOTED_GROUP_CHOICES.SPOTLIGHT in addon.promoted_group().group_id
+        assert PROMOTED_GROUP_CHOICES.SPOTLIGHT in addon.promoted_groups().group_id
 
         # update to mobile app
         promoted.update(application_id=amo.ANDROID.id)
-        assert addon.promoted_group()
+        assert addon.promoted_groups()
         # but if there's no approval for Android it's not promoted
         addon.current_version.promoted_approvals.filter(
             application_id=amo.ANDROID.id
         ).delete()
-        assert not addon.promoted_group()
+        assert not addon.promoted_groups()
         promoted.update(application_id=amo.FIREFOX.id)
-        assert PROMOTED_GROUP_CHOICES.SPOTLIGHT in addon.promoted_group().group_id
+        assert PROMOTED_GROUP_CHOICES.SPOTLIGHT in addon.promoted_groups().group_id
 
         # check it doesn't error if there's no current_version
         addon.current_version.file.update(status=amo.STATUS_DISABLED)
         addon.update_version()
         assert not addon.current_version
-        assert not addon.promoted_group()
-        assert addon.promoted_group(currently_approved=False)
+        assert not addon.promoted_groups()
+        assert addon.promoted_groups(currently_approved=False)
 
     def test_promoted(self):
         addon = addon_factory()
         # default case - no group so return None.
-        assert not addon.promoted
+        assert not addon.cached_promoted_groups
 
         # It's promoted but nothing has been approved.
         promoted = PromotedAddon.objects.create(
             addon=addon, group_id=PROMOTED_GROUP_CHOICES.LINE
         )
-        assert not addon.promoted
+        assert not addon.cached_promoted_groups
 
         # The latest version is approved.
         promoted.approve_for_version(addon.current_version)
-        del addon.promoted
+        del addon.cached_promoted_groups
         assert any(
-            promotion.group_id == promoted.group_id for promotion in addon.promoted
+            promotion.group_id == promoted.group_id for promotion in addon.cached_promoted_groups
         )
 
         # If the group changes the approval for the current version isn't
         # valid.
         promoted.update(group_id=PROMOTED_GROUP_CHOICES.SPOTLIGHT)
-        del addon.promoted
-        assert not addon.promoted
+        del addon.cached_promoted_groups
+        assert not addon.cached_promoted_groups
 
         # Add an approval for the new group.
         promoted.approve_for_version(addon.current_version)
-        del addon.promoted
+        del addon.cached_promoted_groups
         assert any(
-            promotion.group_id == promoted.group_id for promotion in addon.promoted
+            promotion.group_id == promoted.group_id for promotion in addon.cached_promoted_groups
         )
 
     def test_promoted_theme(self):
@@ -1725,23 +1725,23 @@ def test_promoted_theme(self):
         )
         addon = addon_factory(type=amo.ADDON_STATICTHEME)
         # default case - no group so return None.
-        assert not addon.promoted
+        assert not addon.cached_promoted_groups
 
         featured_collection, _ = Collection.objects.get_or_create(
             id=settings.COLLECTION_FEATURED_THEMES_ID
         )
         featured_collection.add_addon(addon)
-        del addon.promoted
+        del addon.cached_promoted_groups
         # it's in the collection, so is now promoted.
-        assert addon.promoted
+        assert addon.cached_promoted_groups
         assert any(recommended == promotion for promotion in addon.promoted)
 
         featured_collection.remove_addon(addon)
-        del addon.promoted
+        del addon.cached_promoted_groups
         addon = Addon.objects.get(id=addon.id)
         # assert not addon.promotedaddon
         # but not when it's removed.
-        assert not addon.promoted
+        assert not addon.cached_promoted_groups
 
     def test_block_property(self):
         addon = Addon.objects.get(id=3615)
@@ -1789,7 +1789,7 @@ def test_can_be_compatible_with_all_fenix_versions_property(self):
 
         # The latest version is approved.
         promoted.approve_for_version(addon.current_version)
-        del addon.promoted
+        del addon.cached_promoted_groups
         assert addon.can_be_compatible_with_all_fenix_versions
 
         promoted.update(application_id=amo.FIREFOX.id)

src/olympia/addons/tests/test_serializers.py

@@ -586,7 +586,7 @@ def test_promoted_shim(self):
             promoted_group=group,
         )
 
-        assert self.addon.promoted_group()
+        assert self.addon.promoted_groups()
 
         # v3 and v4 expect the promoted addon directly.
         gates = {self.request.version: ('promoted-groups-shim',)}

src/olympia/addons/tests/test_views.py

@@ -5622,7 +5622,7 @@ def test_filter_by_featured_no_app_no_lang(self):
             promoted_id=PROMOTED_GROUP_CHOICES.RECOMMENDED,
         )
         addon_factory(slug='other-addon', name='Other Addôn')
-        assert PROMOTED_GROUP_CHOICES.RECOMMENDED in addon.promoted_group().group_id
+        assert PROMOTED_GROUP_CHOICES.RECOMMENDED in addon.promoted_groups().group_id
         self.reindex(Addon)
 
         data = self.perform_search(self.url, {'featured': 'true'})
@@ -5647,7 +5647,7 @@ def test_filter_by_promoted(self):
             min=av_min,
             max=av_max,
         )
-        assert PROMOTED_GROUP_CHOICES.RECOMMENDED in addon.promoted_group().group_id
+        assert PROMOTED_GROUP_CHOICES.RECOMMENDED in addon.promoted_groups().group_id
         assert addon.promotedaddon.application_id is None  # i.e. all
         assert addon.approved_applications == [
             amo.FIREFOX,
@@ -5665,7 +5665,7 @@ def test_filter_by_promoted(self):
         )
         # This case is approved for all apps, but now only set for Firefox
         addon2.promotedaddon.update(application_id=amo.FIREFOX.id)
-        assert PROMOTED_GROUP_CHOICES.RECOMMENDED in addon2.promoted_group().group_id
+        assert PROMOTED_GROUP_CHOICES.RECOMMENDED in addon2.promoted_groups().group_id
         assert addon2.promotedaddon.application_id is amo.FIREFOX.id
         assert addon2.approved_applications == [amo.FIREFOX]
 
@@ -5690,7 +5690,7 @@ def test_filter_by_promoted(self):
         addon4.promotedaddon.update(application_id=amo.FIREFOX.id)
         addon4.promotedaddon.approve_for_version(addon4.current_version)
         addon4.promotedaddon.update(application_id=None)
-        assert PROMOTED_GROUP_CHOICES.RECOMMENDED in addon4.promoted_group().group_id
+        assert PROMOTED_GROUP_CHOICES.RECOMMENDED in addon4.promoted_groups().group_id
         assert addon4.promotedaddon.application_id is None  # i.e. all
         assert addon4.approved_applications == [amo.FIREFOX]
 
@@ -5706,7 +5706,7 @@ def test_filter_by_promoted(self):
         addon5.promotedaddon.update(application_id=amo.ANDROID.id)
         addon5.promotedaddon.approve_for_version(addon5.current_version)
         addon5.promotedaddon.update(application_id=None)
-        assert PROMOTED_GROUP_CHOICES.RECOMMENDED in addon5.promoted_group().group_id
+        assert PROMOTED_GROUP_CHOICES.RECOMMENDED in addon5.promoted_groups().group_id
         assert addon5.promotedaddon.application_id is None  # i.e. all
         assert addon5.approved_applications == [amo.ANDROID]
 
@@ -6645,8 +6645,8 @@ def tearDown(self):
     def test_basic(self):
         addon1 = addon_factory(promoted_id=PROMOTED_GROUP_CHOICES.RECOMMENDED)
         addon2 = addon_factory(promoted_id=PROMOTED_GROUP_CHOICES.RECOMMENDED)
-        assert PROMOTED_GROUP_CHOICES.RECOMMENDED in addon1.promoted_group().group_id
-        assert PROMOTED_GROUP_CHOICES.RECOMMENDED in addon2.promoted_group().group_id
+        assert PROMOTED_GROUP_CHOICES.RECOMMENDED in addon1.promoted_groups().group_id
+        assert PROMOTED_GROUP_CHOICES.RECOMMENDED in addon2.promoted_groups().group_id
         addon_factory()  # not recommended so shouldn't show up
         self.refresh()
 

src/olympia/addons/views.py

@@ -732,7 +732,7 @@ def update(self, request, *args, **kwargs):
     def destroy(self, request, *args, **kwargs):
         instance = self.get_object()
         if not instance.can_be_disabled_and_deleted():
-            group = self.get_addon_object().promoted_group()
+            group = self.get_addon_object().promoted_groups()
             msg = gettext(
                 'The latest approved version of this %s add-on cannot be deleted '
                 'because the previous version was not approved for %s promotion. '

src/olympia/devhub/templates/devhub/includes/addon_details.html

@@ -6,7 +6,7 @@
     {% set status_text = _('Invisible') %}
     {% set tooltip_text = status_tips['invisible'] %}
   {% else %}
-    {% set promoted_group = addon.promoted_group() %}
+    {% set promoted_group = addon.promoted_groups() %}
     {% if addon.status == amo.STATUS_APPROVED and promoted_group.badged|python_any %}
       {% set status_text = _('Approved and %s' % promoted_group.name) %}
     {% else %}

src/olympia/devhub/templates/devhub/new-landing/components/my-addons.html

@@ -1,5 +1,5 @@
 {% macro render_status(addon) %}
-  {% set promoted_group = addon.promoted_group() %}
+  {% set promoted_group = addon.promoted_groups() %}
   {% if addon.status != amo.STATUS_DISABLED and addon.disabled_by_user %}
     {% set status_text = _('Invisible') %}
   {% elif addon.status == amo.STATUS_APPROVED and promoted_group.badged|python_any %}

src/olympia/devhub/templates/devhub/versions/list.html

@@ -297,7 +297,7 @@ <h3 data-tmpl="{{ _('Delete Version {version}') }}"></h3>
     </form>
     <p class="promoted-version-warning">
       {# will be hidden by default, shown by javascript if data-can-be-disabled is falsey #}
-      {% trans promoted_group_name = addon.promoted_group().name %}
+      {% trans promoted_group_name = addon.promoted_groups().name %}
         The latest approved version of this {{ promoted_group_name }} add-on cannot be deleted or disabled
         because the previous version was not approved for {{ promoted_group_name }} promotion.
         Please contact AMO Admins if you need help with this.

src/olympia/devhub/tests/test_views_submit.py

@@ -2493,7 +2493,7 @@ def test_submit_notification_warning(self):
         assert doc('.notification-box.warning')
         assert doc('.notification-box.warning').html().strip() == config.value
 
-    def test_submit_notification_warning_pre_review_ignore_if_not_promoted_group(self):
+    def test_submit_notification_warning_pre_review_ignore_if_not_promoted_groups(self):
         Config.objects.create(
             key='submit_notification_warning_pre_review',
             value='Warning for pre_review and <a href="http://example.com">a link</a>.',

src/olympia/devhub/tests/test_views_versions.py

@@ -243,7 +243,7 @@ def test_can_disable_or_delete_current_ver_if_previous_recommended(self):
         assert self.addon.current_version == previous_version
         # It's still recommended.
         assert (
-            PROMOTED_GROUP_CHOICES.RECOMMENDED in self.addon.promoted_group().group_id
+            PROMOTED_GROUP_CHOICES.RECOMMENDED in self.addon.promoted_groups().group_id
         )
 
     def test_can_still_disable_or_delete_old_version_recommended(self):