diff --git a/backend/api/api/Generateur/__pycache__/__init__.cpython-310.pyc b/backend/api/api/Generateur/__pycache__/__init__.cpython-310.pyc deleted file mode 100644 index da707b24..00000000 Binary files a/backend/api/api/Generateur/__pycache__/__init__.cpython-310.pyc and /dev/null differ diff --git a/backend/api/api/Generateur/__pycache__/generateur_csv.cpython-310.pyc b/backend/api/api/Generateur/__pycache__/generateur_csv.cpython-310.pyc deleted file mode 100644 index 57218c21..00000000 Binary files a/backend/api/api/Generateur/__pycache__/generateur_csv.cpython-310.pyc and /dev/null differ diff --git a/backend/api/api/Generateur/__pycache__/generateur_main.cpython-310.pyc b/backend/api/api/Generateur/__pycache__/generateur_main.cpython-310.pyc deleted file mode 100644 index bb38de65..00000000 Binary files a/backend/api/api/Generateur/__pycache__/generateur_main.cpython-310.pyc and /dev/null differ diff --git a/backend/api/api/__pycache__/__init__.cpython-310.pyc b/backend/api/api/__pycache__/__init__.cpython-310.pyc deleted file mode 100644 index f439c034..00000000 Binary files a/backend/api/api/__pycache__/__init__.cpython-310.pyc and /dev/null differ diff --git a/backend/api/api/__pycache__/asgi.cpython-310.pyc b/backend/api/api/__pycache__/asgi.cpython-310.pyc deleted file mode 100644 index 236b7a5e..00000000 Binary files a/backend/api/api/__pycache__/asgi.cpython-310.pyc and /dev/null differ diff --git a/backend/api/api/__pycache__/settings.cpython-310.pyc b/backend/api/api/__pycache__/settings.cpython-310.pyc deleted file mode 100644 index f8d68288..00000000 Binary files a/backend/api/api/__pycache__/settings.cpython-310.pyc and /dev/null differ diff --git a/backend/api/api/__pycache__/urls.cpython-310.pyc b/backend/api/api/__pycache__/urls.cpython-310.pyc deleted file mode 100644 index b2837fd6..00000000 Binary files a/backend/api/api/__pycache__/urls.cpython-310.pyc and /dev/null differ diff --git a/backend/api/db.sqlite3 b/backend/api/db.sqlite3 deleted file mode 100644 index 620f2ed1..00000000 Binary files a/backend/api/db.sqlite3 and /dev/null differ diff --git a/backend/api/exercices/__pycache__/__init__.cpython-310.pyc b/backend/api/exercices/__pycache__/__init__.cpython-310.pyc deleted file mode 100644 index ae89d83c..00000000 Binary files a/backend/api/exercices/__pycache__/__init__.cpython-310.pyc and /dev/null differ diff --git a/backend/api/exercices/__pycache__/admin.cpython-310.pyc b/backend/api/exercices/__pycache__/admin.cpython-310.pyc deleted file mode 100644 index 8fcf9df7..00000000 Binary files a/backend/api/exercices/__pycache__/admin.cpython-310.pyc and /dev/null differ diff --git a/backend/api/exercices/__pycache__/apps.cpython-310.pyc b/backend/api/exercices/__pycache__/apps.cpython-310.pyc deleted file mode 100644 index aa9f46d6..00000000 Binary files a/backend/api/exercices/__pycache__/apps.cpython-310.pyc and /dev/null differ diff --git a/backend/api/exercices/__pycache__/filters.cpython-310.pyc b/backend/api/exercices/__pycache__/filters.cpython-310.pyc deleted file mode 100644 index 8e79ff5f..00000000 Binary files a/backend/api/exercices/__pycache__/filters.cpython-310.pyc and /dev/null differ diff --git a/backend/api/exercices/__pycache__/models.cpython-310.pyc b/backend/api/exercices/__pycache__/models.cpython-310.pyc deleted file mode 100644 index bf114c45..00000000 Binary files a/backend/api/exercices/__pycache__/models.cpython-310.pyc and /dev/null differ diff --git a/backend/api/exercices/__pycache__/paginations.cpython-310.pyc b/backend/api/exercices/__pycache__/paginations.cpython-310.pyc deleted file mode 100644 index 460bdaaa..00000000 Binary files a/backend/api/exercices/__pycache__/paginations.cpython-310.pyc and /dev/null differ diff --git a/backend/api/exercices/__pycache__/pdfmaker.cpython-310.pyc b/backend/api/exercices/__pycache__/pdfmaker.cpython-310.pyc deleted file mode 100644 index 53caadd5..00000000 Binary files a/backend/api/exercices/__pycache__/pdfmaker.cpython-310.pyc and /dev/null differ diff --git a/backend/api/exercices/__pycache__/serializers.cpython-310.pyc b/backend/api/exercices/__pycache__/serializers.cpython-310.pyc deleted file mode 100644 index 3cf7406f..00000000 Binary files a/backend/api/exercices/__pycache__/serializers.cpython-310.pyc and /dev/null differ diff --git a/backend/api/exercices/__pycache__/signals.cpython-310.pyc b/backend/api/exercices/__pycache__/signals.cpython-310.pyc deleted file mode 100644 index 2ff7a54e..00000000 Binary files a/backend/api/exercices/__pycache__/signals.cpython-310.pyc and /dev/null differ diff --git a/backend/api/exercices/__pycache__/urls.cpython-310.pyc b/backend/api/exercices/__pycache__/urls.cpython-310.pyc deleted file mode 100644 index 9f657f65..00000000 Binary files a/backend/api/exercices/__pycache__/urls.cpython-310.pyc and /dev/null differ diff --git a/backend/api/exercices/__pycache__/utils.cpython-310.pyc b/backend/api/exercices/__pycache__/utils.cpython-310.pyc deleted file mode 100644 index c09b7f3d..00000000 Binary files a/backend/api/exercices/__pycache__/utils.cpython-310.pyc and /dev/null differ diff --git a/backend/api/exercices/__pycache__/views.cpython-310.pyc b/backend/api/exercices/__pycache__/views.cpython-310.pyc deleted file mode 100644 index 37f087ed..00000000 Binary files a/backend/api/exercices/__pycache__/views.cpython-310.pyc and /dev/null differ diff --git a/backend/api/exercices/migrations/0001_initial.py b/backend/api/exercices/migrations/0001_initial.py index d58fa6c6..d1aa471b 100644 --- a/backend/api/exercices/migrations/0001_initial.py +++ b/backend/api/exercices/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 4.0 on 2022-04-17 08:21 +# Generated by Django 4.0 on 2022-07-29 09:08 from django.db import migrations, models import exercices.models @@ -17,11 +17,16 @@ class Migration(migrations.Migration): fields=[ ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('name', models.CharField(max_length=50)), - ('id_code', models.CharField(default=exercices.models.generate_unique_code_step, max_length=50, unique=True)), - ('exo_model', models.TextField(max_length=50000)), + ('id_code', models.CharField(default='generate_unique_code_step', max_length=50, unique=True)), + ('exo_model', models.FileField(upload_to=exercices.models.exo_code)), ('consigne', models.CharField(blank=True, default='', max_length=100)), - ('tags', models.JSONField(default=list)), - ('exemple', models.JSONField(default=list)), + ('exemple', models.JSONField(default=dict)), + ('isPdf', models.BooleanField(default=True)), + ('isCsv', models.BooleanField(default=True)), + ('isWeb', models.BooleanField(default=True)), + ('last_update', models.DateTimeField(auto_now_add=True)), + ('original', models.BooleanField(default=True)), + ('private', models.BooleanField(default=False)), ], ), migrations.CreateModel( @@ -29,7 +34,7 @@ class Migration(migrations.Migration): fields=[ ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('color', models.CharField(default='', max_length=50)), - ('id_code', models.CharField(default=exercices.models.generate_unique_code_tag, max_length=50, unique=True)), + ('id_code', models.CharField(default='generate_unique_code_tag', max_length=50, unique=True)), ('name', models.CharField(default='', max_length=25)), ], ), diff --git a/backend/api/exercices/migrations/0002_exercice_iscsv_exercice_ispdf_exercice_isweb.py b/backend/api/exercices/migrations/0002_exercice_iscsv_exercice_ispdf_exercice_isweb.py deleted file mode 100644 index 6daa6e28..00000000 --- a/backend/api/exercices/migrations/0002_exercice_iscsv_exercice_ispdf_exercice_isweb.py +++ /dev/null @@ -1,28 +0,0 @@ -# Generated by Django 4.0 on 2022-04-17 19:51 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('exercices', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='exercice', - name='isCsv', - field=models.BooleanField(default=True), - ), - migrations.AddField( - model_name='exercice', - name='isPdf', - field=models.BooleanField(default=True), - ), - migrations.AddField( - model_name='exercice', - name='isWeb', - field=models.BooleanField(default=True), - ), - ] diff --git a/backend/api/exercices/migrations/0003_alter_exercice_exo_model.py b/backend/api/exercices/migrations/0003_alter_exercice_exo_model.py deleted file mode 100644 index 9c3b534d..00000000 --- a/backend/api/exercices/migrations/0003_alter_exercice_exo_model.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 4.0 on 2022-04-17 19:56 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('exercices', '0002_exercice_iscsv_exercice_ispdf_exercice_isweb'), - ] - - operations = [ - migrations.AlterField( - model_name='exercice', - name='exo_model', - field=models.FileField(upload_to='uploads/exercices/'), - ), - ] diff --git a/backend/api/exercices/migrations/0004_alter_exercice_exemple_alter_exercice_exo_model.py b/backend/api/exercices/migrations/0004_alter_exercice_exemple_alter_exercice_exo_model.py deleted file mode 100644 index ecaf318d..00000000 --- a/backend/api/exercices/migrations/0004_alter_exercice_exemple_alter_exercice_exo_model.py +++ /dev/null @@ -1,24 +0,0 @@ -# Generated by Django 4.0 on 2022-05-15 06:48 - -from django.db import migrations, models -import exercices.models - - -class Migration(migrations.Migration): - - dependencies = [ - ('exercices', '0003_alter_exercice_exo_model'), - ] - - operations = [ - migrations.AlterField( - model_name='exercice', - name='exemple', - field=models.JSONField(default=dict), - ), - migrations.AlterField( - model_name='exercice', - name='exo_model', - field=models.FileField(upload_to=exercices.models.exo_code), - ), - ] diff --git a/backend/api/exercices/migrations/0005_exercice_author_exercice_private.py b/backend/api/exercices/migrations/0005_exercice_author_exercice_private.py deleted file mode 100644 index 9f13ad3d..00000000 --- a/backend/api/exercices/migrations/0005_exercice_author_exercice_private.py +++ /dev/null @@ -1,25 +0,0 @@ -# Generated by Django 4.0 on 2022-05-20 13:52 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0001_initial'), - ('exercices', '0004_alter_exercice_exemple_alter_exercice_exo_model'), - ] - - operations = [ - migrations.AddField( - model_name='exercice', - name='author', - field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='users.customuser'), - ), - migrations.AddField( - model_name='exercice', - name='private', - field=models.BooleanField(default=True), - ), - ] diff --git a/backend/api/exercices/migrations/0006_alter_exercice_private.py b/backend/api/exercices/migrations/0006_alter_exercice_private.py deleted file mode 100644 index 8e84f0fd..00000000 --- a/backend/api/exercices/migrations/0006_alter_exercice_private.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 4.0 on 2022-05-21 08:06 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('exercices', '0005_exercice_author_exercice_private'), - ] - - operations = [ - migrations.AlterField( - model_name='exercice', - name='private', - field=models.BooleanField(default=False), - ), - ] diff --git a/backend/api/exercices/migrations/0007_exercice_origin.py b/backend/api/exercices/migrations/0007_exercice_origin.py deleted file mode 100644 index de4cafa5..00000000 --- a/backend/api/exercices/migrations/0007_exercice_origin.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 4.0 on 2022-05-30 15:54 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('exercices', '0006_alter_exercice_private'), - ] - - operations = [ - migrations.AddField( - model_name='exercice', - name='origin', - field=models.CharField(default='', max_length=20, null=True), - ), - ] diff --git a/backend/api/exercices/migrations/0008_remove_exercice_origin.py b/backend/api/exercices/migrations/0008_remove_exercice_origin.py deleted file mode 100644 index 8a68d1f1..00000000 --- a/backend/api/exercices/migrations/0008_remove_exercice_origin.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 4.0 on 2022-05-30 16:15 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('exercices', '0007_exercice_origin'), - ] - - operations = [ - migrations.RemoveField( - model_name='exercice', - name='origin', - ), - ] diff --git a/backend/api/exercices/migrations/0009_exercice_origin.py b/backend/api/exercices/migrations/0009_exercice_origin.py deleted file mode 100644 index c6543b54..00000000 --- a/backend/api/exercices/migrations/0009_exercice_origin.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 4.0 on 2022-05-30 16:15 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('exercices', '0008_remove_exercice_origin'), - ] - - operations = [ - migrations.AddField( - model_name='exercice', - name='origin', - field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='exercices.exercice'), - ), - ] diff --git a/backend/api/exercices/migrations/0010_alter_exercice_id_code.py b/backend/api/exercices/migrations/0010_alter_exercice_id_code.py deleted file mode 100644 index 2317a80c..00000000 --- a/backend/api/exercices/migrations/0010_alter_exercice_id_code.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 4.0 on 2022-05-30 16:25 - -from django.db import migrations, models -import exercices.models - - -class Migration(migrations.Migration): - - dependencies = [ - ('exercices', '0009_exercice_origin'), - ] - - operations = [ - migrations.AlterField( - model_name='exercice', - name='id_code', - field=models.CharField(default=exercices.models.generate_unique_code_step, max_length=50, null=True, unique=True), - ), - ] diff --git a/backend/api/exercices/migrations/0011_alter_exercice_id_code.py b/backend/api/exercices/migrations/0011_alter_exercice_id_code.py deleted file mode 100644 index c589272e..00000000 --- a/backend/api/exercices/migrations/0011_alter_exercice_id_code.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 4.0 on 2022-05-30 16:30 - -from django.db import migrations, models -import exercices.models - - -class Migration(migrations.Migration): - - dependencies = [ - ('exercices', '0010_alter_exercice_id_code'), - ] - - operations = [ - migrations.AlterField( - model_name='exercice', - name='id_code', - field=models.CharField(default=exercices.models.generate_unique_code_step, max_length=50, unique=True), - ), - ] diff --git a/backend/api/exercices/migrations/0012_alter_exercice_origin.py b/backend/api/exercices/migrations/0012_alter_exercice_origin.py deleted file mode 100644 index 370889f8..00000000 --- a/backend/api/exercices/migrations/0012_alter_exercice_origin.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 4.0 on 2022-05-30 16:53 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('exercices', '0011_alter_exercice_id_code'), - ] - - operations = [ - migrations.AlterField( - model_name='exercice', - name='origin', - field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='exercices.exercice'), - ), - ] diff --git a/backend/api/exercices/migrations/0013_tag_user.py b/backend/api/exercices/migrations/0013_tag_user.py deleted file mode 100644 index 066ca847..00000000 --- a/backend/api/exercices/migrations/0013_tag_user.py +++ /dev/null @@ -1,20 +0,0 @@ -# Generated by Django 4.0 on 2022-06-04 06:54 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0010_alter_customuser_id_code'), - ('exercices', '0012_alter_exercice_origin'), - ] - - operations = [ - migrations.AddField( - model_name='tag', - name='user', - field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='users.customuser'), - ), - ] diff --git a/backend/api/exercices/migrations/0014_remove_exercice_tags_exercice_tags.py b/backend/api/exercices/migrations/0014_remove_exercice_tags_exercice_tags.py deleted file mode 100644 index fd6d324b..00000000 --- a/backend/api/exercices/migrations/0014_remove_exercice_tags_exercice_tags.py +++ /dev/null @@ -1,22 +0,0 @@ -# Generated by Django 4.0 on 2022-06-04 07:05 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('exercices', '0013_tag_user'), - ] - - operations = [ - migrations.RemoveField( - model_name='exercice', - name='tags', - ), - migrations.AddField( - model_name='exercice', - name='tags', - field=models.ManyToManyField(to='exercices.Tag'), - ), - ] diff --git a/backend/api/exercices/migrations/0015_exercice_original.py b/backend/api/exercices/migrations/0015_exercice_original.py deleted file mode 100644 index c0f284c4..00000000 --- a/backend/api/exercices/migrations/0015_exercice_original.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 4.0 on 2022-06-06 19:47 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('exercices', '0014_remove_exercice_tags_exercice_tags'), - ] - - operations = [ - migrations.AddField( - model_name='exercice', - name='original', - field=models.BooleanField(default=True), - ), - ] diff --git a/backend/api/exercices/migrations/0016_exercice_last_update.py b/backend/api/exercices/migrations/0016_exercice_last_update.py deleted file mode 100644 index b887393a..00000000 --- a/backend/api/exercices/migrations/0016_exercice_last_update.py +++ /dev/null @@ -1,20 +0,0 @@ -# Generated by Django 4.0 on 2022-06-24 08:44 - -from django.db import migrations, models -import django.utils.timezone - - -class Migration(migrations.Migration): - - dependencies = [ - ('exercices', '0015_exercice_original'), - ] - - operations = [ - migrations.AddField( - model_name='exercice', - name='last_update', - field=models.DateField(auto_now_add=True, default=django.utils.timezone.now), - preserve_default=False, - ), - ] diff --git a/backend/api/exercices/migrations/0017_alter_exercice_last_update.py b/backend/api/exercices/migrations/0017_alter_exercice_last_update.py deleted file mode 100644 index 59a48656..00000000 --- a/backend/api/exercices/migrations/0017_alter_exercice_last_update.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 4.0 on 2022-06-24 08:58 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('exercices', '0016_exercice_last_update'), - ] - - operations = [ - migrations.AlterField( - model_name='exercice', - name='last_update', - field=models.DateTimeField(auto_now_add=True), - ), - ] diff --git a/backend/api/exercices/migrations/__pycache__/0001_initial.cpython-310.pyc b/backend/api/exercices/migrations/__pycache__/0001_initial.cpython-310.pyc deleted file mode 100644 index d046e330..00000000 Binary files a/backend/api/exercices/migrations/__pycache__/0001_initial.cpython-310.pyc and /dev/null differ diff --git a/backend/api/exercices/migrations/__pycache__/0002_exercice_iscsv_exercice_ispdf_exercice_isweb.cpython-310.pyc b/backend/api/exercices/migrations/__pycache__/0002_exercice_iscsv_exercice_ispdf_exercice_isweb.cpython-310.pyc deleted file mode 100644 index 243a5bb1..00000000 Binary files a/backend/api/exercices/migrations/__pycache__/0002_exercice_iscsv_exercice_ispdf_exercice_isweb.cpython-310.pyc and /dev/null differ diff --git a/backend/api/exercices/migrations/__pycache__/0003_alter_exercice_exo_model.cpython-310.pyc b/backend/api/exercices/migrations/__pycache__/0003_alter_exercice_exo_model.cpython-310.pyc deleted file mode 100644 index 014d6a22..00000000 Binary files a/backend/api/exercices/migrations/__pycache__/0003_alter_exercice_exo_model.cpython-310.pyc and /dev/null differ diff --git a/backend/api/exercices/migrations/__pycache__/0004_alter_exercice_exemple_alter_exercice_exo_model.cpython-310.pyc b/backend/api/exercices/migrations/__pycache__/0004_alter_exercice_exemple_alter_exercice_exo_model.cpython-310.pyc deleted file mode 100644 index fe360e98..00000000 Binary files a/backend/api/exercices/migrations/__pycache__/0004_alter_exercice_exemple_alter_exercice_exo_model.cpython-310.pyc and /dev/null differ diff --git a/backend/api/exercices/migrations/__pycache__/0005_exercice_author_exercice_private.cpython-310.pyc b/backend/api/exercices/migrations/__pycache__/0005_exercice_author_exercice_private.cpython-310.pyc deleted file mode 100644 index 8c5bcf98..00000000 Binary files a/backend/api/exercices/migrations/__pycache__/0005_exercice_author_exercice_private.cpython-310.pyc and /dev/null differ diff --git a/backend/api/exercices/migrations/__pycache__/0006_alter_exercice_private.cpython-310.pyc b/backend/api/exercices/migrations/__pycache__/0006_alter_exercice_private.cpython-310.pyc deleted file mode 100644 index e1e3237f..00000000 Binary files a/backend/api/exercices/migrations/__pycache__/0006_alter_exercice_private.cpython-310.pyc and /dev/null differ diff --git a/backend/api/exercices/migrations/__pycache__/0007_exercice_origin.cpython-310.pyc b/backend/api/exercices/migrations/__pycache__/0007_exercice_origin.cpython-310.pyc deleted file mode 100644 index 6eec5985..00000000 Binary files a/backend/api/exercices/migrations/__pycache__/0007_exercice_origin.cpython-310.pyc and /dev/null differ diff --git a/backend/api/exercices/migrations/__pycache__/0008_alter_exercice_origin.cpython-310.pyc b/backend/api/exercices/migrations/__pycache__/0008_alter_exercice_origin.cpython-310.pyc deleted file mode 100644 index 0381e063..00000000 Binary files a/backend/api/exercices/migrations/__pycache__/0008_alter_exercice_origin.cpython-310.pyc and /dev/null differ diff --git a/backend/api/exercices/migrations/__pycache__/0008_remove_exercice_origin.cpython-310.pyc b/backend/api/exercices/migrations/__pycache__/0008_remove_exercice_origin.cpython-310.pyc deleted file mode 100644 index f4b96e45..00000000 Binary files a/backend/api/exercices/migrations/__pycache__/0008_remove_exercice_origin.cpython-310.pyc and /dev/null differ diff --git a/backend/api/exercices/migrations/__pycache__/0009_alter_exercice_origin.cpython-310.pyc b/backend/api/exercices/migrations/__pycache__/0009_alter_exercice_origin.cpython-310.pyc deleted file mode 100644 index 631dc5f3..00000000 Binary files a/backend/api/exercices/migrations/__pycache__/0009_alter_exercice_origin.cpython-310.pyc and /dev/null differ diff --git a/backend/api/exercices/migrations/__pycache__/0009_exercice_origin.cpython-310.pyc b/backend/api/exercices/migrations/__pycache__/0009_exercice_origin.cpython-310.pyc deleted file mode 100644 index d4f9b4b6..00000000 Binary files a/backend/api/exercices/migrations/__pycache__/0009_exercice_origin.cpython-310.pyc and /dev/null differ diff --git a/backend/api/exercices/migrations/__pycache__/0009_remove_exercice_origin.cpython-310.pyc b/backend/api/exercices/migrations/__pycache__/0009_remove_exercice_origin.cpython-310.pyc deleted file mode 100644 index be1be92e..00000000 Binary files a/backend/api/exercices/migrations/__pycache__/0009_remove_exercice_origin.cpython-310.pyc and /dev/null differ diff --git a/backend/api/exercices/migrations/__pycache__/0010_alter_exercice_id_code.cpython-310.pyc b/backend/api/exercices/migrations/__pycache__/0010_alter_exercice_id_code.cpython-310.pyc deleted file mode 100644 index 15370200..00000000 Binary files a/backend/api/exercices/migrations/__pycache__/0010_alter_exercice_id_code.cpython-310.pyc and /dev/null differ diff --git a/backend/api/exercices/migrations/__pycache__/0010_remove_exercice_origin_exercice_original.cpython-310.pyc b/backend/api/exercices/migrations/__pycache__/0010_remove_exercice_origin_exercice_original.cpython-310.pyc deleted file mode 100644 index ab6371a8..00000000 Binary files a/backend/api/exercices/migrations/__pycache__/0010_remove_exercice_origin_exercice_original.cpython-310.pyc and /dev/null differ diff --git a/backend/api/exercices/migrations/__pycache__/0011_alter_exercice_id_code.cpython-310.pyc b/backend/api/exercices/migrations/__pycache__/0011_alter_exercice_id_code.cpython-310.pyc deleted file mode 100644 index b7331765..00000000 Binary files a/backend/api/exercices/migrations/__pycache__/0011_alter_exercice_id_code.cpython-310.pyc and /dev/null differ diff --git a/backend/api/exercices/migrations/__pycache__/0011_remove_exercice_original.cpython-310.pyc b/backend/api/exercices/migrations/__pycache__/0011_remove_exercice_original.cpython-310.pyc deleted file mode 100644 index a50ad350..00000000 Binary files a/backend/api/exercices/migrations/__pycache__/0011_remove_exercice_original.cpython-310.pyc and /dev/null differ diff --git a/backend/api/exercices/migrations/__pycache__/0012_alter_exercice_origin.cpython-310.pyc b/backend/api/exercices/migrations/__pycache__/0012_alter_exercice_origin.cpython-310.pyc deleted file mode 100644 index 4affeeda..00000000 Binary files a/backend/api/exercices/migrations/__pycache__/0012_alter_exercice_origin.cpython-310.pyc and /dev/null differ diff --git a/backend/api/exercices/migrations/__pycache__/0013_tag_user.cpython-310.pyc b/backend/api/exercices/migrations/__pycache__/0013_tag_user.cpython-310.pyc deleted file mode 100644 index 3d467e82..00000000 Binary files a/backend/api/exercices/migrations/__pycache__/0013_tag_user.cpython-310.pyc and /dev/null differ diff --git a/backend/api/exercices/migrations/__pycache__/0014_remove_exercice_tags_exercice_tags.cpython-310.pyc b/backend/api/exercices/migrations/__pycache__/0014_remove_exercice_tags_exercice_tags.cpython-310.pyc deleted file mode 100644 index 25511c32..00000000 Binary files a/backend/api/exercices/migrations/__pycache__/0014_remove_exercice_tags_exercice_tags.cpython-310.pyc and /dev/null differ diff --git a/backend/api/exercices/migrations/__pycache__/0015_exercice_original.cpython-310.pyc b/backend/api/exercices/migrations/__pycache__/0015_exercice_original.cpython-310.pyc deleted file mode 100644 index 764b2001..00000000 Binary files a/backend/api/exercices/migrations/__pycache__/0015_exercice_original.cpython-310.pyc and /dev/null differ diff --git a/backend/api/exercices/migrations/__pycache__/0016_exercice_last_update.cpython-310.pyc b/backend/api/exercices/migrations/__pycache__/0016_exercice_last_update.cpython-310.pyc deleted file mode 100644 index fb3f3b75..00000000 Binary files a/backend/api/exercices/migrations/__pycache__/0016_exercice_last_update.cpython-310.pyc and /dev/null differ diff --git a/backend/api/exercices/migrations/__pycache__/0017_alter_exercice_last_update.cpython-310.pyc b/backend/api/exercices/migrations/__pycache__/0017_alter_exercice_last_update.cpython-310.pyc deleted file mode 100644 index a2118154..00000000 Binary files a/backend/api/exercices/migrations/__pycache__/0017_alter_exercice_last_update.cpython-310.pyc and /dev/null differ diff --git a/backend/api/exercices/migrations/__pycache__/__init__.cpython-310.pyc b/backend/api/exercices/migrations/__pycache__/__init__.cpython-310.pyc deleted file mode 100644 index 4ed988dc..00000000 Binary files a/backend/api/exercices/migrations/__pycache__/__init__.cpython-310.pyc and /dev/null differ diff --git a/backend/api/exercices/models.py b/backend/api/exercices/models.py index 656ff9cf..11447aef 100644 --- a/backend/api/exercices/models.py +++ b/backend/api/exercices/models.py @@ -34,7 +34,7 @@ def generate_unique_code_tag(): class Tag(models.Model): color = CharField(max_length=50, default='') id_code = CharField(max_length=50, unique=True, - default=generate_unique_code_tag) + default=generate_unique_code_tag) # Pour la migration initiale : si pas en "" renvoie erreur car table utilisée dans fonction avant d'être crée user = models.ForeignKey('users.CustomUser', null=True, on_delete=models.CASCADE) name = CharField(max_length=25, default='') @@ -54,7 +54,7 @@ class ExerciceManager(models.Manager): class Exercice(models.Model): name = CharField(max_length=50) id_code = CharField( - unique=True, max_length=50, default=generate_unique_code_step) + unique=True, max_length=50, default=generate_unique_code_step) # Pour la migration initiale : si pas en "" renvoie erreur car table utilisée dans fonction avant d'être crée exo_model = models.FileField(upload_to=exo_code) consigne = CharField(max_length=100, default='', blank=True) tags = models.ManyToManyField(Tag) diff --git a/backend/api/room/__pycache__/__init__.cpython-310.pyc b/backend/api/room/__pycache__/__init__.cpython-310.pyc deleted file mode 100644 index 2cdaf882..00000000 Binary files a/backend/api/room/__pycache__/__init__.cpython-310.pyc and /dev/null differ diff --git a/backend/api/room/__pycache__/admin.cpython-310.pyc b/backend/api/room/__pycache__/admin.cpython-310.pyc deleted file mode 100644 index 4fd0d4c7..00000000 Binary files a/backend/api/room/__pycache__/admin.cpython-310.pyc and /dev/null differ diff --git a/backend/api/room/__pycache__/apps.cpython-310.pyc b/backend/api/room/__pycache__/apps.cpython-310.pyc deleted file mode 100644 index d293bc36..00000000 Binary files a/backend/api/room/__pycache__/apps.cpython-310.pyc and /dev/null differ diff --git a/backend/api/room/__pycache__/consumers.cpython-310.pyc b/backend/api/room/__pycache__/consumers.cpython-310.pyc deleted file mode 100644 index b77f23ac..00000000 Binary files a/backend/api/room/__pycache__/consumers.cpython-310.pyc and /dev/null differ diff --git a/backend/api/room/__pycache__/models.cpython-310.pyc b/backend/api/room/__pycache__/models.cpython-310.pyc deleted file mode 100644 index 5e0febe5..00000000 Binary files a/backend/api/room/__pycache__/models.cpython-310.pyc and /dev/null differ diff --git a/backend/api/room/__pycache__/routing.cpython-310.pyc b/backend/api/room/__pycache__/routing.cpython-310.pyc deleted file mode 100644 index 767a8820..00000000 Binary files a/backend/api/room/__pycache__/routing.cpython-310.pyc and /dev/null differ diff --git a/backend/api/room/__pycache__/serializers.cpython-310.pyc b/backend/api/room/__pycache__/serializers.cpython-310.pyc deleted file mode 100644 index 728da7e8..00000000 Binary files a/backend/api/room/__pycache__/serializers.cpython-310.pyc and /dev/null differ diff --git a/backend/api/room/__pycache__/tests.cpython-310.pyc b/backend/api/room/__pycache__/tests.cpython-310.pyc deleted file mode 100644 index 99a55651..00000000 Binary files a/backend/api/room/__pycache__/tests.cpython-310.pyc and /dev/null differ diff --git a/backend/api/room/__pycache__/urls.cpython-310.pyc b/backend/api/room/__pycache__/urls.cpython-310.pyc deleted file mode 100644 index 6fd83862..00000000 Binary files a/backend/api/room/__pycache__/urls.cpython-310.pyc and /dev/null differ diff --git a/backend/api/room/__pycache__/utils.cpython-310.pyc b/backend/api/room/__pycache__/utils.cpython-310.pyc deleted file mode 100644 index 8c86f8ed..00000000 Binary files a/backend/api/room/__pycache__/utils.cpython-310.pyc and /dev/null differ diff --git a/backend/api/room/__pycache__/views.cpython-310.pyc b/backend/api/room/__pycache__/views.cpython-310.pyc deleted file mode 100644 index b3a3ff03..00000000 Binary files a/backend/api/room/__pycache__/views.cpython-310.pyc and /dev/null differ diff --git a/backend/api/room/management/__pycache__/__init__.cpython-310.pyc b/backend/api/room/management/__pycache__/__init__.cpython-310.pyc deleted file mode 100644 index 6817ca53..00000000 Binary files a/backend/api/room/management/__pycache__/__init__.cpython-310.pyc and /dev/null differ diff --git a/backend/api/room/management/commands/__pycache__/__init__.cpython-310.pyc b/backend/api/room/management/commands/__pycache__/__init__.cpython-310.pyc deleted file mode 100644 index 2642e15b..00000000 Binary files a/backend/api/room/management/commands/__pycache__/__init__.cpython-310.pyc and /dev/null differ diff --git a/backend/api/room/management/commands/__pycache__/add_challenger.cpython-310.pyc b/backend/api/room/management/commands/__pycache__/add_challenger.cpython-310.pyc deleted file mode 100644 index 5bb8d9ca..00000000 Binary files a/backend/api/room/management/commands/__pycache__/add_challenger.cpython-310.pyc and /dev/null differ diff --git a/backend/api/room/management/commands/__pycache__/challenge.cpython-310.pyc b/backend/api/room/management/commands/__pycache__/challenge.cpython-310.pyc deleted file mode 100644 index dbab936b..00000000 Binary files a/backend/api/room/management/commands/__pycache__/challenge.cpython-310.pyc and /dev/null differ diff --git a/backend/api/room/migrations/0001_initial.py b/backend/api/room/migrations/0001_initial.py index 3e396a28..a0db490c 100644 --- a/backend/api/room/migrations/0001_initial.py +++ b/backend/api/room/migrations/0001_initial.py @@ -1,8 +1,6 @@ -# Generated by Django 4.0 on 2022-04-17 08:29 +# Generated by Django 4.0 on 2022-07-29 09:08 from django.db import migrations, models -import django.db.models.deletion -import room.models class Migration(migrations.Migration): @@ -13,32 +11,40 @@ class Migration(migrations.Migration): ] operations = [ - migrations.CreateModel( - name='Room', - fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=50)), - ('id_code', models.CharField(default=room.models.generate_unique_code_room, max_length=50)), - ('participants', models.JSONField(default=list)), - ('waiters', models.JSONField(default=list)), - ('created_at', models.DateTimeField(auto_now_add=True)), - ('owner', models.JSONField(default=dict)), - ('public_result', models.BooleanField(default=False)), - ('private', models.BooleanField(default=True)), - ], - ), migrations.CreateModel( name='Parcours', fields=[ ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=50)), - ('id_code', models.CharField(default=room.models.generate_unique_code_parcours, max_length=50)), + ('name', models.CharField(max_length=30)), + ('id_code', models.CharField(default='generate_unique_code_parcours', max_length=50)), ('challenger', models.JSONField(default=list)), ('created_at', models.DateTimeField(auto_now_add=True)), ('timer', models.IntegerField(blank=True)), ('exercices', models.JSONField(default=list)), ('success_condition', models.IntegerField(default=10)), - ('room', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='room.room')), + ], + ), + migrations.CreateModel( + name='Room', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=30)), + ('id_code', models.CharField(default='generate_unique_code_room', max_length=50)), + ('anonymousMembers', models.JSONField(default=list, null=True)), + ('waiters', models.JSONField(default=list)), + ('created_at', models.DateTimeField(auto_now_add=True)), + ('owner', models.JSONField(default=dict)), + ('public_result', models.BooleanField(default=False)), + ('online', models.JSONField(default=list)), + ('private', models.BooleanField(default=True)), + ], + ), + migrations.CreateModel( + name='TempCorrection', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('correction', models.JSONField(default=list)), + ('id_code', models.CharField(default='generate_unique_code_corr', max_length=50)), ], ), ] diff --git a/backend/api/room/migrations/0002_tempcorrection.py b/backend/api/room/migrations/0002_tempcorrection.py deleted file mode 100644 index c81fd43a..00000000 --- a/backend/api/room/migrations/0002_tempcorrection.py +++ /dev/null @@ -1,20 +0,0 @@ -# Generated by Django 4.0 on 2022-05-15 06:48 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('room', '0001_initial'), - ] - - operations = [ - migrations.CreateModel( - name='TempCorrection', - fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('correction', models.JSONField(default=list)), - ], - ), - ] diff --git a/backend/api/room/migrations/0003_tempcorrection_id_code.py b/backend/api/room/migrations/0003_tempcorrection_id_code.py deleted file mode 100644 index b12facad..00000000 --- a/backend/api/room/migrations/0003_tempcorrection_id_code.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 4.0 on 2022-05-15 06:54 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('room', '0002_tempcorrection'), - ] - - operations = [ - migrations.AddField( - model_name='tempcorrection', - name='id_code', - field=models.CharField(default='', max_length=50), - ), - ] diff --git a/backend/api/room/migrations/0004_alter_tempcorrection_id_code.py b/backend/api/room/migrations/0004_alter_tempcorrection_id_code.py deleted file mode 100644 index 86c1de23..00000000 --- a/backend/api/room/migrations/0004_alter_tempcorrection_id_code.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 4.0 on 2022-05-15 06:54 - -from django.db import migrations, models -import room.models - - -class Migration(migrations.Migration): - - dependencies = [ - ('room', '0003_tempcorrection_id_code'), - ] - - operations = [ - migrations.AlterField( - model_name='tempcorrection', - name='id_code', - field=models.CharField(default=room.models.generate_unique_code_corr, max_length=50), - ), - ] diff --git a/backend/api/room/migrations/0005_rename_participants_room_anonymousmembers_and_more.py b/backend/api/room/migrations/0005_rename_participants_room_anonymousmembers_and_more.py deleted file mode 100644 index 7d8f4018..00000000 --- a/backend/api/room/migrations/0005_rename_participants_room_anonymousmembers_and_more.py +++ /dev/null @@ -1,25 +0,0 @@ -# Generated by Django 4.0 on 2022-05-21 15:35 - -from django.conf import settings -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('room', '0004_alter_tempcorrection_id_code'), - ] - - operations = [ - migrations.RenameField( - model_name='room', - old_name='participants', - new_name='anonymousMembers', - ), - migrations.AddField( - model_name='room', - name='userMembers', - field=models.ManyToManyField(to=settings.AUTH_USER_MODEL), - ), - ] diff --git a/backend/api/room/migrations/0006_alter_room_usermembers.py b/backend/api/room/migrations/0006_alter_room_usermembers.py deleted file mode 100644 index ec46e9dd..00000000 --- a/backend/api/room/migrations/0006_alter_room_usermembers.py +++ /dev/null @@ -1,20 +0,0 @@ -# Generated by Django 4.0 on 2022-05-21 15:44 - -from django.conf import settings -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('room', '0005_rename_participants_room_anonymousmembers_and_more'), - ] - - operations = [ - migrations.AlterField( - model_name='room', - name='userMembers', - field=models.ManyToManyField(null=True, to=settings.AUTH_USER_MODEL), - ), - ] diff --git a/backend/api/room/migrations/0007_alter_room_usermembers.py b/backend/api/room/migrations/0007_alter_room_usermembers.py deleted file mode 100644 index 81c49388..00000000 --- a/backend/api/room/migrations/0007_alter_room_usermembers.py +++ /dev/null @@ -1,20 +0,0 @@ -# Generated by Django 4.0 on 2022-05-21 15:44 - -from django.conf import settings -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('room', '0006_alter_room_usermembers'), - ] - - operations = [ - migrations.AlterField( - model_name='room', - name='userMembers', - field=models.ManyToManyField(to=settings.AUTH_USER_MODEL), - ), - ] diff --git a/backend/api/room/migrations/0008_alter_room_anonymousmembers.py b/backend/api/room/migrations/0008_alter_room_anonymousmembers.py deleted file mode 100644 index fefa5040..00000000 --- a/backend/api/room/migrations/0008_alter_room_anonymousmembers.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 4.0 on 2022-05-21 15:45 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('room', '0007_alter_room_usermembers'), - ] - - operations = [ - migrations.AlterField( - model_name='room', - name='anonymousMembers', - field=models.JSONField(default=list, null=True), - ), - ] diff --git a/backend/api/room/migrations/0009_room_online.py b/backend/api/room/migrations/0009_room_online.py deleted file mode 100644 index 705e9e97..00000000 --- a/backend/api/room/migrations/0009_room_online.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 4.0 on 2022-05-21 17:03 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('room', '0008_alter_room_anonymousmembers'), - ] - - operations = [ - migrations.AddField( - model_name='room', - name='online', - field=models.JSONField(default=list), - ), - ] diff --git a/backend/api/room/migrations/0010_remove_parcours_exercices_parcours_exercices.py b/backend/api/room/migrations/0010_remove_parcours_exercices_parcours_exercices.py deleted file mode 100644 index 2c3118c3..00000000 --- a/backend/api/room/migrations/0010_remove_parcours_exercices_parcours_exercices.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 4.0 on 2022-06-14 20:53 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('exercices', '0015_exercice_original'), - ('room', '0009_room_online'), - ] - - operations = [ - migrations.RemoveField( - model_name='parcours', - name='exercices', - ), - migrations.AddField( - model_name='parcours', - name='exercices', - field=models.ManyToManyField(to='exercices.Exercice'), - ), - ] diff --git a/backend/api/room/migrations/0011_remove_parcours_exercices_parcours_exercices.py b/backend/api/room/migrations/0011_remove_parcours_exercices_parcours_exercices.py deleted file mode 100644 index 4eaf03f1..00000000 --- a/backend/api/room/migrations/0011_remove_parcours_exercices_parcours_exercices.py +++ /dev/null @@ -1,22 +0,0 @@ -# Generated by Django 4.0 on 2022-06-14 20:56 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('room', '0010_remove_parcours_exercices_parcours_exercices'), - ] - - operations = [ - migrations.RemoveField( - model_name='parcours', - name='exercices', - ), - migrations.AddField( - model_name='parcours', - name='exercices', - field=models.JSONField(default=list), - ), - ] diff --git a/backend/api/room/migrations/0012_alter_room_name.py b/backend/api/room/migrations/0012_alter_room_name.py deleted file mode 100644 index d9f41ce0..00000000 --- a/backend/api/room/migrations/0012_alter_room_name.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 4.0 on 2022-06-19 14:40 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('room', '0011_remove_parcours_exercices_parcours_exercices'), - ] - - operations = [ - migrations.AlterField( - model_name='room', - name='name', - field=models.CharField(max_length=30), - ), - ] diff --git a/backend/api/room/migrations/0013_alter_parcours_name.py b/backend/api/room/migrations/0013_alter_parcours_name.py deleted file mode 100644 index 49d5260d..00000000 --- a/backend/api/room/migrations/0013_alter_parcours_name.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 4.0 on 2022-06-20 09:00 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('room', '0012_alter_room_name'), - ] - - operations = [ - migrations.AlterField( - model_name='parcours', - name='name', - field=models.CharField(max_length=30), - ), - ] diff --git a/backend/api/room/migrations/__pycache__/0001_initial.cpython-310.pyc b/backend/api/room/migrations/__pycache__/0001_initial.cpython-310.pyc deleted file mode 100644 index f15d25d5..00000000 Binary files a/backend/api/room/migrations/__pycache__/0001_initial.cpython-310.pyc and /dev/null differ diff --git a/backend/api/room/migrations/__pycache__/0002_tempcorrection.cpython-310.pyc b/backend/api/room/migrations/__pycache__/0002_tempcorrection.cpython-310.pyc deleted file mode 100644 index f8289a36..00000000 Binary files a/backend/api/room/migrations/__pycache__/0002_tempcorrection.cpython-310.pyc and /dev/null differ diff --git a/backend/api/room/migrations/__pycache__/0003_tempcorrection_id_code.cpython-310.pyc b/backend/api/room/migrations/__pycache__/0003_tempcorrection_id_code.cpython-310.pyc deleted file mode 100644 index 5dbfb536..00000000 Binary files a/backend/api/room/migrations/__pycache__/0003_tempcorrection_id_code.cpython-310.pyc and /dev/null differ diff --git a/backend/api/room/migrations/__pycache__/0004_alter_tempcorrection_id_code.cpython-310.pyc b/backend/api/room/migrations/__pycache__/0004_alter_tempcorrection_id_code.cpython-310.pyc deleted file mode 100644 index 7f8c68a2..00000000 Binary files a/backend/api/room/migrations/__pycache__/0004_alter_tempcorrection_id_code.cpython-310.pyc and /dev/null differ diff --git a/backend/api/room/migrations/__pycache__/0005_rename_participants_room_anonymousmembers_and_more.cpython-310.pyc b/backend/api/room/migrations/__pycache__/0005_rename_participants_room_anonymousmembers_and_more.cpython-310.pyc deleted file mode 100644 index 47ac4ed4..00000000 Binary files a/backend/api/room/migrations/__pycache__/0005_rename_participants_room_anonymousmembers_and_more.cpython-310.pyc and /dev/null differ diff --git a/backend/api/room/migrations/__pycache__/0006_alter_room_usermembers.cpython-310.pyc b/backend/api/room/migrations/__pycache__/0006_alter_room_usermembers.cpython-310.pyc deleted file mode 100644 index d91ddeb2..00000000 Binary files a/backend/api/room/migrations/__pycache__/0006_alter_room_usermembers.cpython-310.pyc and /dev/null differ diff --git a/backend/api/room/migrations/__pycache__/0007_alter_room_usermembers.cpython-310.pyc b/backend/api/room/migrations/__pycache__/0007_alter_room_usermembers.cpython-310.pyc deleted file mode 100644 index 68193822..00000000 Binary files a/backend/api/room/migrations/__pycache__/0007_alter_room_usermembers.cpython-310.pyc and /dev/null differ diff --git a/backend/api/room/migrations/__pycache__/0008_alter_room_anonymousmembers.cpython-310.pyc b/backend/api/room/migrations/__pycache__/0008_alter_room_anonymousmembers.cpython-310.pyc deleted file mode 100644 index b37b3682..00000000 Binary files a/backend/api/room/migrations/__pycache__/0008_alter_room_anonymousmembers.cpython-310.pyc and /dev/null differ diff --git a/backend/api/room/migrations/__pycache__/0009_room_online.cpython-310.pyc b/backend/api/room/migrations/__pycache__/0009_room_online.cpython-310.pyc deleted file mode 100644 index c7308e4a..00000000 Binary files a/backend/api/room/migrations/__pycache__/0009_room_online.cpython-310.pyc and /dev/null differ diff --git a/backend/api/room/migrations/__pycache__/0010_remove_parcours_exercices_parcours_exercices.cpython-310.pyc b/backend/api/room/migrations/__pycache__/0010_remove_parcours_exercices_parcours_exercices.cpython-310.pyc deleted file mode 100644 index c65a4490..00000000 Binary files a/backend/api/room/migrations/__pycache__/0010_remove_parcours_exercices_parcours_exercices.cpython-310.pyc and /dev/null differ diff --git a/backend/api/room/migrations/__pycache__/0011_remove_parcours_exercices_parcours_exercices.cpython-310.pyc b/backend/api/room/migrations/__pycache__/0011_remove_parcours_exercices_parcours_exercices.cpython-310.pyc deleted file mode 100644 index 5fc0f38d..00000000 Binary files a/backend/api/room/migrations/__pycache__/0011_remove_parcours_exercices_parcours_exercices.cpython-310.pyc and /dev/null differ diff --git a/backend/api/room/migrations/__pycache__/0012_alter_room_name.cpython-310.pyc b/backend/api/room/migrations/__pycache__/0012_alter_room_name.cpython-310.pyc deleted file mode 100644 index 020a09fe..00000000 Binary files a/backend/api/room/migrations/__pycache__/0012_alter_room_name.cpython-310.pyc and /dev/null differ diff --git a/backend/api/room/migrations/__pycache__/0013_alter_parcours_name.cpython-310.pyc b/backend/api/room/migrations/__pycache__/0013_alter_parcours_name.cpython-310.pyc deleted file mode 100644 index b8d2ff11..00000000 Binary files a/backend/api/room/migrations/__pycache__/0013_alter_parcours_name.cpython-310.pyc and /dev/null differ diff --git a/backend/api/room/migrations/__pycache__/__init__.cpython-310.pyc b/backend/api/room/migrations/__pycache__/__init__.cpython-310.pyc deleted file mode 100644 index 6a0ec873..00000000 Binary files a/backend/api/room/migrations/__pycache__/__init__.cpython-310.pyc and /dev/null differ diff --git a/backend/api/room/models.py b/backend/api/room/models.py index 7c33c3aa..0ad62650 100644 --- a/backend/api/room/models.py +++ b/backend/api/room/models.py @@ -137,13 +137,16 @@ class RoomManager(models.Manager): return True def disconnect(self, room_code, code): - room = self.get_queryset().filter(id_code=room_code)[0] - online = room.online + try: + room = self.get_queryset().filter(id_code=room_code)[0] + online = room.online - room.online = [ - o for o in online if o != code] - room.save() - return True + room.online = [ + o for o in online if o != code] + room.save() + return True + except: + return False @@ -167,7 +170,7 @@ class RoomManager(models.Manager): class Room(models.Model): name = models.CharField(max_length=30) id_code = models.CharField( - max_length=50, default=generate_unique_code_room) + max_length=50, default=generate_unique_code_room, unique = True) #Pour la migration initiale : si pas en "" renvoie erreur car table utilisée dans fonction avant d'être crée anonymousMembers = models.JSONField(default=list, null=True) userMembers = models.ManyToManyField("users.CustomUser") waiters = models.JSONField(default=list) @@ -239,7 +242,7 @@ class ParcoursManager(models.Manager): class Parcours(models.Model): name = models.CharField(max_length=30) id_code = models.CharField( - max_length=50, default=generate_unique_code_parcours) + max_length=50, default=generate_unique_code_parcours, unique = True) # Pour la migration initiale : si pas en "" renvoie erreur car table utilisée dans fonction avant d'être crée challenger = models.JSONField(default=list) room = models.ForeignKey(Room, on_delete=models.CASCADE) created_at = models.DateTimeField(auto_now_add=True) @@ -254,4 +257,4 @@ class Parcours(models.Model): class TempCorrection(models.Model): correction = models.JSONField(default=list) id_code = models.CharField( - max_length=50, default=generate_unique_code_corr) + max_length=50, default=generate_unique_code_corr, unique = True) # Pour la migration initiale : si pas en "" renvoie erreur car table utilisée dans fonction avant d'être crée diff --git a/backend/api/users/__pycache__/__init__.cpython-310.pyc b/backend/api/users/__pycache__/__init__.cpython-310.pyc deleted file mode 100644 index cd0f0278..00000000 Binary files a/backend/api/users/__pycache__/__init__.cpython-310.pyc and /dev/null differ diff --git a/backend/api/users/__pycache__/admin.cpython-310.pyc b/backend/api/users/__pycache__/admin.cpython-310.pyc deleted file mode 100644 index 549a96b0..00000000 Binary files a/backend/api/users/__pycache__/admin.cpython-310.pyc and /dev/null differ diff --git a/backend/api/users/__pycache__/apps.cpython-310.pyc b/backend/api/users/__pycache__/apps.cpython-310.pyc deleted file mode 100644 index c7aa4448..00000000 Binary files a/backend/api/users/__pycache__/apps.cpython-310.pyc and /dev/null differ diff --git a/backend/api/users/__pycache__/forms.cpython-310.pyc b/backend/api/users/__pycache__/forms.cpython-310.pyc deleted file mode 100644 index 4e4735c7..00000000 Binary files a/backend/api/users/__pycache__/forms.cpython-310.pyc and /dev/null differ diff --git a/backend/api/users/__pycache__/models.cpython-310.pyc b/backend/api/users/__pycache__/models.cpython-310.pyc deleted file mode 100644 index b1441244..00000000 Binary files a/backend/api/users/__pycache__/models.cpython-310.pyc and /dev/null differ diff --git a/backend/api/users/__pycache__/serializers.cpython-310.pyc b/backend/api/users/__pycache__/serializers.cpython-310.pyc deleted file mode 100644 index 44e4818c..00000000 Binary files a/backend/api/users/__pycache__/serializers.cpython-310.pyc and /dev/null differ diff --git a/backend/api/users/__pycache__/urls.cpython-310.pyc b/backend/api/users/__pycache__/urls.cpython-310.pyc deleted file mode 100644 index 111a7bb7..00000000 Binary files a/backend/api/users/__pycache__/urls.cpython-310.pyc and /dev/null differ diff --git a/backend/api/users/__pycache__/views.cpython-310.pyc b/backend/api/users/__pycache__/views.cpython-310.pyc deleted file mode 100644 index fb9fe6dc..00000000 Binary files a/backend/api/users/__pycache__/views.cpython-310.pyc and /dev/null differ diff --git a/backend/api/users/migrations/0001_initial.py b/backend/api/users/migrations/0001_initial.py index ea7206d9..2c0cd224 100644 --- a/backend/api/users/migrations/0001_initial.py +++ b/backend/api/users/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 4.0 on 2022-05-19 16:47 +# Generated by Django 4.0 on 2022-07-29 09:08 import django.contrib.auth.models import django.contrib.auth.validators @@ -12,6 +12,7 @@ class Migration(migrations.Migration): dependencies = [ ('auth', '0012_alter_user_first_name_max_length'), + ('exercices', '0001_initial'), ] operations = [ @@ -29,7 +30,10 @@ class Migration(migrations.Migration): ('is_staff', models.BooleanField(default=False, help_text='Designates whether the user can log into this admin site.', verbose_name='staff status')), ('is_active', models.BooleanField(default=True, help_text='Designates whether this user should be treated as active. Unselect this instead of deleting accounts.', verbose_name='active')), ('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')), + ('id_code', models.CharField(default='generate_unique_code', max_length=50, unique=True)), + ('clientId', models.CharField(default='generate_unique_uuid', max_length=50, unique=True)), ('groups', models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.Group', verbose_name='groups')), + ('registeredExos', models.ManyToManyField(to='exercices.Exercice')), ('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.Permission', verbose_name='user permissions')), ], options={ diff --git a/backend/api/users/migrations/0002_customuser_registeredexos.py b/backend/api/users/migrations/0002_customuser_registeredexos.py deleted file mode 100644 index 4a4c755e..00000000 --- a/backend/api/users/migrations/0002_customuser_registeredexos.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 4.0 on 2022-05-20 13:55 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('exercices', '0005_exercice_author_exercice_private'), - ('users', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='customuser', - name='registeredExos', - field=models.ManyToManyField(null=True, to='exercices.Exercice'), - ), - ] diff --git a/backend/api/users/migrations/0003_alter_customuser_registeredexos.py b/backend/api/users/migrations/0003_alter_customuser_registeredexos.py deleted file mode 100644 index daa8161d..00000000 --- a/backend/api/users/migrations/0003_alter_customuser_registeredexos.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 4.0 on 2022-05-20 13:55 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('exercices', '0005_exercice_author_exercice_private'), - ('users', '0002_customuser_registeredexos'), - ] - - operations = [ - migrations.AlterField( - model_name='customuser', - name='registeredExos', - field=models.ManyToManyField(to='exercices.Exercice'), - ), - ] diff --git a/backend/api/users/migrations/0004_customuser_id_code.py b/backend/api/users/migrations/0004_customuser_id_code.py deleted file mode 100644 index 72be744f..00000000 --- a/backend/api/users/migrations/0004_customuser_id_code.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 4.0 on 2022-05-21 15:39 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0003_alter_customuser_registeredexos'), - ] - - operations = [ - migrations.AddField( - model_name='customuser', - name='id_code', - field=models.CharField(default='', max_length=50), - ), - ] diff --git a/backend/api/users/migrations/0005_alter_customuser_id_code.py b/backend/api/users/migrations/0005_alter_customuser_id_code.py deleted file mode 100644 index 553fd512..00000000 --- a/backend/api/users/migrations/0005_alter_customuser_id_code.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 4.0 on 2022-05-21 15:39 - -from django.db import migrations, models -import users.models - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0004_customuser_id_code'), - ] - - operations = [ - migrations.AlterField( - model_name='customuser', - name='id_code', - field=models.CharField(default=users.models.generate_unique_code, max_length=50), - ), - ] diff --git a/backend/api/users/migrations/0006_customuser_clientid.py b/backend/api/users/migrations/0006_customuser_clientid.py deleted file mode 100644 index f304ffda..00000000 --- a/backend/api/users/migrations/0006_customuser_clientid.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 4.0 on 2022-05-21 15:50 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0005_alter_customuser_id_code'), - ] - - operations = [ - migrations.AddField( - model_name='customuser', - name='clientId', - field=models.CharField(default='fd3acbe0-5406-4904-9f0d-83c66024ec8c', max_length=50), - ), - ] diff --git a/backend/api/users/migrations/0007_alter_customuser_clientid.py b/backend/api/users/migrations/0007_alter_customuser_clientid.py deleted file mode 100644 index b6f01ac6..00000000 --- a/backend/api/users/migrations/0007_alter_customuser_clientid.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 4.0 on 2022-05-21 17:03 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0006_customuser_clientid'), - ] - - operations = [ - migrations.AlterField( - model_name='customuser', - name='clientId', - field=models.CharField(default='d5c3c8ee-de15-40fd-9988-910330888187', max_length=50), - ), - ] diff --git a/backend/api/users/migrations/0008_alter_customuser_clientid.py b/backend/api/users/migrations/0008_alter_customuser_clientid.py deleted file mode 100644 index fd1a5029..00000000 --- a/backend/api/users/migrations/0008_alter_customuser_clientid.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 4.0 on 2022-05-30 15:54 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0007_alter_customuser_clientid'), - ] - - operations = [ - migrations.AlterField( - model_name='customuser', - name='clientId', - field=models.CharField(default='5a51ccaa-e788-436f-a553-a69fa8ee155a', max_length=50), - ), - ] diff --git a/backend/api/users/migrations/0009_alter_customuser_clientid_alter_customuser_id_code.py b/backend/api/users/migrations/0009_alter_customuser_clientid_alter_customuser_id_code.py deleted file mode 100644 index e4292570..00000000 --- a/backend/api/users/migrations/0009_alter_customuser_clientid_alter_customuser_id_code.py +++ /dev/null @@ -1,24 +0,0 @@ -# Generated by Django 4.0 on 2022-05-30 15:55 - -from django.db import migrations, models -import users.models - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0008_alter_customuser_clientid'), - ] - - operations = [ - migrations.AlterField( - model_name='customuser', - name='clientId', - field=models.CharField(default=users.models.generate_unique_uuid, max_length=50), - ), - migrations.AlterField( - model_name='customuser', - name='id_code', - field=models.CharField(default=users.models.generate_unique_code, max_length=50), - ), - ] diff --git a/backend/api/users/migrations/0010_alter_customuser_id_code.py b/backend/api/users/migrations/0010_alter_customuser_id_code.py deleted file mode 100644 index 1d350a67..00000000 --- a/backend/api/users/migrations/0010_alter_customuser_id_code.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 4.0 on 2022-05-30 16:04 - -from django.db import migrations, models -import users.models - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0009_alter_customuser_clientid_alter_customuser_id_code'), - ] - - operations = [ - migrations.AlterField( - model_name='customuser', - name='id_code', - field=models.CharField(default=users.models.generate_unique_code, max_length=50, unique=True), - ), - ] diff --git a/backend/api/users/migrations/__pycache__/0001_initial.cpython-310.pyc b/backend/api/users/migrations/__pycache__/0001_initial.cpython-310.pyc deleted file mode 100644 index 65c262eb..00000000 Binary files a/backend/api/users/migrations/__pycache__/0001_initial.cpython-310.pyc and /dev/null differ diff --git a/backend/api/users/migrations/__pycache__/0002_customuser_registeredexos.cpython-310.pyc b/backend/api/users/migrations/__pycache__/0002_customuser_registeredexos.cpython-310.pyc deleted file mode 100644 index ecaf7827..00000000 Binary files a/backend/api/users/migrations/__pycache__/0002_customuser_registeredexos.cpython-310.pyc and /dev/null differ diff --git a/backend/api/users/migrations/__pycache__/0003_alter_customuser_registeredexos.cpython-310.pyc b/backend/api/users/migrations/__pycache__/0003_alter_customuser_registeredexos.cpython-310.pyc deleted file mode 100644 index 09bb6226..00000000 Binary files a/backend/api/users/migrations/__pycache__/0003_alter_customuser_registeredexos.cpython-310.pyc and /dev/null differ diff --git a/backend/api/users/migrations/__pycache__/0004_customuser_id_code.cpython-310.pyc b/backend/api/users/migrations/__pycache__/0004_customuser_id_code.cpython-310.pyc deleted file mode 100644 index 27f0da8f..00000000 Binary files a/backend/api/users/migrations/__pycache__/0004_customuser_id_code.cpython-310.pyc and /dev/null differ diff --git a/backend/api/users/migrations/__pycache__/0005_alter_customuser_id_code.cpython-310.pyc b/backend/api/users/migrations/__pycache__/0005_alter_customuser_id_code.cpython-310.pyc deleted file mode 100644 index 76cf5a3a..00000000 Binary files a/backend/api/users/migrations/__pycache__/0005_alter_customuser_id_code.cpython-310.pyc and /dev/null differ diff --git a/backend/api/users/migrations/__pycache__/0006_customuser_clientid.cpython-310.pyc b/backend/api/users/migrations/__pycache__/0006_customuser_clientid.cpython-310.pyc deleted file mode 100644 index c65f48a4..00000000 Binary files a/backend/api/users/migrations/__pycache__/0006_customuser_clientid.cpython-310.pyc and /dev/null differ diff --git a/backend/api/users/migrations/__pycache__/0007_alter_customuser_clientid.cpython-310.pyc b/backend/api/users/migrations/__pycache__/0007_alter_customuser_clientid.cpython-310.pyc deleted file mode 100644 index 788ef415..00000000 Binary files a/backend/api/users/migrations/__pycache__/0007_alter_customuser_clientid.cpython-310.pyc and /dev/null differ diff --git a/backend/api/users/migrations/__pycache__/0008_alter_customuser_clientid.cpython-310.pyc b/backend/api/users/migrations/__pycache__/0008_alter_customuser_clientid.cpython-310.pyc deleted file mode 100644 index cb3acb24..00000000 Binary files a/backend/api/users/migrations/__pycache__/0008_alter_customuser_clientid.cpython-310.pyc and /dev/null differ diff --git a/backend/api/users/migrations/__pycache__/0009_alter_customuser_clientid_alter_customuser_id_code.cpython-310.pyc b/backend/api/users/migrations/__pycache__/0009_alter_customuser_clientid_alter_customuser_id_code.cpython-310.pyc deleted file mode 100644 index 76e62475..00000000 Binary files a/backend/api/users/migrations/__pycache__/0009_alter_customuser_clientid_alter_customuser_id_code.cpython-310.pyc and /dev/null differ diff --git a/backend/api/users/migrations/__pycache__/0010_alter_customuser_clientid.cpython-310.pyc b/backend/api/users/migrations/__pycache__/0010_alter_customuser_clientid.cpython-310.pyc deleted file mode 100644 index 477b358b..00000000 Binary files a/backend/api/users/migrations/__pycache__/0010_alter_customuser_clientid.cpython-310.pyc and /dev/null differ diff --git a/backend/api/users/migrations/__pycache__/0010_alter_customuser_id_code.cpython-310.pyc b/backend/api/users/migrations/__pycache__/0010_alter_customuser_id_code.cpython-310.pyc deleted file mode 100644 index 9a4ee9f2..00000000 Binary files a/backend/api/users/migrations/__pycache__/0010_alter_customuser_id_code.cpython-310.pyc and /dev/null differ diff --git a/backend/api/users/migrations/__pycache__/__init__.cpython-310.pyc b/backend/api/users/migrations/__pycache__/__init__.cpython-310.pyc deleted file mode 100644 index 9b86460f..00000000 Binary files a/backend/api/users/migrations/__pycache__/__init__.cpython-310.pyc and /dev/null differ diff --git a/backend/api/users/models.py b/backend/api/users/models.py index 18803e9e..f99c0efb 100644 --- a/backend/api/users/models.py +++ b/backend/api/users/models.py @@ -17,6 +17,8 @@ def generate_unique_code(): break return code + + def generate_unique_uuid(): while True: @@ -30,7 +32,12 @@ def generate_unique_uuid(): class CustomUser(AbstractUser): # Any extra fields would go here registeredExos = models.ManyToManyField("exercices.Exercice") - id_code = models.CharField(default=generate_unique_code, max_length=50, unique = True) - clientId = models.CharField(default=generate_unique_uuid, max_length=50, ) + # Pour la migration initiale : si pas en "" renvoie erreur car table utilisée dans fonction avant d'être crée + id_code = models.CharField( + default=generate_unique_code, max_length=50, unique=True) + # Pour la migration initiale : si pas en "" renvoie erreur car table utilisée dans fonction avant d'être crée + clientId = models.CharField( + default=generate_unique_uuid, max_length=50, unique=True) + def __str__(self): - return self.email \ No newline at end of file + return self.email