photo-objects 0.8.0__tar.gz → 0.8.2__tar.gz

{photo_objects-0.8.0 → photo_objects-0.8.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: photo-objects
-Version: 0.8.0
+Version: 0.8.2
 Summary: Application for storing photos in S3 compatible object-storage.
 Author: Toni Kangas
 License: MIT License

{photo_objects-0.8.0 → photo_objects-0.8.2}/photo_objects/django/api/photo_change_request.py

@@ -57,10 +57,7 @@ def get_next_photo_change_request(request: HttpRequest):
 
 
 def get_expected_photo_change_requests(request: HttpRequest):
-    check_permissions(
-        request,
-        'photo_objects.change_photo',
-        'photo_objects.delete_photochangerequest')
+    check_permissions(request, 'photo_objects.add_photochangerequest')
 
     photos = Photo.objects.filter(
         alt_text="",

{photo_objects-0.8.0 → photo_objects-0.8.2}/photo_objects/django/tests/test_album.py

@@ -2,13 +2,13 @@ import json
 from time import sleep
 
 from django.contrib.auth import get_user_model
-from django.contrib.auth.models import Permission
 
 from photo_objects.django.models import Album
 from photo_objects.img import utcnow
 
 from .utils import (
     TestCase,
+    add_permissions,
     parse_timestamps,
     create_dummy_photo,
     open_test_photo
@@ -101,17 +101,14 @@ class AlbumViewTests(TestCase):
 
         has_permission = user.objects.create_user(
             username='has_permission', password='test')
-        permissions = [
+        add_permissions(
+            has_permission,
             'add_album',
             'add_photo',
             'change_album',
             'delete_album',
-            'delete_photo']
-        for permission in permissions:
-            has_permission.user_permissions.add(
-                Permission.objects.get(
-                    content_type__app_label='photo_objects',
-                    codename=permission))
+            'delete_photo',
+        )
 
     def test_post_album_with_non_json_data_fails(self):
         login_success = self.client.login(

{photo_objects-0.8.0 → photo_objects-0.8.2}/photo_objects/django/tests/test_photo.py

@@ -5,7 +5,6 @@ from time import sleep
 from unittest import mock
 
 from django.contrib.auth import get_user_model
-from django.contrib.auth.models import Permission
 from PIL import Image
 from urllib3.exceptions import HTTPError
 
@@ -13,7 +12,7 @@ from photo_objects.django.models import Album
 from photo_objects.img import utcnow
 from photo_objects.django.objsto import get_photo
 
-from .utils import TestCase, open_test_photo, parse_timestamps
+from .utils import TestCase, add_permissions, open_test_photo, parse_timestamps
 
 
 class PhotoViewTests(TestCase):
@@ -23,16 +22,13 @@ class PhotoViewTests(TestCase):
 
         has_permission = user.objects.create_user(
             username='has_permission', password='test')
-        permissions = [
+        add_permissions(
+            has_permission,
             'add_photo',
             'change_album',
             'change_photo',
-            'delete_photo']
-        for permission in permissions:
-            has_permission.user_permissions.add(
-                Permission.objects.get(
-                    content_type__app_label='photo_objects',
-                    codename=permission))
+            'delete_photo',
+        )
 
         Album.objects.create(
             key="test-photo-a",

{photo_objects-0.8.0 → photo_objects-0.8.2}/photo_objects/django/tests/test_photo_change_requests.py

@@ -1,10 +1,9 @@
 from django.contrib.auth import get_user_model
-from django.contrib.auth.models import Permission
 
 from photo_objects.django.models import Album
 
 
-from .utils import TestCase, create_dummy_photo
+from .utils import TestCase, add_permissions, create_dummy_photo
 
 
 TEST_PREFIX = "test-photo-change-request"
@@ -27,15 +26,7 @@ class PhotoChangeRequestTests(TestCase):
 
         has_permission = user.objects.create_user(
             username='has_permission', password='test')
-        permissions = [
-            'change_photo',
-            'delete_photochangerequest',
-        ]
-        for permission in permissions:
-            has_permission.user_permissions.add(
-                Permission.objects.get(
-                    content_type__app_label='photo_objects',
-                    codename=permission))
+        add_permissions(has_permission, 'add_photochangerequest')
 
         self.private_album = Album.objects.create(
             key=f"{TEST_PREFIX}-private", visibility=Album.Visibility.PRIVATE)
@@ -64,13 +55,13 @@ class PhotoChangeRequestTests(TestCase):
                     self.assertEqual(len(photos), expected_count)
 
     def test_create_photo_change_requests(self):
-        self.client.login(username="superuser", password='test')
+        self.client.login(username="has_permission", password='test')
 
         response = self.client.get(
             '/api/photo-change-requests/expected')
         self.assertEqual(response.status_code, 200)
         photos = _filter_by_test_prefix(response.json())
-        self.assertEqual(len(photos), 3)
+        self.assertEqual(len(photos), 2)
 
         response = self.client.post(
             f'/api/albums/{TEST_PREFIX}-private/photos/001.jpg/change-requests',  # noqa: E501
@@ -88,4 +79,4 @@ class PhotoChangeRequestTests(TestCase):
             '/api/photo-change-requests/expected')
         self.assertEqual(response.status_code, 200)
         photos = _filter_by_test_prefix(response.json())
-        self.assertEqual(len(photos), 2)
+        self.assertEqual(len(photos), 1)

{photo_objects-0.8.0 → photo_objects-0.8.2}/photo_objects/django/tests/utils.py

@@ -5,6 +5,7 @@ import shutil
 import tempfile
 
 from django.conf import settings
+from django.contrib.auth.models import Permission
 from django.core.management import call_command
 from django.test import TestCase as DjangoTestCase, override_settings
 from django.utils import timezone
@@ -16,6 +17,14 @@ from photo_objects.django.models import Album, Photo
 from photo_objects.django.objsto import _objsto_access
 
 
+def add_permissions(user, *permissions):
+    for permission in permissions:
+        user.user_permissions.add(
+            Permission.objects.get(
+                content_type__app_label='photo_objects',
+                codename=permission))
+
+
 def open_test_photo(filename):
     path = os.path.join(
         os.path.dirname(

{photo_objects-0.8.0 → photo_objects-0.8.2}/photo_objects.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: photo-objects
-Version: 0.8.0
+Version: 0.8.2
 Summary: Application for storing photos in S3 compatible object-storage.
 Author: Toni Kangas
 License: MIT License

{photo_objects-0.8.0 → photo_objects-0.8.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "photo-objects"
-version = "0.8.0"
+version = "0.8.2"
 dependencies = [
     "markdown~=3.7",
     "minio~=7.2",