Merge branch 'dev'

Author: yakser

projects/migrations/0007_remove_collaborator_unique_collaorator_and_more.py

@@ -0,0 +1,23 @@
+# Generated by Django 4.1.2 on 2022-11-17 21:15
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("projects", "0006_alter_project_name_alter_project_step"),
+    ]
+
+    operations = [
+        migrations.RemoveConstraint(
+            model_name="collaborator",
+            name="unique_collaorator",
+        ),
+        migrations.AddConstraint(
+            model_name="collaborator",
+            constraint=models.UniqueConstraint(
+                fields=("project", "user"), name="unique_collaborator"
+            ),
+        ),
+    ]

projects/models.py

@@ -4,7 +4,7 @@
 
 from industries.models import Industry
 from projects.helpers import VERBOSE_STEPS
-from projects.managers import ProjectManager, AchievementManager
+from projects.managers import AchievementManager, ProjectManager
 from users.models import CustomUser
 
 User = get_user_model()
@@ -42,7 +42,6 @@ class Project(models.Model):
         null=True,
         related_name="projects",
     )
-    # TODO think about naming
     presentation_address = models.URLField(blank=True)
     image_address = models.URLField(blank=True)
 
@@ -133,6 +132,6 @@ class Meta:
                     "project",
                     "user",
                 ],
-                name="unique_collaorator",
+                name="unique_collaborator",
             )
         ]

projects/serializers.py

@@ -2,6 +2,7 @@
 
 from industries.models import Industry
 from projects.models import Project, Achievement, Collaborator
+from projects.validators import validate_project
 from users.models import CustomUser
 from vacancy.serializers import ProjectVacancyListSerializer
 
@@ -67,6 +68,10 @@ class ProjectDetailSerializer(serializers.ModelSerializer):
     )
     vacancies = ProjectVacancyListSerializer(many=True, read_only=True)
 
+    def validate(self, data):
+        super().validate(data)
+        return validate_project(data)
+
     class Meta:
         model = Project
         fields = [
@@ -135,6 +140,10 @@ class Meta:
     def is_valid(self, *, raise_exception=False):
         return super().is_valid(raise_exception=raise_exception)
 
+    def validate(self, data):
+        super().validate(data)
+        return validate_project(data)
+
     def create(self, validated_data):
         industry = Industry.objects.get(id=validated_data.pop("industry"))
         leader = CustomUser.objects.get(id=validated_data.pop("leader"))

projects/validators.py

@@ -0,0 +1,12 @@
+from rest_framework.serializers import ValidationError
+
+
+def validate_project(data):
+    if not data.get("draft"):
+        error = {}
+        for key, value in data.items():
+            if value == "" or value is None:
+                error[key] = "This field is required"
+        if error:
+            raise ValidationError(error)
+    return data