@aiquants/daily-report 0.6.0 → 0.6.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiquants/daily-report",
-  "version": "0.6.0",
+  "version": "0.6.2",
   "description": "Reusable daily-report feature package: shared types/schemas, React (Router v7) UI with virtual scrolling + optimistic updates + SSE sync, and a drizzle (mssql) server layer with DI ports (auth, user resolution, redis, external sources).",
   "sideEffects": [
     "**/*.css"
@@ -73,7 +73,7 @@
     "vitest": "^4.1.8",
     "zod": "^3.25.76",
     "@aiquants/swipe-overlay": "1.2.4",
-    "@aiquants/virtualscroll": "1.19.1"
+    "@aiquants/virtualscroll": "1.19.3"
   },
   "peerDependencies": {
     "drizzle-orm": ">=1.0.0-beta.4 <2.0.0",
@@ -82,7 +82,7 @@
     "react-router": "^7.0.0",
     "zod": ">=3.25.0 <5.0.0",
     "@aiquants/swipe-overlay": "^1.2.4",
-    "@aiquants/virtualscroll": "^1.19.1"
+    "@aiquants/virtualscroll": "^1.19.3"
   },
   "peerDependenciesMeta": {
     "drizzle-orm": {

package/src/client/components/daily-report-detail-list.tsx

@@ -78,13 +78,15 @@ type DailyReportDetailListProps = {
     userId?: string | null
     selectedItemId?: number | null
     onSelectItem?: (id: number | null) => void
+    initialScrollOffset?: number
+    onScrollOffsetChange?: (offset: number) => void
 }
 
 /**
  * Daily report detail cards rendered with dynamic height virtual scroll.
  * 動的高さの仮想スクロールで日報詳細カードを描画するコンポーネント。
  */
-export const DailyReportDetailList = ({ dailyReportItems, userId, selectedItemId, onSelectItem }: DailyReportDetailListProps) => {
+export const DailyReportDetailList = ({ dailyReportItems, userId, selectedItemId, onSelectItem, initialScrollOffset, onScrollOffsetChange }: DailyReportDetailListProps) => {
     const [itemHeights, setItemHeights] = useState<Map<number, number>>(new Map())
     const scrollContainerRef = useRef<HTMLDivElement | null>(null)
     const virtualScrollRef = useRef<VirtualScrollHandle>(null)
@@ -182,6 +184,10 @@ export const DailyReportDetailList = ({ dailyReportItems, userId, selectedItemId
     )
 
     const handleScroll = useCallback(() => {
+        if (virtualScrollRef.current && onScrollOffsetChange) {
+            onScrollOffsetChange(virtualScrollRef.current.getScrollPosition())
+        }
+
         const container = scrollContainerRef.current
         if (!container) return
 
@@ -199,7 +205,15 @@ export const DailyReportDetailList = ({ dailyReportItems, userId, selectedItemId
             }
             scrollEndTimerRef.current = null
         }, 150)
-    }, [])
+    }, [onScrollOffsetChange])
+
+    useEffect(() => {
+        return () => {
+            if (virtualScrollRef.current && onScrollOffsetChange) {
+                onScrollOffsetChange(virtualScrollRef.current.getScrollPosition())
+            }
+        }
+    }, [onScrollOffsetChange])
 
     const renderThumbOverlay = useCallback((props: ScrollBarThumbOverlayRenderProps) => <BusinessDayThumbOverlay {...props} label={overlayLabel} isWheelScrollActive={isWheelScrollActive} />, [overlayLabel, isWheelScrollActive])
 
@@ -294,6 +308,7 @@ export const DailyReportDetailList = ({ dailyReportItems, userId, selectedItemId
                     getItemKey={getItemKey}
                     getItemHeight={getItemHeight}
                     viewportSize={viewportHeight}
+                    initialScrollOffset={initialScrollOffset}
                     overscanCount={VIRTUAL_SCROLL_OVERSCAN_COUNT}
                     scrollBarOptions={{
                         width: 8,
@@ -563,7 +578,12 @@ const DailyReportResolvedItem = ({ item, report, onCommentAdded, userId, onDoubl
     // 表示中ユーザーはアクションコンテキストから取得する (root loader 非依存)
     const { toggleStar, toggleRead, pendingStarUpdates, pendingReadUpdates, deleteReport, user } = useDailyReportActionContext()
     const { uiComments, handleAddComment, handleDeleteComment, pendingDeleteId, setPendingDeleteId, resolvedIdMap } = useDailyReportComments(report, user, userId)
-    const { fieldLabels } = useDailyReportConfig()
+    const { fieldLabels, sourceTypeConfigs } = useDailyReportConfig()
+
+    const sourceType = item.sourceType ?? report?.sourceType
+    const sourceConfig = resolveSourceTypeConfig(sourceType, sourceTypeConfigs)
+    const isExternalSource = sourceType ? sourceType.toLowerCase() !== "internal" : false
+    const canComment = sourceConfig?.allowComment ?? !isExternalSource
 
     const handleAddCommentWrapper = async (content: string) => {
         await handleAddComment(content)
@@ -667,9 +687,11 @@ const DailyReportResolvedItem = ({ item, report, onCommentAdded, userId, onDoubl
                                 />
                             </div>
                         )}
-                        <div className="mt-auto" ref={formContainerRef}>
-                            <DailyReportCommentForm reportHubId={report.reportHubId} businessDate={report.date ?? ""} onAddComment={handleAddCommentWrapper} />
-                        </div>
+                        {canComment && (
+                            <div className="mt-auto" ref={formContainerRef}>
+                                <DailyReportCommentForm reportHubId={report.reportHubId} businessDate={report.date ?? ""} onAddComment={handleAddCommentWrapper} />
+                            </div>
+                        )}
                     </div>
                     <MetadataPanel report={report} visitTimeDisplay={visitTimeDisplay} categoryLabel={categoryLabel} fieldLabels={fieldLabels} />
                 </div>

package/src/client/components/daily-report-list.tsx

@@ -47,6 +47,8 @@ type DailyReportListProps = {
     selectedReportHubId: number | null
     onSelectItem: (reportHubId: number | null) => void
     userId?: string | null
+    initialScrollOffset?: number
+    onScrollOffsetChange?: (offset: number) => void
 }
 
 /**
@@ -228,7 +230,7 @@ const useAutoRead = (report: DailyReportDetail | null, isLoading: boolean, autoM
  * Daily report list cards with key metadata and preview content via virtual scrolling.
  * 主なメタデータと内容プレビューを仮想スクロール表示する日報リスト。
  */
-export const DailyReportList = ({ dailyReportItems, initialSelectedBusinessDate = null, initialSelectedReportHubId = null, autoMarkRead = false, selectedReportHubId, onSelectItem, userId }: DailyReportListProps) => {
+export const DailyReportList = ({ dailyReportItems, initialSelectedBusinessDate = null, initialSelectedReportHubId = null, autoMarkRead = false, selectedReportHubId, onSelectItem, userId, initialScrollOffset, onScrollOffsetChange }: DailyReportListProps) => {
     const scrollContainerRef = useRef<HTMLDivElement | null>(null)
     const virtualScrollRef = useRef<VirtualScrollHandle>(null)
     const { viewportHeight, updateViewportHeight } = useDynamicViewportHeight(scrollContainerRef)
@@ -400,6 +402,10 @@ export const DailyReportList = ({ dailyReportItems, initialSelectedBusinessDate
     )
 
     const handleScroll = useCallback(() => {
+        if (virtualScrollRef.current && onScrollOffsetChange) {
+            onScrollOffsetChange(virtualScrollRef.current.getScrollPosition())
+        }
+
         const container = scrollContainerRef.current
         if (!container) return
 
@@ -417,7 +423,15 @@ export const DailyReportList = ({ dailyReportItems, initialSelectedBusinessDate
             }
             scrollEndTimerRef.current = null
         }, 150)
-    }, [])
+    }, [onScrollOffsetChange])
+
+    useEffect(() => {
+        return () => {
+            if (virtualScrollRef.current && onScrollOffsetChange) {
+                onScrollOffsetChange(virtualScrollRef.current.getScrollPosition())
+            }
+        }
+    }, [onScrollOffsetChange])
 
     const renderThumbOverlay = useCallback((props: ScrollBarThumbOverlayRenderProps) => <BusinessDayThumbOverlay {...props} label={overlayLabel} isWheelScrollActive={isWheelScrollActive} />, [overlayLabel, isWheelScrollActive])
 
@@ -431,6 +445,7 @@ export const DailyReportList = ({ dailyReportItems, initialSelectedBusinessDate
                         getItem={getItem}
                         getItemHeight={getItemHeight}
                         viewportSize={viewportHeight}
+                        initialScrollOffset={initialScrollOffset}
                         overscanCount={VIRTUAL_SCROLL_OVERSCAN_COUNT}
                         scrollBarOptions={{
                             width: SCROLL_BAR_WIDTH,
@@ -648,6 +663,7 @@ const DailyReportDisplayPane = ({
     report,
     isLoading,
     error,
+    selectedItem,
     autoMarkRead = false,
     isActive = true,
     onCommentAdded,
@@ -666,12 +682,17 @@ const DailyReportDisplayPane = ({
 }) => {
     // 表示中ユーザーはアクションコンテキストから取得する (root loader 非依存)
     const { toggleStar, toggleRead, deleteReport, user } = useDailyReportActionContext()
-    const { fieldLabels } = useDailyReportConfig()
+    const { fieldLabels, sourceTypeConfigs } = useDailyReportConfig()
 
     // Use custom hook for comments
     const { uiComments, handleAddComment, handleDeleteComment, pendingDeleteId, setPendingDeleteId, resolvedIdMap } = useDailyReportComments(report, user, userId)
     const { handleToggleRead } = useAutoRead(report, isLoading, autoMarkRead, isActive, toggleRead)
 
+    const sourceType = selectedItem.sourceType ?? report?.sourceType
+    const sourceConfig = resolveSourceTypeConfig(sourceType, sourceTypeConfigs)
+    const isExternalSource = sourceType ? sourceType.toLowerCase() !== "internal" : false
+    const canComment = sourceConfig?.allowComment ?? !isExternalSource
+
     // Auto-scroll to bottom when comments are added (e.g. via SSE)
     const prevReportHubIdRef = useRef<number | null>(null)
     const prevCommentsLengthRef = useRef(uiComments.length)
@@ -804,7 +825,7 @@ const DailyReportDisplayPane = ({
                             resolvedIdMap={resolvedIdMap}
                         />
                     )}
-                    <DailyReportCommentForm reportHubId={report.reportHubId} businessDate={report.date ?? ""} onAddComment={handleAddCommentWrapper} />
+                    {canComment && <DailyReportCommentForm reportHubId={report.reportHubId} businessDate={report.date ?? ""} onAddComment={handleAddCommentWrapper} />}
                 </div>
             )}
         </div>

package/src/client/components/daily-report-resolved-content.tsx

@@ -1,6 +1,6 @@
 import { Plus, RefreshCw, RotateCw } from "lucide-react"
 import type { ReactNode } from "react"
-import { useEffect, useMemo, useState } from "react"
+import { useCallback, useEffect, useMemo, useRef, useState } from "react"
 import { useSearchParams } from "react-router"
 import type { DailyReportItem } from "../../shared/types"
 import { useDailyReportConfig } from "../config-context"
@@ -31,6 +31,18 @@ export const DailyReportResolvedContent = ({ dailyReportItems: _initialItems, us
     const { isSseEnabled, toggleSse, createReport, items: dailyReportItems, refetchData, clearCacheAndRefetch } = useDailyReportActionContext()
     const [searchParams] = useSearchParams()
 
+    // 各タブのスクロール位置をアンマウント後も保持する Ref
+    const listScrollOffsetRef = useRef<number>(0)
+    const detailListScrollOffsetRef = useRef<number>(0)
+
+    const handleListScrollOffsetChange = useCallback((offset: number) => {
+        listScrollOffsetRef.current = offset
+    }, [])
+
+    const handleDetailListScrollOffsetChange = useCallback((offset: number) => {
+        detailListScrollOffsetRef.current = offset
+    }, [])
+
     // 選択状態の管理 (タブ間で共有)
     const [selectedItemId, setSelectedItemId] = useState<number | null>(() => {
         if (dailyReportItems.length === 0) return null
@@ -78,7 +90,17 @@ export const DailyReportResolvedContent = ({ dailyReportItems: _initialItems, us
             {
                 value: "list",
                 label: "📄 List",
-                content: <DailyReportList dailyReportItems={dailyReportItems} autoMarkRead={autoMarkRead} selectedReportHubId={selectedItemId} onSelectItem={setSelectedItemId} userId={userId} />,
+                content: (
+                    <DailyReportList
+                        dailyReportItems={dailyReportItems}
+                        autoMarkRead={autoMarkRead}
+                        selectedReportHubId={selectedItemId}
+                        onSelectItem={setSelectedItemId}
+                        userId={userId}
+                        initialScrollOffset={listScrollOffsetRef.current}
+                        onScrollOffsetChange={handleListScrollOffsetChange}
+                    />
+                ),
             },
             {
                 value: "tree",
@@ -88,10 +110,12 @@ export const DailyReportResolvedContent = ({ dailyReportItems: _initialItems, us
             {
                 value: "detailList",
                 label: "📋 DetailList",
-                content: <DailyReportDetailList dailyReportItems={dailyReportItems} userId={userId} selectedItemId={selectedItemId} onSelectItem={setSelectedItemId} />,
+                content: (
+                    <DailyReportDetailList dailyReportItems={dailyReportItems} userId={userId} selectedItemId={selectedItemId} onSelectItem={setSelectedItemId} initialScrollOffset={detailListScrollOffsetRef.current} onScrollOffsetChange={handleDetailListScrollOffsetChange} />
+                ),
             },
         ],
-        [dailyReportItems, autoMarkRead, selectedItemId, userId],
+        [dailyReportItems, autoMarkRead, selectedItemId, userId, handleListScrollOffsetChange, handleDetailListScrollOffsetChange],
     )
 
     return (

package/src/client/config-context.tsx

@@ -42,6 +42,8 @@ export type DailyReportFieldLabels = {
 export type SourceTypeConfig = {
     label: string
     badgeClassName?: string
+    /** コメント投稿を許可するかどうか (既定 true)。false の場合、該当ソースの日報でコメント投稿フォームを非表示にする。 */
+    allowComment?: boolean
 }
 
 /** クライアント層の設定一式。 */

package/src/client/contexts/daily-report-action-context.tsx

@@ -163,10 +163,14 @@ export const DailyReportActionProvider = ({ children, user, initialItems = [], u
         try {
             const formData = new FormData()
             formData.append("intent", "clearCache")
-            await fetch(`${apiBasePath}/action`, {
+            const res = await fetch(`${apiBasePath}/action`, {
                 method: "POST",
                 body: formData,
             })
+            if (!res.ok) {
+                const errData = await res.json().catch(() => null)
+                logger.warn("[DailyReportActionProvider] Failed to clear server-side cache:", res.status, errData)
+            }
         } catch (e) {
             logger.warn("[DailyReportActionProvider] Failed to clear server-side cache:", e)
         }

package/src/client/route-helpers.ts

@@ -35,8 +35,13 @@ export const dailyReportShouldRevalidate: ShouldRevalidateFunction = ({ actionRe
  * Fetches the deferred daily report id list from the API endpoint.
  * API エンドポイントから日報 ID 一覧を遅延取得する処理。
  */
-export const fetchDailyReportIds = (apiBasePath: string = defaultDailyReportClientConfig.apiBasePath): Promise<DailyReportItem[]> =>
-    fetch(`${apiBasePath}/ids`, {
+export const fetchDailyReportIds = (apiBasePath: string = defaultDailyReportClientConfig.apiBasePath, forceRefresh = false): Promise<DailyReportItem[]> => {
+    const url = new URL(`${apiBasePath}/ids`, typeof window !== "undefined" ? window.location.origin : "http://localhost")
+    if (forceRefresh) {
+        url.searchParams.set("forceRefresh", "true")
+        url.searchParams.set("_t", Date.now().toString())
+    }
+    return fetch(url.toString(), {
         method: "GET",
         headers: { "Content-Type": "application/json" },
         cache: "no-cache",
@@ -54,6 +59,7 @@ export const fetchDailyReportIds = (apiBasePath: string = defaultDailyReportClie
             }
             return data.ids as DailyReportItem[]
         })
+}
 
 /**
  * Creates a React Router clientLoader that merges server data with deferred report ids.

package/src/server/authz.spec.ts

@@ -0,0 +1,57 @@
+/**
+ * Unit tests for defineDailyReportAuthzResources & seedDailyReportAuthzResources in @aiquants/daily-report/server.
+ */
+import { describe, expect, it } from "vitest"
+import { defineDailyReportAuthzResources, seedDailyReportAuthzResources } from "./authz"
+
+describe("defineDailyReportAuthzResources", () => {
+    it("generates neutral default resources when no sources specified", () => {
+        const res = defineDailyReportAuthzResources()
+        expect(res).toHaveLength(4) // internal + internal_comment + external + external_comment
+        expect(res[0].resourceKey).toBe("daily_report_internal")
+        expect(res[1].resourceKey).toBe("daily_report_internal_comment")
+    })
+
+    it("generates custom resources from source inputs without domain hardcoding", () => {
+        const res = defineDailyReportAuthzResources([
+            { key: "ORG", name: "Original", description: "Original daily reports" },
+            { key: "NI", name: "NI", description: "NI daily reports", includeCommentResource: false },
+        ])
+        expect(res).toHaveLength(3) // ORG + ORG_comment + NI (no comment)
+        expect(res[0].resourceKey).toBe("daily_report_org")
+        expect(res[1].resourceKey).toBe("daily_report_org_comment")
+        expect(res[2].resourceKey).toBe("daily_report_ni")
+    })
+})
+
+describe("seedDailyReportAuthzResources", () => {
+    it("idempotently seeds resources into TMResource table", async () => {
+        const seeded: Record<string, unknown>[] = []
+
+        const fakeDb = {
+            select: () => ({
+                from: () => ({
+                    where: async () => [],
+                }),
+            }),
+            insert: () => ({
+                values: async (v: unknown) => {
+                    seeded.push(v as Record<string, unknown>)
+                },
+            }),
+        }
+
+        const fakeAuthzTables = {
+            TMResource: { appKey: "appKey", resourceKey: "resourceKey" },
+        }
+
+        await seedDailyReportAuthzResources(fakeDb, fakeAuthzTables, {
+            appKey: "quants",
+            sources: [{ key: "sales", name: "Sales" }],
+        })
+
+        expect(seeded.length).toBe(2)
+        expect(seeded[0].appKey).toBe("quants")
+        expect(seeded[0].resourceKey).toBe("daily_report_sales")
+    })
+})

package/src/server/authz.ts

@@ -0,0 +1,99 @@
+/**
+ * Authz helper utilities for @aiquants/daily-report: standard resource definitions & auto-seeding.
+ * @aiquants/daily-report 用の認可ヘルパー。標準リソース定義および自動シード機能を提供。
+ */
+import { and, eq } from "drizzle-orm"
+
+export type AuthzResourceItem = {
+    resourceKey: string
+    name: string
+    description?: string | null
+}
+
+export type DailyReportSourceTypeInput = {
+    key: string
+    name: string
+    description?: string | null
+    includeCommentResource?: boolean
+}
+
+/**
+ * Dynamically builds neutral Authz resource definitions from provided source type inputs.
+ * 指定されたソース種別定義から中立な認可リソース定義リストを生成するファクトリ。
+ */
+export function defineDailyReportAuthzResources(sources?: DailyReportSourceTypeInput[]): AuthzResourceItem[] {
+    const list: AuthzResourceItem[] = []
+    const targetSources =
+        sources && sources.length > 0
+            ? sources
+            : [
+                  { key: "internal", name: "Internal", description: "Internal daily reports" },
+                  { key: "external", name: "External", description: "External daily reports" },
+              ]
+
+    for (const src of targetSources) {
+        const keyLower = src.key.toLowerCase().replace(/[^a-z0-9_]/g, "_")
+        const resourceKey = `daily_report_${keyLower}`
+        list.push({
+            resourceKey,
+            name: src.name,
+            description: src.description ?? `${src.name} daily report access`,
+        })
+
+        if (src.includeCommentResource !== false) {
+            list.push({
+                resourceKey: `${resourceKey}_comment`,
+                name: `${src.name} Comment`,
+                description: `${src.name} daily report comment access`,
+            })
+        }
+    }
+
+    return list
+}
+
+type DbSelectChain = {
+    from(t: unknown): DbSelectChain
+    where(cond: unknown): PromiseLike<unknown[]>
+}
+type DbInsertChain = {
+    values(v: unknown): PromiseLike<unknown>
+}
+type LooseDb = {
+    select(fields?: unknown): DbSelectChain
+    insert(t: unknown): DbInsertChain
+}
+
+/**
+ * Ensures all daily-report standard resources exist in the authz TMResource table idempotently.
+ * authz データベース内に日報機能の標準認可リソースが存在することを自動保証（冪等シード）する処理。
+ */
+export async function seedDailyReportAuthzResources(db: unknown, authzTables: { TMResource: unknown }, opts: { appKey: string; actor?: string; sources?: DailyReportSourceTypeInput[]; resources?: AuthzResourceItem[] }): Promise<void> {
+    const d = db as LooseDb
+    const TMResource = authzTables.TMResource as Record<string, unknown>
+    const appKey = opts.appKey
+    const actor = opts.actor ?? "system:daily-report"
+    const now = new Date()
+
+    const resourceList = opts.resources ?? defineDailyReportAuthzResources(opts.sources)
+
+    for (const res of resourceList) {
+        const existing = await d
+            .select()
+            .from(TMResource)
+            .where(and(eq(TMResource.appKey as never, appKey as never), eq(TMResource.resourceKey as never, res.resourceKey as never)))
+
+        if (!existing || existing.length === 0) {
+            await d.insert(TMResource).values({
+                appKey,
+                resourceKey: res.resourceKey,
+                name: res.name,
+                description: res.description ?? null,
+                createdAt: now,
+                createdBy: actor,
+                updatedAt: now,
+                updatedBy: actor,
+            })
+        }
+    }
+}

package/src/server/handlers.ts

@@ -190,6 +190,11 @@ export function createDailyReportHandlers(config: DailyReportHandlersConfig) {
         const operationTimestamp = Number(formData.get("operationTimestamp"))
         const clientTempId = formData.get("clientTempId") as string | null
 
+        if (intent === "clearCache") {
+            await service.clearCache()
+            return jsonData({ status: "OK", intent: "clearCache" })
+        }
+
         if (!clientTempId) {
             return jsonData({ error: "clientTempId required" }, { status: 400 })
         }
@@ -317,10 +322,6 @@ export function createDailyReportHandlers(config: DailyReportHandlersConfig) {
                     throw e
                 }
             }
-            case "clearCache": {
-                await service.clearCache()
-                return jsonData({ status: "OK", intent: "clearCache" })
-            }
             default:
                 return jsonData({ error: "Invalid intent" }, { status: 400 })
         }

package/src/server/service.ts

@@ -130,10 +130,11 @@ export type DailyReportServiceConfig = {
     /** クロスワーカー epoch ストア (facade が生成して注入)。 */
     epochs: EpochStore
     /**
-     * 下書きラベル名 (必須)。ドラフトのクロスユーザー可視性フィルタに使うため、
-     * サイレントな既定値を持たせず消費アプリが自 DB のラベル名を必ず注入する。
+     * 下書きラベル名 (単一または配列で指定可能)。
+     * 消費アプリ側で自 DB のラベル名や作成区分の候補名 ("下書き", "DRAFT" など) を注入できる。
      */
-    draftLabelName: string
+    draftLabelName?: string
+    draftLabelNames?: string[]
     /** SSE Redis Stream キー (既定 "daily-report:sse-stream")。 */
     streamKey?: string
     /** SSE Stream の MAXLEN (既定 10000)。 */
@@ -159,7 +160,8 @@ export function createDailyReportService(config: DailyReportServiceConfig) {
     const { db, tables, userTable: users, resolveUserId, encodeUserId, redis, cache: sqlResultCache, epochs } = config
     const { hub: DailyReportHub, internal: DailyReportInternal, comment: DailyReportCommentModel, label: DailyReportLabel, hubLabel: DailyReportHub_Label, userStatus: DailyReportUserStatus } = tables
     const externalSources = config.externalSources ?? []
-    const draftLabelName = config.draftLabelName
+    const draftLabelNames = config.draftLabelNames && config.draftLabelNames.length > 0 ? config.draftLabelNames : [config.draftLabelName ?? "下書き"]
+    const draftLabelName = draftLabelNames[0] ?? "下書き"
     const logger = config.logger ?? createLogger(LogLevel.INFO, "[DailyReportService]")
 
     const DAILY_REPORT_IDS_CACHE_KEY = "daily-report:ids"
@@ -318,9 +320,23 @@ export function createDailyReportService(config: DailyReportServiceConfig) {
             // Internal specific mappings if any
         }
 
-        const labelsRaw = row.labels ?? []
+        const labelsRaw = (row.labels ?? []).map((l) => ({
+            id: l.id,
+            name: l.name,
+            color: l.color,
+        }))
         const commentItemsRaw = row.comments ?? []
 
+        // 作成区分がアプリ設定の下書き候補に合致する場合、ラベル一覧に下書きラベルが含まれるよう補完
+        const isCreationCategoryDraft = creationCategory ? draftLabelNames.includes(creationCategory) : false
+        if (isCreationCategoryDraft && cachedDraftLabelId && !labelsRaw.some((l) => l.id === cachedDraftLabelId)) {
+            labelsRaw.push({
+                id: cachedDraftLabelId,
+                name: draftLabelName,
+                color: null,
+            })
+        }
+
         return {
             reportHubId: hub.id,
             date: formatDateValue(hub.businessDate, "YYYY-MM-DD"),
@@ -342,11 +358,7 @@ export function createDailyReportService(config: DailyReportServiceConfig) {
             comments,
             isRead: row.isRead ?? false,
             isStarred: row.isStarred ?? false,
-            labels: labelsRaw.map((l) => ({
-                id: l.id,
-                name: l.name,
-                color: l.color,
-            })),
+            labels: labelsRaw,
             commentItems: commentItemsRaw.map((c) => ({
                 ...c,
                 userId: encodeUserId(c.userId),
@@ -361,6 +373,7 @@ export function createDailyReportService(config: DailyReportServiceConfig) {
      */
     const fetchDailyReportIdsByUserId = async (userId: number): Promise<DailyReportItem[]> => {
         const DraftLabelRelation = aliasedTable(DailyReportHub_Label as unknown as Parameters<typeof aliasedTable>[0], "draft_label") as unknown as typeof DailyReportHub_Label
+        const draftLabelId = await getDraftLabelId()
 
         const result = await db
             .select<{ reportHubId: number; businessDate: Date | string | null; sourceType: string }>({
@@ -369,8 +382,8 @@ export function createDailyReportService(config: DailyReportServiceConfig) {
                 sourceType: DailyReportHub.sourceType,
             })
             .from(DailyReportHub)
-            .leftJoin(DraftLabelRelation, and(eq(DraftLabelRelation.hubId, DailyReportHub.id), eq(DraftLabelRelation.labelId, db.select({ id: DailyReportLabel.id }).top(1).from(DailyReportLabel).where(eq(DailyReportLabel.name, draftLabelName)))))
-            .where(and(isNull(DailyReportHub.deletedAt), or(eq(DailyReportHub.userId, userId), isNull(DraftLabelRelation.hubId))))
+            .leftJoin(DraftLabelRelation, and(eq(DraftLabelRelation.hubId, DailyReportHub.id), eq(DraftLabelRelation.labelId, draftLabelId ?? -1)))
+            .where(and(isNull(DailyReportHub.deletedAt), or(eq(DailyReportHub.userId, userId), isNull(DailyReportHub.userId), isNull(DraftLabelRelation.hubId))))
             .orderBy(desc(DailyReportHub.businessDate), desc(DailyReportHub.id))
 
         return result.map((item) => ({
@@ -484,7 +497,7 @@ export function createDailyReportService(config: DailyReportServiceConfig) {
     let cachedDraftLabelId: number | null = null
     const getDraftLabelId = async (): Promise<number | null> => {
         if (cachedDraftLabelId !== null) return cachedDraftLabelId
-        const [label] = await db.select<{ id: number }>({ id: DailyReportLabel.id }).top(1).from(DailyReportLabel).where(eq(DailyReportLabel.name, draftLabelName))
+        const [label] = await db.select<{ id: number }>({ id: DailyReportLabel.id }).top(1).from(DailyReportLabel).where(inArray(DailyReportLabel.name, draftLabelNames))
 
         if (label) {
             cachedDraftLabelId = label.id
@@ -867,6 +880,11 @@ export function createDailyReportService(config: DailyReportServiceConfig) {
      * 日報にコメントを追加する。
      */
     const addComment = async (userId: number, reportHubId: number, content: string, businessDate: string | null, clientTempId: string): Promise<DailyReportCommentItem> => {
+        const [hub] = await db.select<{ sourceType: string }>({ sourceType: DailyReportHub.sourceType }).top(1).from(DailyReportHub).where(eq(DailyReportHub.id, reportHubId))
+        if (hub && hub.sourceType.toLowerCase() !== "internal") {
+            throw new Error("Comments are restricted for external daily report sources")
+        }
+
         const [inserted] = await db
             .insert<DailyReportCommentRow>(DailyReportCommentModel)
             .output()

package/src/server.ts

@@ -9,6 +9,7 @@ import type { DailyReportAuthenticate } from "./server/ports"
 import { createDailyReportService, type DailyReportServiceConfig } from "./server/service"
 import { DailyReportSseReader } from "./server/sse-reader"
 
+export * from "./server/authz"
 export * from "./server/cache"
 export { generateETag } from "./server/etag"
 export * from "./server/external-source"