Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore:grouping prisma models into separate domain files #172

Merged
merged 5 commits into from
Jul 6, 2024
Merged

chore:grouping prisma models into separate domain files #172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
89d57ab
chore(package.json): update @prisma-client to 5.16.1
timDeHof Jul 2, 2024
2a9d0a8
feat(schema): add new models for onboarding checklist, health check, …
timDeHof Jul 2, 2024
29a65f9
chore(changelog): add entry for refactoring prisma models to be group…
timDeHof Jul 2, 2024
3a271a5
chore(package.json): update prisma dependency to version 5.16.1
timDeHof Jul 2, 2024
6e5850c
Merge branch 'dev' into chore/upgrade-prisma-and-separate-schema-into…
cherylli Jul 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ Another example [here](https://co-pilot.dev/changelog)
- Update seed data to include voyage 49-51 [#152](https://github.com/chingu-x/chingu-dashboard-be/pull/152)
- Updated Sprints routes with 401 response when not logged in [#157](https://github.com/chingu-x/chingu-dashboard-be/pull/157)
- Updated DELETE ideation-vote service to also delete ideation when no votes remain [#161](https://github.com/chingu-x/chingu-dashboard-be/pull/161)
- Refactored the prisma models to be grouped by domain type [#172](https://github.com/chingu-x/chingu-dashboard-be/pull/172)



Expand Down
266 changes: 134 additions & 132 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,135 +1,137 @@
{
"name": "chingu-dashboard-be",
"version": "0.0.1",
"description": "API server for Chingu",
"author": "Chingu Dashboard",
"private": true,
"license": "UNLICENSED",
"scripts": {
"build": "nest build",
"format": "prettier --write \"{prisma/*seed,src,test}/**/*.ts\"",
"start": "nest start",
"start:dev": "nest start --tsc --watch",
"start:debug": "nest start --debug --watch",
"start:prod": "node dist/main",
"docker:down": "docker compose down",
"docker:clean": "docker compose down -v --remove-orphans",
"docker": "docker-compose up -d",
"migrate": "npx prisma migrate dev",
"migrate:test": "dotenv -e ./.env.test npx prisma migrate dev",
"migrate:test:docker": "dotenv -v DATABASE_URL=postgresql://chingu:chingu@postgres-test:5434/dashboard?schema=public -- npx prisma migrate dev",
"push": "npx prisma db push",
"push:test": "dotenv -e ./.env.test npx prisma db push",
"push:test:docker": "dotenv -v DATABASE_URL=postgresql://chingu:chingu@postgres-test:5434/dashboard?schema=public -- npx prisma db push",
"postinstall": "husky install",
"studio": "prisma studio",
"studio:test": "dotenv -e ./.env.test prisma studio",
"studio:test:docker": "dotenv -v DATABASE_URL=postgresql://chingu:chingu@postgres-test:5434/dashboard?schema=public prisma studio",
"seed": "prisma db seed",
"lint": "eslint \"{prisma/*seed,src,test}/**/*.ts\" --fix",
"test:unit": "dotenv -e ./.env.test jest",
"test:unit:docker": "dotenv -v NODE_ENV=test -v DATABASE_URL=postgresql://chingu:chingu@postgres-test:5434/dashboard?schema=public jest",
"test:watch": "dotenv -e ./.env.test jest --watch",
"test:watch:docker": "dotenv -v NODE_ENV=test -v DATABASE_URL=postgresql://chingu:chingu@postgres-test:5434/dashboard?schema=public jest --watch",
"test:cov": "dotenv -e ./.env.test jest --coverage",
"test:cov:docker": "dotenv -v NODE_ENV=test -v DATABASE_URL=postgresql://chingu:chingu@postgres-test:5434/dashboard?schema=public jest --coverage",
"test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
"test:int": "dotenv -e ./.env.test -- jest -i --no-cache --verbose --config ./test/jest-int.json",
"test:int:docker": "dotenv -v NODE_ENV=test -v DATABASE_URL=postgresql://chingu:chingu@postgres-test:5434/dashboard?schema=public -- jest -i --no-cache --verbose --config ./test/jest-int.json",
"test:e2e": "dotenv -e ./.env.test -- jest --config ./test/jest-e2e.json --runInBand",
"test:e2e:docker": "dotenv -v NODE_ENV=test -v DATABASE_URL=postgresql://chingu:chingu@postgres-test:5434/dashboard?schema=public -- jest --config ./test/jest-e2e.json --runInBand",
"test:docker": "yarn test:e2e:docker --silent && yarn test:unit:docker --silent",
"test": "yarn test:e2e --silent && yarn test:unit --silent"
},
"dependencies": {
"@casl/ability": "^6.7.1",
"@casl/prisma": "^1.4.1",
"@nestjs/common": "^10.0.0",
"@nestjs/config": "^3.0.1",
"@nestjs/core": "^10.0.0",
"@nestjs/jwt": "^10.1.1",
"@nestjs/passport": "^10.0.2",
"@nestjs/platform-express": "^10.0.0",
"@nestjs/schedule": "^4.0.0",
"@nestjs/swagger": "^7.1.11",
"@prisma/client": "^5.10.2",
"bcrypt": "^5.1.1",
"class-transformer": "^0.5.1",
"class-validator": "^0.14.0",
"cookie-parser": "^1.4.6",
"dotenv": "^16.3.1",
"lint-staged": "^15.1.0",
"node-mailjet": "^6.0.4",
"passport": "^0.6.0",
"passport-jwt": "^4.0.1",
"passport-local": "^1.0.0",
"reflect-metadata": "^0.1.13",
"rxjs": "^7.8.1",
"swagger-ui-express": "^5.0.0"
},
"devDependencies": {
"@nestjs/cli": "^10.0.0",
"@nestjs/schematics": "^10.0.0",
"@nestjs/testing": "^10.0.0",
"@types/bcrypt": "^5.0.1",
"@types/cookie-parser": "^1.4.6",
"@types/express": "^4.17.17",
"@types/jest": "^29.5.2",
"@types/node": "^20.3.1",
"@types/passport-jwt": "^3.0.11",
"@types/passport-local": "^1.0.37",
"@types/supertest": "^2.0.12",
"@typescript-eslint/eslint-plugin": "^6.0.0",
"@typescript-eslint/parser": "^6.0.0",
"cross-env": "^7.0.3",
"dotenv-cli": "^7.3.0",
"eslint": "^8.42.0",
"eslint-config-prettier": "^9.0.0",
"eslint-plugin-prettier": "^5.0.0",
"husky": "^8.0.3",
"jest": "^29.5.0",
"jest-extended": "^4.0.2",
"jest-mock-extended": "^3.0.7",
"prettier": "^3.0.0",
"prisma": "^5.3.1",
"source-map-support": "^0.5.21",
"supertest": "^6.3.3",
"ts-jest": "^29.1.0",
"ts-loader": "^9.4.3",
"ts-node": "^10.9.1",
"tsconfig-paths": "^4.2.0",
"typescript": "^5.1.3"
},
"jest": {
"moduleFileExtensions": [
"js",
"json",
"ts"
],
"rootDir": "src",
"testRegex": ".*\\.spec|.jest\\.ts$",
"transform": {
"^.+\\.(t|j)s$": "ts-jest"
"name": "chingu-dashboard-be",
"version": "0.0.1",
"description": "API server for Chingu",
"author": "Chingu Dashboard",
"private": true,
"license": "UNLICENSED",
"scripts": {
"build": "nest build",
"format": "prettier --write \"{prisma/*seed,src,test}/**/*.ts\"",
"start": "nest start",
"start:dev": "nest start --tsc --watch",
"start:debug": "nest start --debug --watch",
"start:prod": "node dist/main",
"docker:down": "docker compose down",
"docker:clean": "docker compose down -v --remove-orphans",
"docker": "docker-compose up -d",
"migrate": "npx prisma migrate dev",
"migrate:test": "dotenv -e ./.env.test npx prisma migrate dev",
"migrate:test:docker": "dotenv -v DATABASE_URL=postgresql://chingu:chingu@postgres-test:5434/dashboard?schema=public -- npx prisma migrate dev",
"push": "npx prisma db push",
"push:test": "dotenv -e ./.env.test npx prisma db push",
"push:test:docker": "dotenv -v DATABASE_URL=postgresql://chingu:chingu@postgres-test:5434/dashboard?schema=public -- npx prisma db push",
"postinstall": "husky install",
"studio": "prisma studio",
"studio:test": "dotenv -e ./.env.test prisma studio",
"studio:test:docker": "dotenv -v DATABASE_URL=postgresql://chingu:chingu@postgres-test:5434/dashboard?schema=public prisma studio",
"seed": "prisma db seed",
"lint": "eslint \"{prisma/*seed,src,test}/**/*.ts\" --fix",
"test:unit": "dotenv -e ./.env.test jest",
"test:unit:docker": "dotenv -v NODE_ENV=test -v DATABASE_URL=postgresql://chingu:chingu@postgres-test:5434/dashboard?schema=public jest",
"test:watch": "dotenv -e ./.env.test jest --watch",
"test:watch:docker": "dotenv -v NODE_ENV=test -v DATABASE_URL=postgresql://chingu:chingu@postgres-test:5434/dashboard?schema=public jest --watch",
"test:cov": "dotenv -e ./.env.test jest --coverage",
"test:cov:docker": "dotenv -v NODE_ENV=test -v DATABASE_URL=postgresql://chingu:chingu@postgres-test:5434/dashboard?schema=public jest --coverage",
"test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
"test:int": "dotenv -e ./.env.test -- jest -i --no-cache --verbose --config ./test/jest-int.json",
"test:int:docker": "dotenv -v NODE_ENV=test -v DATABASE_URL=postgresql://chingu:chingu@postgres-test:5434/dashboard?schema=public -- jest -i --no-cache --verbose --config ./test/jest-int.json",
"test:e2e": "dotenv -e ./.env.test -- jest --config ./test/jest-e2e.json --runInBand",
"test:e2e:docker": "dotenv -v NODE_ENV=test -v DATABASE_URL=postgresql://chingu:chingu@postgres-test:5434/dashboard?schema=public -- jest --config ./test/jest-e2e.json --runInBand",
"test:docker": "yarn test:e2e:docker --silent && yarn test:unit:docker --silent",
"test": "yarn test:e2e --silent && yarn test:unit --silent"
},
"collectCoverageFrom": [
"**/*.(t|j)s"
],
"coverageDirectory": "../coverage",
"testEnvironment": "node",
"setupFilesAfterEnv": ["<rootDir>/prisma/singleton.ts"]
},
"prisma": {
"seed": "ts-node prisma/seed/index.ts"
},
"lint-staged": {
"src/**/*.ts": [
"prettier --write"
],
"test/**/*.ts": [
"prettier --write"
],
"prisma/*seed/**/*.ts": [
"prettier --write"
]
}
"dependencies": {
"@casl/ability": "^6.7.1",
"@casl/prisma": "^1.4.1",
"@nestjs/common": "^10.0.0",
"@nestjs/config": "^3.0.1",
"@nestjs/core": "^10.0.0",
"@nestjs/jwt": "^10.1.1",
"@nestjs/passport": "^10.0.2",
"@nestjs/platform-express": "^10.0.0",
"@nestjs/schedule": "^4.0.0",
"@nestjs/swagger": "^7.1.11",
"@prisma/client": "^5.16.1",
"bcrypt": "^5.1.1",
"class-transformer": "^0.5.1",
"class-validator": "^0.14.0",
"cookie-parser": "^1.4.6",
"dotenv": "^16.3.1",
"lint-staged": "^15.1.0",
"node-mailjet": "^6.0.4",
"passport": "^0.6.0",
"passport-jwt": "^4.0.1",
"passport-local": "^1.0.0",
"reflect-metadata": "^0.1.13",
"rxjs": "^7.8.1",
"swagger-ui-express": "^5.0.0"
},
"devDependencies": {
"@nestjs/cli": "^10.0.0",
"@nestjs/schematics": "^10.0.0",
"@nestjs/testing": "^10.0.0",
"@types/bcrypt": "^5.0.1",
"@types/cookie-parser": "^1.4.6",
"@types/express": "^4.17.17",
"@types/jest": "^29.5.2",
"@types/node": "^20.3.1",
"@types/passport-jwt": "^3.0.11",
"@types/passport-local": "^1.0.37",
"@types/supertest": "^2.0.12",
"@typescript-eslint/eslint-plugin": "^6.0.0",
"@typescript-eslint/parser": "^6.0.0",
"cross-env": "^7.0.3",
"dotenv-cli": "^7.3.0",
"eslint": "^8.42.0",
"eslint-config-prettier": "^9.0.0",
"eslint-plugin-prettier": "^5.0.0",
"husky": "^8.0.3",
"jest": "^29.5.0",
"jest-extended": "^4.0.2",
"jest-mock-extended": "^3.0.7",
"prettier": "^3.0.0",
"prisma": "^5.16.1",
"source-map-support": "^0.5.21",
"supertest": "^6.3.3",
"ts-jest": "^29.1.0",
"ts-loader": "^9.4.3",
"ts-node": "^10.9.1",
"tsconfig-paths": "^4.2.0",
"typescript": "^5.1.3"
},
"jest": {
"moduleFileExtensions": [
"js",
"json",
"ts"
],
"rootDir": "src",
"testRegex": ".*\\.spec|.jest\\.ts$",
"transform": {
"^.+\\.(t|j)s$": "ts-jest"
},
"collectCoverageFrom": [
"**/*.(t|j)s"
],
"coverageDirectory": "../coverage",
"testEnvironment": "node",
"setupFilesAfterEnv": [
"<rootDir>/prisma/singleton.ts"
]
},
"prisma": {
"seed": "ts-node prisma/seed/index.ts"
},
"lint-staged": {
"src/**/*.ts": [
"prettier --write"
],
"test/**/*.ts": [
"prettier --write"
],
"prisma/*seed/**/*.ts": [
"prettier --write"
]
}
}
Loading
Loading