From c58f5c749ae1f4a411dd4cc9a8395dedddf93027 Mon Sep 17 00:00:00 2001 From: Mark Date: Mon, 19 Nov 2018 13:17:36 -0800 Subject: Django - Add Support for Storing Users Not in Guild (#150) * rename Member to User * add boolean field to distinguish users in our server * mark roles as not required * fix import order lint errors * fix order of model registration --- api/migrations/0018_user_rename.py | 17 +++++++++++++++++ api/migrations/0019_user_in_guild.py | 18 ++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 api/migrations/0018_user_rename.py create mode 100644 api/migrations/0019_user_in_guild.py (limited to 'api/migrations') diff --git a/api/migrations/0018_user_rename.py b/api/migrations/0018_user_rename.py new file mode 100644 index 00000000..f88eb5bc --- /dev/null +++ b/api/migrations/0018_user_rename.py @@ -0,0 +1,17 @@ +# Generated by Django 2.1.3 on 2018-11-19 20:09 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('api', '0017_auto_20181029_1921'), + ] + + operations = [ + migrations.RenameModel( + old_name='Member', + new_name='User', + ), + ] diff --git a/api/migrations/0019_user_in_guild.py b/api/migrations/0019_user_in_guild.py new file mode 100644 index 00000000..fda008c4 --- /dev/null +++ b/api/migrations/0019_user_in_guild.py @@ -0,0 +1,18 @@ +# Generated by Django 2.1.3 on 2018-11-19 20:30 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('api', '0018_user_rename'), + ] + + operations = [ + migrations.AddField( + model_name='user', + name='in_guild', + field=models.BooleanField(default=True, help_text='Whether this user is in our server.'), + ), + ] -- cgit v1.2.3 From 04afaefa471d47959fb941cada7a415550090299 Mon Sep 17 00:00:00 2001 From: Hasan <31344273+ImportErr@users.noreply.github.com> Date: Sun, 25 Nov 2018 09:25:08 +0000 Subject: Add a regex validator to snakename fields. (#151) --- api/migrations/0020_auto_20181124_1711.py | 24 ++++++++++++++++++++++++ api/models.py | 6 ++++-- 2 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 api/migrations/0020_auto_20181124_1711.py (limited to 'api/migrations') diff --git a/api/migrations/0020_auto_20181124_1711.py b/api/migrations/0020_auto_20181124_1711.py new file mode 100644 index 00000000..3b625f9b --- /dev/null +++ b/api/migrations/0020_auto_20181124_1711.py @@ -0,0 +1,24 @@ +# Generated by Django 2.1.2 on 2018-11-24 17:11 + +import django.core.validators +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('api', '0019_user_in_guild'), + ] + + operations = [ + migrations.AlterField( + model_name='snakename', + name='name', + field=models.CharField(help_text="The regular name for this snake, e.g. 'Python'.", max_length=100, primary_key=True, serialize=False, validators=[django.core.validators.RegexValidator(regex='^([^0-9])+$')]), + ), + migrations.AlterField( + model_name='snakename', + name='scientific', + field=models.CharField(help_text="The scientific name for this snake, e.g. 'Python bivittatus'.", max_length=150, validators=[django.core.validators.RegexValidator(regex='^([^0-9])+$')]), + ), + ] diff --git a/api/models.py b/api/models.py index bcf4af78..7623c86c 100644 --- a/api/models.py +++ b/api/models.py @@ -92,11 +92,13 @@ class SnakeName(ModelReprMixin, models.Model): name = models.CharField( primary_key=True, max_length=100, - help_text="The regular name for this snake, e.g. 'Python'." + help_text="The regular name for this snake, e.g. 'Python'.", + validators=[RegexValidator(regex=r'^([^0-9])+$')] ) scientific = models.CharField( max_length=150, - help_text="The scientific name for this snake, e.g. 'Python bivittatus'." + help_text="The scientific name for this snake, e.g. 'Python bivittatus'.", + validators=[RegexValidator(regex=r'^([^0-9])+$')] ) def __str__(self): -- cgit v1.2.3 From 5354a964cd44ee58b6399a22b0e4e36f4db53bbf Mon Sep 17 00:00:00 2001 From: Johannes Christ Date: Sun, 25 Nov 2018 10:44:06 +0100 Subject: Use more descriptive migration name. --- api/migrations/0020_add_snake_field_validators.py | 24 +++++++++++++++++++++++ api/migrations/0020_auto_20181124_1711.py | 24 ----------------------- 2 files changed, 24 insertions(+), 24 deletions(-) create mode 100644 api/migrations/0020_add_snake_field_validators.py delete mode 100644 api/migrations/0020_auto_20181124_1711.py (limited to 'api/migrations') diff --git a/api/migrations/0020_add_snake_field_validators.py b/api/migrations/0020_add_snake_field_validators.py new file mode 100644 index 00000000..3b625f9b --- /dev/null +++ b/api/migrations/0020_add_snake_field_validators.py @@ -0,0 +1,24 @@ +# Generated by Django 2.1.2 on 2018-11-24 17:11 + +import django.core.validators +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('api', '0019_user_in_guild'), + ] + + operations = [ + migrations.AlterField( + model_name='snakename', + name='name', + field=models.CharField(help_text="The regular name for this snake, e.g. 'Python'.", max_length=100, primary_key=True, serialize=False, validators=[django.core.validators.RegexValidator(regex='^([^0-9])+$')]), + ), + migrations.AlterField( + model_name='snakename', + name='scientific', + field=models.CharField(help_text="The scientific name for this snake, e.g. 'Python bivittatus'.", max_length=150, validators=[django.core.validators.RegexValidator(regex='^([^0-9])+$')]), + ), + ] diff --git a/api/migrations/0020_auto_20181124_1711.py b/api/migrations/0020_auto_20181124_1711.py deleted file mode 100644 index 3b625f9b..00000000 --- a/api/migrations/0020_auto_20181124_1711.py +++ /dev/null @@ -1,24 +0,0 @@ -# Generated by Django 2.1.2 on 2018-11-24 17:11 - -import django.core.validators -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('api', '0019_user_in_guild'), - ] - - operations = [ - migrations.AlterField( - model_name='snakename', - name='name', - field=models.CharField(help_text="The regular name for this snake, e.g. 'Python'.", max_length=100, primary_key=True, serialize=False, validators=[django.core.validators.RegexValidator(regex='^([^0-9])+$')]), - ), - migrations.AlterField( - model_name='snakename', - name='scientific', - field=models.CharField(help_text="The scientific name for this snake, e.g. 'Python bivittatus'.", max_length=150, validators=[django.core.validators.RegexValidator(regex='^([^0-9])+$')]), - ), - ] -- cgit v1.2.3