Merge pull request #14 from davidsilva/chore/readme-and-clean-up

Chore/readme and clean up

Author: davidsilva

.github/workflows/ci.yml

@@ -70,11 +70,23 @@ jobs:
         working-directory: ./backend
         run: npm install
 
-      - name: Run backend tests
+      # Run integration tests separately to avoid db conflicts
+      - name: Run backend integration tests for users
         working-directory: ./backend
         env:
           DATABASE_URL: postgres://postgres:postgres@localhost:5432/testdb
-        run: npm test
+        run: npm test -- src/__tests__/integration/users.integration.test.ts
+
+      - name: Run backend integration tests for products
+        working-directory: ./backend
+        env:
+          DATABASE_URL: postgres://postgres:postgres@localhost:5432/testdb
+        run: npm test -- src/__tests__/integration/products.integration.test.ts
+
+      # Unit tests can be run together
+      - name: Run backend unit tests
+        working-directory: ./backend
+        run: npm test -- src/__tests__/unit
 
       - name: Install dependencies for frontend
         working-directory: ./frontend

README.md

@@ -1,7 +1,7 @@
 # Stage 1: Build the Node.js application
 FROM node:20 AS build
 
-WORKDIR /app
+WORKDIR /app/backend
 
 COPY package.json ./
 
@@ -14,15 +14,18 @@ RUN npm run build
 # Stage 2: Prepare to serve the application
 FROM node:20-alpine
 
-WORKDIR /app
+WORKDIR /app/backend
 
-COPY --from=build /app/dist /app/dist
-COPY --from=build /app/package.json /app/package.json
-
-# Exclude devDependencies
-RUN npm install --only=production
+COPY --from=build /app/backend/dist /app/backend/dist
+COPY --from=build /app/backend/package.json /app/backend/package.json
+COPY --from=build /app/backend/src /app/backend/src
+COPY --from=build /app/backend/jest.config.ts /app/backend/jest.config.ts
+COPY --from=build /app/backend/tsconfig.json /app/backend/tsconfig.json
+COPY --from=build /app/backend/migrations /app/backend/migrations
+COPY --from=build /app/backend/seeds /app/backend/seeds
+RUN npm install
 
-ENV DEBUG=* NPM_CONFIG_LOGLEVEL=verbose
+# ENV DEBUG=* NPM_CONFIG_LOGLEVEL=error
 
 EXPOSE 3000
 

backend/Dockerfile

@@ -0,0 +1,16 @@
+import type { Knex } from "knex";
+
+
+export async function up(knex: Knex): Promise<void> {
+    return knex.schema.table('users', (table) => {
+        table.string('street_address').nullable();
+    });
+}
+
+
+export async function down(knex: Knex): Promise<void> {
+    return knex.schema.table('users', (table) => {
+        table.dropColumn('street_address');
+    });
+}
+

backend/migrations/20250116185004_add_street_to_users.ts

@@ -0,0 +1,15 @@
+import type { Knex } from "knex";
+
+
+export async function up(knex: Knex): Promise<void> {
+    return knex.schema.table('products', (table) => {
+        table.integer('quantity').notNullable().defaultTo(0);
+    });
+}
+
+
+export async function down(knex: Knex): Promise<void> {
+    return knex.schema.table('products', (table) => {
+        table.dropColumn('quantity');
+    });
+}

backend/migrations/20250117004156_add_quantity_to_products.ts

@@ -1,6 +1,6 @@
 {
   "name": "interview-prep-backend",
-  "version": "0.0.0",
+  "version": "0.1.0",
   "main": "dist/server.js",
   "scripts": {
     "start": "node dist/server.js",

backend/package-lock.json

@@ -2,15 +2,12 @@ import request from 'supertest';
 import app from '../../app';
 import knex from 'knex';
 import knexConfig from '../../knexFile';
-import dotenv from 'dotenv';
 import {
   Product,
   ProductStatus,
 } from '@onyxdevtutorials/interview-prep-shared';
 import retry from "retry";
 
-dotenv.config({ path: '../../../.env.test' });
-
 const db = knex(knexConfig['test_products']);
 
 const productsPath = '/api/v0/products';

backend/package.json

@@ -2,11 +2,11 @@ import request from 'supertest';
 import app from '../../app';
 import knex from 'knex';
 import knexConfig from '../../knexFile';
-import dotenv from 'dotenv';
+// import dotenv from 'dotenv';
 import { User, UserStatus } from '@onyxdevtutorials/interview-prep-shared';
 import retry from "retry";
 
-dotenv.config({ path: '../../../.env.test' });
+// dotenv.config({ path: '../../../.env.test' });
 
 const db = knex(knexConfig['test_users']);
 

backend/src/__tests__/integration/products.integration.test.ts

@@ -1,5 +1,5 @@
 import request from 'supertest';
-import app from '../app';
+import app from '../../app';
 import http from 'http';
 
 describe('Server', () => {