Merge pull request #9 from btaquee/card-bene

fix about card app

Author: XiyuanWu

cards/admin.py

@@ -41,16 +41,18 @@ class UserCardAdmin(admin.ModelAdmin):
 
 @admin.register(CardBenefit)
 class CardBenefitAdmin(admin.ModelAdmin):
-    list_display = ("card", "name", "amount", "get_categories", "description", "frequency")
-    fields = ("card", "name", "amount", "category", "description", "frequency")
-    ordering = ["card", "name"]
+    list_display = ("card", "get_benefits_preview")
+    fields = ("card", "benefits")
+    ordering = ["card"]
 
-    def get_categories(self, obj):
-        """Display categories in a more readable format"""
-        if obj.category:
-            # Convert the stored format to readable format
-            categories = obj.category if isinstance(obj.category, list) else [obj.category]
-            return ", ".join(categories)
-        return "-"
-
-    get_categories.short_description = "Categories"
+    # AI generated function
+    def get_benefits_preview(self, obj):
+        """Display a preview of the benefits"""
+        if obj.benefits:
+            # Show first 50 characters of benefits
+            preview = obj.benefits[:50]
+            if len(obj.benefits) > 50:
+                preview += "..."
+            return preview
+        return "No benefits"
+    get_benefits_preview.short_description = "Benefits Preview"

cards/migrations/0014_remove_cardbenefit_amount_and_more.py

@@ -0,0 +1,34 @@
+# Generated by Django 5.2.7 on 2025-10-23 04:56
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cards', '0013_remove_rewardrule_unique_card_category_and_more'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='cardbenefit',
+            name='amount',
+        ),
+        migrations.RemoveField(
+            model_name='cardbenefit',
+            name='category',
+        ),
+        migrations.RemoveField(
+            model_name='cardbenefit',
+            name='description',
+        ),
+        migrations.RemoveField(
+            model_name='cardbenefit',
+            name='frequency',
+        ),
+        migrations.AddField(
+            model_name='cardbenefit',
+            name='benefits',
+            field=models.JSONField(blank=True, default=list, help_text='List of card benefits'),
+        ),
+    ]

cards/migrations/0015_remove_cardbenefit_name.py

@@ -0,0 +1,17 @@
+# Generated by Django 5.2.7 on 2025-10-23 05:00
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cards', '0014_remove_cardbenefit_amount_and_more'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='cardbenefit',
+            name='name',
+        ),
+    ]

cards/migrations/0016_alter_cardbenefit_benefits.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.2.7 on 2025-10-23 05:03
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cards', '0015_remove_cardbenefit_name'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='cardbenefit',
+            name='benefits',
+            field=models.TextField(blank=True, null=True),
+        ),
+    ]

cards/migrations/0017_alter_cardbenefit_benefits.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.2.7 on 2025-10-23 05:18
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cards', '0016_alter_cardbenefit_benefits'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='cardbenefit',
+            name='benefits',
+            field=models.TextField(blank=True, null=True, verbose_name='Benefits'),
+        ),
+    ]

cards/models.py

@@ -28,35 +28,13 @@ class Card(models.Model):
     def __str__(self):
         return f"{self.issuer} {self.name}"
 
-# A card can have many coupons
+# A card can have many benefits(coupons, etc.)
 class CardBenefit(models.Model):
-
-    BENEFIT_CATEGORY = [
-        ("GENERAL", "General"),
-        ("DINING", "Dining"),
-        ("GROCERIES", "Groceries"),
-        ("TRAVEL", "Travel"),
-        ("ENTERTAINMENT", "Entertainment"),
-        ("SUBSCRIPTIONS", "Subscriptions"),
-        ("OTHER", "Other"),
-    ]
-
-    FREQUENCY_CHOICES = [
-        ("ONCE", "One-time"),
-        ("MONTHLY", "Monthly"),
-        ("ANNUAL", "Annual"),
-        ("EVERY_4_5_YEARS", "Every 4/5 Years"),
-    ]
-
     card = models.ForeignKey(Card, on_delete=models.CASCADE, related_name="benefits")
-    name = models.CharField(max_length=100)
-    amount = models.DecimalField(max_digits=5, decimal_places=0, null=True, blank=True)
-    category = models.CharField(max_length=255, choices=BENEFIT_CATEGORY, default=None)
-    description = models.TextField(blank=True, null=True, default=None)
-    frequency = models.CharField(max_length=20, choices=FREQUENCY_CHOICES, default=None)
-    
+    benefits = models.TextField("Benefits", blank=True, null=True)
+
     def __str__(self):
-        return f"{self.name} ({self.card.name})"
+        return f"Benefits for {self.card.name}"
 
 
 

cards/serializers.py

@@ -7,9 +7,24 @@ class Meta:
         fields = ("id", "multiplier", "category", "cap_amount", "notes")
 
 class CardBenefitSerializer(serializers.ModelSerializer):
+    card = serializers.StringRelatedField(read_only=True)
+    benefits = serializers.SerializerMethodField()
+
     class Meta:
         model = CardBenefit
-        fields = ("id", "card", "name", "amount", "category", "description", "frequency")
+        fields = ("id", "card", "benefits")
+
+    # AI generated function
+    def get_benefits(self, obj):
+        """
+        Convert the `benefits` text field to a JSON list,
+        splitting by comma. Strips whitespace, skips empty values.
+        """
+        if not obj.benefits:
+            return []
+        # Split by comma, strip whitespace, exclude empty
+        items = [item.strip() for item in obj.benefits.split(",") if item.strip()]
+        return items
 
 class CardSerializer(serializers.ModelSerializer):
     reward_rules = RewardRuleSerializer(many=True, read_only=True)