Merge pull request #92 from PROCOLLAB-github/dev

Removed preferred_industries from Member model, fixed CustomListField

Author: yakser

users/migrations/0026_remove_member_preferred_industries_and_more.py

@@ -0,0 +1,32 @@
+# Generated by Django 4.1.3 on 2022-12-30 17:44
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("users", "0025_mentor_preferred_industries"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="member",
+            name="preferred_industries",
+        ),
+        migrations.AlterField(
+            model_name="expert",
+            name="preferred_industries",
+            field=models.CharField(blank=True, max_length=4096, null=True),
+        ),
+        migrations.AlterField(
+            model_name="investor",
+            name="preferred_industries",
+            field=models.CharField(blank=True, max_length=4096, null=True),
+        ),
+        migrations.AlterField(
+            model_name="mentor",
+            name="preferred_industries",
+            field=models.CharField(blank=True, max_length=4096, null=True),
+        ),
+    ]

users/models.py

@@ -3,7 +3,6 @@
 from django.db.models.signals import post_save
 from django.dispatch import receiver
 
-from industries.models import Industry
 from users.helpers import (
     ADMIN,
     EXPERT,
@@ -162,17 +161,13 @@ class Member(models.Model):
         user: ForeignKey instance of the CustomUser model.
         useful_to_project: TextField instance indicates actions useful
                            for the development and maintenance of the project.
-        preferred_industries: ManyToManyField indicating user industries preferred for work.
     """
 
     user = models.OneToOneField(
         CustomUser, on_delete=models.CASCADE, related_name="member"
     )
 
     useful_to_project = models.TextField(blank=True)
-    preferred_industries = models.ManyToManyField(
-        Industry, blank=True, related_name="members"
-    )
 
     def __str__(self):
         return f"Member<{self.id}> - {self.user.first_name} {self.user.last_name}"
@@ -186,15 +181,15 @@ class Mentor(AbstractUserWithRole):
 
     Attributes:
             user: ForeignKey instance of the CustomUser model.
-            preferred_industries: ManyToManyField indicating user industries preferred for work.
+            preferred_industries: CharField 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"
     )
-    preferred_industries = models.CharField(max_length=4096, blank=True)
+    preferred_industries = models.CharField(max_length=4096, null=True, blank=True)
     useful_to_project = models.TextField(blank=True)
 
     def __str__(self):
@@ -217,10 +212,7 @@ class Expert(AbstractUserWithRole):
         CustomUser, on_delete=models.CASCADE, related_name="expert"
     )
 
-    # preferred_industries = models.ManyToManyField(
-    #     Industry, blank=True, related_name="experts"
-    # )
-    preferred_industries = models.CharField(max_length=4096, blank=True)
+    preferred_industries = models.CharField(max_length=4096, null=True, blank=True)
     useful_to_project = models.TextField(blank=True)
 
     # TODO reviews
@@ -244,11 +236,7 @@ class Investor(AbstractUserWithRole):
     user = models.OneToOneField(
         CustomUser, on_delete=models.CASCADE, related_name="investor"
     )
-
-    # preferred_industries = models.ManyToManyField(
-    #     Industry, blank=True, related_name="investors"
-    # )
-    preferred_industries = models.CharField(max_length=4096, blank=True)
+    preferred_industries = models.CharField(max_length=4096, null=True, blank=True)
     interaction_process_description = models.TextField(blank=True)
 
     def __str__(self):

users/serializers.py

@@ -24,7 +24,9 @@ class CustomListField(serializers.ListField):
     def to_representation(self, data):
         if type(data) == list:
             return data
-        return [i.replace("'", "") for i in data.strip("][").split(", ")]
+        return [
+            i.replace("'", "") for i in data.strip("][").split(", ") if i.replace("'", "")
+        ]
 
 
 class MemberSerializer(serializers.ModelSerializer):
@@ -36,6 +38,10 @@ class Meta:
 
 
 class MentorSerializer(serializers.ModelSerializer):
+    preferred_industries = CustomListField(
+        child=serializers.CharField(max_length=255),
+    )
+
     class Meta:
         model = Mentor
         fields = [
@@ -59,7 +65,6 @@ class Meta:
 
 
 class InvestorSerializer(serializers.ModelSerializer):
-
     preferred_industries = CustomListField(child=serializers.CharField(max_length=255))
 
     class Meta: