pretix-map 0.1.0__py3-none-any.whl → 0.1.1__py3-none-any.whl

{pretix_map-0.1.0.dist-info → pretix_map-0.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pretix-map
-Version: 0.1.0
+Version: 0.1.1
 Summary: An overview map of the catchment area of previous orders. Measured by postcode
 Author-email: MarkenJaden <jjsch1410@gmail.com>
 Maintainer-email: MarkenJaden <jjsch1410@gmail.com>
@@ -140,10 +140,12 @@ This command is essential for processing orders that were placed *before* the ma
 **Example Workflow:**
 
 1.  **Test with Dry Run (All Organizers):**
+
     .. code-block:: bash
 
         python manage.py geocode_existing_orders --dry-run
 2.  **(If satisfied) Run for Real (All Organizers):**
+
     .. code-block:: bash
 
         python manage.py geocode_existing_orders

{pretix_map-0.1.0.dist-info → pretix_map-0.1.1.dist-info}/RECORD

@@ -1,10 +1,10 @@
-pretix_map-0.1.0.dist-info/licenses/LICENSE,sha256=RhQ89ePNDClBzEROahhwjDrBSEb5Zpx6XewZfGlY4Ss,569
-pretix_mapplugin/__init__.py,sha256=QTYqXqSTHFRkM9TEgpDFcHvwLbvqHDqvqfQ9EiXkcAM,23
+pretix_map-0.1.1.dist-info/licenses/LICENSE,sha256=RhQ89ePNDClBzEROahhwjDrBSEb5Zpx6XewZfGlY4Ss,569
+pretix_mapplugin/__init__.py,sha256=5xvN_gb61nKeq5TER5dSfcArTP3DVasZGN_MQq5dNpA,23
 pretix_mapplugin/apps.py,sha256=AnThwyRw2AAz5f-kmXZ8hm85OmKnlDkRosVoQOBgPzE,830
 pretix_mapplugin/geocoding.py,sha256=lBmwMvmE_cPyOHxWE8H3Se2P-2Eq0UjDTCv9gUs97Fo,4018
 pretix_mapplugin/models.py,sha256=v0v9K0sb5OQHs5Gc6-jea_aEGECUQp1tZoYMwwb3YIM,994
 pretix_mapplugin/signals.py,sha256=maBMMSq5M7diy_EaNgKr8KRfGFj0U437u-MEl2NVYBw,3661
-pretix_mapplugin/tasks.py,sha256=tNSjm12IVN-NqyCG9AxN5jHsGRbMA13X7qMfkW30_qM,4518
+pretix_mapplugin/tasks.py,sha256=Blpleq0J3Sos7LDEXpH3EOkZcqE2y4VSiZDLyC2YWgU,4411
 pretix_mapplugin/urls.py,sha256=o5407vULF4S-bUihU7AeRxUcMyazg2lPjbvqRflsGxE,838
 pretix_mapplugin/views.py,sha256=7WgmNZeqwmOesT6PrkAIRC8fNfAcWGm-j9-2YqF5egI,7146
 pretix_mapplugin/locale/de/LC_MESSAGES/django.mo,sha256=6VVRAqa0ixL-lDA1QwoVvG0wd5ZBwYjaR4P8T73hxhU,269
@@ -39,8 +39,8 @@ pretix_mapplugin/static/pretix_mapplugin/libs/leaflet-sales-map/images/marker-ic
 pretix_mapplugin/static/pretix_mapplugin/libs/leaflet-sales-map/images/marker-shadow.png,sha256=Jk9cZAM58ELdcpBiz8BMF_jqDymIK1OOOEjtjxDttNo,618
 pretix_mapplugin/templates/pretix_mapplugin/.gitkeep,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pretix_mapplugin/templates/pretix_mapplugin/map_page.html,sha256=jUfPrCkwcbcTXgZ2d9a5wpUD1U7Y8g5rnB20hklKQ-k,2252
-pretix_map-0.1.0.dist-info/METADATA,sha256=P_53hGKTlW_N8JsWYFXsWouU64cW70rxkY9XoJUveCY,9514
-pretix_map-0.1.0.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-pretix_map-0.1.0.dist-info/entry_points.txt,sha256=C3NAjeZHoCekafkLMCJynPcABRTK8AUprtQv7sUNDZs,137
-pretix_map-0.1.0.dist-info/top_level.txt,sha256=CAtEnkgA73zE9Gadm5mjt1SpXHBPOS-QWP0dQVoNToE,17
-pretix_map-0.1.0.dist-info/RECORD,,
+pretix_map-0.1.1.dist-info/METADATA,sha256=az-2dh7UXVgqNYPr2ubPxeKnM2rBsRCNeyqb_V0pMiM,9518
+pretix_map-0.1.1.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+pretix_map-0.1.1.dist-info/entry_points.txt,sha256=C3NAjeZHoCekafkLMCJynPcABRTK8AUprtQv7sUNDZs,137
+pretix_map-0.1.1.dist-info/top_level.txt,sha256=CAtEnkgA73zE9Gadm5mjt1SpXHBPOS-QWP0dQVoNToE,17
+pretix_map-0.1.1.dist-info/RECORD,,

pretix_mapplugin/__init__.py

@@ -1 +1 @@
-__version__ = "0.1.0"
+__version__ = "0.1.1"

pretix_mapplugin/tasks.py

@@ -2,89 +2,89 @@ import logging
 from django.db import transaction
 from django.core.exceptions import ObjectDoesNotExist
 
+# --- Import django-scopes ---
+from django_scopes import scope
+
 # --- Use Pretix Celery app instance ---
 from pretix.celery_app import app
 # --- Import necessary Pretix models ---
-from pretix.base.models import Order
+from pretix.base.models import Order, Organizer  # Import Organizer
 
 # --- Import your Geocode model and geocoding functions ---
 from .models import OrderGeocodeData
 from .geocoding import (
     get_formatted_address_from_order,
     geocode_address,
-    DEFAULT_NOMINATIM_USER_AGENT  # Import default for safety/logging
+    DEFAULT_NOMINATIM_USER_AGENT
 )
 
 logger = logging.getLogger(__name__)
 
 
-# Define the Celery task
-# bind=True gives access to self (the task instance) for retrying
-# ignore_result=True as we don't need the return value stored in Celery backend
 @app.task(bind=True, max_retries=3, default_retry_delay=60, ignore_result=True)
-def geocode_order_task(self, order_pk: int,
-                       nominatim_user_agent: str | None = None):  # Added nominatim_user_agent kwarg
+def geocode_order_task(self, order_pk: int, nominatim_user_agent: str | None = None):
     """
     Celery task to geocode the address for a given order PK.
     Accepts the Nominatim User-Agent as an argument.
+    Activates django-scopes organizer scope before querying scoped models.
     """
+    order = None  # Initialize order to None
     try:
-        # Fetch order with related address and country data efficiently
-        order = Order.objects.select_related(
-            'invoice_address',
-        ).get(pk=order_pk)
-        logger.info(f"Starting geocoding task for Order {order.code} (PK: {order_pk})")
+        try:
+            order = Order.objects.select_related('event__organizer', 'invoice_address').get(pk=order_pk)
+            organizer = order.event.organizer  # Get organizer from the fetched order
+        except ObjectDoesNotExist:
+            logger.error(f"Order with PK {order_pk} not found in geocode_order_task.")
+            return
+        with scope(organizer=organizer):
+            logger.info(
+                f"Starting geocoding task for Order {order.code} (PK: {order_pk}) within scope of Organizer '{organizer.slug}'")
 
-        # Check if already geocoded to prevent redundant work
-        # Replace 'geocode_data' if your related_name is different
-        relation_name = 'geocode_data'  # Ensure this matches your OrderGeocodeData.order related_name
-        if hasattr(order, relation_name) and getattr(order, relation_name) is not None:
-            logger.info(f"Geocode data already exists for Order {order.code}. Skipping.")
-            return  # Exit successfully
+            relation_name = 'geocode_data'  # Ensure this matches your model
+            # Check existence within scope (safer)
+            if OrderGeocodeData.objects.filter(order_id=order_pk).exists():
+                logger.info(f"Geocode data already exists for Order {order.code} (checked within scope). Skipping.")
+                return
 
-        # 1. Get formatted address string
-        address_str = get_formatted_address_from_order(order)
-        if not address_str:
-            logger.info(f"Order {order.code} has no address suitable for geocoding. Storing null coordinates.")
-            # Store null to prevent reprocessing
-            with transaction.atomic():
-                OrderGeocodeData.objects.update_or_create(
-                    order=order,
-                    defaults={'latitude': None, 'longitude': None}
-                )
-            return  # Exit successfully, nothing to geocode
+            address_str = get_formatted_address_from_order(order)
+            if not address_str:
+                logger.info(f"Order {order.code} has no address suitable for geocoding. Storing null coordinates.")
+                # Store null within scope
+                with transaction.atomic():
+                    OrderGeocodeData.objects.update_or_create(
+                        order=order, defaults={'latitude': None, 'longitude': None}
+                    )
+                return
 
-        # 2. Perform geocoding, passing the user agent received by the task
-        logger.debug(f"Attempting to geocode address for Order {order.code}: '{address_str}'")
-        coordinates = geocode_address(address_str, nominatim_user_agent=nominatim_user_agent)
+            logger.debug(f"Attempting to geocode address for Order {order.code}: '{address_str}'")
+            coordinates = geocode_address(address_str, nominatim_user_agent=nominatim_user_agent)
 
-        # 3. Store result (or null if failed) using atomic transaction
-        with transaction.atomic():
-            if coordinates:
-                latitude, longitude = coordinates
-                obj, created = OrderGeocodeData.objects.update_or_create(
-                    order=order,
-                    defaults={'latitude': latitude, 'longitude': longitude}
-                )
-                log_level = logging.INFO if created else logging.DEBUG  # Be less noisy on updates
-                logger.log(log_level,
-                           f"Saved{' new' if created else ' updated'} geocode data for Order {order.code}: ({latitude}, {longitude})")
-            else:
-                logger.warning(f"Geocoding failed for Order {order.code}. Storing null coordinates.")
-                # Store nulls to indicate an attempt was made and failed
-                obj, created = OrderGeocodeData.objects.update_or_create(
-                    order=order,
-                    defaults={'latitude': None, 'longitude': None}
-                )
-                log_level = logging.INFO if created else logging.DEBUG
-                logger.log(log_level,
-                           f"Saved{' new' if created else ' updated'} null geocode data for Order {order.code} after failed attempt.")
+            # Store result within scope
+            with transaction.atomic():
+                if coordinates:
+                    latitude, longitude = coordinates
+                    obj, created = OrderGeocodeData.objects.update_or_create(
+                        order=order, defaults={'latitude': latitude, 'longitude': longitude}
+                    )
+                    log_level = logging.INFO if created else logging.DEBUG
+                    logger.log(log_level,
+                               f"Saved{' new' if created else ' updated'} geocode data for Order {order.code}: ({latitude}, {longitude})")
+                else:
+                    logger.warning(f"Geocoding failed for Order {order.code}. Storing null coordinates.")
+                    obj, created = OrderGeocodeData.objects.update_or_create(
+                        order=order, defaults={'latitude': None, 'longitude': None}
+                    )
+                    log_level = logging.INFO if created else logging.DEBUG
+                    logger.log(log_level,
+                               f"Saved{' new' if created else ' updated'} null geocode data for Order {order.code} after failed attempt.")
+        # --- Scope deactivated automatically here ---
 
-    except ObjectDoesNotExist:  # More specific exception
-        logger.error(f"Order with PK {order_pk} not found in geocode_order_task.")
-        # Don't retry if the order doesn't exist
+    # Keep outer exception handling
+    except ObjectDoesNotExist:
+        # This case is now handled earlier, but keep for safety
+        logger.error(f"Order with PK {order_pk} not found outside scope handling.")
     except Exception as e:
-        # Catch any other unexpected errors
-        logger.exception(f"Unexpected error in geocode_order_task for Order PK {order_pk}: {e}")
-        # Retry on potentially temporary errors (database, network issues etc.)
-        raise self.retry(exc=e)  # Let Celery handle retry logic
+        logger.exception(
+            f"Unexpected error in geocode_order_task for Order PK {order_pk} (potentially outside scope): {e}")
+        # Retry on unexpected errors before scope activation
+        raise self.retry(exc=e)