chore: run ruff to format the code

This commit is contained in:
Alexis Métaireau 2023-12-17 03:28:56 +01:00 committed by Laetitia Getti
parent b39b43386d
commit 5e79ddf78a
10 changed files with 140 additions and 66 deletions

View file

@ -5,27 +5,52 @@ import django.db.models.deletion
class Migration(migrations.Migration):
initial = True
dependencies = [
]
dependencies = []
operations = [
migrations.CreateModel(
name='Grouped_order',
name="Grouped_order",
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('orga', models.CharField(max_length=100)),
('date', models.DateField(verbose_name='Date de livraison')),
(
"id",
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
("orga", models.CharField(max_length=100)),
("date", models.DateField(verbose_name="Date de livraison")),
],
),
migrations.CreateModel(
name='Order',
name="Order",
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('author', models.CharField(max_length=100, verbose_name='Personne qui passe la commande')),
('grouped_order', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='order.grouped_order')),
(
"id",
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
(
"author",
models.CharField(
max_length=100, verbose_name="Personne qui passe la commande"
),
),
(
"grouped_order",
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
to="order.grouped_order",
),
),
],
),
]

View file

@ -4,15 +4,14 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('order', '0001_initial'),
("order", "0001_initial"),
]
operations = [
migrations.AddField(
model_name='grouped_order',
name='name',
model_name="grouped_order",
name="name",
field=models.CharField(max_length=100, null=True),
),
]

View file

@ -5,18 +5,31 @@ import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('order', '0002_grouped_order_name'),
("order", "0002_grouped_order_name"),
]
operations = [
migrations.CreateModel(
name='Item',
name="Item",
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=100)),
('grouped_order', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='order.grouped_order')),
(
"id",
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
("name", models.CharField(max_length=100)),
(
"grouped_order",
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
to="order.grouped_order",
),
),
],
),
]

View file

@ -4,15 +4,14 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('order', '0003_item'),
("order", "0003_item"),
]
operations = [
migrations.AddField(
model_name='item',
name='ordered_nb',
model_name="item",
name="ordered_nb",
field=models.IntegerField(default=0),
),
]

View file

@ -5,28 +5,53 @@ import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('order', '0004_item_ordered_nb'),
("order", "0004_item_ordered_nb"),
]
operations = [
migrations.RemoveField(
model_name='item',
name='ordered_nb',
model_name="item",
name="ordered_nb",
),
migrations.AlterField(
model_name='order',
name='grouped_order',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='order_set', to='order.grouped_order'),
model_name="order",
name="grouped_order",
field=models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
related_name="order_set",
to="order.grouped_order",
),
),
migrations.CreateModel(
name='OrderedItem',
name="OrderedItem",
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('nb', models.PositiveSmallIntegerField(default=0)),
('item', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='ordered_items', to='order.item')),
('order', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='orders', to='order.order')),
(
"id",
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
("nb", models.PositiveSmallIntegerField(default=0)),
(
"item",
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
related_name="ordered_items",
to="order.item",
),
),
(
"order",
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
related_name="orders",
to="order.order",
),
),
],
),
]

View file

@ -4,15 +4,14 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('order', '0005_remove_item_ordered_nb_alter_order_grouped_order_and_more'),
("order", "0005_remove_item_ordered_nb_alter_order_grouped_order_and_more"),
]
operations = [
migrations.AddField(
model_name='item',
name='ordered_nb',
model_name="item",
name="ordered_nb",
field=models.IntegerField(default=0),
),
]

View file

@ -5,20 +5,27 @@ import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('order', '0006_item_ordered_nb'),
("order", "0006_item_ordered_nb"),
]
operations = [
migrations.AlterField(
model_name='ordereditem',
name='item',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='orders', to='order.item'),
model_name="ordereditem",
name="item",
field=models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
related_name="orders",
to="order.item",
),
),
migrations.AlterField(
model_name='ordereditem',
name='order',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='ordered_items', to='order.order'),
model_name="ordereditem",
name="order",
field=models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
related_name="ordered_items",
to="order.order",
),
),
]

View file

@ -5,16 +5,20 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('order', '0007_alter_ordereditem_item_alter_ordereditem_order'),
("order", "0007_alter_ordereditem_item_alter_ordereditem_order"),
]
operations = [
migrations.AddField(
model_name='grouped_order',
name='deadline',
field=models.DateTimeField(default=datetime.datetime(2023, 3, 23, 14, 38, 17, 365192, tzinfo=datetime.timezone.utc), verbose_name='Date limite de commande'),
model_name="grouped_order",
name="deadline",
field=models.DateTimeField(
default=datetime.datetime(
2023, 3, 23, 14, 38, 17, 365192, tzinfo=datetime.timezone.utc
),
verbose_name="Date limite de commande",
),
preserve_default=False,
),
]

View file

@ -4,15 +4,14 @@ from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('order', '0008_grouped_order_deadline'),
("order", "0008_grouped_order_deadline"),
]
operations = [
migrations.RenameField(
model_name='grouped_order',
old_name='date',
new_name='delivery_date',
model_name="grouped_order",
old_name="date",
new_name="delivery_date",
),
]

View file

@ -14,9 +14,12 @@ def create_code_from_pk(pk):
The use of pk in the beginning of the string guarantees the uniqueness, and the random part makes that we cannot guess the url path.
"""
base_36_pk = base36.dumps(pk)
random_string = base36.dumps(random.randint(1727605,60466175)) # generates a 5 digits long string
random_string = base36.dumps(
random.randint(1727605, 60466175)
) # generates a 5 digits long string
return f"{base_36_pk}{random_string}"
def set_code_default(apps, schema_editor):
"""Provides a default code to existing grouped orders during migration"""
GroupedOrder = apps.get_model("order", "GroupedOrder")
@ -24,11 +27,12 @@ def set_code_default(apps, schema_editor):
grouped_order.code = create_code_from_pk(grouped_order.pk)
grouped_order.save()
def reverse_set_code_default(apps, schema_editor):
"""Reverse the set_code default function"""
GroupedOrder = apps.get_model("order", "GroupedOrder")
for grouped_order in GroupedOrder.objects.all().iterator():
grouped_order.code = ''
grouped_order.code = ""
grouped_order.save()