Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

website: updates to settings and events model #4033

Merged
merged 1 commit into from
Dec 10, 2024
Merged

Conversation

OchiengPaul442
Copy link
Contributor

@OchiengPaul442 OchiengPaul442 commented Dec 10, 2024

Description

  • Added Logging to help pin point the cause of the issue

Summary by CodeRabbit

  • New Features

    • Enhanced logging functionality for event-related operations, including creation, update, and deletion actions.
    • Improved logging in viewsets for better traceability of list and retrieve actions.
  • Bug Fixes

    • Adjusted environment variable handling for DEBUG and ALLOWED_HOSTS settings.
  • Documentation

    • Updated comments and docstrings for clarity in environment variable functions and settings.

Copy link
Contributor

coderabbitai bot commented Dec 10, 2024

📝 Walkthrough

Walkthrough

The changes in this pull request enhance logging functionality across multiple classes and viewsets in the application. Modifications include the addition of logging to the save and delete methods of the Event, Inquiry, Program, Session, PartnerLogo, and Resource classes, as well as updates to the EventViewSet, InquiryViewSet, ProgramViewSet, SessionViewSet, PartnerLogoViewSet, and ResourceViewSet. Additionally, the settings.py file has been reorganized for clarity and improved handling of environment variables, including adjustments to DEBUG and ALLOWED_HOSTS.

Changes

File Path Change Summary
src/website/apps/event/models.py Added logging to save and delete methods for Event, Inquiry, Program, Session, PartnerLogo, and Resource classes. Moved logging import to the top and updated comments.
src/website/apps/event/views.py Enhanced logging in EventViewSet, InquiryViewSet, ProgramViewSet, SessionViewSet, PartnerLogoViewSet, and ResourceViewSet for list, retrieve, get_serializer_class, and get_queryset methods.
src/website/core/settings.py Updated comments for clarity, modified environment variable handling, adjusted DEBUG and ALLOWED_HOSTS settings, and streamlined CORS and database configurations.

Possibly related PRs

Suggested reviewers

  • Baalmart
  • Psalmz777

🌟 In the code where events unfold,
Logging tales of actions bold.
From save to delete, each step we trace,
With clearer paths in this digital space.
Settings refined, clarity shines bright,
In our app's journey, everything feels right! 🌟


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR. (Experiment)
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link

codecov bot commented Dec 10, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 11.73%. Comparing base (4bfbb94) to head (18f06ad).
Report is 22 commits behind head on staging.

Additional details and impacted files

Impacted file tree graph

@@           Coverage Diff            @@
##           staging    #4033   +/-   ##
========================================
  Coverage    11.73%   11.73%           
========================================
  Files          114      114           
  Lines        15331    15331           
  Branches       319      319           
========================================
  Hits          1799     1799           
  Misses       13532    13532           

Copy link
Contributor

website changes in this PR available for preview here

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 2

🧹 Outside diff range and nitpick comments (4)
src/website/apps/event/views.py (1)

53-57: Enhance list method logging for better observability

Consider adding the category filter information to the list method's log message for better traceability.

 def list(self, request, *args, **kwargs):
     logger.debug("Handling Event list request")
     response = super().list(request, *args, **kwargs)
-    logger.info(f"Listed Events, returned {len(response.data)} records")
+    category = self.request.query_params.get('category', 'all')
+    logger.info(f"Listed Events with category={category}, returned {len(response.data)} records")
     return response
src/website/core/settings.py (2)

Line range hint 24-47: Enhance environment variable helper functions with type hints and examples

The helper functions would benefit from more detailed documentation and type hints.

-def parse_env_list(env_var: str, default: str = "") -> list:
+def parse_env_list(env_var: str, default: str = "") -> list[str]:
     """
     Convert a comma-separated list in an env var to a Python list.
+    
+    Example:
+        >>> os.environ['HOSTS'] = 'localhost,127.0.0.1'
+        >>> parse_env_list('HOSTS')
+        ['localhost', '127.0.0.1']
     """

-def get_env_bool(env_var: str, default: bool = False) -> bool:
+def get_env_bool(env_var: str, default: bool = False) -> bool:
     """
     Convert an environment variable to boolean.
+    
+    Accepts: 'true', '1', 't', 'yes' (case-insensitive)
+    
+    Example:
+        >>> os.environ['DEBUG'] = 'yes'
+        >>> get_env_bool('DEBUG')
+        True
     """

155-162: Make database SSL requirement configurable

Consider making the SSL requirement configurable via environment variable for development environments.

 if DATABASE_URL:
+    ssl_require = get_env_bool('DATABASE_SSL_REQUIRE', default=True)
     DATABASES = {
         'default': dj_database_url.parse(
             DATABASE_URL,
             conn_max_age=600,
-            ssl_require=True
+            ssl_require=ssl_require
         )
     }
