From 60c90357439352732cd85e16280c736f11ff2332 Mon Sep 17 00:00:00 2001
From: Citali <git@fellies.email>
Date: Thu, 12 Feb 2026 23:05:39 +0100
Subject: [PATCH] feat(announcements): add locale audience targeting and
 published-home news

---
 TODO.md                                       | 11 ++--
 apps/admin/src/app/announcements/page.tsx     | 53 +++++++++++++++++++
 apps/web/src/app/[locale]/layout.tsx          |  2 +-
 apps/web/src/app/[locale]/page.tsx            |  6 +--
 .../src/components/public-announcements.tsx   |  5 +-
 packages/content/src/announcements.ts         |  3 ++
 .../migration.sql                             |  2 +
 packages/db/prisma/schema.prisma              |  1 +
 packages/db/src/announcements.test.ts         |  7 ++-
 packages/db/src/announcements.ts              | 15 ++++++
 10 files changed, 93 insertions(+), 12 deletions(-)
 create mode 100644 packages/db/prisma/migrations/20260213014500_announcement_locale_targeting/migration.sql

diff --git a/TODO.md b/TODO.md
index a36f80f..9075732 100644
--- a/TODO.md
+++ b/TODO.md
@@ -118,7 +118,7 @@ This file is the single source of truth for roadmap and delivery progress.
   page CRUD, navigation tree, reusable page blocks (forms/price cards/gallery embeds)
 - [~] [P1] `todo/mvp1-commissions-customers`:
   commission request intake + admin CRUD + kanban + customer entity/linking
-- [~] [P1] `todo/mvp1-announcements-news`:
+- [x] [P1] `todo/mvp1-announcements-news`:
   announcement management/rendering + news/blog CRUD and public rendering
 - [~] [P1] `todo/mvp1-public-rendering-integration`:
   public rendering for pages/navigation/media/portfolio/announcements and commissioning entrypoints
@@ -153,7 +153,7 @@ This file is the single source of truth for roadmap and delivery progress.
 - [x] [P1] Customer-to-commission linkage and reuse workflow (no re-entry for recurring customers)
 - [x] [P1] Kanban workflow for commissions (new, scoped, in-progress, review, done)
 - [x] [P1] Header banner management (message, CTA, active window)
-- [~] [P1] Announcements management (prominent site notices with schedule, priority, and audience targeting)
+- [x] [P1] Announcements management (prominent site notices with schedule, priority, and audience targeting)
 - [~] [P2] News/blog editorial workflow (draft/review/publish, authoring metadata)
 
 ### Public App
@@ -171,9 +171,9 @@ This file is the single source of truth for roadmap and delivery progress.
 
 ### News / Blog (Secondary Track)
 
-- [~] [P1] News/blog content type (editorial content for artist updates and process posts)
-- [~] [P1] Admin list/editor for news posts
-- [~] [P1] Public news index + detail pages
+- [x] [P1] News/blog content type (editorial content for artist updates and process posts)
+- [x] [P1] Admin list/editor for news posts
+- [x] [P1] Public news index + detail pages
 - [ ] [P2] Tag/category and basic archive support
 
 ### Testing
@@ -369,6 +369,7 @@ This file is the single source of truth for roadmap and delivery progress.
 - [2026-02-12] Navigation management completed: admin `/navigation` now supports menu update/delete controls, nested item parent selection via menu-local dropdown, and full order/visibility updates across menus and items.
 - [2026-02-12] Users management baseline completed: admin `/users` now supports managed user creation, role changes (`admin/editor/manager`), status changes (ban/unban), and protected/system guardrails for role-change/delete/ban actions.
 - [2026-02-12] Commissions management completed: admin kanban cards now include inline detail editing (assignee/customer/budget/due date/notes), linked-artwork references via `linkedArtworkIds`, and creation/edit flows use assignable users instead of raw ID entry.
