Merge pull request #15 from Qwizi/0.0.19

Fix issue when creating guild

src/accounts/views.py

@@ -93,8 +93,11 @@ def steam_callback(request):
     discord_user_session = request.session.get("dc_user", None)
     discord_user = DiscordUser.objects.get(user_id=discord_user_session["id"])
     player, _ = Player.objects.get_or_create(
-        discord_user=discord_user, steam_user=steam_user
+        discord_user=discord_user
     )
+    if not player.steam_user:
+        player.steam_user = steam_user
+        player.save()
     user = User.objects.get(username=discord_user.username)
     user.player = player
     user.save()

src/guilds/models.py

@@ -4,7 +4,7 @@
 from prefix_id import PrefixIDField
 from rest_framework_api_key.models import AbstractAPIKey
 
-from players.models import DiscordUser
+from players.models import DiscordUser, Player
 
 UserModel = get_user_model()
 
@@ -14,7 +14,11 @@
 class GuildManager(models.Manager):
     def create_guild(self, owner_id: str, owner_username: str, **kwargs):
         dc_owner_user, _ = DiscordUser.objects.get_or_create(user_id=owner_id, username=owner_username)
+        player, _ = Player.objects.get_or_create(discord_user=dc_owner_user)
         owner_user, _ = UserModel.objects.get_or_create(username=owner_username)
+        if not owner_user.player:
+            owner_user.player = player
+            owner_user.save()
         guild = self.create(owner=owner_user, **kwargs)
         guild.save()
         return guild

src/guilds/tests/test_views.py

@@ -59,6 +59,9 @@ def test_get_guild(client_with_api_key, guild):
     assert response.data["name"] == guild.name
     assert response.data["owner"] is not None
     assert response.data["guild_id"] == guild.guild_id
+    assert response.data["owner"]["username"] == guild.owner.username
+    assert response.data["owner"]["player"]["id"] == guild.owner.player.id
+    assert response.data["owner"]["player"]["discord_user"]["id"] == guild.owner.player.discord_user.id
 
 @pytest.mark.django_db
 def test_create_guild(client_with_api_key, guild_data):

src/players/migrations/0005_alter_player_steam_user.py

@@ -0,0 +1,19 @@
+# Generated by Django 5.0.4 on 2024-04-21 14:54
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('players', '0004_alter_team_leader'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='player',
+            name='steam_user',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='players.steamuser'),
+        ),
+    ]

src/players/models.py

@@ -31,7 +31,7 @@ def __str__(self):
 class Player(models.Model):
     id = PrefixIDField(primary_key=True, prefix="player")
     discord_user = models.ForeignKey(DiscordUser, on_delete=models.CASCADE)
-    steam_user = models.ForeignKey(SteamUser, on_delete=models.CASCADE)
+    steam_user = models.ForeignKey(SteamUser, on_delete=models.CASCADE, null=True, blank=True)
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)
 

src/players/serializers.py

@@ -16,7 +16,7 @@ class Meta:
 
 class PlayerSerializer(serializers.ModelSerializer):
     discord_user = DiscordUserSerializer()
-    steam_user = SteamUserSerializer()
+    steam_user = SteamUserSerializer(allow_null=True)
 
     class Meta:
         model = Player