Feature/querycsv

app/app/settings.py

@@ -67,6 +67,7 @@ def environ_list(key: str, default=""):
     "core",
     "users",
     "users.authentication",
+    "querycsv",
     "analytics",
     "clubs",
     "clubs.polls",
@@ -228,10 +229,22 @@ def environ_list(key: str, default=""):
 LOGIN_URL = "/auth/login/"
 AUTHENTICATION_BACKENDS = ["core.backend.CustomBackend"]
 
+
+########################
+# ==  AWS S3 Config == #
+########################
+S3_STORAGE_BACKEND = bool(int(os.environ.get("S3_STORAGE_BACKEND", 1)))
+if S3_STORAGE_BACKEND is True:
+    DEFAULT_FILE_STORAGE = "storages.backends.s3boto3.S3Boto3Storage"
+
+AWS_DEFAULT_ACL = "public-read"
+AWS_STORAGE_BUCKET_NAME = os.environ.get("S3_STORAGE_BUCKET_NAME", "")
+AWS_S3_REGION_NAME = os.environ.get("S3_STORAGE_BUCKET_REGION", "us-east-1")
+AWS_QUERYSTRING_AUTH = False
+
 ######################
 # == Email Config == #
 ######################
-
 CONSOLE_EMAIL_BACKEND = environ_bool("CONSOLE_EMAIL_BACKEND", 0)
 
 if CONSOLE_EMAIL_BACKEND:
@@ -264,6 +277,14 @@ def environ_list(key: str, default=""):
 # Custom schedules
 CELERY_BEAT_SCHEDULE = {}
 
+CACHES = {
+    "default": {
+        "BACKEND": "django.core.cache.backends.redis.RedisCache",
+        "LOCATION": os.environ.get("DJANGO_REDIS_URL"),
+    },
+}
+
+
 ###############################
 # == Environment Overrides == #
 ###############################
@@ -291,7 +312,12 @@ def environ_list(key: str, default=""):
 
 
 if TESTING:
-    INSTALLED_APPS.append("core.mock")
+    # Ensure tasks execute immediately
+    CELERY_TASK_ALWAYS_EAGER = True
 
     # Force disable notifications
     EMAIL_HOST_PASSWORD = None
+
+if DEV or TESTING:
+    # Allow for migrations during dev mode
+    INSTALLED_APPS.append("core.mock")

app/clubs/admin.py

@@ -12,7 +12,9 @@
     Team,
     TeamMembership,
 )
+from clubs.serializers import ClubCsvSerializer, ClubMembershipCsvSerializer
 from clubs.services import ClubService
+from core.abstracts.admin import ModelAdminBase
 
 
 class ClubMembershipInlineAdmin(admin.StackedInline):
@@ -29,9 +31,11 @@ class ClubRoleInlineAdmin(admin.StackedInline):
     extra = 0
 
 
-class ClubAdmin(admin.ModelAdmin):
+class ClubAdmin(ModelAdminBase):
     """Admin config for Clubs."""
 
+    csv_serializer_class = ClubCsvSerializer
+
     inlines = (
         ClubRoleInlineAdmin,
         ClubMembershipInlineAdmin,
@@ -46,16 +50,6 @@ class ClubAdmin(admin.ModelAdmin):
     def members_count(self, obj):
         return obj.memberships.count()
 
-    def get_queryset(self, request):
-        user_club_ids = request.user.club_memberships.all().values_list("club__id")
-
-        queryset = super().get_queryset(request)
-
-        if request.user.is_superuser:
-            return queryset
-
-        return queryset.filter(id__in=user_club_ids)
-
 
 class RecurringEventAdmin(admin.ModelAdmin):
 
@@ -139,7 +133,24 @@ class TeamAdmin(admin.ModelAdmin):
     inlines = (TeamMembershipInlineAdmin,)
 
 
+class ClubMembershipAdmin(ModelAdminBase):
+    """Manage club memberships in admin."""
+
+    csv_serializer_class = ClubMembershipCsvSerializer
+
+    list_display = (
+        "__str__",
+        "club",
+        "club_roles",
+        "created_at",
+    )
+
+    def club_roles(self, obj):
+        return ", ".join(str(role) for role in list(obj.roles.all()))
+
+
 admin.site.register(Club, ClubAdmin)
 admin.site.register(Event, EventAdmin)
 admin.site.register(RecurringEvent, RecurringEventAdmin)
 admin.site.register(Team, TeamAdmin)
+admin.site.register(ClubMembership, ClubMembershipAdmin)

app/clubs/polls/migrations/0003_alter_choiceinput_options_and_more.py

@@ -0,0 +1,58 @@
+# Generated by Django 4.2.19 on 2025-02-24 03:18
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        (
+            "polls",
+            "0002_remove_choiceinputoption_unique_choiceoption_order_per_input_and_more",
+        ),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="choiceinput",
+            options={"ordering": ["question__field", "-id"]},
+        ),
+        migrations.AlterModelOptions(
+            name="choiceinputoption",
+            options={"ordering": ["order", "-id"]},
+        ),
+        migrations.AlterModelOptions(
+            name="pollfield",
+            options={"ordering": ["order", "-id"]},
+        ),
+        migrations.AlterModelOptions(
+            name="pollquestion",
+            options={"ordering": ["field", "-id"]},
+        ),
+        migrations.AlterField(
+            model_name="choiceinput",
+            name="multiple_choice_type",
+            field=models.CharField(
+                blank=True,
+                choices=[
+                    ("select", "Multi Select Box"),
+                    ("checkbox", "Multi Checkbox Select"),
+                ],
+                default="checkbox",
+                null=True,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="choiceinput",
+            name="single_choice_type",
+            field=models.CharField(
+                blank=True,
+                choices=[
+                    ("select", "Single Dropdown Select"),
+                    ("radio", "Single Radio Select"),
+                ],
+                default="radio",
+                null=True,
+            ),
+        ),
+    ]

app/clubs/serializers.py

@@ -2,6 +2,7 @@
 
 from clubs.models import Club, ClubMembership
 from core.abstracts.serializers import ModelSerializerBase
+from querycsv.serializers import CsvModelSerializer
 from users.models import User
 
 
@@ -39,6 +40,14 @@ class Meta:
         ]
 
 
+class ClubCsvSerializer(CsvModelSerializer):
+    """Represents clubs in csvs."""
+
+    class Meta:
+        model = Club
+        fields = "__all__"
+
+
 class ClubMembershipSerializer(ModelSerializerBase):
     """Represents a club membership to use for CRUD operations."""
 
@@ -59,3 +68,17 @@ class Meta:
             "owner",
             "points",
         ]
+
+
+class ClubMembershipCsvSerializer(CsvModelSerializer, ClubMembershipSerializer):
+    """Serialize club memberships for a csv."""
+
+    class Meta:
+        model = ClubMembership
+        fields = [
+            *ModelSerializerBase.default_fields,
+            "user_id",
+            "club_id",
+            "owner",
+            "points",
+        ]