From d855ec6a774c24d0f5a849f578f37fc8471b5494 Mon Sep 17 00:00:00 2001 From: Yakser Date: Tue, 27 Dec 2022 21:57:24 +0400 Subject: [PATCH 1/3] Added ordering by name to Industry model --- .../migrations/0002_alter_industry_options.py | 21 +++++++++++++++++++ industries/models.py | 1 + 2 files changed, 22 insertions(+) create mode 100644 industries/migrations/0002_alter_industry_options.py diff --git a/industries/migrations/0002_alter_industry_options.py b/industries/migrations/0002_alter_industry_options.py new file mode 100644 index 00000000..b0ba38ac --- /dev/null +++ b/industries/migrations/0002_alter_industry_options.py @@ -0,0 +1,21 @@ +# Generated by Django 4.1.3 on 2022-12-27 17:51 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ("industries", "0001_initial"), + ] + + operations = [ + migrations.AlterModelOptions( + name="industry", + options={ + "ordering": ["name"], + "verbose_name": "Индустрия", + "verbose_name_plural": "Индустрии", + }, + ), + ] diff --git a/industries/models.py b/industries/models.py index 260ca547..b12e4d25 100644 --- a/industries/models.py +++ b/industries/models.py @@ -23,3 +23,4 @@ def __str__(self): class Meta: verbose_name = "Индустрия" verbose_name_plural = "Индустрии" + ordering = ["name"] From 513f6baf3959ecc37eb497cb3ee895a74ba62c7e Mon Sep 17 00:00:00 2001 From: Yakser Date: Fri, 30 Dec 2022 19:07:32 +0400 Subject: [PATCH 2/3] Add preferred_industries field to Mentor --- .../0025_mentor_preferred_industries.py | 18 ++++++++++++++++++ users/models.py | 4 ++-- 2 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 users/migrations/0025_mentor_preferred_industries.py diff --git a/users/migrations/0025_mentor_preferred_industries.py b/users/migrations/0025_mentor_preferred_industries.py new file mode 100644 index 00000000..c4ea2618 --- /dev/null +++ b/users/migrations/0025_mentor_preferred_industries.py @@ -0,0 +1,18 @@ +# Generated by Django 4.1.3 on 2022-12-30 15:07 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("users", "0024_alter_customuser_birthday"), + ] + + operations = [ + migrations.AddField( + model_name="mentor", + name="preferred_industries", + field=models.CharField(blank=True, max_length=4096), + ), + ] diff --git a/users/models.py b/users/models.py index c220d362..07b253cd 100644 --- a/users/models.py +++ b/users/models.py @@ -186,6 +186,7 @@ class Mentor(AbstractUserWithRole): Attributes: user: ForeignKey instance of the CustomUser model. + preferred_industries: ManyToManyField indicating user industries preferred for work. useful_to_project: TextField instance indicates actions useful for the development and maintenance of the project. """ @@ -193,8 +194,7 @@ class Mentor(AbstractUserWithRole): user = models.OneToOneField( CustomUser, on_delete=models.CASCADE, related_name="mentor" ) - # CustomUser already has a field called "organization" - # job = models.CharField(max_length=255, blank=True) + preferred_industries = models.CharField(max_length=4096, blank=True) useful_to_project = models.TextField(blank=True) def __str__(self): From 3cfe3fc7e3ce3dc51d652ad50d043e7042a62cbc Mon Sep 17 00:00:00 2001 From: Yakser Date: Fri, 30 Dec 2022 19:09:09 +0400 Subject: [PATCH 3/3] Add preferred_industries to Mentor serializer --- users/serializers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/users/serializers.py b/users/serializers.py index cc4048ee..01d30285 100644 --- a/users/serializers.py +++ b/users/serializers.py @@ -39,7 +39,7 @@ class MentorSerializer(serializers.ModelSerializer): class Meta: model = Mentor fields = [ - # "job", + "preferred_industries", "useful_to_project", ]