+- [2026-02-12] Announcements/news completed: announcements now support locale audience targeting (`targetLocales`) with public locale-aware rendering, and homepage news list now uses locale-aware published posts only.
 - [2026-02-12] Public UX pass: commission request flow now reports explicit invalid budget range errors, and header navigation now falls back to localized defaults (`home`, `portfolio`, `news`, `commissions`) when no CMS menu exists; seed data now creates those default menu entries.
 - [2026-02-12] Added `e2e/public-rendering.pw.ts` web coverage for fallback navigation visibility, portfolio routes, and commission submission validation (invalid budget range + successful submission path).
 - [2026-02-12] Testing execution is temporarily paused for delivery velocity: root test scripts are stubbed and CI test steps are disabled; all testing backlog is consolidated under `MVP 3: Testing and Quality`.
diff --git a/apps/admin/src/app/announcements/page.tsx b/apps/admin/src/app/announcements/page.tsx
index 95129fd..1084ffd 100644
--- a/apps/admin/src/app/announcements/page.tsx
+++ b/apps/admin/src/app/announcements/page.tsx
@@ -14,6 +14,7 @@ import { requirePermissionForRoute } from "@/lib/route-guards"
 export const dynamic = "force-dynamic"
 
 type SearchParamsInput = Record<string, string | string[] | undefined>
