photo-objects 0.8.0__py3-none-any.whl → 0.8.1__py3-none-any.whl

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/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/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/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/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.dist-info → photo_objects-0.8.1.dist-info}/METADATA

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

{photo_objects-0.8.0.dist-info → photo_objects-0.8.1.dist-info}/RECORD

@@ -17,7 +17,7 @@ photo_objects/django/api/__init__.py,sha256=inUPmjlTAawHwco4NzjwNEVNnf9c_IIwLH5Z
 photo_objects/django/api/album.py,sha256=CJDeGLCuYoxGUDcjssZRpFnToxG_KVE9Ii7NduFW2ks,2003
 photo_objects/django/api/auth.py,sha256=lS0S1tMVH2uN30g4jlixklv3eMnQ2FbQVQvuRXeMGYo,1420
 photo_objects/django/api/photo.py,sha256=-lo1g6jfBr884wy-WV2DAEPxzH9V-tFUTRtitmA6i28,4471
-photo_objects/django/api/photo_change_request.py,sha256=GOaUttPCdm0EJO-8608p1odoliWha5qVgtiha51_vhs,3133
+photo_objects/django/api/photo_change_request.py,sha256=v94RA7SUM60tC9mIZdz8HppbNKfHWeTFNPr_BPw3pys,3075
 photo_objects/django/api/utils.py,sha256=8r51YgFgKPD05Zjzhstl4jlQ4JM8DtsxUyAzhjXi5Pk,5567
 photo_objects/django/management/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 photo_objects/django/management/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -33,15 +33,15 @@ photo_objects/django/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm
 photo_objects/django/templatetags/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 photo_objects/django/templatetags/photo_objects_extras.py,sha256=1L6wweVA96rTWVXqgyf8gSey1wQKi01h6sqv9kZeTIY,1399
 photo_objects/django/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-photo_objects/django/tests/test_album.py,sha256=yjxP_M0bddS9Xpg1d1Wk5OyJsmxmkdYuljca4oFJSzc,13316
+photo_objects/django/tests/test_album.py,sha256=Uik36QbhaEojed6g862xqj8YI0d2963StU-lOpqMqAc,13095
 photo_objects/django/tests/test_auth.py,sha256=hgr1UMVLvSI1x5zY7wTEXSBKfM5E_sNMIFlx8mVWYPY,3928
 photo_objects/django/tests/test_commands.py,sha256=e3lE1ZhFR39WIq2VSKDNcQHUkSJqSWDYuAcAfu29svs,2955
 photo_objects/django/tests/test_img.py,sha256=HEAWcr5fpTkzePkhoQ4YrWsDO9TvFOr7my_0LqVbaO4,829
 photo_objects/django/tests/test_og_meta.py,sha256=Kk5a9KvE88KZ60gLqXSe6rTz5YU-gdjteksYolHd-nw,1804
-photo_objects/django/tests/test_photo.py,sha256=aZCZw7PIXIfIYX3q1lUxn8C53mLRBNK0qp18t7X4ZQ4,13696
-photo_objects/django/tests/test_photo_change_requests.py,sha256=zYsiRfWuUncrd3QdcrsD9B3XoYTdmAJ0DVh7a_vHbUs,3374
+photo_objects/django/tests/test_photo.py,sha256=JWXN3fF2VtuByMKm2o5b19HnxwDr6ecRwuGzgc5RsBw,13471
+photo_objects/django/tests/test_photo_change_requests.py,sha256=Ld5ytqxxZiEWrqfX8htJ6-5ARU7tqTYD-iUhb7EMcnU,3078
 photo_objects/django/tests/test_utils.py,sha256=zBLv8lkvcLMCaH4D6GR1KZqUe-rPowhcBkQX19-Kshs,2007
-photo_objects/django/tests/utils.py,sha256=s_3hzQEY4tdja_8406s_SQyRC6fCYI_MBPqvFjC8fB4,4345
+photo_objects/django/tests/utils.py,sha256=7oAwFotAFzxIE2YFGysj_a_y-u7E7Z7_K7vl7ycUAzM,4639
 photo_objects/django/views/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 photo_objects/django/views/utils.py,sha256=AjJK5r5HmTF63E9Q4W3pKggDESuhNXUvbROpS8m70KM,1319
 photo_objects/django/views/api/__init__.py,sha256=GgywMJMSFmP5aoMEaYut5V666zachd5YFQIDBMr5znU,188
@@ -56,8 +56,8 @@ photo_objects/django/views/ui/photo.py,sha256=flwcET5nSChzfyAEWRTUlklTW2o64przNX
 photo_objects/django/views/ui/photo_change_request.py,sha256=eaYGXFqtHj8qonDAmPyn4nrEHkL13EBD-1s8Phs0XP4,2098
 photo_objects/django/views/ui/users.py,sha256=nb73cnzuV98QkJb0j8F2hqPgOGFIWpUFTFu6dXMeVwM,722
 photo_objects/django/views/ui/utils.py,sha256=YV_YcUbX-zUkdFnBlezPChR6aPDhZJ9loSOHBSzF6Cc,273
-photo_objects-0.8.0.dist-info/licenses/LICENSE,sha256=V3w6hTjXfP65F4r_mejveHcV5igHrblxao3-2RlfVlA,1068
-photo_objects-0.8.0.dist-info/METADATA,sha256=BnYleSRms4H1v4kO5BAb4Vt5zaMitpBTSyGr3xZi5wg,3605
-photo_objects-0.8.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-photo_objects-0.8.0.dist-info/top_level.txt,sha256=SZeL8mhf-WMGdhRtTGFvZc3aIRBboQls9O0cFDMGdQ0,14
-photo_objects-0.8.0.dist-info/RECORD,,
+photo_objects-0.8.1.dist-info/licenses/LICENSE,sha256=V3w6hTjXfP65F4r_mejveHcV5igHrblxao3-2RlfVlA,1068
+photo_objects-0.8.1.dist-info/METADATA,sha256=ieM9ijgsXYCJSUp3MCGrcHgcq9lz9AAv6MwlaNlqWDY,3605
+photo_objects-0.8.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+photo_objects-0.8.1.dist-info/top_level.txt,sha256=SZeL8mhf-WMGdhRtTGFvZc3aIRBboQls9O0cFDMGdQ0,14
+photo_objects-0.8.1.dist-info/RECORD,,