Small fixes

items/tests.py

@@ -3,7 +3,7 @@ from django.contrib.auth import get_user_model
 from django.core.exceptions import ValidationError
 
 from favorites.models import Favorite
-from items.models import Category, Item, ItemImage, Subcategory
+from items.models import Category, Color, Item, ItemImage, Subcategory
 from orders.models import Cart, CartItem
 
 
@@ -406,6 +406,44 @@ class CatalogViewTests(TestCase):
         self.assertContains(response, 'href="/orders/cart/"', html=False)
         self.assertContains(response, "Перейти в корзину")
 
+    def test_detail_page_selects_first_color_by_default(self):
+        white = Color.objects.create(name="Белый", hex_code="#ffffff")
+        black = Color.objects.create(name="Черный", hex_code="#000000")
+        self.sink.colors.add(black, white)
+        user = get_user_model().objects.create_user(
+            username="default-color-user",
+            email="default-color-user@example.com",
+            password="StrongPassword123",
+            is_active=True,
+        )
+        self.client.force_login(user)
+
+        response = self.client.get("/catalog/plumbing/kitchen-sink/")
+
+        self.assertEqual(response.context["selected_color_id"], white.id)
+        self.assertContains(response, f'value="{white.id}"', html=False)
+        self.assertContains(response, "Цвет: Белый")
+
+    def test_detail_page_keeps_cart_selected_color(self):
+        white = Color.objects.create(name="Белый", hex_code="#ffffff")
+        black = Color.objects.create(name="Черный", hex_code="#000000")
+        self.sink.colors.add(black, white)
+        user = get_user_model().objects.create_user(
+            username="color-cart-user",
+            email="color-cart-user@example.com",
+            password="StrongPassword123",
+            is_active=True,
+        )
+        cart = Cart.objects.create(user=user)
+        CartItem.objects.create(cart=cart, item=self.sink, quantity=1, selected_color=black)
+        self.client.force_login(user)
+
+        response = self.client.get("/catalog/plumbing/kitchen-sink/")
+
+        self.assertEqual(response.context["selected_color_id"], black.id)
+        self.assertContains(response, f'value="{black.id}"', html=False)
+        self.assertContains(response, "Цвет: Черный")
+
     def test_detail_page_guest_cart_cta_redirects_to_login(self):
         response = self.client.get("/catalog/plumbing/kitchen-sink/")
 

items/views.py

@@ -334,6 +334,7 @@ def detail(request: HttpRequest, category: str, slug: str) -> HttpResponse:
         raise Http404()
 
     images = list(item.images.all())
+    colors = list(item.colors.all())
 
     cart_color_id = None
     if request.user.is_authenticated:
@@ -343,12 +344,17 @@ def detail(request: HttpRequest, category: str, slug: str) -> HttpResponse:
         if cart_item and cart_item.selected_color_id:
             cart_color_id = cart_item.selected_color_id
 
+    selected_color_id = cart_color_id
+    if selected_color_id is None and colors:
+        selected_color_id = colors[0].id
+
     return render(request, 'catalog/detail.html', {
         'categories': Category.objects.order_by('name'),
         'item': item,
         'images': images,
+        'colors': colors,
         'primary_image': images[0] if images else None,
         'cart_item_ids': get_user_cart_item_ids(request.user),
-        'cart_color_id': cart_color_id,
+        'selected_color_id': selected_color_id,
         'favorite_item_ids': get_user_favorite_item_ids(request.user),
     })