Merge pull request #91 from PROCOLLAB-github/dev

Dev

Author: VeryBigSad

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": "Индустрии",
+            },
+        ),
+    ]

industries/models.py

@@ -23,3 +23,4 @@ def __str__(self):
     class Meta:
         verbose_name = "Индустрия"
         verbose_name_plural = "Индустрии"
+        ordering = ["name"]

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),
+        ),
+    ]

users/models.py

@@ -186,15 +186,15 @@ 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.
     """
 
     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):

users/serializers.py

@@ -39,7 +39,7 @@ class MentorSerializer(serializers.ModelSerializer):
     class Meta:
         model = Mentor
         fields = [
-            # "job",
+            "preferred_industries",
             "useful_to_project",
         ]