Merge branch 'dev' into feature/caching-views-and-likes

Author: VeryBigSad

files/helpers.py

@@ -38,7 +38,7 @@ def upload(self) -> str:
             name=info["name"],
             size=info["size"],
             extension=info["extension"],
-            mime_type=info["mime_type"],
+            # mime_type=info["mime_type"],
         )
         self.file_object.close()
         return url
@@ -111,9 +111,9 @@ def get_file_info(file: TemporaryUploadedFile) -> dict:
         "size": file.size,
         "name": name,
         "extension": ext,
-        "mime_type": get_file_mime_type(file),
+        # "mime_type": get_file_mime_type(file),
     }
 
 
 def get_file_mime_type(file: TemporaryUploadedFile):
-    return magic.from_file(file.temporary_file_path(), mime=True)
+    return magic.from_file(file.name, mime=True)

files/views.py

@@ -17,13 +17,9 @@ class FileView(generics.GenericAPIView):
     @transaction.atomic
     def post(self, request):
         """creates a UserFile object and uploads the file to selectel"""
-        try:
-            file_api = FileAPI(request.FILES["file"], request.user)
-            url = file_api.upload()
-            return Response({"url": url}, status=status.HTTP_201_CREATED)
-        except Exception as error:
-            print(error)
-            return Response("Failed to upload file", status=status.HTTP_409_CONFLICT)
+        file_api = FileAPI(request.FILES["file"], request.user)
+        url = file_api.upload()
+        return Response({"url": url}, status=status.HTTP_201_CREATED)
 
 
 def delete(self, request, *args, **kwargs):

news/migrations/0005_news_content_type_news_object_id.py

@@ -1,4 +1,4 @@
-# Generated by Django 4.1.3 on 2023-07-08 18:58
+# Generated by Django 4.2.3 on 2023-07-12 23:11
 
 from django.db import migrations, models
 import django.db.models.deletion
@@ -16,16 +16,16 @@ class Migration(migrations.Migration):
             model_name="news",
             name="content_type",
             field=models.ForeignKey(
-                default=0,
+                blank=True,
+                null=True,
                 on_delete=django.db.models.deletion.CASCADE,
+                related_name="news",
                 to="contenttypes.contenttype",
             ),
-            preserve_default=False,
         ),
         migrations.AddField(
             model_name="news",
             name="object_id",
-            field=models.PositiveIntegerField(default=0),
-            preserve_default=False,
+            field=models.PositiveIntegerField(blank=True, null=True),
         ),
     ]

news/models.py

@@ -1,3 +1,4 @@
+from django.contrib.contenttypes.fields import GenericForeignKey
 from django.contrib.contenttypes.models import ContentType
 from django.db import models
 
@@ -56,8 +57,11 @@ class News(models.Model):
     tags = models.ManyToManyField(NewsTag, blank=True, verbose_name="Список тегов")
 
     # generic relation to project/program/ something else possibly
-    content_type = models.ForeignKey(ContentType, on_delete=models.CASCADE)
-    object_id = models.PositiveIntegerField()
+    content_type = models.ForeignKey(
+        ContentType, on_delete=models.CASCADE, related_name="news", null=True, blank=True
+    )
+    object_id = models.PositiveIntegerField(null=True, blank=True)
+    content_object = GenericForeignKey("content_type", "object_id")
 
     datetime_created = models.DateTimeField(
         verbose_name="Дата создания", null=False, auto_now_add=True

poetry.lock

@@ -257,7 +257,7 @@
 STATIC_URL = "/static/"
 STATIC_ROOT = BASE_DIR / "static"
 
-STATICFILES_STORAGE = "whitenoise.storage.CompressedManifestStaticFilesStorage"
+STATICFILES_STORAGE = "whitenoise.storage.CompressedStaticFilesStorage"
 
 # Default primary key field type
 

procollab/settings.py

@@ -55,9 +55,11 @@ channels-redis = "^4.0.0"
 channels = {extras = ["daphne"], version = "^4.0.0"}
 django-taggit = "^3.1.0"
 python-magic = "^0.4.27"
-python-magic-bin = "0.4.14"
+python-magic-bin = {version = "^0.4.14", markers = "sys_platform == 'win32'"}
+requests = "^2.31.0"
+coreapi = "^2.3.3"
 
 
 [build-system]
 requires = ["poetry-core"]
-build-backend = "poetry.core.masonry.api"
+build-backend = "poetry.core.masonry.api"

pyproject.toml

@@ -0,0 +1,12 @@
+# Generated by Django 4.2.3 on 2023-07-12 21:23
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("users", "0036_userlink"),
+    ]
+
+    operations = []

users/migrations/0037_auto_20230713_0023.py

@@ -1,28 +1,15 @@
-# Generated by Django 4.1.3 on 2023-07-03 20:59
+# Generated by Django 4.2.3 on 2023-07-12 21:23
 
 from django.db import migrations, models
 
-from users.models import CustomUser
-
-
-def set_up_ordering_score(apps, schema_editor):
-    for user in CustomUser.objects.all():
-        user.ordering_score = user.calculate_ordering_score()
-        user.save()
-
 
 class Migration(migrations.Migration):
 
     dependencies = [
-        ("users", "0036_userlink"),
+        ("users", "0037_auto_20230713_0023"),
     ]
 
     operations = [
-        migrations.AddField(
-            model_name="customuser",
-            name="ordering_score",
-            field=models.PositiveIntegerField(default=0, editable=False),
-        ),
         migrations.AlterModelOptions(
             name="customuser",
             options={
@@ -31,5 +18,9 @@ class Migration(migrations.Migration):
                 "verbose_name_plural": "Пользователи",
             },
         ),
-        migrations.RunPython(set_up_ordering_score)
+        migrations.AddField(
+            model_name="customuser",
+            name="ordering_score",
+            field=models.PositiveIntegerField(default=0, editable=False),
+        ),
     ]

…ser_options_customuser_ordering_score.py …ser_options_customuser_ordering_score.pyusers/migrations/0037_alter_customuser_options_customuser_ordering_score.py renamed to users/migrations/0038_alter_customuser_options_customuser_ordering_score.py users/migrations/0037_alter_customuser_options_customuser_ordering_score.py renamed to users/migrations/0038_alter_customuser_options_customuser_ordering_score.py

@@ -165,8 +165,8 @@ class UserAchievement(models.Model):
         user: A ForeignKey referring to the CustomUser model.
     """
 
-    title = models.CharField(max_length=256, null=False)
-    status = models.CharField(max_length=256, null=False)
+    title = models.CharField(max_length=256)
+    status = models.CharField(max_length=256)
 
     user = models.ForeignKey(
         CustomUser,
@@ -356,7 +356,7 @@ class UserLink(models.Model):
         on_delete=models.CASCADE,
         related_name="links",
     )
-    link = models.URLField(null=False, blank=False)
+    link = models.URLField()
 
     def __str__(self):
         return f"UserLink<{self.id}> - {self.user.first_name} {self.user.last_name}"