createTenant module

.gitignore

@@ -24,3 +24,4 @@ node_modules/
 *.txt
 *.npmignore
 dist
+.DS_Store

Dockerfile

@@ -1,80 +1,39 @@
 # syntax=docker/dockerfile:1
 
-# Comments are provided throughout this file to help you get started.
-# If you need more help, visit the Dockerfile reference guide at
-# https://docs.docker.com/engine/reference/builder/
-
 ARG NODE_VERSION=20.10.0
 ARG PNPM_VERSION=8.12.1
 
-################################################################################
 # Use node image for base image for all stages.
 FROM node:${NODE_VERSION}-alpine as base
 
 # Set working directory for all build stages.
 WORKDIR /usr/src/app
 
 # Install pnpm.
-RUN --mount=type=cache,target=/root/.npm \
-    npm install -g pnpm@${PNPM_VERSION}
-
-################################################################################
-# Create a stage for installing production dependecies.
-FROM base as deps
-
-# Download dependencies as a separate step to take advantage of Docker's caching.
-# Leverage a cache mount to /root/.local/share/pnpm/store to speed up subsequent builds.
-# Leverage bind mounts to package.json and pnpm-lock.yaml to avoid having to copy them
-# into this layer.
-RUN --mount=type=bind,source=package.json,target=package.json \
-    --mount=type=bind,source=pnpm-lock.yaml,target=pnpm-lock.yaml \
-    --mount=type=cache,target=/root/.local/share/pnpm/store \
-    pnpm install --frozen-lockfile
+RUN npm install -g pnpm@${PNPM_VERSION}
 
-################################################################################
-# Create a stage for building the application.
-FROM deps as build
-
-# Download additional development dependencies before building, as some projects require
-# "devDependencies" to be installed to build. If you don't need this, remove this step.
-# RUN --mount=type=bind,source=package.json,target=package.json \
-#     --mount=type=bind,source=pnpm-lock.yaml,target=pnpm-lock.yaml \
-#     --mount=type=cache,target=/root/.local/share/pnpm/store \
-#     pnpm install --frozen-lockfile
-
-### Prisma section
-COPY prisma/schema.prisma ./prisma/ 
+# Copy package.json so that package manager commands can be used.
+COPY package.json pnpm-lock.yaml ./
 
-RUN pnpx prisma generate
-###
+RUN pnpm install --frozen-lockfile
 
 # Copy the rest of the source files into the image.
 COPY . .
 
+# RUN the prisma generate script.
+RUN pnpm prisma generate
+
 # Run the build script.
 RUN pnpm run build
 
-################################################################################
-# Create a new stage to run the application with minimal runtime dependencies
-# where the necessary files are copied from the build stage.
-FROM base as final
-
 # Use production node environment by default.
 ENV NODE_ENV production
 
 # Run the application as a non-root user.
 USER node
 
-# Copy package.json so that package manager commands can be used.
-COPY package.json .
-
-# Copy the production dependencies from the deps stage and also
-# the built application from the build stage into the image.
-COPY --from=deps /usr/src/app/node_modules ./node_modules
-COPY --from=build /usr/src/app/dist ./dist
-
 # Expose the port that the application listens on.
 EXPOSE 5000
 
 # Run the application.
-CMD pnpm start
+CMD pnpm start

compose.yaml

@@ -4,10 +4,13 @@ services:
       context: .
     environment:
       NODE_ENV: production
+      MANAGE_TENANTS: true
       DATABASE_URL: postgres://postgres:postgres@pg:5432/multiTenant_dev
     ports:
       - 1981:5000
       - 9229:9229 # for debugging
+    networks:
+      - appNetwork
     volumes:
       - .:/usr/src/app
       - /usr/src/app/node_modules
@@ -29,6 +32,8 @@ services:
       - ./db/pgadmin:/var/lib/pgadmin
     ports:
       - "${PGADMIN_LISTEN_PORT:-5050}:80"
+    networks:
+      - appNetwork
     command: pnpm docker:pgadmin
     depends_on:
       pg:
@@ -45,14 +50,20 @@ services:
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-postgres}
     volumes:
       - ./db/db-data:/var/lib/postgresql/data
-    expose:
-      - ${POSTGRES_PORT:-5432}
+    ports:
+      - "5432:5432"
+    networks:
+      - appNetwork
     healthcheck:
       test: [ "CMD", "pg_isready" ]
       interval: 10s
       timeout: 5s
       retries: 5
 
