Delete .idea directory

API/Apps/Chat/migrations/0001_initial.py

@@ -1,8 +1,7 @@
-# Generated by Django 5.0.3 on 2024-03-27 09:21
+# Generated by Django 5.0.3 on 2024-04-20 22:52
 
 import django.db.models.deletion
 import uuid
-from django.conf import settings
 from django.db import migrations, models
 
 
@@ -11,16 +10,16 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('Profile', '0001_initial'),
     ]
 
     operations = [
         migrations.CreateModel(
             name='Room',
             fields=[
                 ('id', models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False)),
-                ('firs_user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='room_first', to=settings.AUTH_USER_MODEL)),
-                ('second_user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='room_second', to=settings.AUTH_USER_MODEL)),
+                ('first_user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='room_first', to='Profile.profile')),
+                ('second_user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='room_second', to='Profile.profile')),
             ],
         ),
         migrations.CreateModel(
@@ -29,7 +28,7 @@ class Migration(migrations.Migration):
                 ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('content', models.TextField()),
                 ('created_date', models.DateTimeField(auto_now_add=True)),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='messages', to=settings.AUTH_USER_MODEL)),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='messages', to='Profile.profile')),
                 ('room', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='messages', to='Chat.room')),
             ],
         ),

API/Apps/Game/api/serializers.py

@@ -7,7 +7,7 @@
 class GameProfileSerializer(serializers.ModelSerializer):
     class Meta:
         model = Profile
-        fields = ['nickname', 'profile_picture']
+        fields = ['nickname', 'profile_picture',]
 
 
 class GameSerializer(serializers.ModelSerializer):

API/Apps/Game/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 5.0.3 on 2024-04-13 19:44
+# Generated by Django 5.0.3 on 2024-04-20 22:52
 
 import django.db.models.deletion
 import uuid
@@ -10,8 +10,7 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        ('Profile', '0020_profile_blocked_users_alter_profile_friends'),
-        ('Tournament', '0007_tournament_current_participants_and_more'),
+        ('Profile', '0001_initial'),
     ]
 
     operations = [
@@ -23,7 +22,6 @@ class Migration(migrations.Migration):
                 ('date', models.DateTimeField(auto_now_add=True)),
                 ('player1', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='player1', to='Profile.profile')),
                 ('player2', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='player2', to='Profile.profile')),
-                ('tournament', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='Tournament.tournament')),
                 ('winner', models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='winner', to='Profile.profile')),
             ],
         ),

API/Apps/Game/models.py

@@ -1,11 +1,8 @@
 import uuid
 
 from django.db import models
-
+from django.apps import apps
 from Apps.Profile.models import Profile
-from Apps.Tournament.models import Tournament
-
-
 # Create your models here.
 
 
@@ -14,13 +11,18 @@ class Game(models.Model):
     player1 = models.ForeignKey(Profile, on_delete=models.CASCADE, related_name='player1')
     player2 = models.ForeignKey(Profile, on_delete=models.CASCADE, related_name='player2')
     winner = models.ForeignKey(Profile, on_delete=models.CASCADE, related_name='winner', null=True, blank=True,default=None)
-    tournament = models.ForeignKey(Tournament, on_delete=models.SET_NULL, blank=True, null=True)
     is_finished = models.BooleanField(default=False)
     date = models.DateTimeField(auto_now_add=True)
-    def __str__(self):
+
+    @property
+    def tournament(self):
+        Tournament = apps.get_model('Tournament', 'Tournament')
+        return models.ForeignKey(Tournament, on_delete=models.SET_NULL, blank=True, null=True)
+
+    def str(self):
         return f'{self.player1} vs {self.player2} on {self.date} with Id {self.id}'
 
-    def save(self, *args, **kwargs):
+    def save(self, args, **kwargs):
         if self.winner:
             self.is_finished = True
-        super().save(*args, **kwargs)
+        super().save(args, **kwargs)

API/Apps/Profile/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 5.0.3 on 2024-03-13 13:12
+# Generated by Django 5.0.3 on 2024-04-20 22:41
 
 import django.db.models.deletion
 from django.conf import settings
@@ -28,11 +28,15 @@ class Migration(migrations.Migration):
             name='Profile',
             fields=[
                 ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('nickname', models.CharField(max_length=100)),
+                ('nickname', models.CharField(blank=True, default=None, max_length=100, null=True, unique=True)),
+                ('profile_picture', models.ImageField(default='profile-pictures/default.svg', upload_to='profile-pictures/')),
                 ('is_online', models.BooleanField(default=False)),
-                ('friends', models.ManyToManyField(blank=True, to='Profile.profile')),
-                ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
-                ('stats', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='Profile.stats')),
+                ('is_verified', models.BooleanField(default=False)),
+                ('bio', models.TextField(blank=True, default=None, null=True)),
+                ('blocked_users', models.ManyToManyField(blank=True, related_name='users_blocked', to='Profile.profile')),
+                ('friends', models.ManyToManyField(blank=True, related_name='profile_friends', to='Profile.profile')),
+                ('user', models.OneToOneField(null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+                ('stats', models.OneToOneField(null=True, on_delete=django.db.models.deletion.CASCADE, to='Profile.stats')),
             ],
         ),
     ]