feat: 플레이 감사 장수 로그를 기수별로 조회
This commit is contained in:
@@ -59,7 +59,8 @@ const persistLogs = async (
|
||||
logs: LogEntryDraft[],
|
||||
year: number,
|
||||
month: number,
|
||||
at: Date
|
||||
at: Date,
|
||||
serverId: string | null
|
||||
): Promise<void> => {
|
||||
const data = logs.flatMap((entry) => {
|
||||
const record = finalizeLogEntry(entry, { year, month, at });
|
||||
@@ -68,6 +69,7 @@ const persistLogs = async (
|
||||
}
|
||||
return [
|
||||
{
|
||||
serverId,
|
||||
scope: record.scope,
|
||||
category: record.category,
|
||||
subType: record.subType ?? null,
|
||||
@@ -92,7 +94,8 @@ const persistEffects = async (
|
||||
effects: GeneralActionEffect[],
|
||||
year: number,
|
||||
month: number,
|
||||
at: Date
|
||||
at: Date,
|
||||
serverId: string | null
|
||||
): Promise<void> => {
|
||||
const logs: LogEntryDraft[] = [];
|
||||
for (const effect of effects) {
|
||||
@@ -122,7 +125,7 @@ const persistEffects = async (
|
||||
logs.push(effect.entry);
|
||||
}
|
||||
}
|
||||
await persistLogs(db, orderLegacyActionLoggerFlush(logs), year, month, at);
|
||||
await persistLogs(db, orderLegacyActionLoggerFlush(logs), year, month, at, serverId);
|
||||
};
|
||||
|
||||
const refreshFrontStates = async (db: DatabaseClient, mapName: string, nationIds: number[]): Promise<number[]> => {
|
||||
@@ -187,11 +190,13 @@ export const respondToDiplomaticMessage = async (options: {
|
||||
}
|
||||
|
||||
const world = await db.worldState.findFirst({
|
||||
select: { currentYear: true, currentMonth: true, config: true },
|
||||
select: { currentYear: true, currentMonth: true, config: true, meta: true },
|
||||
});
|
||||
if (!world) {
|
||||
throw new TRPCError({ code: 'PRECONDITION_FAILED', message: '게임 상태가 없습니다.' });
|
||||
}
|
||||
const serverIdValue = asRecord(world.meta).serverId;
|
||||
const serverId = typeof serverIdValue === 'string' && serverIdValue.trim() ? serverIdValue : null;
|
||||
const now = (await loadCurrentGameTime(db)).now;
|
||||
const action = parseAction(message.payload.option?.action);
|
||||
if (message.msgType !== 'diplomacy' || !action || message.payload.option?.used) {
|
||||
@@ -204,7 +209,8 @@ export const respondToDiplomaticMessage = async (options: {
|
||||
buildFailureLog(actor.id, reason, actionName, response),
|
||||
world.currentYear,
|
||||
world.currentMonth,
|
||||
now
|
||||
now,
|
||||
serverId
|
||||
);
|
||||
return {
|
||||
result: false,
|
||||
@@ -302,7 +308,8 @@ export const respondToDiplomaticMessage = async (options: {
|
||||
[...actorLogger.flush(), ...proposerLogger.flush()],
|
||||
world.currentYear,
|
||||
world.currentMonth,
|
||||
now
|
||||
now,
|
||||
serverId
|
||||
);
|
||||
await invalidateMessages(db, [message.id]);
|
||||
return {
|
||||
@@ -414,7 +421,7 @@ export const respondToDiplomaticMessage = async (options: {
|
||||
...(action === 'noAggression' ? { treatyYear: treatyYear!, treatyMonth: treatyMonth! } : {}),
|
||||
}
|
||||
);
|
||||
await persistEffects(db, resolution.effects, world.currentYear, world.currentMonth, now);
|
||||
await persistEffects(db, resolution.effects, world.currentYear, world.currentMonth, now, serverId);
|
||||
let affectedCityIds: number[] = [];
|
||||
if (resolution.refreshFront) {
|
||||
const worldConfig = asRecord(world.config);
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import { nationSeries, zAuditNation } from './nationSeries.js';
|
||||
import { cityDetail, generalDetail, generalTurns } from './details.js';
|
||||
import { generalLogs } from './logs.js';
|
||||
import { z } from 'zod';
|
||||
import { canReadPlayAuditAccounts } from '@sammo-ts/common';
|
||||
import { router } from '../../trpc.js';
|
||||
@@ -22,6 +23,7 @@ import {
|
||||
} from './projection.js';
|
||||
|
||||
export const playAuditRouter = router({
|
||||
generalLogs,
|
||||
cityDetail,
|
||||
generalDetail,
|
||||
generalTurns,
|
||||
|
||||
@@ -0,0 +1,60 @@
|
||||
import { TRPCError } from '@trpc/server';
|
||||
import { z } from 'zod';
|
||||
import { auditProcedure, monthOrdinal, readAudit, readAuditWorld } from './shared.js';
|
||||
|
||||
const categoryByType = {
|
||||
generalHistory: 'HISTORY',
|
||||
generalAction: 'ACTION',
|
||||
battleResult: 'BATTLE_BRIEF',
|
||||
battleDetail: 'BATTLE_DETAIL',
|
||||
} as const;
|
||||
export const generalLogs = auditProcedure
|
||||
.input(
|
||||
z
|
||||
.object({
|
||||
generalId: z.number().int().nonnegative(),
|
||||
type: z.enum(['generalHistory', 'generalAction', 'battleResult', 'battleDetail']),
|
||||
month: z
|
||||
.object({ year: z.number().int().min(0).max(9999), month: z.number().int().min(1).max(12) })
|
||||
.strict()
|
||||
.optional(),
|
||||
cursor: z.number().int().positive().optional(),
|
||||
limit: z.number().int().min(1).max(200).default(50),
|
||||
})
|
||||
.strict()
|
||||
)
|
||||
.query(({ ctx, input }) =>
|
||||
readAudit(ctx, async (tx) => {
|
||||
const world = await readAuditWorld(tx);
|
||||
if (
|
||||
input.month &&
|
||||
(input.month.year < world.startYear ||
|
||||
monthOrdinal(input.month.year, input.month.month) > monthOrdinal(world.year, world.month))
|
||||
) {
|
||||
throw new TRPCError({ code: 'BAD_REQUEST', message: '현재 기수 안의 로그 월을 선택해 주세요.' });
|
||||
}
|
||||
const rows = world.serverId
|
||||
? await tx.logEntry.findMany({
|
||||
where: {
|
||||
serverId: world.serverId,
|
||||
generalId: input.generalId,
|
||||
scope: 'GENERAL',
|
||||
category: categoryByType[input.type],
|
||||
id: input.cursor === undefined ? undefined : { lt: input.cursor },
|
||||
year: input.month?.year,
|
||||
month: input.month?.month,
|
||||
},
|
||||
orderBy: { id: 'desc' },
|
||||
take: input.limit + 1,
|
||||
select: { id: true, year: true, month: true, text: true, createdAt: true },
|
||||
})
|
||||
: [];
|
||||
return {
|
||||
...world,
|
||||
type: input.type,
|
||||
coverage: world.serverId ? ('IDENTIFIED_LOGS_ONLY' as const) : ('IDENTITY_MISSING' as const),
|
||||
items: rows.slice(0, input.limit),
|
||||
nextCursor: rows.length > input.limit ? rows[input.limit - 1]!.id : null,
|
||||
};
|
||||
})
|
||||
);
|
||||
Reference in New Issue
Block a user