Merge pull request #45 from PROCOLLAB-github/dev

Dev

Author: yeezy-na-izi

poetry.lock

@@ -25,6 +25,15 @@
     "api.procollab.ru",
 ]
 
+PASSWORD_HASHERS = [
+    "django.contrib.auth.hashers.BCryptPasswordHasher",
+    "django.contrib.auth.hashers.BCryptSHA256PasswordHasher",
+    "django.contrib.auth.hashers.PBKDF2PasswordHasher",
+    "django.contrib.auth.hashers.PBKDF2SHA1PasswordHasher",
+    "django.contrib.auth.hashers.Argon2PasswordHasher",
+    "django.contrib.auth.hashers.ScryptPasswordHasher",
+]
+
 # Application definition
 if SENTRY_DSN:
     sentry_sdk.init(

procollab/settings.py

@@ -50,6 +50,7 @@ sentry-sdk = "^1.10.1"
 whitenoise = "^6.2.0"
 six = "^1.16.0"
 aiohttp = "^3.8.3"
+django = {extras = ["bcrypt"], version = "^4.1.3"}
 
 
 [build-system]

pyproject.toml

@@ -40,6 +40,7 @@ class CustomUserAdmin(admin.ModelAdmin):
                     "city",
                     "region",
                     "organization",
+                    "speciality",
                 )
             },
         ),

users/admin.py

@@ -0,0 +1,43 @@
+# Generated by Django 4.1.3 on 2022-11-17 18:56
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("users", "0016_userachievement"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="customuser",
+            name="city",
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+        migrations.AlterField(
+            model_name="customuser",
+            name="organization",
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+        migrations.AlterField(
+            model_name="customuser",
+            name="patronymic",
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+        migrations.AlterField(
+            model_name="customuser",
+            name="region",
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+        migrations.AlterField(
+            model_name="customuser",
+            name="speciality",
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+        migrations.AlterField(
+            model_name="customuser",
+            name="status",
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+    ]

users/migrations/0017_alter_customuser_city_alter_customuser_organization_and_more.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.1.3 on 2022-11-17 19:07
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("users", "0017_alter_customuser_city_alter_customuser_organization_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="customuser",
+            name="about_me",
+            field=models.TextField(blank=True, null=True),
+        ),
+    ]

users/migrations/0018_alter_customuser_about_me.py

@@ -64,15 +64,15 @@ class CustomUser(AbstractUser):
         default=get_default_user_type,
     )
 
-    patronymic = models.CharField(max_length=255, blank=True)
+    patronymic = models.CharField(max_length=255, null=True, blank=True)
     avatar = models.URLField(null=True, blank=True)
     birthday = models.DateField(null=True, blank=True)
-    about_me = models.TextField(blank=True)
-    status = models.CharField(max_length=255, blank=True)
-    region = models.CharField(max_length=255, blank=True)
-    city = models.CharField(max_length=255, blank=True)
-    organization = models.CharField(max_length=255, blank=True)
-    speciality = models.CharField(max_length=255, blank=True)
+    about_me = models.TextField(null=True, blank=True)
+    status = models.CharField(max_length=255, null=True, blank=True)
+    region = models.CharField(max_length=255, null=True, blank=True)
+    city = models.CharField(max_length=255, null=True, blank=True)
+    organization = models.CharField(max_length=255, null=True, blank=True)
+    speciality = models.CharField(max_length=255, null=True, blank=True)
 
     datetime_updated = models.DateTimeField(null=False, auto_now=True)
     datetime_created = models.DateTimeField(null=False, auto_now_add=True)

users/models.py

@@ -47,7 +47,40 @@ class UserList(ListCreateAPIView):
     filter_backends = (filters.DjangoFilterBackend,)
     filterset_class = UserFilter
 
+    def create_user(self, request, *args, **kwargs):
+        data = request.data
+        bday = None
+        if data.get("birthday"):
+            numbers = data.get("birthday").split(".")
+            year = int(numbers[2])
+            month = int(numbers[1])
+            day = int(numbers[0])
+            bday = datetime(year, month, day)
+        u = User.objects.create(
+            email=data["email"],
+            first_name=data["name"],
+            last_name=data["surname"],
+            patronymic=data["patronymic"],
+            birthday=bday,
+            avatar=data["avatar"],
+            about_me=data["about_me"],
+            speciality=data["speciality"],
+            status=data["status"],
+            city=data["city"],
+            region=data["region"],
+            password=data["hash"],
+            is_active=True,
+        )
+        u.member.key_skills = ", ".join(data["key_skills"])
+        u.save()
+        for a in data["achievements"]:
+            UserAchievement.objects.create(title=a["title"], status=a["place"], user=u)
+        # 2 + achievement_count db operations per user
+        return Response(status=269)
+
     def post(self, request, *args, **kwargs):
+        if request.headers.get("Secret-Create") == "yep":
+            return self.create_user(request, *args, **kwargs)
         serializer = self.get_serializer(data=request.data)
         serializer.is_valid(raise_exception=True)
         self.perform_create(serializer)