Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions controllers/userController.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ const createUser = async (req, res) => {
if (error) {
return res.status(400).json({ error: error.details[0].message });
}
if (!req.file) {
return res.status(400).json({ error: "Profile picture is required" });
}
value.picture = req.file.filename; // Add uploaded filename to user data
//if (!req.file) {
//return res.status(400).json({ error: "Profile picture is required" });
//}
//value.picture = req.file.filename; // Add uploaded filename to user data
const userId = await User.create(value);
res.status(201).json({ message: "User added", userId });
};
Expand Down
23 changes: 22 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,22 @@
version: '3.8'
version: '3.3'

services:
db:
image: postgres:15
environment:
POSTGRES_USER: postgres
POSTGRES_PASSWORD: postgres
POSTGRES_DB: node_api_db
ports:
- "5400:5432"
volumes:
- postgres-data:/var/lib/postgresql/data
healthcheck:
test: ["CMD-SHELL", "pg_isready -U postgres"]
interval: 10s
timeout: 5s
retries: 5

node-api:
build:
context: .
Expand All @@ -9,6 +25,9 @@ services:
- "3000:3000"
environment:
- NODE_ENV=development
- DATABASE_URL=postgresql://postgres:postgres@db:5400/node_api_db
depends_on:
- db

prometheus:
image: prom/prometheus
Expand All @@ -29,3 +48,5 @@ services:

volumes:
grafana-storage:
postgres-data:

7 changes: 0 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion routes/userRoutes.js
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ const router = express.Router();
*/

router.get('/', auth, userController.getUsers);
router.post('/', auth, upload.single('picture'), userController.createUser);
router.post('/', upload.single('picture'), userController.createUser);
router.get('/:id', auth, userController.getUserById);
router.put('/:id', auth, userController.updateUser);
router.delete('/:id', auth, userController.deleteUser);
Expand Down
Loading