Merge pull request #84 from PROCOLLAB-github/dev

made expert.preferred_industries and investor.preferred_industries Ch…

Author: VeryBigSad

users/managers.py

@@ -30,9 +30,9 @@ def get_users_for_detail_view(self):
             self.get_queryset()
             .select_related("member", "investor", "expert", "mentor")
             .prefetch_related(
-                "member__preferred_industries",
-                "expert__preferred_industries",
-                "investor__preferred_industries",
+                # "member__preferred_industries",
+                # "expert__preferred_industries",
+                # "investor__preferred_industries",
                 "achievements",
             )
             .all()

users/migrations/0022_alter_customuser_user_type_and_more.py

@@ -0,0 +1,40 @@
+# Generated by Django 4.1.3 on 2022-11-23 12:43
+
+from django.db import migrations, models
+import users.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("users", "0021_alter_customuser_key_skills"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="customuser",
+            name="user_type",
+            field=models.PositiveSmallIntegerField(
+                choices=[(1, "Участник"), (2, "Ментор"), (3, "Эксперт"), (4, "Инвестор")],
+                default=users.models.get_default_user_type,
+            ),
+        ),
+        migrations.RemoveField(
+            model_name="expert",
+            name="preferred_industries",
+        ),
+        migrations.RemoveField(
+            model_name="investor",
+            name="preferred_industries",
+        ),
+        migrations.AddField(
+            model_name="expert",
+            name="preferred_industries",
+            field=models.CharField(blank=True, max_length=4096),
+        ),
+        migrations.AddField(
+            model_name="investor",
+            name="preferred_industries",
+            field=models.CharField(blank=True, max_length=4096),
+        ),
+    ]

users/models.py

@@ -208,9 +208,10 @@ class Expert(AbstractUserWithRole):
         CustomUser, on_delete=models.CASCADE, related_name="expert"
     )
 
-    preferred_industries = models.ManyToManyField(
-        Industry, blank=True, related_name="experts"
-    )
+    # preferred_industries = models.ManyToManyField(
+    #     Industry, blank=True, related_name="experts"
+    # )
+    preferred_industries = models.CharField(max_length=4096, blank=True)
     useful_to_project = models.TextField(blank=True)
 
     # TODO reviews
@@ -235,9 +236,10 @@ class Investor(AbstractUserWithRole):
         CustomUser, on_delete=models.CASCADE, related_name="investor"
     )
 
-    preferred_industries = models.ManyToManyField(
-        Industry, blank=True, related_name="investors"
-    )
+    # preferred_industries = models.ManyToManyField(
+    #     Industry, blank=True, related_name="investors"
+    # )
+    preferred_industries = models.CharField(max_length=4096, blank=True)
     interaction_process_description = models.TextField(blank=True)
 
     def __str__(self):

users/serializers.py

@@ -1,7 +1,6 @@
 from django.forms.models import model_to_dict
 from rest_framework import serializers
 
-from industries.models import Industry
 from .models import CustomUser, Expert, Investor, Member, Mentor, UserAchievement
 
 
@@ -20,6 +19,14 @@ def to_internal_value(self, data):
         return ",".join(data)
 
 
+class CustomListField(serializers.ListField):
+    # костыль
+    def to_representation(self, data):
+        if type(data) == list:
+            return data
+        return [i.replace("'", "") for i in data.strip("][").split(", ")]
+
+
 class MemberSerializer(serializers.ModelSerializer):
     class Meta:
         model = Member
@@ -39,8 +46,8 @@ class Meta:
 
 class ExpertSerializer(serializers.ModelSerializer):
 
-    preferred_industries = serializers.ListSerializer(
-        child=serializers.PrimaryKeyRelatedField(queryset=Industry.objects.all())
+    preferred_industries = CustomListField(
+        child=serializers.CharField(max_length=255),
     )
 
     class Meta:
@@ -53,9 +60,7 @@ class Meta:
 
 class InvestorSerializer(serializers.ModelSerializer):
 
-    preferred_industries = serializers.ListSerializer(
-        child=serializers.PrimaryKeyRelatedField(queryset=Industry.objects.all())
-    )
+    preferred_industries = CustomListField(child=serializers.CharField(max_length=255))
 
     class Meta:
         model = Investor
@@ -107,17 +112,18 @@ def update(self, instance, validated_data):
             instance.investor.__dict__.update(
                 validated_data.get("investor", model_to_dict(instance.investor))
             )
-            instance.investor.preferred_industries.set(
-                validated_data.get("investor", {}).get("preferred_industries", [])
-            )
+            instance.investor.preferred_industries = validated_data.get(
+                "investor", {}
+            ).get("preferred_industries", [])
             instance.investor.save()
         elif instance.user_type == CustomUser.EXPERT:
             instance.expert.__dict__.update(
                 validated_data.get("expert", model_to_dict(instance.expert))
             )
-            instance.expert.preferred_industries.set(
-                validated_data.get("expert", {}).get("preferred_industries", [])
+            instance.expert.preferred_industries = validated_data.get("expert", {}).get(
+                "preferred_industries", []
             )
+            print("expert", instance.expert.preferred_industries)
             instance.expert.save()
         elif instance.user_type == CustomUser.MENTOR:
             instance.mentor.__dict__.update(