+networks:
+  appNetwork:
+    driver: bridge
+
 volumes:
   db-data:
   pgadmin:

jest.config.ts

@@ -6,43 +6,18 @@
 import type {Config} from 'jest';
 
 const config: Config = {
-  // All imported modules in your tests should be mocked automatically
-  // automock: false,
-
-  // Stop running tests after `n` failures
-  // bail: 0,
-
-  // The directory where Jest should store its cached dependency information
-  // cacheDirectory: "/private/var/folders/04/pllw_vxs0mn8hz26hrhh5l400000gn/T/jest_dx",
-
   // Automatically clear mock calls, instances, contexts and results before every test
   clearMocks: true,
 
   // Indicates whether the coverage information should be collected while executing the test
   collectCoverage: true,
 
-  // An array of glob patterns indicating a set of files for which coverage information should be collected
-  // collectCoverageFrom: undefined,
-
   // The directory where Jest should output its coverage files
   coverageDirectory: "coverage",
 
-  // An array of regexp pattern strings used to skip coverage collection
-  // coveragePathIgnorePatterns: [
-  //   "/node_modules/"
-  // ],
-
   // Indicates which provider should be used to instrument code for coverage
   coverageProvider: "v8",
 
-  // A list of reporter names that Jest uses when writing coverage reports
-  // coverageReporters: [
-  //   "json",
-  //   "text",
-  //   "lcov",
-  //   "clover"
-  // ],
-
   // An object that configures minimum threshold enforcement for coverage results
   coverageThreshold: {
     global: {
@@ -59,154 +34,11 @@ const config: Config = {
     },
   },
 
-  // A path to a custom dependency extractor
-  // dependencyExtractor: undefined,
-
-  // Make calling deprecated APIs throw helpful error messages
-  // errorOnDeprecated: false,
-
-  // The default configuration for fake timers
-  // fakeTimers: {
-  //   "enableGlobally": false
-  // },
-
-  // Force coverage collection from ignored files using an array of glob patterns
-  // forceCoverageMatch: [],
-
-  // A path to a module which exports an async function that is triggered once before all test suites
-  // globalSetup: undefined,
-
-  // A path to a module which exports an async function that is triggered once after all test suites
-  // globalTeardown: undefined,
-
-  // A set of global variables that need to be available in all test environments
-  // globals: {},
-
-  // The maximum amount of workers used to run your tests. Can be specified as % or a number. E.g. maxWorkers: 10% will use 10% of your CPU amount + 1 as the maximum worker number. maxWorkers: 2 will use a maximum of 2 workers.
-  // maxWorkers: "50%",
-
-  // An array of directory names to be searched recursively up from the requiring module's location
-  // moduleDirectories: [
-  //   "node_modules"
-  // ],
-
-  // An array of file extensions your modules use
-  // moduleFileExtensions: [
-  //   "js",
-  //   "mjs",
-  //   "cjs",
-  //   "jsx",
-  //   "ts",
-  //   "tsx",
-  //   "json",
-  //   "node"
-  // ],
-
-  // A map from regular expressions to module names or to arrays of module names that allow to stub out resources with a single module
-  // moduleNameMapper: {},
-
-  // An array of regexp pattern strings, matched against all module paths before considered 'visible' to the module loader
-  // modulePathIgnorePatterns: [],
-
-  // Activates notifications for test results
-  // notify: false,
-
-  // An enum that specifies notification mode. Requires { notify: true }
-  // notifyMode: "failure-change",
-
   // A preset that is used as a base for Jest's configuration
   preset: 'ts-jest',
 
-  // Run tests from one or more projects
-  // projects: undefined,
-
-  // Use this configuration option to add custom reporters to Jest
-  // reporters: undefined,
-
-  // Automatically reset mock state before every test
-  // resetMocks: false,
-
-  // Reset the module registry before running each individual test
-  // resetModules: false,
-
-  // A path to a custom resolver
-  // resolver: undefined,
-
-  // Automatically restore mock state and implementation before every test
-  // restoreMocks: false,
-
-  // The root directory that Jest should scan for tests and modules within
-  // rootDir: undefined,
-
-  // A list of paths to directories that Jest should use to search for files in
-  // roots: [
-  //   "<rootDir>"
-  // ],
-
-  // Allows you to use a custom runner instead of Jest's default test runner
-  // runner: "jest-runner",
-
-  // The paths to modules that run some code to configure or set up the testing environment before each test
-  // setupFiles: [],
-
-  // A list of paths to modules that run some code to configure or set up the testing framework before each test
-  // setupFilesAfterEnv: [],
-
-  // The number of seconds after which a test is considered as slow and reported as such in the results.
-  // slowTestThreshold: 5,
-
-  // A list of paths to snapshot serializer modules Jest should use for snapshot testing
-  // snapshotSerializers: [],
-
   // The test environment that will be used for testing
   testEnvironment: "node",
-
-  // Options that will be passed to the testEnvironment
-  // testEnvironmentOptions: {},
-
-  // Adds a location field to test results
-  // testLocationInResults: false,
-
-  // The glob patterns Jest uses to detect test files
-  // testMatch: [
-  //   "**/__tests__/**/*.[jt]s?(x)",
-  //   "**/?(*.)+(spec|test).[tj]s?(x)"
-  // ],
-
-  // An array of regexp pattern strings that are matched against all test paths, matched tests are skipped
-  // testPathIgnorePatterns: [
-  //   "/node_modules/"
-  // ],
-
-  // The regexp pattern or array of patterns that Jest uses to detect test files
-  // testRegex: [],
-
-  // This option allows the use of a custom results processor
-  // testResultsProcessor: undefined,
-
-  // This option allows use of a custom test runner
-  // testRunner: "jest-circus/runner",
-
-  // A map from regular expressions to paths to transformers
-  // transform: undefined,
-
-  // An array of regexp pattern strings that are matched against all source file paths, matched files will skip transformation
-  // transformIgnorePatterns: [
-  //   "/node_modules/",
-  //   "\\.pnp\\.[^\\/]+$"
-  // ],
-
-  // An array of regexp pattern strings that are matched against all modules before the module loader will automatically return a mock for them
-  // unmockedModulePathPatterns: undefined,
-
-  // Indicates whether each individual test should be reported during the run
-  // verbose: undefined,
-
-  // An array of regexp patterns that are matched against all source file paths before re-running tests in watch mode
-  // watchPathIgnorePatterns: [],
-
-  // Whether to use watchman for file crawling
-  // watchman: true,
 };
 
 export default config;

knexfile.ts

@@ -4,7 +4,7 @@ const config: Knex.Config = {
   client: 'pg',
   connection: process.env.DATABASE_URL,
   migrations: {
-    directory: "./src/migrations",
+    directory: "./src/db/migrations",
     extension: "ts",
   },
 };

package.json

@@ -4,19 +4,19 @@
   "description": "Multi-tenant Node.js Application",
   "main": "src/index.js",
   "scripts": {
-    "test": "jest",
     "prepare": "husky install",
     "start": "node dist/index.js",
     "db:drop": "knex migrate:down",
     "db:migrate": "knex migrate:latest",
+    "test": "docker compose run backend pnpm jest",
     "eslint": "eslint src/*.ts --fix --cache --quiet",
     "build": "rimraf dist && swc ./src -d dist && pnpm eslint",
     "docker:db-drop": "docker compose run backend pnpm db:drop",
     "docker:db-migrate": "docker compose run backend pnpm db:migrate",
-    "docker:start": "pnpm build && node --inspect=0.0.0.0 dist/index.js",
     "push:test": "jest --no-coverage --passWithNoTests --changedSince origin/main",
     "db:console": "docker compose run pg psql -h pg -U postgres -d multiTenant_dev",
     "docker:pgadmin": "docker compose up -d pgadmin && open http://localhost:5050/browser/",
+    "docker:start": "pnpm build && docker compose run backend pnpm node --inspect=0.0.0.0 dist/index.js",
     "rebuild:be": "docker compose build backend && docker compose rm --force --stop backend && docker compose up -d backend"
   },
   "lint-staged": {

prisma/schema.prisma

@@ -1,8 +1,6 @@
-// This is your Prisma schema file,
-// learn more about it in the docs: https://pris.ly/d/prisma-schema
-
 generator client {
-  provider = "prisma-client-js"
+    provider = "prisma-client-js"
+    output = "../node_modules/.prisma/client"
 }
 
 datasource db {
@@ -16,7 +14,7 @@ model Hostname {
   redirect_to             String    
   force_https             Boolean   @default(false)
   under_maintenance_since DateTime?
-  uuid                    String    @db.Uuid @unique
+  db_name                 String    @unique
   createdAt               DateTime  @default(now())
   updatedAt               DateTime  @updatedAt
   deletedAt               DateTime?