[25.10.04 / TASK-250] Feature - 주간 뉴스레터 수신거부 기능 추가 (#46)

ooheunda · web-flow · commit d2c5cdb7510b · 2025-10-19T22:36:36.000+09:00
* feature: User 모델에 newsletter_subscribed 컬럼 추가
* feature: 메일을 구독한 사용자만 분석/발송하도록 수정
* feature: 템플릿에 수신 거부 추가 및 렌더링시 적용
* test: 템플릿 렌더링 테스트 수정
* fix: 까먹은 주석 해제
* fix: 지난 핫픽스 관련 테스트 수정
* fix: 템플릿 스타일 및 어드민 약간 수정
* fix: 주석추가
diff --git a/insight/admin/user_weekly_trend_admin.py b/insight/admin/user_weekly_trend_admin.py
@@ -145,6 +145,10 @@ def render_full_preview(self, obj: UserWeeklyTrend):
                 {
                     "s_date": obj.week_start_date,
                     "e_date": obj.week_end_date,
+                    "user": {
+                        "username": obj.user.username if obj.user else "N/A",
+                        "email": obj.user.email if obj.user else "N/A",
+                    },
                     "is_expired_token_user": False,
                     "weekly_trend_html": weekly_trend_html,
                     "user_weekly_trend_html": user_weekly_trend_html,
diff --git a/insight/schemas.py b/insight/schemas.py
@@ -8,6 +8,7 @@
 class NewsletterContext:
     s_date: str
     e_date: str
+    user: dict
     is_expired_token_user: bool
     weekly_trend_html: str
     user_weekly_trend_html: str | None = None
diff --git a/insight/tasks/weekly_newsletter_batch.py b/insight/tasks/weekly_newsletter_batch.py
@@ -91,6 +91,7 @@ def _get_target_user_chunks(self) -> list[list[dict]]:
                 User.objects.filter(
                     is_active=True,
                     email__isnull=False,
+                    newsletter_subscribed=True,
                 )
                 .values("id", "email", "username")
                 .distinct("email")
@@ -222,6 +223,7 @@ def _get_user_weekly_trend_html(
 
     def _get_newsletter_html(
         self,
+        user: dict,
         is_expired_token_user: bool,
         weekly_trend_html: str,
         user_weekly_trend_html: str | None,
@@ -234,6 +236,7 @@ def _get_newsletter_html(
                     NewsletterContext(
                         s_date=self.weekly_info["s_date"],
                         e_date=self.weekly_info["e_date"],
+                        user=user,
                         is_expired_token_user=is_expired_token_user,
                         weekly_trend_html=weekly_trend_html,
                         user_weekly_trend_html=user_weekly_trend_html,
@@ -294,6 +297,7 @@ def _build_newsletters(
 
                     # 최종 뉴스레터 렌더링
                     html_body = self._get_newsletter_html(
+                        user=user,
                         is_expired_token_user=is_expired_token_user,
                         weekly_trend_html=weekly_trend_html,
                         user_weekly_trend_html=user_weekly_trend_html,
diff --git a/insight/tasks/weekly_user_trend_analysis.py b/insight/tasks/weekly_user_trend_analysis.py
@@ -282,6 +282,7 @@ async def _fetch_data(
                 User.objects.filter(
                     email__isnull=False,
                     is_active=True,
+                    newsletter_subscribed=True,
                 )
                 .exclude(email="")
                 .values("id", "username")
diff --git a/insight/tests/conftest.py b/insight/tests/conftest.py
@@ -47,6 +47,7 @@ def user(db):
         email="test@example.com",
         username="test_user",
         is_active=True,
+        newsletter_subscribed=True,
     )
 
 
diff --git a/insight/tests/tasks/test_weekly_newsletter_batch.py b/insight/tests/tasks/test_weekly_newsletter_batch.py
@@ -115,6 +115,11 @@ def test_get_target_user_chunks_success(
 
             chunks = newsletter_batch._get_target_user_chunks()
 
+            mock_filter.assert_called_once_with(
+                is_active=True,
+                email__isnull=False,
+                newsletter_subscribed=True,
+            )
             assert len(chunks) == 1
             assert len(chunks[0]) == 1
             assert chunks[0][0]["email"] == user.email
@@ -197,7 +202,10 @@ def test_build_newsletters_success(
             assert newsletters[0].user_id == user.id
             assert newsletters[0].email_message.to[0] == user.email
             # 제목 포맷 검증
-            assert "벨로그 대시보드 주간 뉴스레터" in newsletters[0].email_message.subject
+            assert (
+                "벨로그 대시보드 주간 뉴스레터"
+                in newsletters[0].email_message.subject
+            )
 
     @patch("insight.tasks.weekly_newsletter_batch.logger")
     def test_send_newsletters_success(
diff --git a/insight/tests/tasks/test_weekly_newsletter_template.py b/insight/tests/tasks/test_weekly_newsletter_template.py
@@ -125,7 +125,10 @@ def test_get_user_weekly_trend_html_success(
 
         assert trending_summary[0]["title"] in user_weekly_trend_html
         assert trend_analysis["insights"] in user_weekly_trend_html
-        assert f'{user_weekly_stats["new_posts"]}개의 글' in user_weekly_trend_html
+        assert (
+            f'{user_weekly_stats["new_posts"]}개의 글'
+            in user_weekly_trend_html
+        )
         assert "마지막으로 글을 작성하신지" not in user_weekly_trend_html
         assert user.username in user_weekly_trend_html
         assert "이번주에 작성한 글" in user_weekly_trend_html
@@ -179,13 +182,16 @@ def test_get_user_weekly_trend_html_exception(
                 )
 
     @patch("insight.tasks.weekly_newsletter_batch.logger")
-    def test_get_newsletter_html_success(self, mock_logger, newsletter_batch):
+    def test_get_newsletter_html_success(
+        self, mock_logger, newsletter_batch, user
+    ):
         """정상 사용자 뉴스레터 HTML 렌더링 테스트"""
         is_expired_token_user = False
         weekly_trend_html = "test-weekly-trend-html"
         user_weekly_trend_html = "test-user-weekly-trend-html"
 
         newsletter_html = newsletter_batch._get_newsletter_html(
+            user,
             is_expired_token_user,
             weekly_trend_html,
             user_weekly_trend_html,
@@ -198,33 +204,45 @@ def test_get_newsletter_html_success(self, mock_logger, newsletter_batch):
         assert "대시보드 보러가기" in newsletter_html
         assert "Weekly Report" in newsletter_html
         assert "Velog Dashboard" in newsletter_html
+        assert (
+            "user/newsletter-unsubscribe?email=" + user.email
+            in newsletter_html
+        )
 
     @patch("insight.tasks.weekly_newsletter_batch.logger")
     def test_get_newsletter_html_expired_token_user(
-        self, mock_logger, newsletter_batch
+        self, mock_logger, newsletter_batch, user
     ):
         """토큰 만료 사용자 뉴스레터 HTML 렌더링 테스트"""
         is_expired_token_user = True
         weekly_trend_html = "test-weekly-trend-html"
         user_weekly_trend_html = "test-user-weekly-trend-html"
 
         newsletter_html = newsletter_batch._get_newsletter_html(
+            user,
             is_expired_token_user,
             weekly_trend_html,
             user_weekly_trend_html,
         )
 
         # 템플릿 렌더링 검증
         assert "🚨 잠시만요, 토큰이 만료된 것 같아요!" in newsletter_html
-        assert "토큰이 만료되어 정상적으로 통계를 수집할 수 없었어요" in newsletter_html
+        assert (
+            "토큰이 만료되어 정상적으로 통계를 수집할 수 없었어요"
+            in newsletter_html
+        )
         assert weekly_trend_html in newsletter_html
         assert user_weekly_trend_html not in newsletter_html
         assert "대시보드 보러가기" in newsletter_html
         assert "활동 리포트" in newsletter_html
+        assert (
+            "user/newsletter-unsubscribe?email=" + user.email
+            in newsletter_html
+        )
 
     @patch("insight.tasks.weekly_newsletter_batch.logger")
     def test_get_newsletter_html_exception(
-        self, mock_logger, newsletter_batch
+        self, mock_logger, newsletter_batch, user
     ):
         """뉴스레터 HTML 렌더링 실패 시 예외 처리 테스트"""
         with patch(
@@ -234,6 +252,7 @@ def test_get_newsletter_html_exception(
 
             with pytest.raises(Exception):
                 newsletter_batch._get_newsletter_html(
+                    user,
                     False,
                     "test-weekly-trend-html",
                     "test-user-weekly-trend-html",
diff --git a/insight/tests/test_user_weekly_trend_admin.py b/insight/tests/test_user_weekly_trend_admin.py
@@ -413,7 +413,7 @@ def test_processed_at_formatted_with_date(
         result = user_weekly_trend_admin.processed_at_formatted(
             user_weekly_trend
         )
-        assert now.strftime("%Y-%m-%d %H:%M") == result
+        assert now.strftime("%Y-%m-%d %H:%M:%S") == result
 
     def test_processed_at_formatted_no_date(
         self, user_weekly_trend_admin, user_weekly_trend
diff --git a/insight/tests/test_weekly_trend_admin.py b/insight/tests/test_weekly_trend_admin.py
@@ -49,7 +49,7 @@ def test_processed_at_formatted_with_date(
         weekly_trend.save()
 
         result = weekly_trend_admin.processed_at_formatted(weekly_trend)
-        assert now.strftime("%Y-%m-%d %H:%M") == result
+        assert now.strftime("%Y-%m-%d %H:%M:%S") == result
 
     def test_processed_at_formatted_no_date(
         self, weekly_trend_admin, weekly_trend: WeeklyTrend
diff --git a/templates/insights/index.html b/templates/insights/index.html
@@ -134,29 +134,30 @@
                     {{weekly_trend_html}} 
                   {% endif %}
 
+                  <h2
+                  style="
+                    box-sizing: border-box;
+                    margin-top: 40px;
+                    color: #000000;
+                    font-size: 24px;
+                    font-weight: 900;
+                    letter-spacing: 0;
+                  "
+                >
+                  {% if user.username %} 
+                    {{user.username}}님의 활동 리포트 
+                  {% else %} 
+                    활동 리포트 
+                  {% endif %}
+                </h2>
+
                   {% if not is_expired_token_user and user_weekly_trend_html %}
                     {{user_weekly_trend_html}} 
                   {% endif %} 
                   
                   {% if is_expired_token_user %}
                   <!-- Token Expired Warning -->
                   <div style="margin-bottom: 40px; box-sizing: border-box">
-                    <h2
-                      style="
-                        font-size: 24px;
-                        font-weight: 900;
-                        color: #000000;
-                        margin-bottom: 20px;
-                        letter-spacing: 0;
-                        box-sizing: border-box;
-                      "
-                    >
-                      {% if user.username %} 
-                        {{user.username}}님의 활동 리포트
-                      {% else %} 
-                        활동 리포트 
-                      {% endif %}
-                    </h2>
                     <div
                       style="
                         background-color: #fffbd7;
@@ -311,6 +312,21 @@
             >
               개인정보처리방침
             </a>
+            &nbsp;&nbsp;|&nbsp;&nbsp;
+            <!-- 뉴스레터 구독 해제: API 엔드포인트로 직접 구독 해제 처리 -->
+            <a
+              href="https://velog-dashboard.kro.kr/api/user/newsletter-unsubscribe?email={{user.email}}"
+              target="_blank"
+              rel="noopener noreferrer"
+              style="
+                color: #4d4d4d;
+                text-decoration: underline;
+                box-sizing: border-box;
+                display: inline-block;
+              "
+            >
+              수신 거부
+            </a>
           </p>
         </td>
       </tr>
diff --git a/templates/insights/user_weekly_trend.html b/templates/insights/user_weekly_trend.html
@@ -1,25 +1,7 @@
 <div
   class="user-weekly-trend"
-  style="box-sizing: border-box; margin-top: 40px; color: #000000"
+  style="box-sizing: border-box; color: #000000"
 >
-  {% if insight.trending_summary or insight.user_weekly_stats or insight.user_weekly_reminder %}
-  <h2
-    style="
-      box-sizing: border-box;
-      margin-bottom: 24px;
-      color: #000000;
-      font-size: 24px;
-      font-weight: 900;
-      letter-spacing: 0;
-    "
-  >
-    {% if user.username %} 
-      {{user.username}}님의 활동 리포트 
-    {% else %} 
-      활동 리포트 
-    {% endif %}
-  </h2>
-  {% endif %} 
   {% if insight.user_weekly_stats %}
   <div
     style="
diff --git a/users/admin.py b/users/admin.py
@@ -21,6 +21,7 @@ class UserAdmin(admin.ModelAdmin):
         "email",
         "group_id",
         "is_active",
+        "newsletter_subscribed",
         "created_at",
         "post_count",
         "get_qr_login_token",
@@ -31,7 +32,7 @@ class UserAdmin(admin.ModelAdmin):
     empty_value_display = "-"
     ordering = ["-created_at"]
 
-    actions = ["make_inactive", "update_stats"]
+    actions = ["make_inactive", "update_stats", "make_unsubscribed"]
 
     def get_list_display(self, request):
         list_display = super().get_list_display(request)
@@ -40,6 +41,7 @@ def get_list_display(self, request):
             "email": "이메일",
             "group_id": "그룹 ID",
             "is_active": "활성화 여부",
+            "newsletter_subscribed": "뉴스레터 구독 여부",
             "created_at": "생성일",
         }
         return list_display
@@ -95,6 +97,20 @@ def make_inactive(self, request: HttpRequest, queryset: QuerySet[User]):
             messages.SUCCESS,
         )
 
+    @admin.action(description="선택된 사용자 뉴스레터 구독 해제")
+    def make_unsubscribed(
+        self, request: HttpRequest, queryset: QuerySet[User]
+    ):
+        updated = queryset.update(newsletter_subscribed=False)
+        logger.info(
+            f"{request.user} 가 {updated} 명 사용자를 뉴스레터 구독 해제 했습니다."
+        )
+        self.message_user(
+            request,
+            f"{updated} 명의 사용자가 뉴스레터 구독 해제되었습니다.",
+            messages.SUCCESS,
+        )
+
     @admin.action(
         description="선택된 사용자 실시간 통계 업데이트 (1명 정도만 진행, 이상 timeout 발생 위험)"
     )
diff --git a/users/migrations/0014_user_newsletter_subscribed.py b/users/migrations/0014_user_newsletter_subscribed.py
@@ -0,0 +1,19 @@
+# Generated by Django 5.1.6 on 2025-10-01 17:57
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("users", "0013_user_thumbnail"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="user",
+            name="newsletter_subscribed",
+            field=models.BooleanField(
+                default=True, verbose_name="뉴스레터 구독 여부"
+            ),
+        ),
+    ]
diff --git a/users/models.py b/users/models.py
@@ -47,6 +47,9 @@ class User(TimeStampedModel):
     is_active = models.BooleanField(
         default=True, null=False, verbose_name="활성 여부"
     )
+    newsletter_subscribed = models.BooleanField(
+        default=True, null=False, verbose_name="뉴스레터 구독 여부"
+    )
 
     def __str__(self) -> str:
         return f"{self.velog_uuid}"

Original file line number	Diff line number	Diff line change
`@@ -282,6 +282,7 @@ async def _fetch_data(`
`282`	`282`	`User.objects.filter(`
`283`	`283`	`email__isnull=False,`
`284`	`284`	`is_active=True,`
	`285`	`+ newsletter_subscribed=True,`
`285`	`286`	`)`
`286`	`287`	`.exclude(email="")`
`287`	`288`	`.values("id", "username")`
Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,7 @@ def user(db):`
`47`	`47`	`email="[email protected]",`
`48`	`48`	`username="test_user",`
`49`	`49`	`is_active=True,`
	`50`	`+ newsletter_subscribed=True,`
`50`	`51`	`)`
`51`	`52`
`52`	`53`
Original file line number	Diff line number	Diff line change
`@@ -413,7 +413,7 @@ def test_processed_at_formatted_with_date(`
`413`	`413`	`result = user_weekly_trend_admin.processed_at_formatted(`
`414`	`414`	`user_weekly_trend`
`415`	`415`	`)`
`416`		`- assert now.strftime("%Y-%m-%d %H:%M") == result`
	`416`	`+ assert now.strftime("%Y-%m-%d %H:%M:%S") == result`
`417`	`417`
`418`	`418`	`def test_processed_at_formatted_no_date(`
`419`	`419`	`self, user_weekly_trend_admin, user_weekly_trend`