[25.09.20 / TASK-255] Feature - admin mail template 업데이트 및 주간 배치 cron (#45)

* feature: 주간 배치 관련 어드민, 메일 템플릿 활용해서 상세보기시 최종적으로 만들어진 메일 볼 수 있게
* feature: 어드민 업데이트에 따른 test code update
* modify: 주간 매일링 배치 cron update
* modify: 코드 리뷰 반영
* modify: 더 이상 안쓰는 것들 정리 및 테코 업데이트
* modify: mocking 경로 수정
* modify: 다른 test 도 조금 수정

Author: Nuung

.github/workflows/run-weekly-analysis.yaml

@@ -2,8 +2,9 @@ name: Weekly Analysis Batch
 
 on:
   workflow_dispatch:
-  # schedule:
-  #   - cron: "*/50 * * * *"
+  schedule:
+    # 매주 월요일 오전 9시 30분(KST, UTC+9) 실행 -> UTC 기준 00:30 월요일
+    - cron: "30 0 * * 1"
 
 jobs:
   weekly-trend-analysis-batch:
@@ -93,7 +94,7 @@ jobs:
           else
             echo "RESULT=No output file found" >> $GITHUB_OUTPUT
           fi
-    
+
       - name: Send Slack Notification on Success
         if: success()
         uses: slackapi/[email protected]
@@ -114,4 +115,4 @@ jobs:
               "text": "*Weekly Analysis Batch*\n\n❌ *Status:* Failure\n📅 *Timestamp (KST):* ${{ env.KST_TIME }}\n📝 *Result:* \n```${{ steps.read-result.outputs.RESULT }}```\n🔗 *Workflow URL:* <${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}|View Workflow>"
             }
         env:
-          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}

.github/workflows/run-weekly-newsletter.yaml

@@ -2,8 +2,9 @@ name: Weekly Newsletter Batch
 
 on:
   workflow_dispatch:
-  # schedule:
-  #   - cron: "*/50 * * * *"
+  schedule:
+    # 매주 월요일 오전 7시(KST, UTC+9) 실행 -> UTC 기준 일요일 22:00
+    - cron: "0 22 * * 0"
 
 jobs:
   weekly-newsletter-batch:
@@ -89,7 +90,7 @@ jobs:
           else
             echo "RESULT=No output file found" >> $GITHUB_OUTPUT
           fi
-      
+
       - name: Send Slack Notification on Success
         if: success()
         uses: slackapi/[email protected]
@@ -110,4 +111,4 @@ jobs:
               "text": "*Weekly Newsletter Batch*\n\n❌ *Status:* Failure\n📅 *Timestamp (KST):* ${{ env.KST_TIME }}\n📝 *Result:* \n```${{ steps.read-result.outputs.RESULT }}```\n🔗 *Workflow URL:* <${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}|View Workflow>"
             }
         env:
-          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}

.gitignore

@@ -1,5 +1,5 @@
 # CUSTOM
