fix(dynasty): normalize archived nation records
This commit is contained in:
@@ -25,6 +25,50 @@ const parseDisplayArray = (value: unknown): Array<string | number> =>
|
||||
)
|
||||
: [];
|
||||
|
||||
const parseArchiveRecord = (value: unknown): Record<string, unknown> => {
|
||||
if (typeof value === 'string') {
|
||||
try {
|
||||
return asRecord(JSON.parse(value));
|
||||
} catch {
|
||||
return {};
|
||||
}
|
||||
}
|
||||
return asRecord(value);
|
||||
};
|
||||
|
||||
const firstFiniteNumber = (...values: unknown[]): number | null => {
|
||||
for (const value of values) {
|
||||
const parsed = typeof value === 'string' ? Number(value) : value;
|
||||
if (typeof parsed === 'number' && Number.isFinite(parsed)) return parsed;
|
||||
}
|
||||
return null;
|
||||
};
|
||||
|
||||
const firstDisplayArray = (...values: unknown[]): Array<string | number> => {
|
||||
for (const value of values) {
|
||||
const parsed = parseDisplayArray(value);
|
||||
if (parsed.length > 0 || Array.isArray(value)) return parsed;
|
||||
}
|
||||
return [];
|
||||
};
|
||||
|
||||
const normalizeOldNationData = (value: unknown) => {
|
||||
const data = asRecord(value);
|
||||
const aux = parseArchiveRecord(data.aux);
|
||||
const meta = asRecord(data.meta);
|
||||
const legacyMaxPower = asRecord(meta.max_power);
|
||||
const typeCode = typeof data.type === 'string' ? data.type : typeof data.typeCode === 'string' ? data.typeCode : '';
|
||||
|
||||
return {
|
||||
data,
|
||||
typeCode,
|
||||
tech: firstFiniteNumber(data.tech, meta.tech),
|
||||
maxPower: firstFiniteNumber(data.maxPower, aux.maxPower, legacyMaxPower.maxPower, data.power),
|
||||
maxCrew: firstFiniteNumber(data.maxCrew, aux.maxCrew, legacyMaxPower.maxCrew),
|
||||
maxCities: firstDisplayArray(data.maxCities, aux.maxCities, legacyMaxPower.maxCities),
|
||||
};
|
||||
};
|
||||
|
||||
const formatNationType = (typeCode: string): string => {
|
||||
const separator = typeCode.indexOf('_');
|
||||
return separator < 0 ? typeCode : typeCode.slice(separator + 1);
|
||||
@@ -94,31 +138,27 @@ export const dynastyRouter = router({
|
||||
const serverId = emperor.serverId ?? '';
|
||||
const oldNationRows = await ctx.db.oldNation.findMany({
|
||||
where: { serverId },
|
||||
orderBy: { date: 'desc' },
|
||||
orderBy: [{ date: 'desc' }, { id: 'desc' }],
|
||||
});
|
||||
|
||||
const nationEntries = oldNationRows
|
||||
.map((row) => {
|
||||
const data = asRecord(row.data);
|
||||
const normalized = normalizeOldNationData(row.data);
|
||||
const { data } = normalized;
|
||||
const nationId = row.nation ?? (typeof data.nation === 'number' ? data.nation : 0);
|
||||
const typeCode = typeof data.type === 'string' ? data.type : '';
|
||||
return {
|
||||
archiveId: row.id,
|
||||
nation: nationId,
|
||||
isWinner: winnerNationId !== null && nationId === winnerNationId,
|
||||
name: typeof data.name === 'string' ? data.name : nationId === 0 ? '재야' : '미상',
|
||||
color: typeof data.color === 'string' ? data.color : '#000000',
|
||||
type: typeCode,
|
||||
typeName: formatNationType(typeCode),
|
||||
type: normalized.typeCode,
|
||||
typeName: formatNationType(normalized.typeCode),
|
||||
level: typeof data.level === 'number' ? data.level : null,
|
||||
tech: typeof data.tech === 'number' ? data.tech : null,
|
||||
maxPower:
|
||||
typeof data.maxPower === 'number'
|
||||
? data.maxPower
|
||||
: typeof data.power === 'number'
|
||||
? data.power
|
||||
: null,
|
||||
maxCrew: typeof data.maxCrew === 'number' ? data.maxCrew : null,
|
||||
maxCities: parseDisplayArray(data.maxCities),
|
||||
tech: normalized.tech,
|
||||
maxPower: normalized.maxPower,
|
||||
maxCrew: normalized.maxCrew,
|
||||
maxCities: normalized.maxCities,
|
||||
generals: parseNumberArray(data.generals),
|
||||
history: parseTextArray(data.history),
|
||||
date: row.date.toISOString(),
|
||||
|
||||
@@ -69,12 +69,11 @@ const oldNation = {
|
||||
nation: 1,
|
||||
name: '촉',
|
||||
color: '#FF0000',
|
||||
type: 'che_병가',
|
||||
typeCode: 'che_병가',
|
||||
level: 7,
|
||||
tech: 4000,
|
||||
power: 34434,
|
||||
maxCrew: 120000,
|
||||
maxCities: ['성도', '한중'],
|
||||
power: 12_345,
|
||||
aux: { maxPower: 34_434, maxCrew: 120_000, maxCities: ['성도', '한중'] },
|
||||
generals: [11, 12],
|
||||
history: ['<Y>유비</>가 황제로 즉위'],
|
||||
owner: 'not-returned',
|
||||
@@ -82,6 +81,28 @@ const oldNation = {
|
||||
date: new Date('2026-07-25T12:00:00.000Z'),
|
||||
};
|
||||
|
||||
const deletedOldNation = {
|
||||
id: 4,
|
||||
serverId: emperor.serverId,
|
||||
nation: 2,
|
||||
data: {
|
||||
nation: 2,
|
||||
name: '위',
|
||||
color: '#0000FF',
|
||||
type: 'che_법가',
|
||||
level: 5,
|
||||
power: 8_000,
|
||||
generals: [13],
|
||||
history: [],
|
||||
meta: {
|
||||
tech: 3_000,
|
||||
max_power: { maxPower: 20_000, maxCrew: 80_000, maxCities: ['허창'] },
|
||||
privateNote: 'not-returned',
|
||||
},
|
||||
},
|
||||
date: new Date('2026-07-24T12:00:00.000Z'),
|
||||
};
|
||||
|
||||
const authFor = (userId: string, roles: string[] = []): GameSessionTokenPayload => ({
|
||||
version: 1,
|
||||
profile: profile.name,
|
||||
@@ -97,7 +118,10 @@ const authFor = (userId: string, roles: string[] = []): GameSessionTokenPayload
|
||||
sanctions: {},
|
||||
});
|
||||
|
||||
const buildContext = (auth: GameSessionTokenPayload | null): GameApiContext => {
|
||||
const buildContext = (
|
||||
auth: GameSessionTokenPayload | null,
|
||||
oldNations: Array<Record<string, unknown>> = [oldNation, deletedOldNation]
|
||||
): GameApiContext => {
|
||||
const db = {
|
||||
worldState: {
|
||||
findFirst: async () => ({ currentYear: 220, currentMonth: 1 }),
|
||||
@@ -108,12 +132,13 @@ const buildContext = (auth: GameSessionTokenPayload | null): GameApiContext => {
|
||||
},
|
||||
oldNation: {
|
||||
findMany: async ({ where }: { where: { serverId: string } }) =>
|
||||
where.serverId === emperor.serverId ? [oldNation] : [],
|
||||
where.serverId === emperor.serverId ? oldNations : [],
|
||||
},
|
||||
oldGeneral: {
|
||||
findMany: async () => [
|
||||
{ generalNo: 11, name: '유비', lastYearMonth: 21504 },
|
||||
{ generalNo: 12, name: '제갈량', lastYearMonth: 21504 },
|
||||
{ generalNo: 13, name: '조조', lastYearMonth: 21003 },
|
||||
],
|
||||
},
|
||||
};
|
||||
@@ -204,16 +229,30 @@ describe('dynasty public read model', () => {
|
||||
);
|
||||
expect(result.nations).toEqual([
|
||||
expect.objectContaining({
|
||||
archiveId: 3,
|
||||
name: '촉',
|
||||
type: 'che_병가',
|
||||
typeName: '병가',
|
||||
levelName: '황제',
|
||||
maxPower: 34434,
|
||||
maxCrew: 120000,
|
||||
maxCities: ['성도', '한중'],
|
||||
generalsFull: [
|
||||
{ generalNo: 11, name: '유비', lastYearMonth: 21504 },
|
||||
{ generalNo: 12, name: '제갈량', lastYearMonth: 21504 },
|
||||
],
|
||||
}),
|
||||
expect.objectContaining({
|
||||
archiveId: 4,
|
||||
name: '위',
|
||||
type: 'che_법가',
|
||||
typeName: '법가',
|
||||
tech: 3000,
|
||||
maxPower: 20000,
|
||||
maxCrew: 80000,
|
||||
maxCities: ['허창'],
|
||||
generalsFull: [{ generalNo: 13, name: '조조', lastYearMonth: 21003 }],
|
||||
}),
|
||||
]);
|
||||
expect(JSON.stringify(result)).not.toContain('privateNote');
|
||||
expect(JSON.stringify(result)).not.toContain('not-returned');
|
||||
@@ -221,6 +260,29 @@ describe('dynasty public read model', () => {
|
||||
expect(JSON.stringify(result)).not.toContain('"data"');
|
||||
});
|
||||
|
||||
it('reads legacy JSON-string aux values without exposing malformed archive internals', async () => {
|
||||
const stringAuxNation = {
|
||||
...oldNation,
|
||||
id: 5,
|
||||
data: {
|
||||
...oldNation.data,
|
||||
aux: JSON.stringify({ maxPower: 45_000, maxCrew: 130_000, maxCities: ['낙양'] }),
|
||||
owner: 'not-returned',
|
||||
},
|
||||
};
|
||||
const result = await appRouter
|
||||
.createCaller(buildContext(null, [stringAuxNation]))
|
||||
.dynasty.getDetail({ emperorId: emperor.id });
|
||||
|
||||
expect(result.nations[0]).toMatchObject({
|
||||
archiveId: 5,
|
||||
maxPower: 45_000,
|
||||
maxCrew: 130_000,
|
||||
maxCities: ['낙양'],
|
||||
});
|
||||
expect(JSON.stringify(result)).not.toContain('not-returned');
|
||||
});
|
||||
|
||||
it('rejects invalid and missing record identifiers without querying another scope', async () => {
|
||||
const caller = appRouter.createCaller(buildContext(null));
|
||||
|
||||
|
||||
Reference in New Issue
Block a user