Attempting to add some typeorm migrations
This commit is contained in:
parent
a2ab3e8c3c
commit
d6616bc33c
6 changed files with 58 additions and 335 deletions
|
|
@ -1,13 +1,10 @@
|
||||||
import 'reflect-metadata'
|
|
||||||
import { Reservation } from './src/reservations/entity'
|
|
||||||
import { DataSource } from 'typeorm'
|
import { DataSource } from 'typeorm'
|
||||||
|
|
||||||
|
|
||||||
export const AppDataSource = new DataSource({
|
export const AppDataSource = new DataSource({
|
||||||
type: 'sqlite',
|
type: 'sqlite',
|
||||||
database: 'autobaan',
|
database: './db/autobaan_db',
|
||||||
logging: true,
|
logging: true,
|
||||||
entities: [Reservation],
|
entities: ['./src/**/*.entity.ts'],
|
||||||
migrations: [],
|
migrations: ['./database/migrations/*.ts'],
|
||||||
subscribers: [],
|
subscribers: [],
|
||||||
})
|
})
|
||||||
|
|
|
||||||
|
|
@ -34,11 +34,14 @@ USER node
|
||||||
|
|
||||||
COPY --chown=node:node package.json package.json
|
COPY --chown=node:node package.json package.json
|
||||||
COPY --chown=node:node package-lock.json package-lock.json
|
COPY --chown=node:node package-lock.json package-lock.json
|
||||||
|
COPY --chown=node:node database database
|
||||||
COPY --chown=node:node src src
|
COPY --chown=node:node src src
|
||||||
|
COPY --chown=node:node tsconfig.build.json tsconfig.build.json
|
||||||
COPY --chown=node:node tsconfig.json tsconfig.json
|
COPY --chown=node:node tsconfig.json tsconfig.json
|
||||||
|
|
||||||
RUN CXX=g++-12 npm install
|
RUN CXX=g++-12 npm install
|
||||||
RUN npm run build
|
RUN npm run migrations:run
|
||||||
|
ENTRYPOINT [ "npm", "run", "start" ]
|
||||||
|
|
||||||
FROM base as app
|
FROM base as app
|
||||||
|
|
||||||
|
|
@ -53,4 +56,4 @@ ENV REDIS_PORT=$REDIS_PORT
|
||||||
|
|
||||||
COPY --chown=node:node --from=builder /app/dist ./dist
|
COPY --chown=node:node --from=builder /app/dist ./dist
|
||||||
|
|
||||||
ENTRYPOINT ["node", "./dist/main.js"]
|
ENTRYPOINT ["npm", "run", "start"]
|
||||||
304
package-lock.json
generated
304
package-lock.json
generated
File diff suppressed because it is too large
Load diff
10
package.json
10
package.json
|
|
@ -8,7 +8,9 @@
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"build": "nest build",
|
"build": "nest build",
|
||||||
"format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
|
"format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
|
||||||
|
"prestart": "npm run migrations",
|
||||||
"start": "nest start",
|
"start": "nest start",
|
||||||
|
"prestart:dev": "npm run migrations",
|
||||||
"start:dev": "nest start --watch",
|
"start:dev": "nest start --watch",
|
||||||
"start:debug": "nest start --debug --watch",
|
"start:debug": "nest start --debug --watch",
|
||||||
"start:prod": "node dist/main",
|
"start:prod": "node dist/main",
|
||||||
|
|
@ -17,10 +19,13 @@
|
||||||
"test:watch": "jest --watch",
|
"test:watch": "jest --watch",
|
||||||
"test:cov": "jest --coverage",
|
"test:cov": "jest --coverage",
|
||||||
"test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
|
"test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
|
||||||
"test:e2e": "jest --config ./test/jest-e2e.json"
|
"test:e2e": "jest --config ./test/jest-e2e.json",
|
||||||
|
"migrations:generate": "typeorm migration:create database/migrations/$npm_config_name",
|
||||||
|
"migrations": "npx typeorm-ts-node-commonjs migration:run -d data-source.ts"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@nestjs/bull": "^0.6.3",
|
"@nestjs/bull": "^0.6.3",
|
||||||
|
"@nestjs/cli": "^9.0.0",
|
||||||
"@nestjs/common": "^9.0.0",
|
"@nestjs/common": "^9.0.0",
|
||||||
"@nestjs/config": "^2.3.2",
|
"@nestjs/config": "^2.3.2",
|
||||||
"@nestjs/core": "^9.0.0",
|
"@nestjs/core": "^9.0.0",
|
||||||
|
|
@ -36,10 +41,9 @@
|
||||||
"reflect-metadata": "^0.1.13",
|
"reflect-metadata": "^0.1.13",
|
||||||
"rxjs": "^7.2.0",
|
"rxjs": "^7.2.0",
|
||||||
"sqlite3": "^5.1.6",
|
"sqlite3": "^5.1.6",
|
||||||
"typeorm": "^0.3.16"
|
"typeorm": "^0.3.17"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@nestjs/cli": "^9.0.0",
|
|
||||||
"@nestjs/schematics": "^9.0.0",
|
"@nestjs/schematics": "^9.0.0",
|
||||||
"@nestjs/testing": "^9.0.0",
|
"@nestjs/testing": "^9.0.0",
|
||||||
"@types/express": "^4.17.13",
|
"@types/express": "^4.17.13",
|
||||||
|
|
|
||||||
|
|
@ -1,54 +0,0 @@
|
||||||
{
|
|
||||||
"name": "autobaan",
|
|
||||||
"version": "1.0.0",
|
|
||||||
"description": "",
|
|
||||||
"private": true,
|
|
||||||
"engines": {
|
|
||||||
"node": "18"
|
|
||||||
},
|
|
||||||
"scripts": {
|
|
||||||
"preinstall": "export CXX=g++-12",
|
|
||||||
"clean": "rm -r ./dist || true",
|
|
||||||
"prebuild": "npm run clean",
|
|
||||||
"build": "tsc",
|
|
||||||
"test": "jest",
|
|
||||||
"test:unit": "jest tests/unit/*",
|
|
||||||
"test:unit:clean": "npm run test:clear-cache && npm run test:unit",
|
|
||||||
"test:integration": "jest tests/integration/*",
|
|
||||||
"test:integration:clean": "npm run test:clear-cache && npm run test:integration",
|
|
||||||
"test:clear-cache": "jest --clearCache",
|
|
||||||
"lint": "eslint src/ --ext ts",
|
|
||||||
"prettier": "prettier src tests -w",
|
|
||||||
"local": "npx ts-node src/local/index.ts",
|
|
||||||
"docker:build": "docker build . -f docker/server/Dockerfile",
|
|
||||||
"docker:start": "docker compose -f docker/docker-compose.yml up",
|
|
||||||
"docker:stop": "docker compose -f docker/docker-compose.yml down"
|
|
||||||
},
|
|
||||||
"author": "Collin Duncan",
|
|
||||||
"license": "ISC",
|
|
||||||
"dependencies": {
|
|
||||||
"@nestjs/cli": "^9.5.0",
|
|
||||||
"argon2": "^0.30.3",
|
|
||||||
"axios": "^1.2.0",
|
|
||||||
"dayjs": "^1.11.6",
|
|
||||||
"node-cron": "^3.0.2",
|
|
||||||
"puppeteer": "^19.5.2",
|
|
||||||
"sqlite3": "^5.1.4",
|
|
||||||
"uuid": "^9.0.0"
|
|
||||||
},
|
|
||||||
"devDependencies": {
|
|
||||||
"@types/jest": "^29.2.3",
|
|
||||||
"@types/node": "^18.11.9",
|
|
||||||
"@types/node-cron": "^3.0.6",
|
|
||||||
"@types/puppeteer": "^7.0.4",
|
|
||||||
"@types/uuid": "^8.3.4",
|
|
||||||
"@typescript-eslint/eslint-plugin": "^5.42.0",
|
|
||||||
"@typescript-eslint/parser": "^5.42.0",
|
|
||||||
"babel-jest": "^29.2.1",
|
|
||||||
"eslint": "^8.27.0",
|
|
||||||
"jest": "^29.2.1",
|
|
||||||
"prettier": "^2.7.1",
|
|
||||||
"ts-jest": "^29.0.3",
|
|
||||||
"typescript": "^4.9.4"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -14,9 +14,10 @@ import { LoggerModule } from './logger/module'
|
||||||
TypeOrmModule.forRoot({
|
TypeOrmModule.forRoot({
|
||||||
type: 'sqlite',
|
type: 'sqlite',
|
||||||
database: resolve('./db/autobaan_db'),
|
database: resolve('./db/autobaan_db'),
|
||||||
|
migrations: [resolve('./database/migrations/*.ts')],
|
||||||
|
entities: [resolve('./src/**/*.entity.ts')],
|
||||||
autoLoadEntities: true,
|
autoLoadEntities: true,
|
||||||
logging: true,
|
logging: true,
|
||||||
synchronize: true,
|
|
||||||
}),
|
}),
|
||||||
BullModule.forRoot({
|
BullModule.forRoot({
|
||||||
redis: {
|
redis: {
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue