Fix friend_code max length issues in tests, and fix in_game_name length issues, also update tests to fit more scenarios

accounts/models.py

@@ -1,6 +1,14 @@
 from django.contrib.auth.models import AbstractUser
 from django.db import models
 from django.core.exceptions import ValidationError
+import re
+
+def validate_friend_code(value):
+    """Validate that friend code follows the format XXXX-XXXX-XXXX-XXXX where X is a digit."""
+    if not re.match(r'^\d{4}-\d{4}-\d{4}-\d{4}$', value):
+        raise ValidationError(
+            'Friend code must be in format XXXX-XXXX-XXXX-XXXX where X is a digit.'
+        )
 
 class CustomUser(AbstractUser):
     default_friend_code = models.ForeignKey("FriendCode", on_delete=models.SET_NULL, null=True, blank=True)
@@ -34,8 +42,8 @@ class CustomUser(AbstractUser):
             self.save(update_fields=["default_friend_code"])
 
 class FriendCode(models.Model):
-    friend_code = models.CharField(max_length=19)
-    in_game_name = models.CharField(max_length=16, null=False, blank=False)
+    friend_code = models.CharField(max_length=19, validators=[validate_friend_code])
+    in_game_name = models.CharField(max_length=14, null=False, blank=False)
     user = models.ForeignKey(CustomUser, on_delete=models.PROTECT, related_name='friend_codes')
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)

accounts/tests.py

@@ -12,6 +12,7 @@ from accounts.models import FriendCode
 from accounts.forms import FriendCodeForm, CustomUserCreationForm, UserSettingsForm
 from accounts.templatetags import gravatar
 from trades.models import TradeOffer
+from tests.utils.rarity import RARITY_MAPPING
 
 # Create your tests here.
 
@@ -415,11 +416,11 @@ class FriendCodeViewsTests(TestCase):
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
         # POST request.
-        new_data = {"in_game_name": "UpdatedViewGame"}
+        new_data = {"in_game_name": "UpdatedGame"}
         response = self.client.post(url, new_data)
         self.assertEqual(response.status_code, 302)
         self.friend_code2.refresh_from_db()
-        self.assertEqual(self.friend_code2.in_game_name, "UpdatedViewGame")
+        self.assertEqual(self.friend_code2.in_game_name, "UpdatedGame")
 
     def test_edit_friend_code_view_wrong_user(self):
         """A user should not be able to edit a friend code that does not belong to them."""
@@ -490,7 +491,7 @@ class FriendCodeViewsTests(TestCase):
         self.trade_offer = TradeOffer.objects.create(
             initiated_by=self.friend_code2,
             is_closed=False,
-            rarity_icon="⭐️",
+            rarity_icon=RARITY_MAPPING[5],
             rarity_level=5
         )
         url = reverse("delete_friend_code", kwargs={"pk": self.friend_code2.pk})