Remove saclay asset, add new fixtures for activity and notes, clean some migrations

apps/activity/fixtures/initial.json

@@ -1,32 +1 @@
-[
-    {
-        "model": "activity.activitytype",
-        "pk": 1,
-        "fields": {
-            "name": "Pot",
-            "manage_entries": true,
-            "can_invite": true,
-            "guest_entry_fee": 500
-        }
-    },
-    {
-        "model": "activity.activitytype",
-        "pk": 2,
-        "fields": {
-            "name": "Soir\u00e9e de club",
-            "manage_entries": false,
-            "can_invite": false,
-            "guest_entry_fee": 0
-        }
-    },
-    {
-        "model": "activity.activitytype",
-        "pk": 3,
-        "fields": {
-            "name": "Autre",
-            "manage_entries": false,
-            "can_invite": false,
-            "guest_entry_fee": 0
-        }
-    }
-]
+[{"model": "activity.activitytype", "pk": 4, "fields": {"name": "Activit\u00e9 gratuite ouverte", "manage_entries": false, "can_invite": true, "guest_entry_fee": 0}}, {"model": "activity.activitytype", "pk": 5, "fields": {"name": "Soir\u00e9e", "manage_entries": true, "can_invite": false, "guest_entry_fee": 500}}]

apps/activity/tests/test_activities.py

@@ -36,7 +36,7 @@ class TestActivities(TestCase):
             name="Activity",
             description="This is a test activity\non two very very long lines\nbecause this is very important.",
             location="Earth",
-            activity_type=ActivityType.objects.get(name="Pot"),
+            activity_type=ActivityType.objects.get(name="Activit\u00e9 gratuite ouverte"),
             creater=self.user,
             organizer=Club.objects.get(name="Kfet"),
             attendees_club=Club.objects.get(name="Kfet"),
@@ -70,7 +70,7 @@ class TestActivities(TestCase):
             name="Activity created",
             description="This activity was successfully created.",
             location="Earth",
-            activity_type=ActivityType.objects.get(name="Soirée de club").id,
+            activity_type=ActivityType.objects.get(name="Soir\u00e9e").id,
             creater=self.user.id,
             organizer=Club.objects.get(name="Kfet").id,
             attendees_club=Club.objects.get(name="Kfet").id,
@@ -100,7 +100,7 @@ class TestActivities(TestCase):
             name=str(self.activity) + " updated",
             description="This activity was successfully updated.",
             location="Earth",
-            activity_type=ActivityType.objects.get(name="Autre").id,
+            activity_type=ActivityType.objects.get(name="Soir\u00e9e").id,
             creater=self.user.id,
             organizer=Club.objects.get(name="Kfet").id,
             attendees_club=Club.objects.get(name="Kfet").id,
@@ -186,7 +186,7 @@ class TestActivityAPI(TestAPI):
             name="Activity",
             description="This is a test activity\non two very very long lines\nbecause this is very important.",
             location="Earth",
-            activity_type=ActivityType.objects.get(name="Pot"),
+            activity_type=ActivityType.objects.get(name="Activit\u00e9 gratuite ouverte"),
             creater=self.user,
             organizer=Club.objects.get(name="Kfet"),
             attendees_club=Club.objects.get(name="Kfet"),

apps/note/fixtures/initial.json

@@ -0,0 +1,57 @@
+[
+    {
+        "model": "note.templatecategory",
+        "pk": 1,
+        "fields": {
+            "name": "Soft"
+        }
+    },
+    {
+        "model": "note.templatecategory",
+        "pk": 2,
+        "fields": {
+            "name": "Alcool"
+        }
+    },
+    {
+        "model": "note.templatecategory",
+        "pk": 3,
+        "fields": {
+            "name": "Nourriture"
+        }
+    },
+    {
+        "model": "note.templatecategory",
+        "pk": 4,
+        "fields": {
+            "name": "Clubs"
+        }
+    },
+    {
+        "model": "note.templatecategory",
+        "pk": 5,
+        "fields": {
+            "name": "Goodies"
+        }
+    },
+    {
+        "model": "note.templatecategory",
+        "pk": 6,
+        "fields": {
+            "name": "Autre"
+        }
+    },
+    {
+        "model": "note.transactiontemplate",
+        "pk": 1,
+        "fields": {
+            "name": "Test Button",
+            "destination": 5,
+            "amount": 1,
+            "category": 6,
+            "display": false,
+            "highlighted": false,
+            "description": "Test button"
+        }
+    }
+]

apps/note/models/notes.py

