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

Jump to bottom

Prisma #63

Merged
merged 57 commits into from
Mar 7, 2024
Merged

Prisma #63

merged 57 commits into from
Mar 7, 2024

Conversation

Flyinchicken
Copy link
Collaborator

No description provided.

@Flyinchicken
removed mongoose and database module; disabled pre-commit hook for now
1930f3a
@Flyinchicken
disabled husky for now
a2f0683
@Flyinchicken
added dev docker compose for mongo db; added scripts to run mongodb i…
ef6459a 
…n docker and config the mongo container
@Flyinchicken
added ./api/data to git ignore
51a04d8
@Flyinchicken
npm installed prisma, init prisma, added db url to ./api/.env, remove…
59d5725 
…d MONGO_URI in the .env in root
@Flyinchicken
added /data to the gitignore file in /api; removed /api/data in root …
a722d83 
…gitignore
@Flyinchicken
added dynamic prisma module and inject prisma client decorator; imple…
e0ff7c4 
…menting model User
@Flyinchicken
added schemas in prisma for user and dataset
d6349db
@Flyinchicken
added setup model
19aed47
@Flyinchicken
added $CreateUserDto as validation schema; exported and used CreateUs…
0d7beb4 
…erDto type
@Flyinchicken
implement datasets types (partly)
929f07a
@Flyinchicken
removed dto and schemas; start to refactor setup module
5c18608
@Flyinchicken
added custom functions for prisma model injection
789153e
@Flyinchicken
added user service tests
26b9b13
@Flyinchicken
removed pipe for user controller
a29f72d
@Flyinchicken
removed datasets dtos and schemas; added unit tests templates for dat…
f570538 
…aset
@Flyinchicken
added basic dataset zod validation
de9c4be
@Flyinchicken
changed dataset schema
aa35afb
@Flyinchicken
added file upload interceptor; modified user id intercepter
ea3919b
@Flyinchicken
refactoring auth and setup
c074677
@Flyinchicken
fixed type change related problems with auth and setup
33932bc
@Flyinchicken
change dataset schema to use columns to store data
98c1aee
@Flyinchicken
implemented zod validation schema for dataset
01523b9
@Flyinchicken
rename dto and schema folders to zod
14657c6
@Flyinchicken
fix import Model error (should import from prisma types); implement C…
2c86732 
…RUD for dataset
@Flyinchicken
added boolean column type in prisma model; minor change in dataset dt…
f12e4a8 
…o and create dataset
@Flyinchicken
finished create dataset and create columns
cc3f133
@Flyinchicken
fixed errors in addManagers; fixed minor error in auth
38eb06b
@Flyinchicken
Minor fix in auth, enum constants are now all capitalized
4966be9
@Flyinchicken
finishes get available, remove manager
d3f3415
@Flyinchicken Flyinchicken requested a review from joshunrau as a code owner March 5, 2024 15:21
joshunrau
joshunrau requested changes Mar 5, 2024
View reviewed changes
Copy link
Collaborator

@joshunrau joshunrau left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Overall, I think this is a great start, I have made quite a few small comments with suggested changes. Some of them are just questions and if I am wrong feel free to ignore and/or respond why. The only major issue I have here is the lack of discriminated union support in Prisma (discuss in-person).

.husky/pre-commit Outdated Show resolved Hide resolved
api/.gitignore Outdated Show resolved Hide resolved
api/docker-compose.dev.yaml Outdated Show resolved Hide resolved
api/package.json Outdated Show resolved Hide resolved
api/prisma/schema.prisma Show resolved Hide resolved
api/src/users/users.service.ts Outdated Show resolved Hide resolved
api/src/users/users.service.ts Show resolved Hide resolved
api/src/users/zod/user.ts Outdated Show resolved Hide resolved
api/src/users/zod/user.ts Outdated Show resolved Hide resolved
api/src/users/zod/user.ts Outdated Show resolved Hide resolved
@Flyinchicken
uncommented pre-commit except for bun lint
eb77ca4
@Flyinchicken
remove mongoose; fixed capitalization
5a99fa2
@Flyinchicken
fixed setup service, type error in dataset service
2f935c6
@Flyinchicken
removed gitignore in api folder and added those ignores to the root l…
8562174 
…evel gitignore file
@Flyinchicken
moved docker compose for dev to the root folder
0964e15
@Flyinchicken
fixed errors in auth service
db4e4fa
@Flyinchicken
remove mongo db related scripts
a731f70
@Flyinchicken
change expiry to expiryAt for consistency
b8e9323
@Flyinchicken
removed empty imports
9e882a1
@Flyinchicken
change snakecase to camelcase
1c69176
@Flyinchicken
rename setup to setupConfiguration
ef24c4d
@Flyinchicken
improve readability for isVerified
b6f4997
@Flyinchicken
readability of isVerified
d45c9f5
@Flyinchicken
remove export for non-external z object
c2e814f
@Flyinchicken
use CurrentUser decorator in JSLib for current user id
36cde89
@Flyinchicken
remove user and setup from each other
0da2890
@Flyinchicken
change native enum to string literal enum
483ae3b
@Flyinchicken
add id column for datasets without primary keys
75fad8d
@Flyinchicken
added min 1 manager required in dataset info
4226be0
@Flyinchicken
fixed setup service manager id
f6c73f8
@Flyinchicken
replace discriminated union with regular union
4bddf18
@joshunrau joshunrau merged commit 6c2df88 into DouglasNeuroInformatics:dev Mar 7, 2024
@Flyinchicken Flyinchicken deleted the prisma branch March 8, 2024 16:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@joshunrau joshunrau joshunrau approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Flyinchicken @joshunrau