@aiquants/daily-report 0.13.0 → 0.14.0

package/src/server/service.ts

@@ -13,7 +13,7 @@ import type { EpochStore, SqlResultCache, SqlResultCacheQueryOptions } from "./c
 import type { DailyReportExternalSource } from "./external-source"
 import type { DailyReportEncodeUserId, DailyReportIdCodec, DailyReportRedisProvider, DailyReportResolveUserId } from "./ports"
 import type { DailyReportTables, DailyReportUserTable } from "./schema"
-import { buildVisibleSourceTypeCondition, computeSourceTypeDigest, deniesEverySourceType, isSourceTypeVisible, type VisibleSourceTypeSet } from "./visibility"
+import { buildVisibleSourceTypeCondition, computeViewerScopeDigest, DailyReportViewerScope, deniesEverySourceType, isSourceTypeVisible, type VisibleSourceTypeSet } from "./visibility"
 
 export type { SqlResultCacheQueryOptions }
 
@@ -451,10 +451,10 @@ export function createDailyReportService(config: DailyReportServiceConfig) {
      * 区分 (sourceType) の可視性は緩和の対象外であり、他経路と完全に同一の条件を適用する。
      *
      * @param userId Internal numeric user id. 内部数値ユーザー ID。
-     * @param visible Normalized visible source-type set. 正規化済みの可視 sourceType 集合。
+     * @param scope Viewer scope carrying the visible source types. 可視 sourceType を運ぶ閲覧範囲。
      * @returns Stream-ordered items. ストリーム順のアイテム一覧。
      */
-    const fetchDailyReportIdsByUserId = async (userId: number, visible: VisibleSourceTypeSet): Promise<DailyReportItem[]> => {
+    const fetchDailyReportIdsByUserId = async (scope: DailyReportViewerScope, 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 draftLabelJoinIds = await getDraftLabelJoinIds()
 
@@ -466,7 +466,7 @@ export function createDailyReportService(config: DailyReportServiceConfig) {
             })
             .from(DailyReportHub)
             .leftJoin(DraftLabelRelation, and(eq(DraftLabelRelation.hubId, DailyReportHub.id), inArray(DraftLabelRelation.labelId, draftLabelJoinIds)))
-            .where(and(isNull(DailyReportHub.deletedAt), or(eq(DailyReportHub.userId, userId), isNull(DailyReportHub.userId), isNull(DraftLabelRelation.hubId)), visibleSourceTypeCondition(visible)))
+            .where(and(isNull(DailyReportHub.deletedAt), or(eq(DailyReportHub.userId, userId), isNull(DailyReportHub.userId), isNull(DraftLabelRelation.hubId)), visibleSourceTypeCondition(scope.visible)))
             .orderBy(desc(DailyReportHub.businessDate), desc(DailyReportHub.id))
 
         return result.map((item) => ({
@@ -486,16 +486,16 @@ export function createDailyReportService(config: DailyReportServiceConfig) {
      *
      * @param externalId External user id. 外部ユーザー ID。
      * @param limit Page size. ページサイズ。
-     * @param visible Normalized visible source-type set. 正規化済みの可視 sourceType 集合。
+     * @param scope Viewer scope carrying the visible source types. 可視 sourceType を運ぶ閲覧範囲。
      * @returns First-page items in stream order. ストリーム順の先頭ページ。
      */
-    const getDailyReportIdsFirstPageByExternalId = async (externalId: string, limit: number, visible: VisibleSourceTypeSet): Promise<DailyReportItem[]> => {
+    const getDailyReportIdsFirstPageByExternalId = async (scope: DailyReportViewerScope, externalId: string, limit: number): Promise<DailyReportItem[]> => {
         const userId = await getUserIdByExternalId(externalId)
         if (!userId) {
             return []
         }
         // 全拒否なら DB を引かずに空を返す (0 件 = fail-close)
-        if (deniesEverySourceType(visible)) {
+        if (deniesEverySourceType(scope.visible)) {
             return []
         }
         const DraftLabelRelation = aliasedTable(DailyReportHub_Label as unknown as Parameters<typeof aliasedTable>[0], "draft_label") as unknown as typeof DailyReportHub_Label
@@ -510,7 +510,7 @@ export function createDailyReportService(config: DailyReportServiceConfig) {
             .top(limit)
             .from(DailyReportHub)
             .leftJoin(DraftLabelRelation, and(eq(DraftLabelRelation.hubId, DailyReportHub.id), inArray(DraftLabelRelation.labelId, draftLabelJoinIds)))
-            .where(and(isNull(DailyReportHub.deletedAt), or(eq(DailyReportHub.userId, userId), isNull(DailyReportHub.userId), isNull(DraftLabelRelation.hubId)), visibleSourceTypeCondition(visible)))
+            .where(and(isNull(DailyReportHub.deletedAt), or(eq(DailyReportHub.userId, userId), isNull(DailyReportHub.userId), isNull(DraftLabelRelation.hubId)), visibleSourceTypeCondition(scope.visible)))
             .orderBy(desc(DailyReportHub.businessDate), desc(DailyReportHub.id))
 
         return result.map((item) => ({
@@ -523,7 +523,7 @@ export function createDailyReportService(config: DailyReportServiceConfig) {
      * Fetches daily report details for the provided business date.
      * 指定した営業日の日報詳細を取得する内部処理。
      */
-    const fetchDailyReportsByBusinessDate = async (normalizedBusinessDate: string): Promise<DailyReportDetail[]> => {
+    const fetchDailyReportsByBusinessDate = async (scope: DailyReportViewerScope, normalizedBusinessDate: string): Promise<DailyReportDetail[]> => {
         const rows = await applyExternalJoins(
             db
                 .select<HubQueryRow>({
@@ -536,7 +536,7 @@ export function createDailyReportService(config: DailyReportServiceConfig) {
         )
             .leftJoin(DailyReportInternal, eq(DailyReportHub.id, DailyReportInternal.hubId))
             .leftJoin(users, eq(DailyReportHub.userId, users.id))
-            .where(and(eq(DailyReportHub.businessDate, sql`${normalizedBusinessDate}`), isNull(DailyReportHub.deletedAt)))
+            .where(and(eq(DailyReportHub.businessDate, sql`${normalizedBusinessDate}`), isNull(DailyReportHub.deletedAt), visibleSourceTypeCondition(scope.visible)))
             .orderBy(desc(DailyReportHub.id))
 
         const attachmentsMap = await getAttachmentsByHubIds(rows.map((r) => r.hub.id))
@@ -575,25 +575,25 @@ export function createDailyReportService(config: DailyReportServiceConfig) {
      *
      * @param externalId External user id. 外部ユーザー ID。
      * @param options Cache query options. キャッシュ問い合わせオプション。
-     * @param visible Normalized visible source-type set. 正規化済みの可視 sourceType 集合。
+     * @param scope Viewer scope carrying the visible source types. 可視 sourceType を運ぶ閲覧範囲。
      * @returns Stream-ordered items. ストリーム順のアイテム一覧。
      */
-    const getDailyReportIdsByExternalId = async (externalId: string, { forceRefresh = false, snapshot = false, ttlMsOverride }: SqlResultCacheQueryOptions = {}, visible: VisibleSourceTypeSet): Promise<DailyReportItem[]> => {
+    const getDailyReportIdsByExternalId = async (scope: DailyReportViewerScope, externalId: string, { forceRefresh = false, snapshot = false, ttlMsOverride }: SqlResultCacheQueryOptions = {}): Promise<DailyReportItem[]> => {
         const userId = await getUserIdByExternalId(externalId)
         if (!userId) {
             return []
         }
         // 全拒否なら DB を引かずに空を返す (0 件 = fail-close)
-        if (deniesEverySourceType(visible)) {
+        if (deniesEverySourceType(scope.visible)) {
             return []
         }
 
         // 可視集合ごとに別バケットへ隔離する (権限変更後に旧結果を配信しない)
-        const cacheKey = idsCacheKey(userId, computeSourceTypeDigest(visible))
+        const cacheKey = idsCacheKey(userId, computeViewerScopeDigest(scope))
         return sqlResultCache.getOrFetch<DailyReportItem>({
             cacheKey,
             fetcher: async () => {
-                const res = await fetchDailyReportIdsByUserId(userId, visible)
+                const res = await fetchDailyReportIdsByUserId(scope, userId)
                 return res
             },
             forceRefresh,
@@ -616,15 +616,20 @@ export function createDailyReportService(config: DailyReportServiceConfig) {
      * 必ず {@link getDailyReportsByBusinessDateByExternalId} を使うこと。
      * (本関数は管理・バッチ・テスト用途に限定する。)
      */
-    const getDailyReportsByBusinessDate = (businessDate: string, { forceRefresh = false, snapshot = false, ttlMsOverride }: SqlResultCacheQueryOptions = {}): Promise<DailyReportDetail[]> => {
+    const getDailyReportsByBusinessDate = (scope: DailyReportViewerScope, businessDate: string, { forceRefresh = false, snapshot = false, ttlMsOverride }: SqlResultCacheQueryOptions = {}): Promise<DailyReportDetail[]> => {
         const normalizedBusinessDate = normalizeBusinessDateKey(businessDate)
         if (!normalizedBusinessDate) {
             return Promise.resolve([])
         }
+        // 全拒否なら DB を引かずに空を返す (0 件 = fail-close)
+        if (deniesEverySourceType(scope.visible)) {
+            return Promise.resolve([])
+        }
 
         return sqlResultCache.getOrFetch<DailyReportDetail>({
-            cacheKey: buildBusinessDateCacheKey(normalizedBusinessDate),
-            fetcher: () => fetchDailyReportsByBusinessDate(normalizedBusinessDate),
+            // 可視集合ごとに別バケットへ隔離する (管理経路でも権限混在を起こさない)
+            cacheKey: `${buildBusinessDateCacheKey(normalizedBusinessDate)}:st:${computeViewerScopeDigest(scope)}`,
+            fetcher: () => fetchDailyReportsByBusinessDate(scope, normalizedBusinessDate),
             forceRefresh,
             snapshot,
             ttlMsOverride: ttlMsOverride ?? DAILY_REPORT_BUSINESS_DATE_TTL_MS,
@@ -765,16 +770,16 @@ export function createDailyReportService(config: DailyReportServiceConfig) {
      *
      * @param attachmentId Internal numeric attachment id. 内部数値の添付 ID。
      * @param userId Internal numeric user id of the viewer. 閲覧者の内部数値ユーザー ID。
-     * @param visible Normalized visible source-type set. 正規化済みの可視 sourceType 集合。
+     * @param scope Viewer scope carrying the visible source types. 可視 sourceType を運ぶ閲覧範囲。
      * @returns Attachment row when visible, otherwise null. 可視なら添付行、それ以外は null。
      */
-    const getAttachmentForUser = async (attachmentId: number, userId: number, visible: VisibleSourceTypeSet): Promise<{ fileName: string; filePath: string; fileType: string | null; fileSize: number | null } | null> => {
+    const getAttachmentForUser = async (scope: DailyReportViewerScope, attachmentId: number, userId: number): Promise<{ fileName: string; filePath: string; fileType: string | null; fileSize: number | null } | null> => {
         const attachment = tables.attachment
         if (!attachment) {
             return null
         }
         // 全拒否なら DB を引かずに null を返す (0 件 = fail-close)
-        if (deniesEverySourceType(visible)) {
+        if (deniesEverySourceType(scope.visible)) {
             return null
         }
         const draftLabelJoinIds = await getDraftLabelJoinIds()
@@ -795,7 +800,7 @@ export function createDailyReportService(config: DailyReportServiceConfig) {
             .from(attachment)
             .innerJoin(DailyReportHub, eq(DailyReportHub.id, attachment.hubId))
             .leftJoin(DraftLabelRelation, and(eq(DraftLabelRelation.hubId, DailyReportHub.id), inArray(DraftLabelRelation.labelId, draftLabelJoinIds)))
-            .where(and(eq(attachment.id, attachmentId), isNull(DailyReportHub.deletedAt), or(eq(DailyReportHub.userId, userId), isNull(DraftLabelRelation.hubId)), visibleSourceTypeCondition(visible)))
+            .where(and(eq(attachment.id, attachmentId), isNull(DailyReportHub.deletedAt), or(eq(DailyReportHub.userId, userId), isNull(DraftLabelRelation.hubId)), visibleSourceTypeCondition(scope.visible)))
 
         return rows[0] ?? null
     }
@@ -849,7 +854,7 @@ export function createDailyReportService(config: DailyReportServiceConfig) {
      * Retrieves daily report details for a business date with user-specific status and relations.
      * 指定した営業日の日報詳細を、ユーザー状態と関連データを含めて取得する。
      */
-    const getDailyReportsByBusinessDateByExternalId = async (businessDate: string, externalId: string, { forceRefresh = false, snapshot = false, ttlMsOverride }: SqlResultCacheQueryOptions = {}, visible: VisibleSourceTypeSet): Promise<DailyReportDetail[]> => {
+    const getDailyReportsByBusinessDateByExternalId = async (scope: DailyReportViewerScope, businessDate: string, externalId: string, { forceRefresh = false, snapshot = false, ttlMsOverride }: SqlResultCacheQueryOptions = {}): Promise<DailyReportDetail[]> => {
         const userId = await getUserIdByExternalId(externalId)
         if (!userId) {
             return []
@@ -860,12 +865,12 @@ export function createDailyReportService(config: DailyReportServiceConfig) {
             return []
         }
         // 全拒否なら DB を引かずに空を返す (0 件 = fail-close)
-        if (deniesEverySourceType(visible)) {
+        if (deniesEverySourceType(scope.visible)) {
             return []
         }
 
         // 可視集合ごとに別バケットへ隔離する (権限変更後に旧結果を配信しない)
-        const cacheKey = dateCacheKey(normalizedBusinessDate, userId, computeSourceTypeDigest(visible))
+        const cacheKey = dateCacheKey(normalizedBusinessDate, userId, computeViewerScopeDigest(scope))
 
         return sqlResultCache.getOrFetch<DailyReportDetail>({
             cacheKey,
@@ -889,7 +894,7 @@ export function createDailyReportService(config: DailyReportServiceConfig) {
                     .leftJoin(DailyReportUserStatus, and(eq(DailyReportHub.id, DailyReportUserStatus.hubId), eq(DailyReportUserStatus.userId, userId)))
                     .leftJoin(DraftLabelRelation, and(eq(DraftLabelRelation.hubId, DailyReportHub.id), inArray(DraftLabelRelation.labelId, draftLabelJoinIds)))
                     .leftJoin(users, eq(DailyReportHub.userId, users.id))
-                    .where(and(eq(DailyReportHub.businessDate, sql`${normalizedBusinessDate}`), isNull(DailyReportHub.deletedAt), or(eq(DailyReportHub.userId, userId), isNull(DraftLabelRelation.hubId)), visibleSourceTypeCondition(visible)))
+                    .where(and(eq(DailyReportHub.businessDate, sql`${normalizedBusinessDate}`), isNull(DailyReportHub.deletedAt), or(eq(DailyReportHub.userId, userId), isNull(DraftLabelRelation.hubId)), visibleSourceTypeCondition(scope.visible)))
                     .orderBy(desc(DailyReportHub.id))
 
                 if (rows.length === 0) {
@@ -992,17 +997,17 @@ export function createDailyReportService(config: DailyReportServiceConfig) {
      * @param reportHubId Hub id. 対象 hub の ID。
      * @param userId Internal numeric user id of the viewer. 閲覧者の内部数値ユーザー ID。
      * @param options Cache query options. キャッシュ問い合わせオプション。
-     * @param visible Normalized visible source-type set. 正規化済みの可視 sourceType 集合。
+     * @param scope Viewer scope carrying the visible source types. 可視 sourceType を運ぶ閲覧範囲。
      * @returns Detail when visible, otherwise null. 可視なら詳細、そうでなければ null。
      */
-    const getDailyReportDetailById = async (reportHubId: number, userId: number, { forceRefresh = false, snapshot = false, ttlMsOverride }: SqlResultCacheQueryOptions = {}, visible: VisibleSourceTypeSet): Promise<DailyReportDetail | null> => {
+    const getDailyReportDetailById = async (scope: DailyReportViewerScope, reportHubId: number, userId: number, { forceRefresh = false, snapshot = false, ttlMsOverride }: SqlResultCacheQueryOptions = {}): Promise<DailyReportDetail | null> => {
         // 全拒否なら DB を引かずに null を返す (0 件 = fail-close)
-        if (deniesEverySourceType(visible)) {
+        if (deniesEverySourceType(scope.visible)) {
             return null
         }
 
         // 可視集合ごとに別バケットへ隔離する (権限変更後に旧結果を配信しない)
-        const cacheKey = detailCacheKey(reportHubId, userId, computeSourceTypeDigest(visible))
+        const cacheKey = detailCacheKey(reportHubId, userId, computeViewerScopeDigest(scope))
 
         const results = (await sqlResultCache.getOrFetch<DailyReportDetail>({
             cacheKey,
@@ -1026,7 +1031,7 @@ export function createDailyReportService(config: DailyReportServiceConfig) {
                     .leftJoin(DailyReportUserStatus, and(eq(DailyReportHub.id, DailyReportUserStatus.hubId), eq(DailyReportUserStatus.userId, userId)))
                     .leftJoin(DraftLabelRelation, and(eq(DraftLabelRelation.hubId, DailyReportHub.id), inArray(DraftLabelRelation.labelId, draftLabelJoinIds)))
                     .leftJoin(users, eq(DailyReportHub.userId, users.id))
-                    .where(and(eq(DailyReportHub.id, reportHubId), isNull(DailyReportHub.deletedAt), or(eq(DailyReportHub.userId, userId), isNull(DraftLabelRelation.hubId)), visibleSourceTypeCondition(visible)))
+                    .where(and(eq(DailyReportHub.id, reportHubId), isNull(DailyReportHub.deletedAt), or(eq(DailyReportHub.userId, userId), isNull(DraftLabelRelation.hubId)), visibleSourceTypeCondition(scope.visible)))
 
                 if (rows.length === 0) {
                     return []
@@ -1102,17 +1107,17 @@ export function createDailyReportService(config: DailyReportServiceConfig) {
      * @param reportHubId Hub id. 対象 hub の ID。
      * @param externalId External user id. 外部ユーザー ID。
      * @param options Cache query options. キャッシュ問い合わせオプション。
-     * @param visible Normalized visible source-type set. 正規化済みの可視 sourceType 集合。
+     * @param scope Viewer scope carrying the visible source types. 可視 sourceType を運ぶ閲覧範囲。
      * @returns Detail when visible, otherwise null. 可視なら詳細、そうでなければ null。
      */
-    const getDailyReportDetailByIdByExternalId = async (reportHubId: number, externalId: string, options: SqlResultCacheQueryOptions = {}, visible: VisibleSourceTypeSet): Promise<DailyReportDetail | null> => {
+    const getDailyReportDetailByIdByExternalId = async (scope: DailyReportViewerScope, reportHubId: number, externalId: string, options: SqlResultCacheQueryOptions = {}): Promise<DailyReportDetail | null> => {
         const userId = await getUserIdByExternalId(externalId)
         if (!userId) {
             return null
         }
         // ❗ 受け取った可視集合はそのまま透過する。ここで null へ潰すと外部 ID 経由の詳細取得だけ
         //    フィルタが外れる (内部の create/update/publish が明示 null を渡すのとは別物)
-        return getDailyReportDetailById(reportHubId, userId, options, visible)
+        return getDailyReportDetailById(scope, reportHubId, userId, options)
     }
 
     /**
@@ -1135,12 +1140,12 @@ export function createDailyReportService(config: DailyReportServiceConfig) {
      * 一切検証せず任意の `reportHubId` へ upsert できたため、その穴も同時に塞ぐ。
      *
      * @param reportHubId Hub id. 対象 hub の ID。
-     * @param visible Normalized visible source-type set. 正規化済みの可視 sourceType 集合。
+     * @param scope Viewer scope carrying the visible source types. 可視 sourceType を運ぶ閲覧範囲。
      * @returns Nothing; throws when rejected. なし (拒否時は例外送出)。
      */
-    const assertHubMutable = async (reportHubId: number, visible: VisibleSourceTypeSet): Promise<void> => {
+    const assertHubMutable = async (scope: DailyReportViewerScope, reportHubId: number): Promise<void> => {
         const hub = await findHubGateColumns(reportHubId)
-        if (!hub || hub.deletedAt || !isSourceTypeVisible(visible, hub.sourceType)) {
+        if (!hub || hub.deletedAt || !isSourceTypeVisible(scope.visible, hub.sourceType)) {
             throw new Error("Not Found")
         }
     }
@@ -1154,12 +1159,12 @@ export function createDailyReportService(config: DailyReportServiceConfig) {
      * @param businessDate Business date for cache invalidation. キャッシュ無効化に使う営業日。
      * @param isStarred Desired star state. 設定するスター状態。
      * @param clientTempId Optimistic-update correlation id. 楽観更新の相関 ID。
-     * @param visible Normalized visible source-type set. 正規化済みの可視 sourceType 集合。
+     * @param scope Viewer scope carrying the visible source types. 可視 sourceType を運ぶ閲覧範囲。
      * @returns Updated status row. 更新後の状態行。
      */
-    const setStarStatus = async (userId: number, reportHubId: number, businessDate: string | null, isStarred: boolean, clientTempId: string, visible: VisibleSourceTypeSet): Promise<DailyReportUserStatusRow> => {
+    const setStarStatus = async (scope: DailyReportViewerScope, userId: number, reportHubId: number, businessDate: string | null, isStarred: boolean, clientTempId: string): Promise<DailyReportUserStatusRow> => {
         // 不可視区分・不存在・削除済みへの書き込みを先に弾く
-        await assertHubMutable(reportHubId, visible)
+        await assertHubMutable(scope, reportHubId)
 
         const existing = await db
             .select<DailyReportUserStatusRow>()
@@ -1238,12 +1243,12 @@ export function createDailyReportService(config: DailyReportServiceConfig) {
      * @param businessDate Business date for cache invalidation. キャッシュ無効化に使う営業日。
      * @param isRead Desired read state. 設定する既読状態。
      * @param clientTempId Optimistic-update correlation id. 楽観更新の相関 ID。
-     * @param visible Normalized visible source-type set. 正規化済みの可視 sourceType 集合。
+     * @param scope Viewer scope carrying the visible source types. 可視 sourceType を運ぶ閲覧範囲。
      * @returns Updated status row. 更新後の状態行。
      */
-    const setReadStatus = async (userId: number, reportHubId: number, businessDate: string | null, isRead: boolean, clientTempId: string, visible: VisibleSourceTypeSet): Promise<DailyReportUserStatusRow> => {
+    const setReadStatus = async (scope: DailyReportViewerScope, userId: number, reportHubId: number, businessDate: string | null, isRead: boolean, clientTempId: string): Promise<DailyReportUserStatusRow> => {
         // 不可視区分・不存在・削除済みへの書き込みを先に弾く
-        await assertHubMutable(reportHubId, visible)
+        await assertHubMutable(scope, reportHubId)
 
         const existing = await db
             .select<DailyReportUserStatusRow>()
@@ -1346,10 +1351,10 @@ export function createDailyReportService(config: DailyReportServiceConfig) {
      * @param content Comment body. コメント本文。
      * @param businessDate Business date for cache invalidation. キャッシュ無効化に使う営業日。
      * @param clientTempId Optimistic-update correlation id. 楽観更新の相関 ID。
-     * @param visible Normalized visible source-type set. 正規化済みの可視 sourceType 集合。
+     * @param scope Viewer scope carrying the visible source types. 可視 sourceType を運ぶ閲覧範囲。
      * @returns The created comment. 追加されたコメント。
      */
-    const addComment = async (userId: number, reportHubId: number, content: string, businessDate: string | null, clientTempId: string, visible: VisibleSourceTypeSet): Promise<DailyReportCommentItem> => {
+    const addComment = async (scope: DailyReportViewerScope, userId: number, reportHubId: number, content: string, businessDate: string | null, clientTempId: string): Promise<DailyReportCommentItem> => {
         const [hub] = await db
             .select<{ sourceType: string; deletedAt: Date | string | null; userId: number | null }>({ sourceType: DailyReportHub.sourceType, deletedAt: DailyReportHub.deletedAt, userId: DailyReportHub.userId })
             .top(1)
@@ -1362,7 +1367,7 @@ export function createDailyReportService(config: DailyReportServiceConfig) {
         }
         // 不可視区分の日報にはコメントできない。認可失敗と不存在を区別せず Not Found にする
         // (存在オラクルの回避)
-        if (!isSourceTypeVisible(visible, hub.sourceType)) {
+        if (!isSourceTypeVisible(scope.visible, hub.sourceType)) {
             throw new Error("Not Found")
         }
         if (hub.sourceType.toLowerCase() !== "internal") {
@@ -1441,10 +1446,10 @@ export function createDailyReportService(config: DailyReportServiceConfig) {
      * @param commentId Comment id to delete. 削除対象のコメント ID。
      * @param businessDate Business date for cache invalidation. キャッシュ無効化に使う営業日。
      * @param clientTempId Optimistic-update correlation id. 楽観更新の相関 ID。
-     * @param visible Normalized visible source-type set. 正規化済みの可視 sourceType 集合。
+     * @param scope Viewer scope carrying the visible source types. 可視 sourceType を運ぶ閲覧範囲。
      * @returns Nothing. なし。
      */
-    const deleteComment = async (userId: number, reportHubId: number, commentId: number, businessDate: string | null, clientTempId: string, visible: VisibleSourceTypeSet): Promise<void> => {
+    const deleteComment = async (scope: DailyReportViewerScope, userId: number, reportHubId: number, commentId: number, businessDate: string | null, clientTempId: string): Promise<void> => {
         const comments = await findDailyReportCommentById(db, commentId)
         if (comments.length === 0) {
             throw new Error("Not Found")
@@ -1463,7 +1468,7 @@ export function createDailyReportService(config: DailyReportServiceConfig) {
         //    あり、呼び出し側が渡した ID ではない (上で一致を確認済み)。hub 行が引けない場合も
         //    fail-close で Not Found にする (assertHubMutable と同一の規約)
         const [hubForDelete] = await db.select<{ userId: number | null; sourceType: string }>({ userId: DailyReportHub.userId, sourceType: DailyReportHub.sourceType }).top(1).from(DailyReportHub).where(eq(DailyReportHub.id, comments[0].hubId))
-        if (!(hubForDelete && isSourceTypeVisible(visible, hubForDelete.sourceType))) {
+        if (!(hubForDelete && isSourceTypeVisible(scope.visible, hubForDelete.sourceType))) {
             throw new Error("Not Found")
         }
 
@@ -1618,7 +1623,7 @@ export function createDailyReportService(config: DailyReportServiceConfig) {
             // ❗ 明示 null (無制限)。所有者が自分で作った日報を取り直す経路なので、消費側の可視集合に
             //    作成区分 ("Internal") が含まれなくても取得と SSE 配信を壊さない。区分の出し分けは
             //    受信側の SSE フィルタと次回読み取り時のサーバーフィルタが担う
-            const fullDetail = await getDailyReportDetailById(result.reportHubId, userId, { forceRefresh: true }, null)
+            const fullDetail = await getDailyReportDetailById(DailyReportViewerScope.unrestricted("post-write self read: the writer always sees the row they just wrote"), result.reportHubId, userId, { forceRefresh: true })
 
             if (fullDetail) {
                 // 下書き判定
@@ -1773,7 +1778,7 @@ export function createDailyReportService(config: DailyReportServiceConfig) {
 
         // ❗ 明示 null (無制限)。所有者が自分の日報を取り直す経路であり、区分の出し分けは
         //    受信側の SSE フィルタと次回読み取り時のサーバーフィルタが担う
-        const fullDetail = await getDailyReportDetailById(reportHubId, userId, { forceRefresh: true }, null)
+        const fullDetail = await getDailyReportDetailById(DailyReportViewerScope.unrestricted("post-write self read: the writer always sees the row they just wrote"), reportHubId, userId, { forceRefresh: true })
         if (fullDetail) {
             // 下書き判定
             // 判定は代表 ID ではなく下書きラベル**全体**で行う (2 つ目の下書き名を見落とさない)
@@ -1833,7 +1838,7 @@ export function createDailyReportService(config: DailyReportServiceConfig) {
 
         // ❗ 明示 null (無制限)。所有者が自分の日報を取り直す経路であり、区分の出し分けは
         //    受信側の SSE フィルタと次回読み取り時のサーバーフィルタが担う
-        const fullDetail = await getDailyReportDetailById(reportHubId, userId, { forceRefresh: true }, null)
+        const fullDetail = await getDailyReportDetailById(DailyReportViewerScope.unrestricted("post-write self read: the writer always sees the row they just wrote"), reportHubId, userId, { forceRefresh: true })
         if (fullDetail) {
             await publishToSseStream(
                 reportPublishMessageSchema.parse({

package/src/server/test-helpers/handlers-config.ts

@@ -11,7 +11,7 @@ import type { DailyReportHandlersConfig } from "../handlers"
 import type { DailyReportAttachmentBytes, DailyReportAttachmentError, DailyReportIdCodec, DailyReportResolveVisibleSourceTypes, DailyReportVisibilityResolveContext, DailyReportVisibilityResolveReason } from "../ports"
 import type { DailyReportService } from "../service"
 import type { DailyReportSseReader, StreamEntry } from "../sse-reader"
-import type { VisibleSourceTypeSet } from "../visibility"
+import type { DailyReportViewerScope, VisibleSourceTypeSet } from "../visibility"
 
 /** 既定の外部ユーザー ID (認証済みユーザーを表す)。 */
 export const TEST_EXTERNAL_USER_ID = "external-user"
@@ -128,50 +128,50 @@ export const makeHandlersFixture = (options: HandlersFixtureOptions = {}): { con
         clearCache: async () => {
             calls.clearCache += 1
         },
-        getDailyReportIdsByExternalId: async (externalId: string, opts: { forceRefresh?: boolean } | undefined, visible: VisibleSourceTypeSet) => {
+        getDailyReportIdsByExternalId: async (scope: DailyReportViewerScope, externalId: string, opts?: { forceRefresh?: boolean }) => {
             calls.getDailyReportIds.push([externalId, opts?.forceRefresh ?? false])
-            calls.visibleArgs.push({ method: "getDailyReportIdsByExternalId", visible })
+            calls.visibleArgs.push({ method: "getDailyReportIdsByExternalId", visible: scope.visible })
             if (options.idsStreamError) throw options.idsStreamError
             if (options.idsStreamFullGate) await options.idsStreamFullGate
             return options.idsStreamItems ?? []
         },
-        getDailyReportIdsFirstPageByExternalId: async (externalId: string, limit: number, visible: VisibleSourceTypeSet) => {
+        getDailyReportIdsFirstPageByExternalId: async (scope: DailyReportViewerScope, externalId: string, limit: number) => {
             calls.getDailyReportIdsFirstPage.push([externalId, limit])
-            calls.visibleArgs.push({ method: "getDailyReportIdsFirstPageByExternalId", visible })
+            calls.visibleArgs.push({ method: "getDailyReportIdsFirstPageByExternalId", visible: scope.visible })
             if (options.idsStreamError) throw options.idsStreamError
             return options.idsStreamFirstPageItems ?? (options.idsStreamItems ?? []).slice(0, limit)
         },
-        getAttachmentForUser: async (attachmentId: number, viewerUserId: number, visible: VisibleSourceTypeSet) => {
+        getAttachmentForUser: async (scope: DailyReportViewerScope, attachmentId: number, viewerUserId: number) => {
             // 引数を記録する。記録しないと「閲覧者 ID を渡し忘れた」欠陥がテストに映らない
             calls.getAttachmentForUser.push([attachmentId, viewerUserId])
-            calls.visibleArgs.push({ method: "getAttachmentForUser", visible })
+            calls.visibleArgs.push({ method: "getAttachmentForUser", visible: scope.visible })
             return attachment
         },
-        getDailyReportsByBusinessDateByExternalId: async (_businessDate: string, _externalId: string, _opts: unknown, visible: VisibleSourceTypeSet) => {
-            calls.visibleArgs.push({ method: "getDailyReportsByBusinessDateByExternalId", visible })
+        getDailyReportsByBusinessDateByExternalId: async (scope: DailyReportViewerScope, _businessDate: string, _externalId: string, _opts?: unknown) => {
+            calls.visibleArgs.push({ method: "getDailyReportsByBusinessDateByExternalId", visible: scope.visible })
             return []
         },
-        getDailyReportDetailByIdByExternalId: async (_reportHubId: number, _externalId: string, _opts: unknown, visible: VisibleSourceTypeSet) => {
-            calls.visibleArgs.push({ method: "getDailyReportDetailByIdByExternalId", visible })
+        getDailyReportDetailByIdByExternalId: async (scope: DailyReportViewerScope, _reportHubId: number, _externalId: string, _opts?: unknown) => {
+            calls.visibleArgs.push({ method: "getDailyReportDetailByIdByExternalId", visible: scope.visible })
             return null
         },
-        setStarStatus: async (_userId: number, reportHubId: number, _businessDate: string | null, _value: boolean, _clientTempId: string, visible: VisibleSourceTypeSet) => {
-            calls.mutations.push({ method: "setStarStatus", reportHubId, visible })
+        setStarStatus: async (scope: DailyReportViewerScope, _userId: number, reportHubId: number, _businessDate: string | null, _value: boolean, _clientTempId: string) => {
+            calls.mutations.push({ method: "setStarStatus", reportHubId, visible: scope.visible })
             if (options.mutationError) throw options.mutationError
             return { hubId: reportHubId, userId: internalUserId ?? 0, isRead: false, isStarred: true, createdAt: "", createdBy: "", updatedAt: "", updatedBy: "" }
         },
-        setReadStatus: async (_userId: number, reportHubId: number, _businessDate: string | null, _value: boolean, _clientTempId: string, visible: VisibleSourceTypeSet) => {
-            calls.mutations.push({ method: "setReadStatus", reportHubId, visible })
+        setReadStatus: async (scope: DailyReportViewerScope, _userId: number, reportHubId: number, _businessDate: string | null, _value: boolean, _clientTempId: string) => {
+            calls.mutations.push({ method: "setReadStatus", reportHubId, visible: scope.visible })
             if (options.mutationError) throw options.mutationError
             return { hubId: reportHubId, userId: internalUserId ?? 0, isRead: true, isStarred: false, createdAt: "", createdBy: "", updatedAt: "", updatedBy: "" }
         },
-        addComment: async (_userId: number, reportHubId: number, _content: string, _businessDate: string | null, _clientTempId: string, visible: VisibleSourceTypeSet) => {
-            calls.mutations.push({ method: "addComment", reportHubId, visible })
+        addComment: async (scope: DailyReportViewerScope, _userId: number, reportHubId: number, _content: string, _businessDate: string | null, _clientTempId: string) => {
+            calls.mutations.push({ method: "addComment", reportHubId, visible: scope.visible })
             if (options.mutationError) throw options.mutationError
             return { id: 1, userId: "ENC1", userName: "u", content: "c", createdAt: "", isMine: true }
         },
-        deleteComment: async (_userId: number, reportHubId: number, _commentId: number, _businessDate: string | null, _clientTempId: string, visible: VisibleSourceTypeSet) => {
-            calls.mutations.push({ method: "deleteComment", reportHubId, visible })
+        deleteComment: async (scope: DailyReportViewerScope, _userId: number, reportHubId: number, _commentId: number, _businessDate: string | null, _clientTempId: string) => {
+            calls.mutations.push({ method: "deleteComment", reportHubId, visible: scope.visible })
             if (options.mutationError) throw options.mutationError
         },
         markAttachmentMissing: async (id: number) => {

package/src/server/visibility.spec.ts

@@ -5,8 +5,10 @@
  * ここで固定するのは「無制限 (null) と全拒否 (空集合) を決して取り違えない」という不変条件であり、
  * 取り違えは情報漏洩 (全件配信) か機能停止 (0 件) に直結する。
  */
+
+import { bigint, MsSqlDialect, mssqlSchema, nvarchar, primaryKey } from "drizzle-orm/mssql-core"
 import { describe, expect, it } from "vitest"
-import { computeSourceTypeDigest, isSourceTypeVisible, normalizeVisibleSourceTypes } from "./visibility"
+import { buildVisibleSourceTypeCondition, computeSourceTypeDigest, computeViewerScopeDigest, DailyReportViewerScope, deniesEverySourceType, isSourceTypeVisible, normalizeVisibleSourceTypes } from "./visibility"
 
 describe("normalizeVisibleSourceTypes", () => {
     it("undefined と null は無制限 (null) になる", () => {
@@ -105,10 +107,26 @@ describe("computeSourceTypeDigest", () => {
         expect(new Set(digests).size).toBe(digests.length)
     })
 
+    it("sentinel と同名のトークンだけを許された閲覧者が無制限 / 全拒否とキャッシュを共有しない", () => {
+        // "all" や "none" へ畳み込まれるトークンだけを持つ集合が sentinel と同じ digest になると、
+        // その閲覧者と無制限閲覧者が同じキャッシュバケットを共有してしまう
+        expect(computeSourceTypeDigest(normalizeVisibleSourceTypes(["all"]))).not.toBe("all")
+        expect(computeSourceTypeDigest(normalizeVisibleSourceTypes(["none"]))).not.toBe("none")
+        expect(computeSourceTypeDigest(normalizeVisibleSourceTypes(["All"]))).not.toBe(computeSourceTypeDigest(null))
+        expect(computeSourceTypeDigest(normalizeVisibleSourceTypes(["NONE"]))).not.toBe(computeSourceTypeDigest(normalizeVisibleSourceTypes([])))
+    })
+
+    it("区切り文字を含みうるトークンでも連結が単射になる (長さ接頭辞)", () => {
+        // 長さ接頭辞が無いと、区切り位置の異なる別集合が同じ連結結果になりうる
+        const a = computeSourceTypeDigest(normalizeVisibleSourceTypes(["ab", "c"]))
+        const b = computeSourceTypeDigest(normalizeVisibleSourceTypes(["a", "bc"]))
+        expect(a).not.toBe(b)
+    })
+
     it("巨大な集合はハッシュへ退避しつつキー長が有界になる", () => {
         const many = Array.from({ length: 200 }, (_, index) => `source-type-${index}`)
         const digest = computeSourceTypeDigest(normalizeVisibleSourceTypes(many))
-        expect(digest.startsWith("h:")).toBe(true)
+        expect(digest.startsWith("sh:")).toBe(true)
         expect(digest.length).toBeLessThanOrEqual(16)
     })
 
@@ -117,7 +135,9 @@ describe("computeSourceTypeDigest", () => {
         const hashed = computeSourceTypeDigest(normalizeVisibleSourceTypes(many))
         const raw = computeSourceTypeDigest(normalizeVisibleSourceTypes(["ni"]))
         expect(hashed).not.toBe(raw)
-        expect(raw.startsWith("h:")).toBe(false)
+        expect(raw.startsWith("sh:")).toBe(false)
+        // 限定集合は必ず s: 名前空間の下に入る (sentinel と衝突しない)
+        expect(raw.startsWith("s:")).toBe(true)
     })
 })
 
@@ -140,3 +160,109 @@ describe("JS 判定と SQL 述語の対称性", () => {
         expect([...(set ?? [])]).toEqual(["ni"])
     })
 })
+
+describe("DailyReportViewerScope", () => {
+    it("restrictTo は入力を正規化して保持する", () => {
+        const scope = DailyReportViewerScope.restrictTo(["NI", " ni ", "kintone"])
+        expect([...(scope.visible ?? [])].sort()).toEqual(["kintone", "ni"])
+    })
+
+    it("restrictTo に空配列を渡すと全拒否 (0 件) になる", () => {
+        const scope = DailyReportViewerScope.restrictTo([])
+        expect(scope.visible).not.toBeNull()
+        expect(scope.visible?.size).toBe(0)
+    })
+
+    it("unrestricted は無制限 (null) を保持する", () => {
+        const scope = DailyReportViewerScope.unrestricted("unit test: documents why unfiltered is correct")
+        expect(scope.visible).toBeNull()
+    })
+
+    it("computeViewerScopeDigest はスコープ単位で集合ダイジェストと一致する", () => {
+        const scope = DailyReportViewerScope.restrictTo(["ni"])
+        expect(computeViewerScopeDigest(scope)).toBe(computeSourceTypeDigest(normalizeVisibleSourceTypes(["ni"])))
+        expect(computeViewerScopeDigest(DailyReportViewerScope.unrestricted("unit test"))).toBe("all")
+        expect(computeViewerScopeDigest(DailyReportViewerScope.restrictTo([]))).toBe("none")
+    })
+
+    it("構造的偽造もスプレッド widening も型が拒否する (名目型であることの実証)", () => {
+        const real = DailyReportViewerScope.restrictTo(["ni"])
+
+        // @ts-expect-error 素のオブジェクトはスコープとして通らない (構造的偽造の拒否)
+        const forged: DailyReportViewerScope = { visible: null }
+        // @ts-expect-error 既存スコープを展開して visible だけ差し替える偽装も通らない
+        const widened: DailyReportViewerScope = { ...real, visible: null }
+        // @ts-expect-error コンストラクタは private なので直接生成できない
+        const constructed = new DailyReportViewerScope(null)
+
+        // 生成経路は 2 つの静的ファクトリだけ (実行時にも到達しないことの明示)
+        void forged
+        void widened
+        void constructed
+        expect(real.visible?.has("ni")).toBe(true)
+    })
+
+    it("restrictTo は nullish を受け付けない (無制限の第 2 の入口を作らない)", () => {
+        // 受け付けると「restrict」という名前のまま無制限スコープを生めてしまい、
+        // 「絞り込まれない読み取りは必ず unrestricted() に現れる」という監査不変条件が崩れる
+        // @ts-expect-error null は限定トークン列ではない
+        const fromNull = DailyReportViewerScope.restrictTo(null)
+        // @ts-expect-error undefined も同様 (省略可能フィールドの取りこぼしを型で止める)
+        const fromUndefined = DailyReportViewerScope.restrictTo(undefined)
+        void fromNull
+        void fromUndefined
+        expect(DailyReportViewerScope.restrictTo([]).visible?.size).toBe(0)
+    })
+
+    it("Object.assign による実体の書き換えを実行時に拒否する", () => {
+        const scope = DailyReportViewerScope.restrictTo(["ni"])
+        // private スロット + getter なので、public プロパティへの代入は実行時に失敗する
+        expect(() => Object.assign(scope, { visible: null })).toThrow()
+        expect(scope.visible?.has("ni")).toBe(true)
+    })
+
+    it("公開された可視集合を in-place で広げられない (毎回コピーを返す)", () => {
+        const scope = DailyReportViewerScope.restrictTo(["ni"])
+        const leaked = scope.visible as unknown as Set<string>
+        leaked.add("kintone")
+        // 取得したコピーを汚しても、スコープ本体は変わらない
+        expect(scope.visible?.has("kintone")).toBe(false)
+        expect(scope.visible?.has("ni")).toBe(true)
+    })
+})
+
+describe("deniesEverySourceType の三値", () => {
+    it("無制限 (null) は全拒否ではない", () => {
+        expect(deniesEverySourceType(null)).toBe(false)
+    })
+
+    it("空集合だけが全拒否になる", () => {
+        expect(deniesEverySourceType(normalizeVisibleSourceTypes([]))).toBe(true)
+        expect(deniesEverySourceType(normalizeVisibleSourceTypes(["ni"]))).toBe(false)
+    })
+})
+
+describe("buildVisibleSourceTypeCondition の三値", () => {
+    // 実カラムが要るため最小のテスト用テーブルを組む (getColumns / sql テンプレートが実体を要求する)
+    const testTable = mssqlSchema("test").table("Hub", { id: bigint("id", { mode: "number" }).notNull(), sourceType: nvarchar("source_type", { length: 20 }).notNull() }, (t) => [primaryKey({ columns: [t.id] })])
+    const dialect = new MsSqlDialect()
+
+    it("無制限は条件を生成しない (既存述語をそのまま残す)", () => {
+        expect(buildVisibleSourceTypeCondition(testTable.sourceType, null)).toBeUndefined()
+    })
+
+    it("全拒否は 1 = 0 を生成する (呼び出し側の短絡が漏れても認可が反転しない)", () => {
+        const condition = buildVisibleSourceTypeCondition(testTable.sourceType, normalizeVisibleSourceTypes([]))
+        expect(condition).toBeDefined()
+        expect(dialect.sqlToQuery(condition as NonNullable<typeof condition>).sql).toContain("1 = 0")
+    })
+
+    it("限定は LOWER(列) IN (畳み込み済みトークン) を生成する", () => {
+        const condition = buildVisibleSourceTypeCondition(testTable.sourceType, normalizeVisibleSourceTypes(["NI", "kintone"]))
+        const rendered = dialect.sqlToQuery(condition as NonNullable<typeof condition>)
+        expect(rendered.sql).toContain("LOWER(")
+        expect(rendered.sql).toContain("[source_type]")
+        expect(rendered.sql).toContain(" in ")
+        expect(rendered.params).toEqual(expect.arrayContaining(["kintone", "ni"]))
+    })
+})