-**/timescale_data/**
+**/timescale_data*/**
 *_result.txt
 
 # Created by https://www.toptal.com/developers/gitignore/api/macos,python,pycharm,django

insight/admin/base_admin.py

@@ -1,12 +1,14 @@
 import json
+from html import escape
 
 from django.contrib import admin
-from django.template.defaultfilters import truncatechars
-from django.template.loader import render_to_string
+from django.db.models import QuerySet
+from django.http import HttpRequest
 from django.utils.html import format_html
 from django.utils.safestring import mark_safe
 
 from insight.models import UserWeeklyTrend, WeeklyTrend
+from utils.utils import get_local_now
 
 
 class BaseTrendAdminMixin:
@@ -21,11 +23,6 @@ def week_range(self, obj: WeeklyTrend | UserWeeklyTrend):
             obj.week_end_date.strftime("%Y-%m-%d"),
         )
 
-    @admin.display(description="인사이트 미리보기")
-    def insight_preview(self, obj: WeeklyTrend | UserWeeklyTrend):
-        """인사이트 미리보기"""
-        return self.get_json_preview(obj, "insight")
-
     @admin.display(description="처리 완료")
     def is_processed_colored(self, obj: WeeklyTrend | UserWeeklyTrend):
         """처리 상태를 색상으로 표시"""
@@ -44,29 +41,24 @@ def processed_at_formatted(self, obj: WeeklyTrend | UserWeeklyTrend):
             return obj.processed_at.strftime("%Y-%m-%d %H:%M")
         return "-"
 
-
-class JsonPreviewMixin:
-    """JSONField를 보기 좋게 표시하기 위한 Mixin"""
-
-    def get_json_preview(
-        self, obj: WeeklyTrend | UserWeeklyTrend, field_name, max_length=150
-    ):
-        """JSONField 내용의 미리보기를 반환"""
-        json_data = getattr(obj, field_name, {})
-        if not json_data:
+    @admin.display(description="Insight JSON")
+    def formatted_insight_json(self, obj: WeeklyTrend | UserWeeklyTrend):
+        if not obj.insight:
             return "-"
+        json_str = json.dumps(obj.insight, indent=2, ensure_ascii=False)
+        return mark_safe(f"<pre><code>{escape(json_str)}</code></pre>")
 
-        # JSON 문자열로 변환하여 일부만 표시
-        json_str = json.dumps(json_data, ensure_ascii=False)
-        return truncatechars(json_str, max_length)
+    # ========================================================================
+    # Actions
+    # ========================================================================
 
-    @admin.display(description="인사이트 데이터")
-    def formatted_insight(self, obj: WeeklyTrend | UserWeeklyTrend):
-        """인사이트 JSON을 보기 좋게 포맷팅하여 표시"""
-        if not hasattr(obj, "insight") or not obj.insight:
-            return "-"
-
-        context = {"insight": obj.insight, "user": getattr(obj, "user", None)}
-        # render_to_string을 사용하여 템플릿 렌더링
-        html = render_to_string("insights/insight_preview.html", context)
-        return mark_safe(html)
+    @admin.action(description="선택된 항목을 처리 완료로 표시하기")
+    def mark_as_processed(
+        self, request: HttpRequest, queryset: QuerySet[UserWeeklyTrend]
+    ):
+        """선택된 항목을 처리 완료로 표시"""
+        queryset.update(is_processed=True, processed_at=get_local_now())
+        self.message_user(
+            request,
+            f"{queryset.count()}개의 사용자 인사이트가 처리 완료로 표시되었습니다.",
+        )

insight/admin/user_weekly_trend_admin.py

@@ -1,23 +1,29 @@
+from html import escape
+
 from django.contrib import admin
-from django.db.models import QuerySet
 from django.http import HttpRequest
+from django.template.loader import render_to_string
 from django.urls import reverse
 from django.utils.html import format_html
+from django.utils.safestring import mark_safe
 
-from insight.admin import BaseTrendAdminMixin, JsonPreviewMixin
-from insight.models import UserWeeklyTrend
-from utils.utils import get_local_now
+from insight.admin.base_admin import BaseTrendAdminMixin
+from insight.models import (
+    UserWeeklyTrend,
+    WeeklyTrend,
+    WeeklyTrendInsight,
+    WeeklyUserTrendInsight,
+)
+from utils.utils import from_dict
 
 
 @admin.register(UserWeeklyTrend)
-class UserWeeklyTrendAdmin(
-    admin.ModelAdmin, JsonPreviewMixin, BaseTrendAdminMixin
-):
+class UserWeeklyTrendAdmin(admin.ModelAdmin, BaseTrendAdminMixin):
     list_display = (
         "id",
         "user_info",
         "week_range",
-        "insight_preview",
+        "summarize_insight",
         "is_processed_colored",
         "processed_at_formatted",
         "created_at",
@@ -26,7 +32,8 @@ class UserWeeklyTrendAdmin(
     search_fields = ("user__username", "insight")
     readonly_fields = (
         "processed_at",
-        "formatted_insight",
+        "render_full_preview",
+        "formatted_insight_json",
     )
     raw_id_fields = ("user",)
 
@@ -38,10 +45,17 @@ class UserWeeklyTrendAdmin(
             },
         ),
         (
-            "인사이트 데이터",
+            "뉴스레터 미리보기",
+            {
+                "fields": ("render_full_preview",),
+                "classes": ("wide",),
+            },
+        ),
+        (
+            "원본 데이터 (JSON)",
             {
-                "fields": ("formatted_insight",),
-                "classes": ("wide", "extrapretty"),
+                "fields": ("formatted_insight_json",),
+                "classes": ("wide", "collapse"),
             },
         ),
         (
@@ -71,13 +85,98 @@ def user_info(self, obj: UserWeeklyTrend):
             obj.user.username or f"사용자 {obj.user.id}",
         )
 
-    @admin.action(description="선택된 항목을 처리 완료로 표시하기")
-    def mark_as_processed(
-        self, request: HttpRequest, queryset: QuerySet[UserWeeklyTrend]
-    ):
-        """선택된 항목을 처리 완료로 표시"""
-        queryset.update(is_processed=True, processed_at=get_local_now())
-        self.message_user(
-            request,
-            f"{queryset.count()}개의 사용자 인사이트가 처리 완료로 표시되었습니다.",
-        )
+    @admin.display(description="인사이트 요약")
+    def summarize_insight(self, obj: UserWeeklyTrend):
+        if not isinstance(obj.insight, dict):
+            return "데이터 없음"
+
+        summary_parts = []
+        stats = obj.insight.get("user_weekly_stats")
+        if stats:
+            summary_parts.append(
+                f"조회수: {stats.get('views', 0)}, 새글: {stats.get('new_posts', 0)}"
+            )
+
+        summary = obj.insight.get("trending_summary", [])
+        if summary and isinstance(summary, list) and summary[0].get("title"):
+            summary_parts.append(f"신규글: {summary[0]['title'][:20]}...")
+
+        return " | ".join(summary_parts) if summary_parts else "요약 정보 없음"
+
+    @admin.display(description="뉴스레터 템플릿")
+    def render_full_preview(self, obj: UserWeeklyTrend):
+        if not obj.insight:
+            return "No insight data to preview."
+        try:
+            # 공통 주간 트렌드 데이터 조회
+            weekly_trend = WeeklyTrend.objects.filter(
+                week_start_date=obj.week_start_date,
+                week_end_date=obj.week_end_date,
+            ).first()
+
+            if not weekly_trend or not weekly_trend.insight:
+                weekly_trend_html = "<p><strong>경고:</strong> 해당 주차의 공통 WeeklyTrend를 찾을 수 없거나 데이터가 없습니다.</p>"
+            else:
+                weekly_trend_insight = from_dict(
+                    WeeklyTrendInsight, weekly_trend.insight
+                )
+                weekly_trend_html = render_to_string(
+                    "insights/weekly_trend.html",
+                    {"insight": weekly_trend_insight.to_dict()},
+                )
+
+            # 사용자 주간 트렌드 렌더링
+            user_weekly_insight = from_dict(
+                WeeklyUserTrendInsight, obj.insight
+            )
+            user_weekly_trend_html = render_to_string(
+                "insights/user_weekly_trend.html",
+                {
+                    "user": {
+                        "username": obj.user.username if obj.user else "N/A"
+                    },
+                    "insight": user_weekly_insight.to_dict(),
+                },
+            )
+
+            # 최종 뉴스레터 렌더링
+            final_html = render_to_string(
+                "insights/index.html",
+                {
+                    "s_date": obj.week_start_date,
+                    "e_date": obj.week_end_date,
+                    "is_expired_token_user": False,
+                    "weekly_trend_html": weekly_trend_html,
+                    "user_weekly_trend_html": user_weekly_trend_html,
+                },
+            )
+
+            # Admin 페이지 너비 확장을 위한 CSS
+            style = """
+            <style>
+            /* iframe을 감싸는 필드의 너비 확장 */
+            .field-render_full_preview {
+                width: 100% !important;
+                max-width: none !important;
+            }
+            
+            /* Django admin 전체 콘텐츠 영역 확장 */
+            .app-insight.model-weeklytrend .form-row,
+            .app-insight.model-weeklytrend .wide,
+            .app-insight.model-weeklytrend #content-main {
+                max-width: 1400px !important;
+                width: 100% !important;
+            }
+            </style>
+            """
+
+            iframe = f"""
+            <iframe 
+                srcdoc="{escape(final_html)}" 
+                style="width: 100%; min-width: 600px; height: 600px; border: 1px solid #ccc;"
+            ></iframe>
+            """
+
+            return mark_safe(style + iframe)
+        except Exception as e:
+            return f"Error rendering preview: {e}"