src/website/apps/event/models.py (1)

Line range hint 101-121: Refactor Cloudinary operations into utility function

Consider extracting the Cloudinary file deletion logic into a utility function to reduce code duplication.

def delete_cloudinary_file(public_id: str, file_type: str) -> bool:
    """Delete a file from Cloudinary and log the operation.
    
    Args:
        public_id: The public ID of the file in Cloudinary
        file_type: The type of file (e.g., 'event_image', 'partner_logo')
    
    Returns:
        bool: True if deletion was successful, False otherwise
    """
    try:
        destroy(public_id)
        logger.info(f"Deleted {file_type} from Cloudinary: {public_id}")
        return True
    except Exception as e:
        logger.error(f"Error deleting {file_type} from Cloudinary: {e}")
        return False

# Usage in models:
def delete(self, *args, **kwargs):
    logger.debug(f"Attempting to delete {self.__class__.__name__}: ID={self.pk}")
    if self.event_image:
        delete_cloudinary_file(self.event_image.public_id, 'event_image')
    if self.background_image:
        delete_cloudinary_file(self.background_image.public_id, 'background_image')
    super().delete(*args, **kwargs)
    logger.info(f"Deleted {self.__class__.__name__}: ID={self.pk}")

Also applies to: 268-280, 318-329

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between 1afd917 and 18f06ad.

📒 Files selected for processing (3)
  • src/website/apps/event/models.py (9 hunks)
  • src/website/apps/event/views.py (2 hunks)
  • src/website/core/settings.py (7 hunks)

Comment on lines +71 to +82
def list(self, request, *args, **kwargs):
logger.debug("Handling Inquiry list request")
response = super().list(request, *args, **kwargs)
logger.info(f"Listed Inquiries, returned {len(response.data)} records")
return response

def retrieve(self, request, *args, **kwargs):
logger.debug(
f"Handling Inquiry retrieve request, id={kwargs.get('id')}")
response = super().retrieve(request, *args, **kwargs)
logger.info(f"Retrieved Inquiry detail for ID={kwargs.get('id')}")
return response
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Reduce code duplication in viewset logging

The logging implementation is duplicated across all viewsets. Consider creating a LoggingMixin to encapsulate this common functionality.

class LoggingMixin:
    def list(self, request, *args, **kwargs):
        logger.debug(f"Handling {self.__class__.__name__} list request")
        response = super().list(request, *args, **kwargs)
        logger.info(f"Listed {self.__class__.__name__}s, returned {len(response.data)} records")
        return response

    def retrieve(self, request, *args, **kwargs):
        logger.debug(f"Handling {self.__class__.__name__} retrieve request, id={kwargs.get('id')}")
        response = super().retrieve(request, *args, **kwargs)
        logger.info(f"Retrieved {self.__class__.__name__} detail for ID={kwargs.get('id')}")
        return response

# Usage example:
class EventViewSet(LoggingMixin, viewsets.ReadOnlyModelViewSet):
    ...

Also applies to: 91-102, 110-121, 129-141, 149-160

Comment on lines +93 to +100
def save(self, *args, **kwargs):
is_new = self.pk is None
super().save(*args, **kwargs)
if is_new:
logger.info(f"Created new Event: ID={self.pk}, Title={self.title}")
else:
logger.info(f"Updated Event: ID={self.pk}, Title={self.title}")

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Add transaction handling to model save methods

Consider wrapping the save operations in transactions to ensure data consistency with logging.

+from django.db import transaction

 def save(self, *args, **kwargs):
     is_new = self.pk is None
-    super().save(*args, **kwargs)
-    if is_new:
-        logger.info(f"Created new {self.__class__.__name__}: ID={self.pk}, Title={self.title}")
-    else:
-        logger.info(f"Updated {self.__class__.__name__}: ID={self.pk}, Title={self.title}")
+    try:
+        with transaction.atomic():
+            super().save(*args, **kwargs)
+            if is_new:
+                logger.info(f"Created new {self.__class__.__name__}: ID={self.pk}, Title={self.title}")
+            else:
+                logger.info(f"Updated {self.__class__.__name__}: ID={self.pk}, Title={self.title}")
+    except Exception as e:
+        logger.error(f"Error saving {self.__class__.__name__}: {e}")
+        raise

Also applies to: 145-154, 180-187, 216-225, 259-267, 309-317

@Baalmart Baalmart merged commit ac4d3c1 into staging Dec 10, 2024
52 checks passed
@Baalmart Baalmart deleted the website-trigger-3 branch December 10, 2024 11:38
@Baalmart Baalmart mentioned this pull request Dec 10, 2024
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants