@aiquants/daily-report 0.4.0 → 0.5.0

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

@@ -3,11 +3,12 @@
  * 日報の楽観的 CRUD と SSE 同期を提供するアクションコンテキスト。
  */
 import { type Context, createContext, type ReactNode, useCallback, useContext, useEffect, useRef, useState } from "react"
+import { useRevalidator } from "react-router"
 import { createLogger, LogLevel } from "../../shared/logger"
 import type { DailyReportSseMessage } from "../../shared/sse-schema"
 import type { DailyReportCommentItem, DailyReportDetail, DailyReportItem, DailyReportUser } from "../../shared/types"
 import { useDailyReportConfig } from "../config-context"
-import { acquireMutationLock, applyDailyReportServerUpdates, deleteDailyReportCache, getCachedReport, registerRecentDeletion, releaseMutationLock, subscribeCacheReady, updateDailyReportCache, writeCache } from "../hooks/use-daily-report"
+import { acquireMutationLock, applyDailyReportServerUpdates, clearDailyReportCache, DailyReportCache, deleteDailyReportCache, getCachedReport, registerRecentDeletion, releaseMutationLock, subscribeCacheReady, updateDailyReportCache, writeCache } from "../hooks/use-daily-report"
 import { useDailyReportSseConnection } from "../hooks/use-daily-report-sse-connection"
 
 const logger = createLogger(LogLevel.INFO, "daily-report-action-context")
@@ -80,6 +81,10 @@ type DailyReportActionContextType = {
     deleteReport: (reportHubId: number, businessDate: string) => Promise<void>
     /** stale アイテムをリストから除去する安全弁 */
     removeStaleItem: (reportHubId: number) => void
+    /** データのみリロード (ページリロードなし) */
+    refetchData: () => Promise<void>
+    /** キャッシュを破棄してデータのみ再読み込み (ページリロードなし) */
+    clearCacheAndRefetch: () => Promise<void>
 }
 
 // HMR / dual-bundle (ESM+CJS) でもコンテキスト identity を一意に保つため、
@@ -132,6 +137,50 @@ export const DailyReportActionProvider = ({ children, user, initialItems = [], u
     /** 自分が発行したアクションのID（SSEエコー無視用） */
     const processedClientTempIds = useRef<Set<string>>(new Set())
 
+    const revalidator = useRevalidator()
+
+    const refetchData = useCallback(async () => {
+        logger.info("[DailyReportActionProvider] Refetching data without page reload...")
+        if (revalidator.state === "idle") {
+            revalidator.revalidate()
+        }
+        setVersion((v) => v + 1)
+        DailyReportCache.listeners.forEach((listener: (id: number) => void) => {
+            listener(-1)
+        })
+    }, [revalidator])
+
+    const clearCacheAndRefetch = useCallback(async () => {
+        logger.info("[DailyReportActionProvider] Clearing client & server/DB cache and refetching data without page reload...")
+        // 1. クライアント側キャッシュ破棄
+        clearDailyReportCache()
+        removedIds.current.clear()
+        try {
+            sessionStorage.clear()
+        } catch {}
+
+        // 2. サーバー/DB側キャッシュ破棄 API 呼び出し
+        try {
+            const formData = new FormData()
+            formData.append("intent", "clearCache")
+            await fetch(`${apiBasePath}/action`, {
+                method: "POST",
+                body: formData,
+            })
+        } catch (e) {
+            logger.warn("[DailyReportActionProvider] Failed to clear server-side cache:", e)
+        }
+
+        // 3. ルートローダーの再フェッチ & UI 再描画
+        if (revalidator.state === "idle") {
+            revalidator.revalidate()
+        }
+        setVersion((v) => v + 1)
+        DailyReportCache.listeners.forEach((listener: (id: number) => void) => {
+            listener(-1)
+        })
+    }, [apiBasePath, revalidator])
+
     /**
      * Queue for SSE messages that arrived before the target report was cached.
      * キャッシュ未取得時に到着した SSE メッセージの待機キュー。
@@ -703,6 +752,7 @@ export const DailyReportActionProvider = ({ children, user, initialItems = [], u
             createdAt: now,
             author: getUserDisplayName(user),
             userId: user?.id ?? "unknown",
+            sourceType: "Internal",
             employeeName: getUserDisplayName(user),
             updatedBy: getUserDisplayName(user),
             updatedAt: now,
@@ -903,6 +953,8 @@ export const DailyReportActionProvider = ({ children, user, initialItems = [], u
                 publishReport,
                 deleteReport,
                 removeStaleItem,
+                refetchData,
+                clearCacheAndRefetch,
             }}>
             {children}
         </DailyReportActionContext.Provider>

package/src/client/hooks/use-daily-report.ts

@@ -27,7 +27,7 @@ const FETCH_DEBOUNCE_MS = 120
 // --- Cache Store (Centralized State) ---
 type CacheEntry<T> = { data: T; expiresAt: number }
 
-const DailyReportCache = {
+export const DailyReportCache = {
     reports: new Map<number, CacheEntry<DailyReportDetail>>(),
     lists: new Map<string, CacheEntry<DailyReportDetail[]>>(),
     pendingLists: new Map<string, Promise<DailyReportDetail[]>>(),
@@ -58,6 +58,23 @@ const DailyReportCache = {
         }
     },
 
+    /**
+     * Clear all cached entries and pending requests.
+     * すべてのキャッシュエントリおよび待機中リクエストをクリアする。
+     */
+    clear() {
+        this.reports.clear()
+        this.lists.clear()
+        this.pendingLists.clear()
+        this.pendingReports.clear()
+        this.locks.clear()
+        this.lastMutations.clear()
+        this.recentDeletes.clear()
+        this.listeners.forEach((listener) => {
+            listener(-1)
+        })
+    },
+
     /**
      * Check if the cache entry is still valid.
      * キャッシュエントリがまだ有効かを確認する。
@@ -218,6 +235,11 @@ export const updateDailyReportCache = (id: number, u: Partial<DailyReportDetail>
  * キャッシュからレポートを削除する。
  */
 export const deleteDailyReportCache = (id: number, d: string) => DailyReportCache.delete(id, d)
+/**
+ * Clear all daily report cache store entries.
+ * 日報の全キャッシュストアを消去する。
+ */
+export const clearDailyReportCache = () => DailyReportCache.clear()
 
 export const acquireMutationLock = (id: number) => {
     DailyReportCache.locks.add(id)

package/src/server/cache.spec.ts

@@ -0,0 +1,47 @@
+import { describe, expect, it, vi } from "vitest"
+import { createEpochStore, SqlResultCache } from "./cache"
+
+describe("SqlResultCache Memory Cleanup", () => {
+    it("should clean up expired cache entries when map size exceeds 500", async () => {
+        // Mock epoch store
+        const epochStore = createEpochStore(undefined)
+        vi.spyOn(epochStore, "getEpoch").mockResolvedValue(0)
+
+        const cache = new SqlResultCache({ defaultTtlMs: 1000 }, epochStore)
+
+        // 1. 期限切れのキャッシュを 500 件作成 (expireAt を過去に設定)
+        // 直接プライベートフィールド buckets に流し込むことでモック状態を作る
+        const buckets = (cache as any).buckets
+        for (let i = 0; i < 505; i++) {
+            buckets.set(`expired-key-${i}`, {
+                records: [i],
+                expireAt: Date.now() - 1000, // 過去時間
+                epoch: 0,
+            })
+        }
+
+        // 2. 有効なキャッシュを 10 件作成 (expireAt を未来に設定)
+        for (let i = 0; i < 10; i++) {
+            buckets.set(`valid-key-${i}`, {
+                records: [i],
+                expireAt: Date.now() + 100000, // 未来時間
+                epoch: 0,
+            })
+        }
+
+        expect(buckets.size).toBe(515)
+
+        // 3. getOrFetch を実行して 500 件超えの閾値トリガーを引く
+        const fetcher = vi.fn().mockResolvedValue(["new-value"])
+        await cache.getOrFetch({
+            cacheKey: "trigger-key",
+            fetcher,
+        })
+
+        // 4. 検証: 期限切れの 505 件のデータが cleanExpired で削除され、有効な 10 件 + 新規の 1 件のみ残っていること
+        expect(buckets.size).toBe(11) // 10 (valid) + 1 (trigger-key)
+        expect(buckets.has("trigger-key")).toBe(true)
+        expect(buckets.has("valid-key-0")).toBe(true)
+        expect(buckets.has("expired-key-0")).toBe(false)
+    })
+})

package/src/server/cache.ts

@@ -123,6 +123,10 @@ export class SqlResultCache {
                 // キャッシュ保存時に現在の epoch を記録
                 const epoch = opts.epochKey ? await this.epochStore.getEpoch(opts.epochKey) : 0
                 this.buckets.set(cacheKey, { records, expireAt, epoch })
+                // 蓄積防止のため、サイズが一定値を超えたら期限切れキャッシュを一括クリーンアップ
+                if (this.buckets.size > 500) {
+                    this.cleanExpired()
+                }
             }
             return records
         })()
@@ -146,6 +150,15 @@ export class SqlResultCache {
         this.inFlight.delete(cacheKey)
     }
 
+    /**
+     * Clears all cached buckets and in-flight requests.
+     * すべてのキャッシュバケットと進行中のリクエストを全クリアします。
+     */
+    clearAll = (): void => {
+        this.buckets.clear()
+        this.inFlight.clear()
+    }
+
     /**
      * Invalidates cache buckets matching a prefix.
      * 指定されたプレフィックスに一致するキャッシュバケットを無効化します。
@@ -162,4 +175,18 @@ export class SqlResultCache {
             }
         }
     }
+
+    /**
+     * Cleans up all expired cache buckets to prevent memory accumulation.
+     * メモリー蓄積を防ぐため、期限切れのキャッシュバケットをすべてクリーンアップする処理。
+     */
+    private cleanExpired(): void {
+        const now = Date.now()
+        // 期限切れのキーを削除
+        for (const [key, bucket] of this.buckets.entries()) {
+            if (bucket.expireAt <= now) {
+                this.buckets.delete(key)
+            }
+        }
+    }
 }

