Lisätty päivityksen aloitusvuoden valinta admin-näkymään

Author: ArttKan

backend/src/app.ts

@@ -8,6 +8,7 @@ import { fileURLToPath } from 'url';
 import { runSetup } from './dbSetup.js';
 import { getLatestStatusEntry, getAllStatusEntries, clearAllStatusEntries } from './db/models/status.js';
 import { addStatusRow, createTables } from './db/db.js';
+import { yearFrom, yearTo } from './util/config.js';
 
 const app = express()
 const __filename = fileURLToPath(import.meta.url);
@@ -31,14 +32,26 @@ app.get('/api/ping', async (req, res) => {
   res.send({ data: 'pong' })
 })
 
+// Expose a small config endpoint so frontend can show current START_YEAR
+app.get('/api/config', (req, res) => {
+  try {
+    res.status(200).json({ startYear: yearFrom(), endYear: yearTo() });
+  } catch (error) {
+    console.error('Config endpoint error:', error);
+    res.status(500).json({ error: 'Failed to get config' });
+  }
+})
+
 app.post('/api/setup', async (req: express.Request, res: express.Response): Promise<void> => {
   try {
     res.status(200).json({ status: 'started', message: 'Database update started in background' });
     setImmediate(async () => {
       try {
-        console.log('[SETUP] Starting database setup...');
-        await runSetup();
-        console.log('[SETUP] Setup completed successfully');
+        console.info('Database setup started');
+        const body: any = req.body || {}
+        const startYear = body.startYear !== undefined ? parseInt(body.startYear as any, 10) : undefined
+        await runSetup(startYear);
+        console.info('Database setup completed');
       } catch (error) {
         console.error('[SETUP] Setup failed with error:', error);
         const errorMessage = error instanceof Error ? error.message : String(error);

backend/src/db/db.ts

@@ -85,7 +85,7 @@ async function dbIsReady(): Promise<boolean> {
   }
 }
 
-async function dbIsUpToDate(): Promise<{upToDate: boolean, statutes: StatuteKey[], judgments: JudgmentKey[]}> {
+async function dbIsUpToDate(startYear?: number): Promise<{upToDate: boolean, statutes: StatuteKey[], judgments: JudgmentKey[]}> {
   console.log('Checking if database is up to date...');
 
   async function compareStatuteCount(year: number): Promise<boolean> {
@@ -218,7 +218,8 @@ async function dbIsUpToDate(): Promise<{upToDate: boolean, statutes: StatuteKey[
     const judgments: JudgmentKey[] = [];
     let upToDate = true;
     const currentYear = yearTo()
-    for (let year = yearFrom(); year <= currentYear + 1; year++) {
+    const start = startYear ?? yearFrom()
+    for (let year = start; year <= currentYear + 1; year++) {
 
       if (!await compareStatuteCount(year)) {
         console.log(`Statutes for year ${year} are not up to date`);

backend/src/dbSetup.ts

@@ -6,7 +6,7 @@ import { yearFrom, yearTo } from "./util/config.js";
 
 setPool(process.env.PG_URI ?? '');
 
-async function initDatabase() {
+async function initDatabase(startYear?: number) {
   try {
     console.log('[DB] Checking if database is ready...');
     if (!await dbIsReady()) {
@@ -18,9 +18,11 @@ async function initDatabase() {
     }
 
     await clearStatusRows();
-    await addStatusRow({ message: 'updating', from: yearFrom(), to: yearTo() }, true);
+    const from = startYear ?? yearFrom();
+    const to = yearTo();
+    await addStatusRow({ message: 'updating', from, to }, true);
     console.log('[DB] Checking if database is up to date...');
-    const { upToDate, statutes, judgments } = await dbIsUpToDate();
+    const { upToDate, statutes, judgments } = await dbIsUpToDate(from);
 
     console.log('[DB] Up to date:', upToDate, 'missing statutes:', statutes.length, 'missing judgements:', judgments.length);
 
@@ -38,7 +40,7 @@ async function initDatabase() {
   }
 }
 
-export const runSetup = async () => {
+export const runSetup = async (startYear?: number) => {
   try {
     if (process.env.NODE_ENV === 'test') {
       console.log('[SETUP] Running in test mode...');
@@ -47,7 +49,7 @@ export const runSetup = async () => {
       console.log('[SETUP] Running in production mode...');
 
       console.log('[SETUP] Step 1: Initialize database...');
-      await initDatabase();
+      await initDatabase(startYear);
 
       console.log('[SETUP] Step 2: Clear and sync Typesense collections...');
       await deleteCollection('statutes', 'fin');
@@ -64,7 +66,9 @@ export const runSetup = async () => {
       await syncJudgments('swe');
 
       console.log('[SETUP] Step 5: Write completion status...');
-      await addStatusRow({ message: 'updated', from: yearFrom(), to: yearTo(), timestamp: new Date().toISOString() }, false);
+      const from = startYear ?? yearFrom();
+      const to = yearTo();
+      await addStatusRow({ message: 'updated', from, to, timestamp: new Date().toISOString() }, false);
     }
     console.log('[SETUP] Database setup done.');
   } catch (error) {

frontend/src/components/AdminPage.tsx

@@ -19,7 +19,9 @@ const AdminPage = ({ language }: AdminPageProps) => {
   const [error, setError] = useState('')
   const [latestStatus, setLatestStatus] = useState<StatusEntry | null>(null)
   const [hasStartedUpdate, setHasStartedUpdate] = useState(false)
+  const [startYearInput, setStartYearInput] = useState<string>('')
   const intervalRef = useRef<NodeJS.Timeout | null>(null)
+  const [defaultStartYear, setDefaultStartYear] = useState<number | null>(null)
 
   const pollLatestStatus = async () => {
     try {
@@ -51,6 +53,25 @@ const AdminPage = ({ language }: AdminPageProps) => {
     }
   }, [])
 
+  // Fetch backend config (current START_YEAR) and prefill input if empty
+  useEffect(() => {
+    let mounted = true
+    const fetchConfig = async () => {
+      try {
+        const resp = await axios.get('/api/config')
+        const sy = resp.data?.startYear
+        if (mounted && typeof sy === 'number') {
+          setDefaultStartYear(sy)
+          if (startYearInput.trim() === '') setStartYearInput(String(sy))
+        }
+      } catch (e) {
+        // ignore
+      }
+    }
+    fetchConfig()
+    return () => { mounted = false }
+  }, [])
+
   const handleUpdate = async () => {
     setIsUpdating(true)
     setMessage('')
@@ -59,7 +80,12 @@ const AdminPage = ({ language }: AdminPageProps) => {
     setHasStartedUpdate(true)
 
     try {
-      const response = await axios.post('/api/setup')
+      const payload: Record<string, unknown> = {}
+      if (startYearInput.trim() !== '') {
+        const yearNum = parseInt(startYearInput, 10)
+        if (!Number.isNaN(yearNum)) payload.startYear = yearNum
+      }
+      const response = await axios.post('/api/setup', payload)
       setMessage(language === 'fin'
         ? 'Päivitys aloitettu!'
         : 'Uppdatering startad!'
@@ -232,6 +258,17 @@ const AdminPage = ({ language }: AdminPageProps) => {
           </p>
 
           <div style={{ display: 'flex', justifyContent: 'center', flexWrap: 'wrap' }}>
+            <div style={{ display: 'flex', alignItems: 'center', gap: '10px', marginRight: '10px' }}>
+              <label style={{ fontSize: '14px' }}>{language === 'fin' ? 'Aloitusvuosi, oletuksena .env START_YEAR:' : 'Startår:'}</label>
+              <input
+                type="number"
+                value={startYearInput}
+                onChange={(e) => setStartYearInput(e.target.value)}
+                placeholder={defaultStartYear !== null ? String(defaultStartYear) : (language === 'fin' ? 'Oletus .env START_YEAR' : 'Default from .env START_YEAR')}
+                style={{ padding: '8px', borderRadius: '4px', border: '1px solid #ccc', width: '140px' }}
+              />
+            </div>
+
             <button
               style={buttonStyle}
               onClick={handleUpdate}