Merge remote-tracking branch 'origin/develop' into feature/#12
No related branches found
No related tags found
Showing
- package-lock.json 474 additions, 83 deletionspackage-lock.json
- package.json 5 additions, 2 deletionspackage.json
- routes/inviteRoutes.js 32 additions, 0 deletionsroutes/inviteRoutes.js
- services/chatService.js 1 addition, 1 deletionservices/chatService.js
- services/friendService.js 1 addition, 2 deletionsservices/friendService.js
- services/friendService.test.js 3 additions, 2 deletionsservices/friendService.test.js
- services/friendrelation.test.js 1 addition, 2 deletionsservices/friendrelation.test.js
- services/meetingService.js 333 additions, 60 deletionsservices/meetingService.js
- services/meetingService.test.js 497 additions, 0 deletionsservices/meetingService.test.js
- services/schedule.test.js 330 additions, 208 deletionsservices/schedule.test.js
- services/scheduleService.js 144 additions, 234 deletionsservices/scheduleService.js
This diff is collapsed.
... | @@ -22,7 +22,6 @@ | ... | @@ -22,7 +22,6 @@ |
"firebase-admin": "^13.0.1", | "firebase-admin": "^13.0.1", | ||
"jest": "^29.7.0", | "jest": "^29.7.0", | ||
"joi": "^17.13.3", | "joi": "^17.13.3", | ||
"mongoose": "^8.8.1", | |||
"morgan": "^1.10.0", | "morgan": "^1.10.0", | ||
"multer": "^1.4.5-lts.1", | "multer": "^1.4.5-lts.1", | ||
"mysql2": "^3.11.4", | "mysql2": "^3.11.4", | ||
... | @@ -36,6 +35,10 @@ | ... | @@ -36,6 +35,10 @@ |
"devDependencies": { | "devDependencies": { | ||
"artillery": "^2.0.21", | "artillery": "^2.0.21", | ||
"cross-env": "^7.0.3", | "cross-env": "^7.0.3", | ||
"nodemon": "^3.1.7" | "jest": "^29.7.0", | ||
"jest-mock": "^29.7.0", | |||
"mongoose": "^8.8.2", | |||
"nodemon": "^3.1.7", | |||
"sequelize-mock": "^0.10.2" | |||
} | } | ||
} | } |
routes/inviteRoutes.js
0 → 100644
services/meetingService.test.js
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Please register or sign in to comment