Merge branch 'main' into feature/nation-personnel-finance-parity

# Conflicts: # app/game-frontend/e2e/playwright.config.mjs # app/game-frontend/package.json # docs/frontend-legacy-parity.md
2026-07-26 04:31:54 +00:00
parent f4c09a9b02 78aae176fe
commit 625476c86e
42 changed files with 4790 additions and 1949 deletions
@@ -0,0 +1,127 @@
+import { TRPCError } from '@trpc/server';
+
+import { asRecord } from '@sammo-ts/common';
+import { LogCategory, LogScope } from '@sammo-ts/infra';
+import { getGoldIncome, getOutcome, getRiceIncome, getWallIncome, getWarGoldIncome } from '@sammo-ts/logic';
+
+import { authedProcedure } from '../../../trpc.js';
+import { getMyGeneral } from '../../shared/general.js';
+import {
+    assertNationAccess,
+    buildNationIncomeContext,
+    resolveNationBill,
+    resolveNationRate,
+    resolveOfficerCity,
+    toIncomeCity,
+} from '../shared.js';
+
+export const getNationInfo = authedProcedure.query(async ({ ctx }) => {
+    const me = await getMyGeneral(ctx);
+    assertNationAccess(me);
+
+    const [nation, cities, generals, history] = await Promise.all([
+        ctx.db.nation.findUnique({ where: { id: me.nationId } }),
+        ctx.db.city.findMany({ where: { nationId: me.nationId }, orderBy: { id: 'asc' } }),
+        ctx.db.general.findMany({ where: { nationId: me.nationId } }),
+        ctx.db.logEntry.findMany({
+            where: {
+                scope: LogScope.NATION,
+                category: LogCategory.HISTORY,
+                nationId: me.nationId,
+            },
+            select: { id: true, year: true, month: true, text: true },
+            orderBy: { id: 'asc' },
+        }),
+    ]);
+    if (!nation) {
+        throw new TRPCError({ code: 'NOT_FOUND', message: 'Nation not found' });
+    }
+
+    const officerCntByCity = new Map<number, number>();
+    for (const general of generals) {
+        const officerCity = resolveOfficerCity(asRecord(general.meta));
+        if (
+            general.officerLevel >= 2 &&
+            general.officerLevel <= 4 &&
+            officerCity > 0 &&
+            general.cityId === officerCity
+        ) {
+            officerCntByCity.set(officerCity, (officerCntByCity.get(officerCity) ?? 0) + 1);
+        }
+    }
+
+    const incomeContext = await buildNationIncomeContext(nation);
+    const incomeCities = cities.map(toIncomeCity);
+    const rate = resolveNationRate(nation);
+    const bill = resolveNationBill(asRecord(nation.meta));
+    const goldCity = getGoldIncome(
+        incomeContext,
+        incomeCities,
+        officerCntByCity,
+        nation.capitalCityId ?? 0,
+        nation.level
+    );
+    const goldWar = getWarGoldIncome(incomeContext, incomeCities);
+    const riceCity = getRiceIncome(
+        incomeContext,
+        incomeCities,
+        officerCntByCity,
+        nation.capitalCityId ?? 0,
+        nation.level
+    );
+    const riceWall = getWallIncome(
+        incomeContext,
+        incomeCities,
+        officerCntByCity,
+        nation.capitalCityId ?? 0,
+        nation.level
+    );
+    const outcome = getOutcome(
+        bill,
+        generals.filter((general) => general.npcState !== 5)
+    );
+    const population = cities.reduce((sum, city) => sum + city.population, 0);
+    const populationMax = cities.reduce((sum, city) => sum + city.populationMax, 0);
+    const crewGenerals = generals.filter((general) => general.npcState !== 5);
+    const crew = crewGenerals.reduce((sum, general) => sum + general.crew, 0);
+    const crewMax = crewGenerals.reduce((sum, general) => sum + general.leadership * 100, 0);
+    const meta = asRecord(nation.meta);
+
+    return {
+        nation: {
+            id: nation.id,
+            name: nation.name,
+            color: nation.color,
+            level: nation.level,
+            power: typeof meta.power === 'number' ? meta.power : 0,
+            gold: nation.gold,
+            rice: nation.rice,
+            tech: Math.floor(nation.tech),
+            rate,
+            bill,
+            capitalCityId: nation.capitalCityId ?? 0,
+            generalCount: generals.length,
+        },
+        population: { current: population, max: populationMax },
+        crew: { current: crew, max: crewMax },
+        income: {
+            goldCity,
+            goldWar,
+            goldTotal: goldCity + goldWar,
+            riceCity,
+            riceWall,
+            riceTotal: riceCity + riceWall,
+            outcome,
+        },
+        budget: {
+            gold: nation.gold + goldCity + goldWar - outcome,
+            rice: nation.rice + riceCity + riceWall - outcome,
+        },
+        cities: cities.map((city) => ({
+            id: city.id,
+            name: city.name,
+            capital: city.id === nation.capitalCityId,
+        })),
+        history,
+    };
+});
@@ -6,6 +6,7 @@ import { getChiefCenter } from './endpoints/getChiefCenter.js';
 import { getCityOverview } from './endpoints/getCityOverview.js';
 import { getGeneralList } from './endpoints/getGeneralList.js';
 import { getGeneralLog } from './endpoints/getGeneralLog.js';
+import { getNationInfo } from './endpoints/getNationInfo.js';
 import { getPersonnelInfo } from './endpoints/getPersonnelInfo.js';
 import { getStratFinan } from './endpoints/getStratFinan.js';
 import { kick } from './endpoints/kick.js';
@@ -18,6 +19,7 @@ import { setScoutMsg } from './endpoints/setScoutMsg.js';
 import { setSecretLimit } from './endpoints/setSecretLimit.js';

 export const nationRouter = router({
+    getNationInfo,
    getGeneralList,
    getCityOverview,
    getPersonnelInfo,
@@ -36,4 +38,3 @@ export const nationRouter = router({
    kick,
    appoint,
 });
-