Appi composeen, luodaan taulut jo startupissa niin statuksen kysyminen ei romuta koko appia

Author: ArttKan

backend/src/app.ts

@@ -32,7 +32,6 @@ 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() });

backend/src/db/db.ts

@@ -50,7 +50,9 @@ async function fillDb(statutes: StatuteKey[], judgments: JudgmentKey[]): Promise
 
 async function dbIsReady(): Promise<boolean> {
   try {
+    console.log('tsekataan db')
     const client = await pool.connect();
+    console.log('yli poolin')
     let result = await client.query("SELECT EXISTS (SELECT 1 FROM information_schema.tables WHERE table_schema = 'public' AND table_name = 'images');")
     const imagesExists = result.rows[0].exists;
 
@@ -244,9 +246,7 @@ async function dbIsUpToDate(startYear?: number): Promise<{upToDate: boolean, sta
 
 async function createTables(): Promise<void> {
   try {
-    console.log('ennen poolia')
     const client = await pool.connect();
-    console.log("taulut");
     await client.query(`
       CREATE TABLE IF NOT EXISTS images (
         uuid UUID PRIMARY KEY,

backend/src/index.ts

@@ -1,10 +1,31 @@
 import app from './app.js'
-import { setPool } from './db/db.js'
+import { setPool, createTables, addStatusRow } from './db/db.js'
 import './util/config.js'
 
 setPool(process.env.PG_URI ?? '')
 
 const PORT = 3001
-app.listen(PORT, () => {
-  console.log(`Server running on port ${PORT}`)
-})
+
+async function startServer() {
+  try {
+    await createTables()
+    console.log('[STARTUP] Tables created/verified')
+
+    await addStatusRow(
+      {
+        message: 'server_started',
+        timestamp: new Date().toISOString()
+      },
+      false
+    )
+    console.log('[STARTUP] Initial status row inserted')
+  } catch (error) {
+    console.error('[STARTUP] Error initializing database:', error)
+  }
+
+  app.listen(PORT, () => {
+    console.log(`Server running on port ${PORT}`)
+  })
+}
+
+startServer()

backend/src/search.ts

@@ -328,7 +328,7 @@ export async function deleteCollection(name: string, lang: string) {
 
 
 export async function searchStatutes(lang: string, queryStr: string): Promise<StatuteSearchResult[]> {
-  const searchParameters: SearchParams = {
+  const searchParameters: SearchParams<Record<string, any>> = {
     q: queryStr,
     query_by: "title,common_names,keywords,headings,year,number,paragraphs",
     query_by_weights: "50,49,48,20,15,10,1",
@@ -350,7 +350,7 @@ export async function searchStatutes(lang: string, queryStr: string): Promise<St
 
 
 export async function searchJudgments(lang: string, queryStr: string, level: string): Promise<JudgmentSearchResult[]> {
-  const searchParameters: SearchParams = {
+  const searchParameters: SearchParams<Record<string, any>> = {
     q: queryStr,
     query_by: "keywords,level,year,number,headings,paragraphs",
     query_by_weights: "60,50,49,48,10,1",

docker-compose.yml

@@ -11,6 +11,12 @@ services:
       - "5432:5432"
     volumes:
       - finlex-db-data:/data
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U postgres -d testdb"]
+      interval: 1s
+      timeout: 5s
+      retries: 20
+      start_period: 10s
   typesense:
     build:
       context: .
@@ -20,5 +26,23 @@ services:
       TYPESENSE_DATA_DIR: /tmp
     ports:
       - "8108:8108"
+  app:
+    build:
+      context: .
+      dockerfile: e2e/Dockerfile.app
+    environment:
+      PG_URI: postgresql://postgres:postgres@postgres:5432/testdb
+      TYPESENSE_HOST: typesense
+      TYPESENSE_PORT: 8108
+      TYPESENSE_API_KEY: xyz
+      START_YEAR: 2024
+      NODE_ENV: production
+    ports:
+      - "3001:3001"
+    depends_on:
+      postgres:
+        condition: service_healthy
+      typesense:
+        condition: service_started
 volumes:
   finlex-db-data:

e2e/Dockerfile.app

@@ -1,11 +1,9 @@
-FROM node:24
+FROM node:24.0.2
 RUN apt update && apt install -y curl
-USER node
 
 WORKDIR /home/node/app/frontend
-COPY frontend/package-lock.json .
 COPY frontend/package.json .
-RUN npm ci
+RUN npm install --prefer-offline --no-audit
 
 COPY frontend/tsconfig.json .
 COPY frontend/tsconfig.node.json .
@@ -18,13 +16,15 @@ RUN mkdir -p ../backend/src/frontend
 RUN npm run build
 
 WORKDIR /home/node/app/backend
-COPY backend/package-lock.json .
 COPY backend/package.json .
-RUN npm ci
+RUN npm install --prefer-offline --no-audit
 
 COPY backend/tsconfig.json .
 COPY backend/src ./src
 RUN npm run build
+RUN chown -R node:node /home/node/app || true
+RUN chmod -R a+rX /home/node/app/backend/dist || true
 
+USER node
 WORKDIR /home/node/app/backend/dist
-CMD node start.js
+CMD node index.js