refactor(template): simplify code and fix teams view bug (#41)

Author: CuriousLearner

template/apps/api/{% if api_style in ['drf', 'both'] %}views.py{% endif %}.jinja

@@ -1,5 +1,4 @@
 """API views."""
-from rest_framework import viewsets, permissions
 from rest_framework.decorators import api_view
 from rest_framework.response import Response
 

template/apps/billing/{% if use_stripe %}decorators.py{% endif %}.jinja

@@ -1,8 +1,9 @@
 """Feature gating decorators for subscription-based access control."""
 from functools import wraps
-from django.shortcuts import redirect
+
 from django.contrib import messages
-from django.http import JsonResponse, HttpResponseForbidden
+from django.http import JsonResponse
+from django.shortcuts import redirect
 from django.utils.translation import gettext_lazy as _
 
 from .utils import (

template/apps/billing/{% if use_stripe %}utils.py{% endif %}.jinja

@@ -91,11 +91,9 @@ def get_customer_portal_url(customer_id, return_url):
 def get_or_create_customer(user):
     """Get or create a Stripe customer for a user."""
     try:
-        customer = Customer.objects.get(subscriber=user)
-        return customer
+        return Customer.objects.get(subscriber=user)
     except Customer.DoesNotExist:
-        customer = Customer.create(subscriber=user)
-        return customer
+        return Customer.create(subscriber=user)
 
 
 def create_checkout_session(user, price_id, success_url, cancel_url, metadata=None):

template/apps/core/feature_flags.py.jinja

@@ -27,16 +27,17 @@ def is_feature_enabled(feature_name, request=None, user=None):
     """
     if request:
         return flag_is_active(request, feature_name)
-    elif user:
+
+    if user:
         # Create a minimal request-like object for waffle
         class MinimalRequest:
             def __init__(self, user):
                 self.user = user
 
         return flag_is_active(MinimalRequest(user), feature_name)
-    else:
-        # No user context, check if it's a switch
-        return switch_is_active(feature_name)
+
+    # No user context, check if it's a switch
+    return switch_is_active(feature_name)
 
 
 def is_switch_enabled(switch_name):

template/apps/teams/{% if use_teams %}views.py{% endif %}.jinja

@@ -235,7 +235,7 @@ class TeamMemberUpdateView(TeamAdminRequiredMixin, UpdateView):
     def form_valid(self, form):
         """Show success message."""
         response = super().form_valid(form)
-        messages.success(request, _("Member updated successfully!"))
+        messages.success(self.request, _("Member updated successfully!"))
         return response
 
     def get_success_url(self):

template/apps/users/impersonation.py.jinja

@@ -1,6 +1,7 @@
 """User impersonation for admin support."""
 import logging
-from django.conf import settings
+from functools import wraps
+
 from django.contrib import messages
 from django.contrib.auth import get_user_model
 from django.shortcuts import redirect, get_object_or_404
@@ -186,8 +187,6 @@ def prevent_while_impersonating(view_func):
         def sensitive_view(request):
             ...
     """
-    from functools import wraps
-
     @wraps(view_func)
     def wrapper(request, *args, **kwargs):
         if getattr(request, "is_impersonating", False):

tests/conftest.py

@@ -107,11 +107,7 @@ def _generate(answers: dict[str, Any] | None = None, **kwargs) -> Path:
         Returns:
             Path to generated project
         """
-        final_answers = copier_answers.copy()
-        if answers:
-            final_answers.update(answers)
-        final_answers.update(kwargs)
-
+        final_answers = {**copier_answers, **(answers or {}), **kwargs}
         return generate_project(template_dir, temp_dir, final_answers)
 
     return _generate