Merge remote-tracking branch 'origin/dev' into dev

Author: yeezy-na-izi

README.md

@@ -31,4 +31,4 @@ To install pre-commit simply run inside the shell:
 
 ```bash
 pre-commit install
-```
+```

poetry.lock

@@ -120,7 +120,6 @@
         "rest_framework.renderers.AdminRenderer",
     ],
 }
-
 # Database
 if DEBUG:
     DATABASES = {

procollab/settings.py

@@ -22,15 +22,24 @@ class Meta:
 
 
 class ProjectCollaboratorSerializer(serializers.ModelSerializer):
+    key_skills = serializers.SerializerMethodField()
+
     class Meta:
         model = CustomUser
         fields = [
             "id",
             "first_name",
             "last_name",
             "avatar",
+            "key_skills",
         ]
 
+    def get_key_skills(self, obj):
+        return obj.get_member_key_skills()
+
+    def get_queryset(self):
+        return CustomUser.objects.all()
+
 
 class ProjectDetailSerializer(serializers.ModelSerializer):
     achievements = AchievementListSerializer(many=True, read_only=True)

projects/serializers.py

@@ -47,10 +47,10 @@ django-filter = "^22.1"
 setuptools = "^65.5.0"
 drf-yasg = "^1.21.4"
 sentry-sdk = "^1.10.1"
-uvicorn = "^0.19.0"
 whitenoise = "^6.2.0"
+six = "^1.16.0"
 
 
 [build-system]
 requires = ["poetry-core"]
-build-backend = "poetry.core.masonry.api"
+build-backend = "poetry.core.masonry.api"

pyproject.toml

@@ -91,32 +91,6 @@ class CustomUserAdmin(admin.ModelAdmin):
         "id",
     )
 
-
-# TODO display additional fields
-
-# @admin.register(Member)
-# class MemberAdmin(admin.ModelAdmin):
-#     inlines = (CustomUserInlined,)
-#     fieldsets = (
-#         (
-#             "Дополнительные поля",
-#             {
-#                 "fields": (
-#                     "key_skills",
-#                     "useful_to_project",
-#                     "speciality",
-#                 )
-#             },
-#         ),
-#     )
-
-#     list_display = (
-#         "id",
-#     )
-#     search_fields = (
-#         "id",
-#     )
-
-#     list_filter = (
-#         "id",
-#     )
+    def save_model(self, request, obj, form, change):
+        obj.set_password(form.cleaned_data["password"])
+        obj.save()

users/admin.py

@@ -0,0 +1,24 @@
+# Generated by Django 4.1.2 on 2022-11-01 10:09
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("users", "0008_alter_customuser_user_type_delete_usertype"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="member",
+            name="user",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="member",
+                to=settings.AUTH_USER_MODEL,
+            ),
+        ),
+    ]

users/migrations/0009_alter_member_user.py

@@ -0,0 +1,51 @@
+# Generated by Django 4.1.2 on 2022-11-01 10:15
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("users", "0009_alter_member_user"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="expert",
+            name="user",
+            field=models.OneToOneField(
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="expert",
+                to=settings.AUTH_USER_MODEL,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="investor",
+            name="user",
+            field=models.OneToOneField(
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="investor",
+                to=settings.AUTH_USER_MODEL,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="member",
+            name="user",
+            field=models.OneToOneField(
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="member",
+                to=settings.AUTH_USER_MODEL,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="mentor",
+            name="user",
+            field=models.OneToOneField(
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="mentor",
+                to=settings.AUTH_USER_MODEL,
+            ),
+        ),
+    ]

users/migrations/0010_alter_expert_user_alter_investor_user_and_more.py

@@ -77,19 +77,26 @@ class CustomUser(AbstractUser):
 
     objects = CustomUserManager()
 
+    def get_member_key_skills(self):
+        if self.user_type == CustomUser.MEMBER:
+            return str(self.member.key_skills)
+        return ""
+
     def __str__(self):
         return f"User<{self.id}> - {self.first_name} {self.last_name}"
 
 
 class Member(models.Model):
-    user = models.ForeignKey(CustomUser, on_delete=models.CASCADE)
+    user = models.OneToOneField(
+        CustomUser, on_delete=models.CASCADE, related_name="member"
+    )
 
     key_skills = models.CharField(max_length=255, blank=True)  # TODO
     useful_to_project = models.TextField(blank=True)
     speciality = models.CharField(max_length=255, blank=True)
 
     def __str__(self):
-        return f"Member<{self.id}> - {self.first_name} {self.last_name}"
+        return f"Member<{self.id}> - {self.user.first_name} {self.user.last_name}"
 
 
 class Mentor(models.Model):
@@ -101,13 +108,15 @@ class Mentor(models.Model):
             useful_to_project: CharField instance some text.
     """
 
-    user = models.ForeignKey(CustomUser, on_delete=models.CASCADE, related_name="mentors")
+    user = models.OneToOneField(
+        CustomUser, on_delete=models.CASCADE, related_name="mentor"
+    )
 
     job = models.CharField(max_length=255, blank=True)
     useful_to_project = models.TextField(blank=True)
 
     def __str__(self):
-        return f"Mentor<{self.id}> - {self.first_name} {self.last_name}"
+        return f"Mentor<{self.id}> - {self.user.first_name} {self.user.last_name}"
 
 
 class Expert(models.Model):
@@ -119,7 +128,9 @@ class Expert(models.Model):
             useful_to_project: CharField instance TODO
     """
 
-    user = models.ForeignKey(CustomUser, on_delete=models.CASCADE)
+    user = models.OneToOneField(
+        CustomUser, on_delete=models.CASCADE, related_name="expert"
+    )
 
     preferred_industries = models.ManyToManyField(
         Industry, blank=True, related_name="experts"
@@ -129,7 +140,7 @@ class Expert(models.Model):
     # TODO reviews
 
     def __str__(self):
-        return f"Expert<{self.id}> - {self.first_name} {self.last_name}"
+        return f"Expert<{self.id}> - {self.user.first_name} {self.user.last_name}"
 
 
 class Investor(models.Model):
@@ -142,15 +153,17 @@ class Investor(models.Model):
 
     """
 
-    user = models.ForeignKey(CustomUser, on_delete=models.CASCADE)
+    user = models.OneToOneField(
+        CustomUser, on_delete=models.CASCADE, related_name="investor"
+    )
 
     preferred_industries = models.ManyToManyField(
         Industry, blank=True, related_name="investors"
     )
     interaction_process_description = models.TextField(blank=True)
 
     def __str__(self):
-        return f"Investor<{self.id}> - {self.first_name} {self.last_name}"
+        return f"Investor<{self.id}> - {self.user.first_name} {self.user.last_name}"
 
 
 @receiver(post_save, sender=CustomUser)