feat: 메인 화면에 정식 기수 표시
This commit is contained in:
@@ -44,6 +44,7 @@ export type WorldStateConfig = z.infer<typeof zWorldStateConfig>;
|
|||||||
|
|
||||||
export const zWorldStateMeta = z.object({
|
export const zWorldStateMeta = z.object({
|
||||||
serverId: z.string().optional(),
|
serverId: z.string().optional(),
|
||||||
|
gameIdx: z.number().int().positive().optional(),
|
||||||
starttime: z.string().optional(),
|
starttime: z.string().optional(),
|
||||||
opentime: z.string().optional(),
|
opentime: z.string().optional(),
|
||||||
preopenAt: z.string().optional(),
|
preopenAt: z.string().optional(),
|
||||||
|
|||||||
@@ -53,6 +53,8 @@ export const lobbyRouter = router({
|
|||||||
|
|
||||||
return {
|
return {
|
||||||
serverId: worldState.meta.serverId?.trim() || ctx.profile?.name || 'game',
|
serverId: worldState.meta.serverId?.trim() || ctx.profile?.name || 'game',
|
||||||
|
profile: ctx.profile.id,
|
||||||
|
gameIdx: worldState.meta.gameIdx ?? 1,
|
||||||
year: worldState.currentYear,
|
year: worldState.currentYear,
|
||||||
month: worldState.currentMonth,
|
month: worldState.currentMonth,
|
||||||
userCnt,
|
userCnt,
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ const buildContext = (
|
|||||||
): GameApiContext =>
|
): GameApiContext =>
|
||||||
({
|
({
|
||||||
auth: null,
|
auth: null,
|
||||||
|
profile: { id: 'che', scenario: 'default', name: 'che:default' },
|
||||||
db: {
|
db: {
|
||||||
worldState: {
|
worldState: {
|
||||||
findFirst: vi.fn(async () => ({
|
findFirst: vi.fn(async () => ({
|
||||||
@@ -75,6 +76,7 @@ describe('lobby season state', () => {
|
|||||||
buildContext(
|
buildContext(
|
||||||
{
|
{
|
||||||
serverId: 'che_260819_season',
|
serverId: 'che_260819_season',
|
||||||
|
gameIdx: 101,
|
||||||
preopenAt: '2026-08-19 22:00:00',
|
preopenAt: '2026-08-19 22:00:00',
|
||||||
opentime: '2026-08-19 23:00:00',
|
opentime: '2026-08-19 23:00:00',
|
||||||
scenarioMeta: { title: '【가상모드27-b】 아시아 명장전(비급)' },
|
scenarioMeta: { title: '【가상모드27-b】 아시아 명장전(비급)' },
|
||||||
@@ -103,6 +105,8 @@ describe('lobby season state', () => {
|
|||||||
|
|
||||||
expect(result).toMatchObject({
|
expect(result).toMatchObject({
|
||||||
serverId: 'che_260819_season',
|
serverId: 'che_260819_season',
|
||||||
|
profile: 'che',
|
||||||
|
gameIdx: 101,
|
||||||
preopenAt: '2026-08-19 22:00:00',
|
preopenAt: '2026-08-19 22:00:00',
|
||||||
opentime: '2026-08-19 23:00:00',
|
opentime: '2026-08-19 23:00:00',
|
||||||
scenarioTitle: '【가상모드27-b】 아시아 명장전(비급)',
|
scenarioTitle: '【가상모드27-b】 아시아 명장전(비급)',
|
||||||
|
|||||||
@@ -323,9 +323,6 @@ export const seedScenarioToDatabase = async (options: ScenarioSeedOptions): Prom
|
|||||||
options: install.autorunUser.options,
|
options: install.autorunUser.options,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
const archivedWorldMeta = { ...worldMeta };
|
|
||||||
delete archivedWorldMeta.hiddenSeed;
|
|
||||||
|
|
||||||
await connector.connect();
|
await connector.connect();
|
||||||
try {
|
try {
|
||||||
const result: ScenarioSeedResult = { seed, warnings, applied: true };
|
const result: ScenarioSeedResult = { seed, warnings, applied: true };
|
||||||
@@ -383,6 +380,20 @@ export const seedScenarioToDatabase = async (options: ScenarioSeedOptions): Prom
|
|||||||
await prisma.worldState.deleteMany();
|
await prisma.worldState.deleteMany();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const serverId = typeof worldMeta.serverId === 'string' ? worldMeta.serverId : undefined;
|
||||||
|
const completedGameCount = await prisma.gameHistory.count({
|
||||||
|
where: {
|
||||||
|
status: 'COMPLETED',
|
||||||
|
...(serverId ? { serverId: { not: serverId } } : {}),
|
||||||
|
},
|
||||||
|
});
|
||||||
|
// Ref fixes server_cnt once during ResetHelper initialization. Keep the
|
||||||
|
// frequently rendered game index in the same persisted read model and
|
||||||
|
// exclude abandoned or unfinished rows from the official sequence.
|
||||||
|
worldMeta.gameIdx = completedGameCount + 1;
|
||||||
|
const archivedWorldMeta = { ...worldMeta };
|
||||||
|
delete archivedWorldMeta.hiddenSeed;
|
||||||
|
|
||||||
await prisma.worldState.create({
|
await prisma.worldState.create({
|
||||||
data: {
|
data: {
|
||||||
scenarioCode: String(options.scenarioId),
|
scenarioCode: String(options.scenarioId),
|
||||||
|
|||||||
@@ -128,6 +128,58 @@ describeDb('scenario database seed', () => {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test('persists the next official game index without counting cancelled or unfinished games', async () => {
|
||||||
|
const marker = `scenario-seeder-game-index-${Date.now()}`;
|
||||||
|
const connector = createGamePostgresConnector({ url: databaseUrl });
|
||||||
|
await connector.connect();
|
||||||
|
try {
|
||||||
|
const completedBefore = await connector.prisma.gameHistory.count({ where: { status: 'COMPLETED' } });
|
||||||
|
await connector.prisma.gameHistory.createMany({
|
||||||
|
data: [
|
||||||
|
{
|
||||||
|
serverId: `${marker}-completed`,
|
||||||
|
date: new Date('2026-08-01T00:00:00.000Z'),
|
||||||
|
season: 1,
|
||||||
|
scenario: 1010,
|
||||||
|
scenarioName: '정상 종료 fixture',
|
||||||
|
status: 'COMPLETED',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
serverId: `${marker}-abandoned`,
|
||||||
|
date: new Date('2026-08-02T00:00:00.000Z'),
|
||||||
|
season: 1,
|
||||||
|
scenario: 1010,
|
||||||
|
scenarioName: '취소 fixture',
|
||||||
|
status: 'ABANDONED',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
serverId: `${marker}-open`,
|
||||||
|
date: new Date('2026-08-03T00:00:00.000Z'),
|
||||||
|
season: 1,
|
||||||
|
scenario: 1010,
|
||||||
|
scenarioName: '미완료 fixture',
|
||||||
|
status: 'OPEN',
|
||||||
|
},
|
||||||
|
],
|
||||||
|
});
|
||||||
|
|
||||||
|
await seedScenarioToDatabase({
|
||||||
|
scenarioId: 1010,
|
||||||
|
databaseUrl,
|
||||||
|
installOptions: { serverId: marker },
|
||||||
|
});
|
||||||
|
|
||||||
|
const worldState = await connector.prisma.worldState.findFirstOrThrow();
|
||||||
|
expect(worldState.meta).toMatchObject({ gameIdx: completedBefore + 2 });
|
||||||
|
await expect(
|
||||||
|
connector.prisma.gameHistory.findUniqueOrThrow({ where: { serverId: marker } })
|
||||||
|
).resolves.toMatchObject({ status: 'OPEN' });
|
||||||
|
} finally {
|
||||||
|
await connector.prisma.gameHistory.deleteMany({ where: { serverId: { startsWith: marker } } });
|
||||||
|
await connector.disconnect();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
test('writes scenario data into tables', async () => {
|
test('writes scenario data into tables', async () => {
|
||||||
const { seed } = await seedScenarioToDatabase({
|
const { seed } = await seedScenarioToDatabase({
|
||||||
scenarioId,
|
scenarioId,
|
||||||
|
|||||||
@@ -52,6 +52,8 @@ type NavigationFixture = {
|
|||||||
currentYear?: number;
|
currentYear?: number;
|
||||||
currentMonth?: number;
|
currentMonth?: number;
|
||||||
serverId?: string;
|
serverId?: string;
|
||||||
|
profile?: string;
|
||||||
|
gameIdx?: number;
|
||||||
scenarioTitle?: string;
|
scenarioTitle?: string;
|
||||||
nationColor?: string;
|
nationColor?: string;
|
||||||
lastExecuted?: string | null;
|
lastExecuted?: string | null;
|
||||||
@@ -529,6 +531,8 @@ const installFixture = async (page: Page, state: NavigationFixture) => {
|
|||||||
return response({
|
return response({
|
||||||
myGeneral: { id: 7, name: '메뉴검증장수' },
|
myGeneral: { id: 7, name: '메뉴검증장수' },
|
||||||
serverId: state.serverId ?? 'che_fixture_season',
|
serverId: state.serverId ?? 'che_fixture_season',
|
||||||
|
profile: state.profile ?? 'che',
|
||||||
|
gameIdx: state.gameIdx ?? 101,
|
||||||
year: state.currentYear ?? 185,
|
year: state.currentYear ?? 185,
|
||||||
month: state.currentMonth ?? 1,
|
month: state.currentMonth ?? 1,
|
||||||
turnTerm: 10,
|
turnTerm: 10,
|
||||||
@@ -1112,7 +1116,9 @@ test('desktop menus preserve ref columns, prefix-safe routes, and controlled dro
|
|||||||
await expect(page.locator('.main-mobile-bottom')).toBeHidden();
|
await expect(page.locator('.main-mobile-bottom')).toBeHidden();
|
||||||
await expect(page.locator('.layout-desktop')).toBeVisible();
|
await expect(page.locator('.layout-desktop')).toBeVisible();
|
||||||
await expect(page.locator('.layout-mobile')).toHaveCount(0);
|
await expect(page.locator('.layout-mobile')).toHaveCount(0);
|
||||||
await expect(page.getByRole('heading', { name: '메인 화면 검증 시나리오', exact: true })).toHaveCount(1);
|
await expect(page.getByRole('heading', { name: '메인 화면 검증 시나리오 체섭 101기', exact: true })).toHaveCount(
|
||||||
|
1
|
||||||
|
);
|
||||||
await expect(page.locator('.game-shell__subtitle')).toHaveCount(0);
|
await expect(page.locator('.game-shell__subtitle')).toHaveCount(0);
|
||||||
await expect(page.locator('.legacy-game-info')).toContainText('현재: 185년 1월');
|
await expect(page.locator('.legacy-game-info')).toContainText('현재: 185년 1월');
|
||||||
await expect(page.locator('.legacy-game-info')).toContainText('턴: 10분');
|
await expect(page.locator('.legacy-game-info')).toContainText('턴: 10분');
|
||||||
@@ -1264,6 +1270,56 @@ test('desktop menus preserve ref columns, prefix-safe routes, and controlled dro
|
|||||||
await persistArtifact(page, `${basePath.slice(1)}-desktop-1200`);
|
await persistArtifact(page, `${basePath.slice(1)}-desktop-1200`);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test('shows the persisted official game index beside the scenario title without viewport overflow', async ({ page }) => {
|
||||||
|
const state: NavigationFixture = {
|
||||||
|
officerLevel: 5,
|
||||||
|
permission: 2,
|
||||||
|
nationLevel: 3,
|
||||||
|
stage: 0,
|
||||||
|
npcMode: 1,
|
||||||
|
profile: 'hwe',
|
||||||
|
gameIdx: 7,
|
||||||
|
scenarioTitle: '메인 화면 검증 시나리오',
|
||||||
|
generalMeCalls: 0,
|
||||||
|
operations: [],
|
||||||
|
};
|
||||||
|
await installFixture(page, state);
|
||||||
|
if (artifactRoot) await mkdir(resolve(artifactRoot), { recursive: true });
|
||||||
|
|
||||||
|
for (const viewport of [
|
||||||
|
{ width: 1200, height: 900 },
|
||||||
|
{ width: 500, height: 900 },
|
||||||
|
]) {
|
||||||
|
await page.setViewportSize(viewport);
|
||||||
|
if (page.url() === 'about:blank') await waitForMain(page);
|
||||||
|
|
||||||
|
const title = page.getByRole('heading', { name: '메인 화면 검증 시나리오 훼섭 7기', exact: true });
|
||||||
|
await expect(title).toBeVisible();
|
||||||
|
const geometry = await title.evaluate((element) => {
|
||||||
|
const rect = element.getBoundingClientRect();
|
||||||
|
const mainRect = element.closest<HTMLElement>('.main-page')?.getBoundingClientRect();
|
||||||
|
const style = getComputedStyle(element);
|
||||||
|
return {
|
||||||
|
left: rect.left,
|
||||||
|
right: rect.right,
|
||||||
|
mainLeft: mainRect?.left,
|
||||||
|
mainRight: mainRect?.right,
|
||||||
|
fontFamily: style.fontFamily,
|
||||||
|
fontSize: style.fontSize,
|
||||||
|
lineHeight: style.lineHeight,
|
||||||
|
documentOverflow: document.documentElement.scrollWidth - document.documentElement.clientWidth,
|
||||||
|
};
|
||||||
|
});
|
||||||
|
expect(geometry.left).toBeGreaterThanOrEqual(geometry.mainLeft ?? 0);
|
||||||
|
expect(geometry.right).toBeLessThanOrEqual(geometry.mainRight ?? viewport.width);
|
||||||
|
expect(geometry.documentOverflow).toBeLessThanOrEqual(0);
|
||||||
|
expect(geometry.fontSize).toBe('25.6px');
|
||||||
|
expect(geometry.lineHeight).toBe('38.4px');
|
||||||
|
expect(geometry.fontFamily).toContain('Pretendard');
|
||||||
|
await persistArtifact(page, `official-game-index-${viewport.width}`);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
test('nation split buttons keep square inner corners and a single divider in every interaction state', async ({
|
test('nation split buttons keep square inner corners and a single divider in every interaction state', async ({
|
||||||
page,
|
page,
|
||||||
}, testInfo) => {
|
}, testInfo) => {
|
||||||
@@ -2239,7 +2295,7 @@ test('the 939/940 boundary switches to the Ref-style 500px single document', asy
|
|||||||
await expect(page.locator('.main-mobile-bottom')).toBeVisible();
|
await expect(page.locator('.main-mobile-bottom')).toBeVisible();
|
||||||
|
|
||||||
await page.setViewportSize({ width: 500, height: 900 });
|
await page.setViewportSize({ width: 500, height: 900 });
|
||||||
await expect(page.getByRole('heading', { name: '모바일 검증 시나리오', exact: true })).toHaveCount(1);
|
await expect(page.getByRole('heading', { name: '모바일 검증 시나리오 체섭 101기', exact: true })).toHaveCount(1);
|
||||||
await expect(page.locator('.game-shell__subtitle')).toHaveCount(0);
|
await expect(page.locator('.game-shell__subtitle')).toHaveCount(0);
|
||||||
await expect(page.locator('.legacy-game-info')).toContainText('현재: 185년 1월');
|
await expect(page.locator('.legacy-game-info')).toContainText('현재: 185년 1월');
|
||||||
await expect(page.locator('.legacy-game-info')).toContainText('턴: 10분');
|
await expect(page.locator('.legacy-game-info')).toContainText('턴: 10분');
|
||||||
|
|||||||
@@ -95,6 +95,27 @@ const nationAccess = computed(() => ({
|
|||||||
}));
|
}));
|
||||||
const nationColor = computed(() => nation.value?.color ?? '#000000');
|
const nationColor = computed(() => nation.value?.color ?? '#000000');
|
||||||
const voteActive = computed(() => Boolean(frontStatus.value?.latestVote));
|
const voteActive = computed(() => Boolean(frontStatus.value?.latestVote));
|
||||||
|
const profileLabels: Record<string, string> = {
|
||||||
|
che: '체',
|
||||||
|
kwe: '퀘',
|
||||||
|
pwe: '풰',
|
||||||
|
twe: '퉤',
|
||||||
|
nya: '냐',
|
||||||
|
pya: '퍄',
|
||||||
|
hwe: '훼',
|
||||||
|
};
|
||||||
|
const gameProfileLabel = computed(() => {
|
||||||
|
const profile = lobbyInfo.value?.profile?.trim();
|
||||||
|
return profile ? (profileLabels[profile] ?? profile) : '';
|
||||||
|
});
|
||||||
|
const gameTitle = computed(() => {
|
||||||
|
const scenarioTitle = lobbyInfo.value?.scenarioTitle || '전장 현황';
|
||||||
|
const profileLabel = gameProfileLabel.value;
|
||||||
|
const gameIdx = lobbyInfo.value?.gameIdx;
|
||||||
|
return profileLabel && typeof gameIdx === 'number' && Number.isInteger(gameIdx) && gameIdx > 0
|
||||||
|
? `${scenarioTitle} ${profileLabel}섭 ${gameIdx}기`
|
||||||
|
: scenarioTitle;
|
||||||
|
});
|
||||||
const recordTimeSuffixPattern = /\d{2}:\d{2}(?:<\/>)?\s*$/u;
|
const recordTimeSuffixPattern = /\d{2}:\d{2}(?:<\/>)?\s*$/u;
|
||||||
const formatRecord = (entry: { text: string; createdAt?: string | Date }, appendTime = false): string => {
|
const formatRecord = (entry: { text: string; createdAt?: string | Date }, appendTime = false): string => {
|
||||||
if (!appendTime || recordTimeSuffixPattern.test(entry.text)) return formatLog(entry.text);
|
if (!appendTime || recordTimeSuffixPattern.test(entry.text)) return formatLog(entry.text);
|
||||||
@@ -199,7 +220,7 @@ watch(
|
|||||||
|
|
||||||
<header class="game-shell__header">
|
<header class="game-shell__header">
|
||||||
<h1 class="game-shell__title">
|
<h1 class="game-shell__title">
|
||||||
{{ lobbyInfo?.scenarioTitle || '전장 현황' }}
|
{{ gameTitle }}
|
||||||
</h1>
|
</h1>
|
||||||
<div class="game-shell__actions desktop-action-controls">
|
<div class="game-shell__actions desktop-action-controls">
|
||||||
<button
|
<button
|
||||||
|
|||||||
@@ -39,7 +39,7 @@ describe('readReleaseManifest', () => {
|
|||||||
await expect(readReleaseManifest(workspaceRoot)).resolves.toMatchObject({
|
await expect(readReleaseManifest(workspaceRoot)).resolves.toMatchObject({
|
||||||
controllerProtocol: RELEASE_CONTROLLER_PROTOCOL,
|
controllerProtocol: RELEASE_CONTROLLER_PROTOCOL,
|
||||||
gatewaySchemaHead: '20260819000000_backfill_profile_release_source',
|
gatewaySchemaHead: '20260819000000_backfill_profile_release_source',
|
||||||
gameSchemaHead: '20260820001000_restore_united_turn_halt',
|
gameSchemaHead: '20260820002000_persist_official_game_index',
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
+18
@@ -0,0 +1,18 @@
|
|||||||
|
-- Ref stores server_cnt once at reset time because it is rendered on every main-page load.
|
||||||
|
-- Backfill the active world's equivalent read-model value while excluding cancelled and
|
||||||
|
-- unfinished history rows from the official sequence.
|
||||||
|
UPDATE "world_state" AS ws
|
||||||
|
SET "meta" = jsonb_set(
|
||||||
|
COALESCE(ws."meta", '{}'::jsonb),
|
||||||
|
'{gameIdx}',
|
||||||
|
to_jsonb((
|
||||||
|
SELECT COUNT(*)::integer + 1
|
||||||
|
FROM "ng_games" AS history
|
||||||
|
WHERE history."status" = 'COMPLETED'
|
||||||
|
AND (
|
||||||
|
ws."meta"->>'serverId' IS NULL
|
||||||
|
OR history."server_id" <> ws."meta"->>'serverId'
|
||||||
|
)
|
||||||
|
)),
|
||||||
|
true
|
||||||
|
);
|
||||||
@@ -2,6 +2,6 @@
|
|||||||
"formatVersion": 1,
|
"formatVersion": 1,
|
||||||
"controllerProtocol": 2,
|
"controllerProtocol": 2,
|
||||||
"gatewaySchemaHead": "20260819000000_backfill_profile_release_source",
|
"gatewaySchemaHead": "20260819000000_backfill_profile_release_source",
|
||||||
"gameSchemaHead": "20260820001000_restore_united_turn_halt",
|
"gameSchemaHead": "20260820002000_persist_official_game_index",
|
||||||
"components": ["gateway-api", "gateway-frontend", "release-controller", "game-api", "game-engine", "game-frontend"]
|
"components": ["gateway-api", "gateway-frontend", "release-controller", "game-api", "game-engine", "game-frontend"]
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user