http://localhost:8000/users/me/

Author: javiercoronadonarvaez

badges/display.py

@@ -22,13 +22,7 @@
 from django.utils import timezone
 
 from badges.enums import BadgeLabel, TierRank, label_order, rank_order
-from badges.models import (
-    RANK_LADDER_ORDER,
-    Achievement,
-    Badge,
-    BadgeTier,
-    UserBadge,
-)
+from badges.models import Achievement, UserBadge
 from badges.summary import user_badge_summary
 from core.constants import BadgeToken
 
@@ -385,55 +379,29 @@ def _rank_key(user_badge):
 )
 
 
+# Stands in until the dialog is given the reader's own tallies.
+PLACEHOLDER_ACHIEVEMENT_COUNT = 1
+
+
 def achievement_dialog_rows():
     """Every achievement type as a dialog row, Boost Day last.
 
-    Each row is iconed by the badge it feeds, so the dialog shows real artwork
-    rather than a counter standing in for one.
+    Each row carries a counter, which is what the design asks for: the tally is
+    the point, the artwork being the same for every achievement type.
 
     Ordered by name, ``Achievement`` being an admin-editable registry with no
     catalogue ordering of its own.
     """
-    achievements = Achievement.objects.prefetch_related(
-        Prefetch(
-            "badges",
-            queryset=Badge.objects.prefetch_related(
-                Prefetch(
-                    "tiers",
-                    queryset=BadgeTier.objects.filter(is_active=True).order_by(
-                        RANK_LADDER_ORDER
-                    ),
-                    to_attr="active_tiers",
-                )
-            ),
-            to_attr="fed_badges",
-        )
-    )
-    return [_achievement_row(achievement) for achievement in achievements] + [
-        BOOST_DAY_ROW
+    rows = [
+        {
+            "token": BadgeToken.ACHIEVEMENT_COUNT,
+            "count": PLACEHOLDER_ACHIEVEMENT_COUNT,
+            "name": achievement.name,
+            "description": achievement.description,
+        }
+        for achievement in Achievement.objects.all()
     ]
-
-
-def _achievement_row(achievement):
-    """One achievement, iconed by the entry tier of the badge it feeds.
-
-    An achievement with no badge, or one whose badge is briefly tierless while a
-    retuned replacement is created, falls back to the counter. It carries 1
-    rather than a real tally: the dialog names what each achievement is, and the
-    reader's own counts are on their profile.
-    """
-    row = {"name": achievement.name, "description": achievement.description}
-    tier = next(
-        (
-            badge.active_tiers[0]
-            for badge in achievement.fed_badges
-            if badge.active_tiers
-        ),
-        None,
-    )
-    if tier is None:
-        return {**row, "token": BadgeToken.ACHIEVEMENT_COUNT, "count": 1}
-    return {**row, "token": TIER_TOKENS[tier.rank]}
+    return rows + [BOOST_DAY_ROW]
 
 
 def badge_dialog_rows():

badges/tests/test_recognition_dialogs.py

@@ -9,13 +9,12 @@
 from badges.display import (
     ACHIEVEMENT_BASED_ROW,
     BOOST_DAY_ROW,
+    PLACEHOLDER_ACHIEVEMENT_COUNT,
     TENURE_ROW,
-    TIER_TOKENS,
     achievement_dialog_rows,
     badge_dialog_rows,
 )
-from badges.enums import AchievementSlug, TierRank
-from badges.models import Achievement, BadgeTier
+from badges.models import Achievement
 from core.constants import BadgeToken
 
 ACHIEVEMENTS = "v3/includes/_achievements_modal.html"
@@ -41,39 +40,23 @@ def test_achievement_rows_end_with_boost_day(catalogue):
     assert len(rows) == Achievement.objects.count() + 1
 
 
-def test_achievement_rows_are_iconed_by_the_badge_they_feed(catalogue):
-    rows = {row["name"]: row for row in achievement_dialog_rows()}
-    review = Achievement.objects.get(slug=AchievementSlug.LIBRARY_REVIEW)
+def test_achievement_rows_carry_a_counter(catalogue):
+    """Per Figma the achievement icon is a tally, not tier artwork."""
+    rows = achievement_dialog_rows()[:-1]
 
-    assert rows[review.name]["token"] == TIER_TOKENS[TierRank.BRONZE]
-    assert "count" not in rows[review.name]
+    assert {row["token"] for row in rows} == {BadgeToken.ACHIEVEMENT_COUNT}
+    assert {row["count"] for row in rows} == {PLACEHOLDER_ACHIEVEMENT_COUNT}
 
 
-def test_achievement_with_no_badge_falls_back_to_the_counter(db):
-    achievement = Achievement.objects.create(slug="manual-only", name="Manual Only")
-
-    row, _boost_day = achievement_dialog_rows()
-
-    assert row["name"] == achievement.name
-    assert row["token"] == BadgeToken.ACHIEVEMENT_COUNT
-    assert row["count"] == 1
-
-
-def test_achievement_whose_badge_is_tierless_falls_back_to_the_counter(catalogue):
-    """A retuned badge is briefly tierless while its replacement is created."""
-    achievement = Achievement.objects.get(slug=AchievementSlug.LIBRARY_REVIEW)
-    BadgeTier.objects.filter(badge__achievement=achievement).update(is_active=False)
-
-    rows = {row["name"]: row for row in achievement_dialog_rows()}
+def test_single_digit_counts_render_padded(catalogue):
+    """A single digit is padded so the counter keeps one width."""
+    out = render_to_string(ACHIEVEMENTS, {})
 
-    assert rows[achievement.name]["token"] == BadgeToken.ACHIEVEMENT_COUNT
+    assert ">01<" in out
 
 
-def test_achievement_rows_cost_a_fixed_number_of_queries(
-    catalogue, django_assert_num_queries
-):
-    """Prefetching keeps the row count from driving the query count."""
-    with django_assert_num_queries(3):
+def test_achievement_rows_cost_one_query(catalogue, django_assert_num_queries):
+    with django_assert_num_queries(1):
         achievement_dialog_rows()
 
 

core/templatetags/number_filters.py

@@ -33,8 +33,9 @@ def compact_number(value):
 @register.filter
 def k_count(value):
     """
-    Achievement-counter format per Figma spec: 1..999 shown as-is, 1000+ uses
-    the "K" dimension — e.g. 1000 → "1K", 5500 → "5.5K", 10000 → "10K".
+    Achievement-counter format per Figma spec: a single digit is padded to two
+    so the counter keeps one width — e.g. 1 → "01", 9 → "09" — 10..999 are shown
+    as-is, and 1000+ uses the "K" dimension: 1000 → "1K", 5500 → "5.5K".
     Non-numeric values are returned unchanged.
     """
     if value is None:
@@ -44,7 +45,7 @@ def k_count(value):
     except (TypeError, ValueError):
         return value
     if n < 1000:
-        return str(n)
+        return f"{n:02d}" if 0 <= n < 10 else str(n)
     k = n / 1000
     formatted = f"{k:.1f}".rstrip("0").rstrip(".")
     return f"{formatted}K"

core/tests/test_templatetags.py

@@ -2,6 +2,7 @@
 from datetime import date, timedelta
 
 from ..templatetags.date_filters import years_since
+from ..templatetags.number_filters import k_count
 from ..templatetags.text_helpers import to_json
 
 
@@ -48,3 +49,16 @@ def test_to_json_escapes_html_special_chars():
 def test_to_json_prevents_script_injection():
     raw = to_json([{"value": "x", "label": "</script><script>alert(1)"}])
     assert "</script>" not in raw
+
+
+def test_k_count_pads_single_digits():
+    """The counter keeps one width, so 1..9 are shown as 01..09."""
+    assert [k_count(n) for n in (0, 1, 9)] == ["00", "01", "09"]
+
+
+def test_k_count_leaves_wider_numbers_alone():
+    assert [k_count(n) for n in (10, 99, 999)] == ["10", "99", "999"]
+
+
+def test_k_count_still_uses_the_k_dimension():
+    assert [k_count(n) for n in (1000, 5500, 10000)] == ["1K", "5.5K", "10K"]