merge develop in

Author: chpy04

.prettierignore

@@ -17,6 +17,7 @@
 
 # production
 /build
+/src/*/dist 
 
 # misc
 .DS_Store

devContainerization/Dockerfile.backend.dev

@@ -1,5 +1,4 @@
-FROM node:20-alpine
-WORKDIR /base
+FROM node:20
 
 COPY package.json tsconfig.build.json ./
 COPY ./src/backend/package.json ./src/backend/tsconfig.json src/backend/
@@ -15,4 +14,4 @@ COPY ./src/shared src/shared
 RUN yarn prisma:generate
 
 EXPOSE 3001
-CMD [ "sh", "-c", "cd src/backend; npx prisma migrate reset --force & yarn workspace backend dev" ]
+CMD [ "sh", "-c", "yarn workspace backend dev" ]

devContainerization/Dockerfile.frontend.dev

@@ -1,5 +1,4 @@
 FROM node:20-alpine
-WORKDIR /base
 
 COPY package.json tsconfig.build.json ./
 COPY ./src/frontend/package.json ./src/frontend/tsconfig.json src/frontend/

devContainerization/docker-compose.dev.yml

@@ -1,7 +1,7 @@
 name: finishline-development
 services:
   database:
-    container_name: database
+    container_name: database-dev
     image: postgres
     environment:
       POSTGRES_USER: postgres
@@ -11,34 +11,41 @@ services:
       - '5432:5432'
     volumes:
       - pgdata:/var/lib/postgresql/data
+    healthcheck:
+      test: ['CMD-SHELL', 'pg_isready -U postgres -d finishline_database']
+      interval: 5s
+      timeout: 5s
+      retries: 5
+      start_period: 30s
 
   backend:
-    container_name: backend
+    container_name: backend-dev
     build:
       context: ../
       dockerfile: devContainerization/Dockerfile.backend.dev
     ports:
       - '3001:3001'
     volumes:
-      - ../src/backend:/base/src/backend
-      - ../src/shared:/base/src/shared
+      - ../src/backend:/src/backend
+      - ../src/shared:/src/shared
     depends_on:
-      - database
+      database:
+        condition: service_healthy
     env_file:
       - ../src/backend/.env
     environment:
       DATABASE_URL: 'postgresql://postgres:docker@database:5432/finishline_database'
 
   frontend:
-    container_name: frontend
+    container_name: frontend-dev
     build:
       context: ../
       dockerfile: devContainerization/Dockerfile.frontend.dev
     ports:
       - '3000:3000'
     volumes:
-      - ../src/frontend:/base/src/frontend
-      - ../src/shared:/base/src/shared
+      - ../src/frontend:/src/frontend
+      - ../src/shared:/src/shared
     depends_on:
       - backend
 

devContainerization/start-containers.js

@@ -0,0 +1,124 @@
+const { exec, spawn } = require('child_process');
+const { promisify } = require('util');
+
+const execAsync = promisify(exec);
+const COMPOSE_FILE = 'docker-compose.dev.yml';
+
+async function getContainerStatus() {
+  try {
+    //get all containers from the compose file (running and stopped)
+    const { stdout } = await execAsync(`docker compose -f ${COMPOSE_FILE} ps -a -q`);
+    const containerIds = stdout
+      .trim()
+      .split('\n')
+      .filter((id) => id);
+
+    if (containerIds.length === 0) {
+      return { status: 'not_created', running: 0, total: 0 };
+    }
+
+    //check which ones are running
+    const runningCheck = await execAsync(`echo "${containerIds.join('\n')}" | xargs docker inspect -f '{{.State.Running}}'`);
+    const runningStatuses = runningCheck.stdout.trim().split('\n');
+    const runningCount = runningStatuses.filter((status) => status === 'true').length;
+
+    return {
+      status: runningCount === 3 ? 'all_running' : 'some_stopped',
+      running: runningCount,
+      total: containerIds.length
+    };
+  } catch (error) {
+    return { status: 'not_created', running: 0, total: 0 };
+  }
+}
+
+function runCommand(command, options = {}) {
+  return new Promise((resolve, reject) => {
+    const child = spawn('sh', ['-c', command], {
+      stdio: 'inherit',
+      ...options
+    });
+
+    child.on('close', (code) => {
+      if (code === 0) resolve();
+      else reject(new Error(`Command failed with code ${code}`));
+    });
+
+    child.on('error', reject);
+  });
+}
+
+async function waitForBackendReady() {
+  console.log('Waiting for backend container to be ready...');
+  let attempts = 0;
+  const maxAttempts = 30; //wait up to 30 seconds
+
+  while (attempts < maxAttempts) {
+    try {
+      await execAsync(`docker compose -f ${COMPOSE_FILE} exec -T backend echo "ready"`);
+      console.log('Backend container is ready.');
+      return;
+    } catch (error) {
+      attempts++;
+      console.log(`Waiting for backend... (${attempts}/${maxAttempts})`);
+      await new Promise((resolve) => setTimeout(resolve, 1000));
+    }
+  }
+
+  throw new Error('Backend container failed to become ready within 30 seconds');
+}
+
+async function runMigrations() {
+  console.log('Running database migrations and seed...');
+  try {
+    await runCommand(
+      `docker compose -f ${COMPOSE_FILE} exec -T backend sh -c "cd /src/backend && npx prisma migrate reset --force"`
+    );
+    console.log('Database migrations and seeding completed successfully.');
+  } catch (error) {
+    console.error('Failed to run migrations:', error.message);
+    throw error;
+  }
+}
+
+async function main() {
+  console.log('Checking container status...');
+
+  const containerStatus = await getContainerStatus();
+
+  switch (containerStatus.status) {
+    case 'all_running':
+      console.log('All 3 containers are running. Following logs...');
+      await runCommand(`docker compose -f ${COMPOSE_FILE} logs --follow`);
+      break;
+
+    case 'some_stopped':
+      console.log(
+        `Found ${containerStatus.running}/${containerStatus.total} containers running. Starting all containers...`
+      );
+      await runCommand(`docker compose -f ${COMPOSE_FILE} up -d`);
+      console.log('Containers started. Following logs...');
+      await runCommand(`docker compose -f ${COMPOSE_FILE} logs --follow`);
+      break;
+
+    case 'not_created':
+      console.log('Containers not found. Building and starting...');
+      await runCommand(`docker compose -f ${COMPOSE_FILE} up --build -d`);
+      console.log('Containers built and started. Waiting for backend...');
+      await waitForBackendReady();
+      console.log('Running migrations...');
+      await runMigrations();
+      console.log('Setup complete. Following logs...');
+      await runCommand(`docker compose -f ${COMPOSE_FILE} logs --follow`);
+      break;
+
+    default:
+      console.error('Unexpected container state. Please delete existing finishline containers.');
+      break;
+  }
+}
+
+main().catch((error) => {
+  console.error('Error:', error.message);
+  process.exit(1);
+});

package.json

@@ -17,19 +17,25 @@
     "prisma:seed": "cd src/backend; npx prisma db seed",
     "prisma:reset:force": "yarn workspace shared build; cd src/backend; npx prisma migrate reset --force",
     "prisma:reset": "yarn workspace shared build; cd src/backend; npx prisma migrate reset",
+    "docker:prisma:reset": "cd devContainerization && docker compose -f docker-compose.dev.yml exec -T backend sh -c \"cd /src/backend && npx prisma migrate reset --force\"",
     "prisma:migrate": "yarn prisma:migrate:dev",
+    "docker:prisma:migrate": "cd devContainerization && docker compose -f docker-compose.dev.yml exec -it -w /src/backend backend npx prisma migrate dev",
     "prisma:migrate:dev": "cd src/backend; npx prisma migrate dev",
     "prisma:migrate:prod": "cd src/backend; npx prisma migrate deploy",
     "prisma:generate": "cd src/backend; npx prisma generate",
+    "docker:prisma:generate": "cd devContainerization && docker compose -f docker-compose.dev.yml exec -T backend sh -c \"cd /src/backend && npx prisma generate\"",
     "prisma:manual": "yarn workspace backend prisma:manual",
     "prisma:studio": "cd src/backend; npx prisma studio",
+    "docker:prisma:studio": "cd devContainerization && docker compose -f docker-compose.dev.yml exec -T backend sh -c \"cd /src/backend && npx prisma studio\"",
     "containerize": "cd containerization; docker compose down && docker compose build && docker compose up -d && sleep 5 && cd ../ && yarn containerize:psql:init && yarn prisma:migrate",
     "containerize:psql:init": "docker exec database psql -U postgres -c \"CREATE DATABASE nerpm;\" && yarn database:setup:script",
     "containerize:test:e2e": "yarn containerize && yarn prisma:reset:force && yarn test:e2e",
     "lint": "npx eslint .",
     "test:e2e": "./system-tests/run.sh",
     "test:frontend": "yarn workspace shared build; yarn workspace frontend test",
+    "docker:test:frontend": "cd devContainerization && docker compose -f docker-compose.dev.yml exec -T frontend sh -c \"cd /src/frontend && yarn test\"",
     "test:backend": "yarn workspace shared build; yarn workspace backend test",
+    "docker:test:backend": "cd devContainerization && docker compose -f docker-compose.dev.yml exec -T backend sh -c \"cd /src/backend && yarn test\"",
     "test": "yarn test:backend && yarn test:frontend",
     "test:setup": "node scripts/test-setup.js && docker run --name finishline_test -e POSTGRES_PASSWORD=docker -p 5433:5432 -d postgres && sleep 5 && docker exec finishline_test psql -U postgres -c \"CREATE DATABASE nerpm;\" && yarn prisma:migrate",
     "test:teardown": "docker stop finishline_test && docker rm finishline_test && node scripts/test-teardown.js",
@@ -44,17 +50,25 @@
     "istart": "yarn i && yarn start",
     "reset": "rimraf yarn.lock; rimraf src/frontend/node_modules; rimraf src/backend/node_modules; rimraf src/shared/node_modules; rimraf ./node_modules; ",
     "install:hard": "yarn reset; yarn install; yarn prisma:generate",
-    "tsc-check": "tsc --noEmit --project src/backend/tsconfig.json && tsc --noEmit --project src/frontend/tsconfig.json",
+    "tsc-check": "tsc --noEmit --project src/frontend/tsconfig.json && tsc --noEmit --project src/backend/tsconfig.json",
     "docker:dev": "docker stop finishline; cd devContainerization; docker compose -f docker-compose.dev.yml down && docker compose -f docker-compose.dev.yml build && docker compose -f docker-compose.dev.yml up --watch",
     "exec:frontend": "docker exec -it frontend /bin/sh",
-    "exec:backend": "docker exec -it backend /bin/sh"
+    "exec:backend": "docker exec -it backend /bin/sh",
+    "docker:ps": "docker compose -f devContainerization/docker-compose.dev.yml ps",
+    "docker:start": "yarn database:setup:script && cd devContainerization && node start-containers.js",
+    "docker:i": "cd devContainerization && docker compose -f docker-compose.dev.yml exec -T backend sh -c \"yarn install && cd src/backend && npx prisma generate\" && docker compose -f docker-compose.dev.yml exec -T frontend sh -c \"yarn install\"",
+    "docker:test": "yarn test:setup && cd devContainerization && docker compose -f docker-compose.dev.yml exec backend bash -c \"yarn test:backend\" && docker compose -f docker-compose.dev.yml exec frontend sh -c \"yarn test:frontend\" && yarn test:teardown",
+    "docker:rebuild": "docker compose -f devContainerization/docker-compose.dev.yml rm -f -s && yarn docker:start"
   },
   "resolutions": {
     "@types/react": "17.0.1",
     "@types/react-dom": "17.0.1"
   },
   "dependencies": {
+    "@types/multer": "^1.4.12",
     "mitt": "^3.0.1",
+    "react-hook-form-persist": "^3.0.0",
+    "recharts": "^2.15.3",
     "typescript": "^5.7.3"
   },
   "devDependencies": {
@@ -70,7 +84,7 @@
     "eslint": "^7.0.0",
     "eslint-config-prettier": "^10.0.1",
     "eslint-config-react-app": "^7.0.1",
-    "eslint-plugin-cypress": "latest",
+    "eslint-plugin-cypress": "4.3.0",
     "eslint-plugin-prettier": "^5.2.2",
     "prettier": "^3.4.2",
     "rimraf": "^6.0.1",

scripts/database-setup.js

@@ -17,14 +17,15 @@ fs.readFile(filePath, 'utf8', (err, data) => {
     // Split file contents into lines
     const lines = data.trim().split('\n');
 
-    // Check if the last line matches the lineToAdd
-    if (lines[lines.length - 1] !== lineToAdd) {
-        // Append the line if it's not already the last line
-        fs.appendFile(filePath, `\n${lineToAdd}`, 'utf8', (err) => {
-            if (err) {
-                console.error('Error appending line to file:', err);
-                return;
-            }
-        });
+    for (const line of lines) {
+        //db url already exists, no need to add it
+        if (line.startsWith("DATABASE_URL=")) return;
     }
+
+    fs.appendFile(filePath, `\n${lineToAdd}`, 'utf8', (err) => {
+        if (err) {
+            console.error('Error appending line to file:', err);
+            return;
+        }
+    });
 });

scripts/test-setup.js

@@ -22,4 +22,4 @@ fs.readFile(filePath, 'utf8', (err, data) => {
             }
         });
     }
-});
+});

scripts/test-teardown.js

@@ -25,4 +25,4 @@ fs.readFile(filePath, 'utf8', (err, data) => {
             }
         });
     } 
-});
+});

src/backend/.dockerignore

@@ -1,6 +1,4 @@
 **/node_modules
 **/dist
-**/tests
-**/*.test.ts
 
 **/frontend