Merge branch 'stage' into 52-betechtix-add-multi-usage-discount-codes-feature

Author: ASPactores

backend/constants/common_constants.py

@@ -30,6 +30,8 @@ class CommonConstants:
     REGISTRATION_ID = 'registrationId'
     PREREGISTRATION_ID = 'preRegistrationId'
 
+    OBJECT_KEY = 'objectKey'
+
     # Exclude to Comparison Keys
     EXCLUDE_COMPARISON_KEYS = [
         CLS,

backend/controller/event_router.py

@@ -7,7 +7,7 @@
 from model.common import Message
 from model.events.event import EventAdminOut, EventIn, EventOut
 from model.events.events_constants import EventUploadType
-from model.file_uploads.file_upload import FileUploadIn, FileUploadOut
+from model.file_uploads.file_upload import FileDownloadOut, FileUploadIn, FileUploadOut
 from model.file_uploads.file_upload_constants import FileUploadConstants
 from usecase.event_usecase import EventUsecase
 from usecase.file_s3_usecase import FileS3Usecase
@@ -298,3 +298,32 @@ def get_presigned_url(
     """
     file_s3_uc = FileS3Usecase()
     return file_s3_uc.create_presigned_url(f'events/{entry_id}/{upload_type.value}/{upload_in.fileName}')
+
+
+@event_router.get(
+    '/{entryId}/download',
+    response_model=FileDownloadOut,
+    responses={500: {'model': Message, 'description': 'Interal server error'}},
+    summary='Get download URL',
+)
+@event_router.get(
+    '/{entryId}/download/',
+    response_model=FileDownloadOut,
+    response_model_exclude_none=True,
+    response_model_exclude_unset=True,
+    include_in_schema=False,
+)
+def get_download_url(
+    object_key: str = Query(..., title='Object key', alias=CommonConstants.OBJECT_KEY),
+):
+    """Get download URL
+
+    :param object_key: The key of the object. Defaults to Query(None, title='Object key', alias=CommonConstants.OBJECT_KEY).
+    :type admin_id: str
+
+    :return: FileDownloadOut object.
+    :rtype: FileDownloadOut
+
+    """
+    file_s3_uc = FileS3Usecase()
+    return file_s3_uc.create_download_url(object_key=object_key)

backend/model/pycon_registrations/pycon_registration.py

@@ -1,14 +1,7 @@
 from enum import Enum
 from typing import Optional
 
-from pydantic import (
-    BaseModel,
-    EmailStr,
-    Field,
-    HttpUrl,
-    field_validator,
-    model_validator,
-)
+from pydantic import BaseModel, EmailStr, Field, HttpUrl, root_validator, validator
 
 
 class SocialMedia(BaseModel):
@@ -78,15 +71,15 @@ class PyconRegistration(BaseModel):
     )
     imageId: Optional[str] = Field(None, title='Image ID Object Key')
 
-    @field_validator('firstName', 'lastName', 'nickname')
-    @classmethod
+
+    @validator('firstName', 'lastName', 'nickname')
     def normalize_names(cls, v: str) -> str:
         if not v.strip():
             raise ValueError('Name fields cannot be empty')
         return ' '.join(word.capitalize() for word in v.split())
 
-    @model_validator(mode='after')
-    def check_shirt_availability(self):
-        if self.availTShirt and (self.shirtType is None or self.shirtSize is None):
+    @root_validator(pre='false')
+    def check_shirt_availability(cls, values):
+        if values.get('availTShirt') and (values.get('shirtType') is None or values.get('shirtSize') is None):
             raise ValueError('If availTShirt is True, then shirtType and shirtSize must be provided.')
-        return self
+        return values

backend/usecase/file_s3_usecase.py

@@ -1,4 +1,5 @@
 import os
+from http import HTTPStatus
 from typing import Tuple
 
 from boto3 import client as boto3_client
@@ -65,7 +66,9 @@ def create_download_url(self, object_key) -> FileDownloadOut:
             return FileDownloadOut(**url_data)
         except ClientError as e:
             logger.error('Error creating presigned url: %s', e)
-            return None
+            return JSONResponse(
+                status_code=HTTPStatus.INTERNAL_SERVER_ERROR, content={'message': 'Error fetching download url'}
+            )
 
     def upload_file(self, file_name: str, object_name: str = None, verbose: bool = True) -> bool:
         # If S3 object_name was not specified, use file_name