package/src/server/handlers.ts

@@ -317,6 +317,10 @@ 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

@@ -326,6 +326,7 @@ export function createDailyReportService(config: DailyReportServiceConfig) {
             date: formatDateValue(hub.businessDate, "YYYY-MM-DD"),
             author: row.creatorName ?? maskAuditActor(hub.createdBy) ?? "",
             userId: hub.userId ? encodeUserId(hub.userId) : "",
+            sourceType: hub.sourceType ?? "Internal",
             createdAt: formatDateValue(hub.createdAt, "YYYY-MM-DD HH:mm:ss"),
             updatedAt: formatDateValue(hub.updatedAt, "YYYY-MM-DD HH:mm:ss"),
             updatedBy: maskAuditActor(hub.updatedBy),
@@ -362,9 +363,10 @@ export function createDailyReportService(config: DailyReportServiceConfig) {
         const DraftLabelRelation = aliasedTable(DailyReportHub_Label as unknown as Parameters<typeof aliasedTable>[0], "draft_label") as unknown as typeof DailyReportHub_Label
 
         const result = await db
-            .select<{ reportHubId: number; businessDate: Date | string | null }>({
+            .select<{ reportHubId: number; businessDate: Date | string | null; sourceType: string }>({
                 reportHubId: DailyReportHub.id,
                 businessDate: DailyReportHub.businessDate,
+                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)))))
@@ -1034,6 +1036,7 @@ export function createDailyReportService(config: DailyReportServiceConfig) {
                     createdAt: formatDateValue(hub.createdAt, "YYYY-MM-DD HH:mm:ss"),
                     author: userName,
                     userId: encodeUserId(userId),
+                    sourceType: "Internal",
                     employeeName: userName,
                     // 監査列と同様、クライアント公開時は生内部 ID を難読化する (mapHubRecord と整合)
                     updatedBy: encodeUserId(userId),
@@ -1277,10 +1280,26 @@ export function createDailyReportService(config: DailyReportServiceConfig) {
         return fullDetail ?? null
     }
 
+    /**
+     * Clears all server-side SQL result and user ID caches.
+     * サーバー側のすべての SQL 結果キャッシュおよびユーザー ID キャッシュを全消去する。
+     */
+    const clearCache = async (): Promise<void> => {
+        sqlResultCache.clearAll()
+        userIdCache.clear()
+        cachedDraftLabelId = null
+        if (epochs) {
+            await incrementRedisEpoch(DAILY_REPORT_IDS_EPOCH_KEY)
+        }
+        logger.info("[DailyReportService] Server-side DB/SQL caches cleared successfully.")
+    }
+
     return {
         // 定数 (アプリ側の互換 export 用)
         streamKey: DAILY_REPORT_SSE_STREAM_KEY,
         streamMaxLen: DAILY_REPORT_SSE_STREAM_MAXLEN,
+        // キャッシュクリア
+        clearCache,
         // ユーザー解決
         getUserIdByExternalId,
         // 参照系

package/src/shared/sse-schema.ts

@@ -39,6 +39,7 @@ export const dailyReportDetailSchema = z.object({
     createdAt: z.string().nullable(),
     author: z.string(),
     userId: z.string(),
+    sourceType: z.string().nullable(),
     employeeName: z.string().nullable(),
     updatedBy: z.string().nullable(),
     updatedAt: z.string().nullable(),

package/src/shared/types.ts

@@ -7,6 +7,7 @@
 export type DailyReportItem = {
     reportHubId: number
     businessDate: string | null
+    sourceType?: string
 }
 
 /** 面談者情報。 */
@@ -46,6 +47,7 @@ export type DailyReportDetail = {
     createdAt: string | null
     author: string
     userId: string
+    sourceType: string | null
     employeeName: string | null
     updatedBy: string | null
     updatedAt: string | null