From 66b8c1bc53d9825cf56e9ef0e7f161f146b6eea4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?c=C4=83t=C4=83lin?= Date: Mon, 25 Jan 2021 14:59:23 +0100 Subject: [PATCH] chg: revamped fistures !minor --- README.md | 8 ++- order/fixtures/lines.json | 42 ++++++++++++++++ order/fixtures/order.json | 54 -------------------- order/fixtures/orders.json | 22 ++++++++ order/fixtures/products.json | 34 +++++++++++++ order/migrations/0003_auto_20210125_1345.py | 23 +++++++++ order/models.py | 2 +- users/fixtures/users.json | 56 +++++++++++++++++++++ 8 files changed, 185 insertions(+), 56 deletions(-) create mode 100644 order/fixtures/lines.json delete mode 100644 order/fixtures/order.json create mode 100644 order/fixtures/orders.json create mode 100644 order/fixtures/products.json create mode 100644 order/migrations/0003_auto_20210125_1345.py create mode 100644 users/fixtures/users.json diff --git a/README.md b/README.md index 94e6d78..4f3e49e 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,13 @@ EMAIL_HOST_PASSWORD = "somepassword" EMAIL_USE_TLS = True ``` - this will send an email when calling `/api/orders/{order}/sent` which will render `bernini/templates/order_sold.html` as body - +#### fixtures +```bash +./wrapper.sh m loaddata users +./wrapper.sh m loaddata products +./wrapper.sh m loaddata product +./wrapper.sh m loaddata lines +``` ### api - based on [Django REST framework](https://www.django-rest-framework.org/) - auth system using and extending django's `contrib.auth` diff --git a/order/fixtures/lines.json b/order/fixtures/lines.json new file mode 100644 index 0000000..61b76cd --- /dev/null +++ b/order/fixtures/lines.json @@ -0,0 +1,42 @@ +[ +{ + "model": "order.saleorderline", + "pk": 1, + "fields": { + "name": "sol 1", + "product": 1, + "order": 1, + "quantity": 5 + } +}, +{ + "model": "order.saleorderline", + "pk": 2, + "fields": { + "name": "sol 2", + "product": 2, + "order": 1, + "quantity": 1 + } +}, +{ + "model": "order.saleorderline", + "pk": 3, + "fields": { + "name": "sol 3", + "product": 3, + "order": 2, + "quantity": 3 + } +}, +{ + "model": "order.saleorderline", + "pk": 4, + "fields": { + "name": "sol 4", + "product": 4, + "order": 2, + "quantity": 25 + } +} +] diff --git a/order/fixtures/order.json b/order/fixtures/order.json deleted file mode 100644 index 0cbbbdc..0000000 --- a/order/fixtures/order.json +++ /dev/null @@ -1,54 +0,0 @@ -[ - { - "model": "django.contrib.auth.models.User", - "pk": 100, - "fields": { - "username": "alovelace", - "first_name": "Ada", - "last_name": "Lovelace", - "email": "alovelace@berni.ni", - "password": "alovelace" - } - }, - { - "model": "django.contrib.auth.models.User", - "pk": 200, - "fields": { - "username": "ltorvalds", - "first_name": "Linus", - "last_name": "Torvalds", - "email": "ltorvalds@berni.ni", - "password": "ltorvalds" - } - }, - { - "model": "django.contrib.auth.models.User", - "pk": 300, - "fields": { - "username": "dritchie", - "first_name": "Dennis", - "last_name": "Ritchie", - "email": "dritchie@berni.ni", - "password": "dritchie" - } - }, - { - "model": "django.contrib.auth.models.User", - "pk": 400, - "fields": { - "username": "kthompson", - "first_name": "Ken", - "last_name": "Thompson", - "email": "kthompson@berni.ni", - "password": "kthompson" - } - }, - { - "model": "SaleOrder", - "pk": 1, - "fields": { - "name": "Ken's first sale order", - "user": 400 - } - } -] \ No newline at end of file diff --git a/order/fixtures/orders.json b/order/fixtures/orders.json new file mode 100644 index 0000000..b4037da --- /dev/null +++ b/order/fixtures/orders.json @@ -0,0 +1,22 @@ +[ +{ + "model": "order.saleorder", + "pk": 1, + "fields": { + "name": "Laurentius' first quote", + "sold_to": 5, + "total": 2749.94, + "sold_at": "2021-01-25T00:47:01Z" + } +}, +{ + "model": "order.saleorder", + "pk": 2, + "fields": { + "name": "Laurentius' second quote", + "sold_to": 5, + "total": 6499.72, + "sold_at": "2021-01-25T13:49:02Z" + } +} +] diff --git a/order/fixtures/products.json b/order/fixtures/products.json new file mode 100644 index 0000000..f78d661 --- /dev/null +++ b/order/fixtures/products.json @@ -0,0 +1,34 @@ +[ +{ + "model": "order.product", + "pk": 1, + "fields": { + "name": "Boots of the Explorer", + "unit_price": 499.99 + } +}, +{ + "model": "order.product", + "pk": 2, + "fields": { + "name": "Lord's Blade Waistcloth", + "unit_price": 249.99 + } +}, +{ + "model": "order.product", + "pk": 3, + "fields": { + "name": "Leggings of Favor", + "unit_price": 499.99 + } +}, +{ + "model": "order.product", + "pk": 4, + "fields": { + "name": "Brigand Trousers", + "unit_price": 199.99 + } +} +] diff --git a/order/migrations/0003_auto_20210125_1345.py b/order/migrations/0003_auto_20210125_1345.py new file mode 100644 index 0000000..c049e6f --- /dev/null +++ b/order/migrations/0003_auto_20210125_1345.py @@ -0,0 +1,23 @@ +# Generated by Django 3.1.5 on 2021-01-25 13:45 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('order', '0002_auto_20210124_2304'), + ] + + operations = [ + migrations.AlterField( + model_name='product', + name='unit_price', + field=models.FloatField(default=0), + ), + migrations.AlterField( + model_name='saleorderline', + name='quantity', + field=models.IntegerField(default=1), + ), + ] diff --git a/order/models.py b/order/models.py index 02a8cd0..400bf4d 100644 --- a/order/models.py +++ b/order/models.py @@ -50,7 +50,7 @@ class SaleOrder(BaseModel): class Product(models.Model): name = models.CharField(max_length=200) - unit_price = models.IntegerField(default=0) + unit_price = models.FloatField(default=0) class SaleOrderLine(models.Model): diff --git a/users/fixtures/users.json b/users/fixtures/users.json new file mode 100644 index 0000000..45d97ab --- /dev/null +++ b/users/fixtures/users.json @@ -0,0 +1,56 @@ +[ +{ + "model": "auth.user", + "pk": 1, + "fields": { + "password": "pbkdf2_sha256$216000$XUCdRSZgidku$tsan8mpxMengfd7rL5THvqofYTyZk9ko90hd+/OrV6A=", + "last_login": "2021-01-25T13:44:36Z", + "is_superuser": true, + "username": "admin", + "first_name": "Admin", + "last_name": "", + "email": "admin@berni.ni", + "is_staff": true, + "is_active": true, + "date_joined": "2021-01-19T21:47:24Z", + "groups": [], + "user_permissions": [] + } +}, +{ + "model": "auth.user", + "pk": 4, + "fields": { + "password": "pbkdf2_sha256$216000$qLORqdXRy45f$8JXtnVZbhvIFJh3rWpBiJko4PBVrUsGh4R3dAYOA7kg=", + "last_login": null, + "is_superuser": false, + "username": "solaire@berni.ni", + "first_name": "Solaire", + "last_name": "of Astora", + "email": "solaire@berni.ni", + "is_staff": true, + "is_active": true, + "date_joined": "2021-01-25T13:43:07Z", + "groups": [], + "user_permissions": [] + } +}, +{ + "model": "auth.user", + "pk": 5, + "fields": { + "password": "pbkdf2_sha256$216000$KzsdPkNXwOlk$CgXZPR6B+If9V1YoudPEreQYtxxNB8a0zIyikiOH5Tw=", + "last_login": null, + "is_superuser": false, + "username": "laurentius@berni.ni", + "first_name": "Laurentius", + "last_name": "of the Great Swamp", + "email": "laurentius@berni.ni", + "is_staff": true, + "is_active": true, + "date_joined": "2021-01-25T13:43:46Z", + "groups": [], + "user_permissions": [] + } +} +]