+const SUPPORTED_LOCALES = ["de", "en", "es", "fr"] as const
 
 function readFirstValue(value: string | string[] | undefined): string | null {
   if (Array.isArray(value)) {
@@ -49,6 +50,22 @@ function readNullableDate(formData: FormData, field: string): Date | null {
   return parsed
 }
 
+function readLocaleSelections(formData: FormData, field: string): string[] {
+  const values = formData.getAll(field)
+  const locales = new Set<string>()
+
+  for (const value of values) {
+    if (
+      typeof value === "string" &&
+      SUPPORTED_LOCALES.includes(value as (typeof SUPPORTED_LOCALES)[number])
+    ) {
+      locales.add(value)
+    }
+  }
+
+  return Array.from(locales)
+}
+
 function readInt(formData: FormData, field: string, fallback = 100): number {
   const value = readInputString(formData, field)
 
@@ -94,6 +111,7 @@ async function createAnnouncementAction(formData: FormData) {
       title: readInputString(formData, "title"),
       message: readInputString(formData, "message"),
       placement: readInputString(formData, "placement"),
+      targetLocales: readLocaleSelections(formData, "targetLocales"),
       priority: readInt(formData, "priority", 100),
       ctaLabel: readNullableString(formData, "ctaLabel"),
       ctaHref: readNullableString(formData, "ctaHref"),
@@ -125,6 +143,7 @@ async function updateAnnouncementAction(formData: FormData) {
       title: readInputString(formData, "title"),
       message: readInputString(formData, "message"),
       placement: readInputString(formData, "placement"),
+      targetLocales: readLocaleSelections(formData, "targetLocales"),
       priority: readInt(formData, "priority", 100),
       ctaLabel: readNullableString(formData, "ctaLabel"),
       ctaHref: readNullableString(formData, "ctaHref"),
@@ -277,6 +296,20 @@ export default async function AnnouncementsPage({
               />
             </label>
           </div>
+          <div className="space-y-1">
+            <p className="text-xs text-neutral-600">Target locales (empty = all locales)</p>
+            <div className="flex flex-wrap gap-3">
+              {SUPPORTED_LOCALES.map((locale) => (
+                <label
+                  key={`create-locale-${locale}`}
+                  className="inline-flex items-center gap-2 text-sm"
+                >
+                  <input name="targetLocales" type="checkbox" value={locale} className="size-4" />
+                  {locale.toUpperCase()}
+                </label>
+              ))}
+            </div>
+          </div>
           <div className="grid gap-3 md:grid-cols-2">
             <label className="space-y-1">
               <span className="text-xs text-neutral-600">Starts at</span>
@@ -390,6 +423,26 @@ export default async function AnnouncementsPage({
                   />
                 </label>
               </div>
+              <div className="mt-3 space-y-1">
+                <p className="text-xs text-neutral-600">Target locales (empty = all locales)</p>
+                <div className="flex flex-wrap gap-3">
+                  {SUPPORTED_LOCALES.map((locale) => (
+                    <label
+                      key={`${announcement.id}-locale-${locale}`}
+                      className="inline-flex items-center gap-2 text-sm"
+                    >
+                      <input
+                        name="targetLocales"
+                        type="checkbox"
+                        value={locale}
+                        defaultChecked={announcement.targetLocales.includes(locale)}
+                        className="size-4"
+                      />
+                      {locale.toUpperCase()}
+                    </label>
+                  ))}
+                </div>
+              </div>
               <div className="mt-3 flex flex-wrap items-center justify-between gap-3">
                 <label className="inline-flex items-center gap-2 text-sm text-neutral-700">
                   <input
diff --git a/apps/web/src/app/[locale]/layout.tsx b/apps/web/src/app/[locale]/layout.tsx
index 1f7eec6..b2c8226 100644
--- a/apps/web/src/app/[locale]/layout.tsx
+++ b/apps/web/src/app/[locale]/layout.tsx
@@ -52,7 +52,7 @@ export default async function LocaleLayout({ children, params }: LocaleLayoutPro
     <NextIntlClientProvider locale={locale}>
       <Providers>
         <PublicHeaderBanner banner={banner} />
-        <PublicAnnouncements placement="global_top" />
+        <PublicAnnouncements placement="global_top" locale={locale} />
         <PublicSiteHeader />
         <main>{children}</main>
         <PublicSiteFooter />
diff --git a/apps/web/src/app/[locale]/page.tsx b/apps/web/src/app/[locale]/page.tsx
index 2f4f4cd..d01d955 100644
--- a/apps/web/src/app/[locale]/page.tsx
+++ b/apps/web/src/app/[locale]/page.tsx
@@ -1,4 +1,4 @@
-import { getPublishedPageBySlugForLocale, listPosts } from "@cms/db"
+import { getPublishedPageBySlugForLocale, listPostsForLocale } from "@cms/db"
 import { getTranslations } from "next-intl/server"
 import { PublicAnnouncements } from "@/components/public-announcements"
 import { PublicPageView } from "@/components/public-page-view"
@@ -15,14 +15,14 @@ export default async function HomePage({ params }: HomePageProps) {
 
   const [homePage, posts, t] = await Promise.all([
     getPublishedPageBySlugForLocale("home", locale),
-    listPosts(),
+    listPostsForLocale(locale),
     getTranslations("Home"),
   ])
 
   return (
     <section>
       {homePage ? <PublicPageView page={homePage} /> : null}
-      <PublicAnnouncements placement="homepage" />
+      <PublicAnnouncements placement="homepage" locale={locale} />
 
       <section className="mx-auto flex w-full max-w-6xl flex-col gap-6 px-6 py-6 pb-16">
         <header className="space-y-3">
diff --git a/apps/web/src/components/public-announcements.tsx b/apps/web/src/components/public-announcements.tsx
index 33bf8fe..aeaa2d2 100644
--- a/apps/web/src/components/public-announcements.tsx
+++ b/apps/web/src/components/public-announcements.tsx
@@ -3,6 +3,7 @@ import Link from "next/link"
 
 type PublicAnnouncementsProps = {
   placement: "global_top" | "homepage"
+  locale?: string
 }
 
 function AnnouncementCard({ announcement }: { announcement: PublicAnnouncement }) {
@@ -22,8 +23,8 @@ function AnnouncementCard({ announcement }: { announcement: PublicAnnouncement }
   )
 }
 
-export async function PublicAnnouncements({ placement }: PublicAnnouncementsProps) {
-  const announcements = await listActiveAnnouncements(placement)
+export async function PublicAnnouncements({ placement, locale }: PublicAnnouncementsProps) {
+  const announcements = await listActiveAnnouncements(placement, new Date(), locale)
 
   if (announcements.length === 0) {
     return null
diff --git a/packages/content/src/announcements.ts b/packages/content/src/announcements.ts
index 518520a..877cf5a 100644
--- a/packages/content/src/announcements.ts
+++ b/packages/content/src/announcements.ts
@@ -1,11 +1,13 @@
 import { z } from "zod"
 
 export const announcementPlacementSchema = z.enum(["global_top", "homepage"])
+export const announcementLocaleSchema = z.enum(["de", "en", "es", "fr"])
 
 export const createAnnouncementInputSchema = z.object({
   title: z.string().min(1).max(180),
   message: z.string().min(1).max(500),
   placement: announcementPlacementSchema.default("global_top"),
+  targetLocales: z.array(announcementLocaleSchema).default([]),
   priority: z.number().int().min(0).default(100),
   ctaLabel: z.string().max(120).nullable().optional(),
   ctaHref: z.string().max(500).nullable().optional(),
@@ -19,6 +21,7 @@ export const updateAnnouncementInputSchema = z.object({
   title: z.string().min(1).max(180).optional(),
   message: z.string().min(1).max(500).optional(),
   placement: announcementPlacementSchema.optional(),
+  targetLocales: z.array(announcementLocaleSchema).optional(),
   priority: z.number().int().min(0).optional(),
   ctaLabel: z.string().max(120).nullable().optional(),
   ctaHref: z.string().max(500).nullable().optional(),
diff --git a/packages/db/prisma/migrations/20260213014500_announcement_locale_targeting/migration.sql b/packages/db/prisma/migrations/20260213014500_announcement_locale_targeting/migration.sql
new file mode 100644
index 0000000..81d8925
--- /dev/null
+++ b/packages/db/prisma/migrations/20260213014500_announcement_locale_targeting/migration.sql
@@ -0,0 +1,2 @@
+ALTER TABLE "Announcement"
+ADD COLUMN "targetLocales" TEXT[] NOT NULL DEFAULT ARRAY[]::TEXT[];
diff --git a/packages/db/prisma/schema.prisma b/packages/db/prisma/schema.prisma
index 443329a..d81dfda 100644
--- a/packages/db/prisma/schema.prisma
+++ b/packages/db/prisma/schema.prisma
@@ -405,6 +405,7 @@ model Announcement {
   title     String
   message   String
   placement String
+  targetLocales String[] @default([])
   priority  Int      @default(100)
   ctaLabel  String?
   ctaHref   String?
diff --git a/packages/db/src/announcements.test.ts b/packages/db/src/announcements.test.ts
index 50edf16..ffed744 100644
--- a/packages/db/src/announcements.test.ts
+++ b/packages/db/src/announcements.test.ts
@@ -41,13 +41,18 @@ describe("announcements service", () => {
   it("queries only visible announcements in the given placement", async () => {
     mockDb.announcement.findMany.mockResolvedValue([])
 
-    await listActiveAnnouncements("homepage")
+    await listActiveAnnouncements("homepage", new Date("2026-02-12T10:00:00.000Z"), "en")
 
     expect(mockDb.announcement.findMany).toHaveBeenCalledTimes(1)
     expect(mockDb.announcement.findMany.mock.calls[0]?.[0]).toMatchObject({
       where: {
         placement: "homepage",
         isVisible: true,
+        AND: [
+          {
+            OR: [{ targetLocales: { isEmpty: true } }, { targetLocales: { has: "en" } }],
+          },
+        ],
       },
     })
   })
diff --git a/packages/db/src/announcements.ts b/packages/db/src/announcements.ts
index b95904d..5aa47f5 100644
--- a/packages/db/src/announcements.ts
+++ b/packages/db/src/announcements.ts
@@ -13,6 +13,7 @@ export type PublicAnnouncement = {
   ctaLabel: string | null
   ctaHref: string | null
   placement: string
+  targetLocales: string[]
   priority: number
 }
 
@@ -50,13 +51,26 @@ export async function deleteAnnouncement(id: string) {
 export async function listActiveAnnouncements(
   placement: AnnouncementPlacement,
   now = new Date(),
+  locale?: string,
 ): Promise<PublicAnnouncement[]> {
+  const localeFilter =
+    locale && locale.length > 0
+      ? {
+          AND: [
+            {
+              OR: [{ targetLocales: { isEmpty: true } }, { targetLocales: { has: locale } }],
+            },
+          ],
+        }
+      : undefined
+
   const announcements = await db.announcement.findMany({
     where: {
       placement,
       isVisible: true,
       OR: [{ startsAt: null }, { startsAt: { lte: now } }],
       AND: [{ OR: [{ endsAt: null }, { endsAt: { gte: now } }] }],
+      ...(localeFilter ?? {}),
     },
     orderBy: [{ priority: "asc" }, { createdAt: "desc" }],
     select: {
@@ -66,6 +80,7 @@ export async function listActiveAnnouncements(
       ctaLabel: true,
       ctaHref: true,
       placement: true,
+      targetLocales: true,
       priority: true,
     },
   })