@@ -219,7 +219,7 @@ class NoteSpecial(Note):
 
 class Trust(models.Model):
     """
-    A one-sided trust relationship bertween two users
+    A one-sided trust relationship between two users
 
     If another user considers you as your friend, you can transfer money from
     them

apps/treasury/migrations/0001_initial.py

@@ -1,7 +1,7 @@
-# Generated by Django 2.2.16 on 2020-09-04 21:41
+# Generated by Django 2.2.28 on 2022-08-06 13:33
 
 import datetime
-from django.conf import settings
+import django.core.validators
 from django.db import migrations, models
 import django.db.models.deletion
 import django.utils.timezone
@@ -12,8 +12,7 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('note', '0001_initial'),
+        ('note', '0006_trust'),
     ]
 
     operations = [
@@ -21,7 +20,7 @@ class Migration(migrations.Migration):
             name='Invoice',
             fields=[
                 ('id', models.PositiveIntegerField(primary_key=True, serialize=False, verbose_name='Invoice identifier')),
-                ('bde', models.CharField(choices=[('Saperlistpopette.png', 'Saper[list]popette'), ('Finalist.png', 'Fina[list]'), ('Listorique.png', '[List]orique'), ('Satellist.png', 'Satel[list]'), ('Monopolist.png', 'Monopo[list]'), ('Kataclist.png', 'Katac[list]')], default='Saperlistpopette.png', max_length=32, verbose_name='BDE')),
+                ('bde', models.CharField(choices=[('BDE', 'BDE')], default='BDE', max_length=32, verbose_name='BDE')),
                 ('object', models.CharField(max_length=255, verbose_name='Object')),
                 ('description', models.TextField(verbose_name='Description')),
                 ('name', models.CharField(max_length=255, verbose_name='Name')),
@@ -53,7 +52,7 @@ class Migration(migrations.Migration):
             name='SpecialTransactionProxy',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('remittance', models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='treasury.Remittance', verbose_name='Remittance')),
+                ('remittance', models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, related_name='transaction_proxies', to='treasury.Remittance', verbose_name='Remittance')),
                 ('transaction', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='note.SpecialTransaction')),
             ],
             options={
@@ -61,19 +60,6 @@ class Migration(migrations.Migration):
                 'verbose_name_plural': 'special transaction proxies',
             },
         ),
-        migrations.CreateModel(
-            name='SogeCredit',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('credit_transaction', models.OneToOneField(null=True, on_delete=django.db.models.deletion.SET_NULL, to='note.SpecialTransaction', verbose_name='credit transaction')),
-                ('transactions', models.ManyToManyField(related_name='_sogecredit_transactions_+', to='note.MembershipTransaction', verbose_name='membership transactions')),
-                ('user', models.OneToOneField(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL, verbose_name='user')),
-            ],
-            options={
-                'verbose_name': 'Credit from the Société générale',
-                'verbose_name_plural': 'Credits from the Société générale',
-            },
-        ),
         migrations.CreateModel(
             name='RemittanceType',
             fields=[
@@ -95,7 +81,7 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('designation', models.CharField(max_length=255, verbose_name='Designation')),
-                ('quantity', models.PositiveIntegerField(verbose_name='Quantity')),
+                ('quantity', models.DecimalField(decimal_places=2, max_digits=7, validators=[django.core.validators.MinValueValidator(0)], verbose_name='Quantity')),
                 ('amount', models.IntegerField(verbose_name='Unit price')),
                 ('invoice', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='products', to='treasury.Invoice', verbose_name='invoice')),
             ],

apps/treasury/migrations/0002_invoice_remove_png_extension.py

@@ -1,18 +0,0 @@
-# Generated by Django 2.2.16 on 2020-09-06 13:43
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('treasury', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='invoice',
-            name='bde',
-            field=models.CharField(choices=[('Saperlistpopette', 'Saper[list]popette'), ('Finalist', 'Fina[list]'), ('Listorique', '[List]orique'), ('Satellist', 'Satel[list]'), ('Monopolist', 'Monopo[list]'), ('Kataclist', 'Katac[list]')], default='Saperlistpopette', max_length=32, verbose_name='BDE'),
-        ),
-    ]

apps/treasury/migrations/0003_auto_20210321_1034.py

@@ -1,25 +0,0 @@
-# Generated by Django 2.2.19 on 2021-03-21 09:34
-
-import django.core.validators
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('treasury', '0002_invoice_remove_png_extension'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='product',
-            name='quantity',
-            field=models.DecimalField(decimal_places=2, max_digits=7, validators=[django.core.validators.MinValueValidator(0)], verbose_name='Quantity'),
-        ),
-        migrations.AlterField(
-            model_name='specialtransactionproxy',
-            name='remittance',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, related_name='transaction_proxies', to='treasury.Remittance', verbose_name='Remittance'),
-        ),
-    ]

apps/treasury/migrations/0004_auto_20211005_1544.py

@@ -1,18 +0,0 @@
-# Generated by Django 2.2.24 on 2021-10-05 13:44
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('treasury', '0003_auto_20210321_1034'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='sogecredit',
-            name='transactions',
-            field=models.ManyToManyField(blank=True, related_name='_sogecredit_transactions_+', to='note.MembershipTransaction', verbose_name='membership transactions'),
-        ),
-    ]

apps/treasury/migrations/0005_delete_sogecredit.py

@@ -1,16 +0,0 @@
-# Generated by Django 2.2.28 on 2022-07-31 11:45
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('treasury', '0004_auto_20211005_1544'),
-    ]
-
-    operations = [
-        migrations.DeleteModel(
-            name='SogeCredit',
-        ),
-    ]

apps/treasury/models.py

@@ -28,14 +28,9 @@ class Invoice(models.Model):
 
     bde = models.CharField(
         max_length=32,
-        default='Saperlistpopette',
+        default='BDE',
         choices=(
-            ('Saperlistpopette', 'Saper[list]popette'),
-            ('Finalist', 'Fina[list]'),
-            ('Listorique', '[List]orique'),
-            ('Satellist', 'Satel[list]'),
-            ('Monopolist', 'Monopo[list]'),
-            ('Kataclist', 'Katac[list]'),
+            ('BDE', 'BDE'),
         ),
         verbose_name=_("BDE"),
     )