From 41abfa499a99821c6bb11e8b7c70949acd0ebfd5 Mon Sep 17 00:00:00 2001 From: emilbartholdy Date: Wed, 29 Apr 2020 18:31:59 +0200 Subject: [PATCH 1/3] remove some duplicated code --- .github/workflows/ci-cd.yml | 15 +++++++++++++++ backend/src/custom-server.js | 30 +++++++++--------------------- 2 files changed, 24 insertions(+), 21 deletions(-) diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml index 5f9056c..39efc1c 100644 --- a/.github/workflows/ci-cd.yml +++ b/.github/workflows/ci-cd.yml @@ -116,6 +116,18 @@ jobs: docker-compose -f docker-compose.yml -f docker-compose.prod.yml pull docker-compose -f docker-compose.yml -f docker-compose.prod.yml up -d + - name: Rolling updates + uses: appleboy/ssh-action@master + with: + host: 167.172.180.155 # Leader IP + USERNAME: root + KEY: ${{ secrets.CI_swarm_private_key }} + script: | + echo ${{ secrets.db-config }} >> db-config + source db-config + docker stack up minitwit -c minitwit_stack.yml + docker service update -d --image dagandersen/frontend:latest minitwit_fontend + - name: Bump version and push tag id: tagger uses: anothrNick/github-tag-action@1.17.2 @@ -142,3 +154,6 @@ jobs: ${{ steps.commit_message.outputs.message }} draft: false prerelease: false + + + \ No newline at end of file diff --git a/backend/src/custom-server.js b/backend/src/custom-server.js index 36f17ad..5551709 100644 --- a/backend/src/custom-server.js +++ b/backend/src/custom-server.js @@ -118,27 +118,14 @@ app.get('/user/:username/:currentUserId?', async (req, res) => { }); app.post('/:username/follow', async (req, res) => { - try { - const { currentUserId } = req.body; - const { username } = req.params; - - if (!currentUserId) return res.status(401).send({ error: 'currentUserId is missing' }); - - const follower = await userRepository.getById(currentUserId); - - const followed = await userRepository.getByUsername(username); - - if (!follower || !followed) return res.status(404).send({ error: 'User not found' }); - - await userRepository.addFollow(follower, followed); - - return res.status(204).send(); - } catch (err) { - return res.status(500).send(err.message); - } + processFollowRequest(req, res, userRepository.addFollow); }); app.post('/:username/unfollow', async (req, res) => { + await processFollowRequest(req, res, userRepository.removeFollow); +}); + +async function processFollowRequest(req, res, followFunction) { try { const { currentUserId } = req.body; const { username } = req.params; @@ -146,18 +133,17 @@ app.post('/:username/unfollow', async (req, res) => { if (!currentUserId) return res.status(401).send({ error: 'currentUserId is missing' }); const follower = await userRepository.getById(currentUserId); - const followed = await userRepository.getByUsername(username); if (!follower || !followed) return res.status(404).send({ error: 'User not found' }); - await userRepository.removeFollow(follower, followed); + await followFunction(follower, followed); return res.status(204).send(); } catch (err) { return res.status(500).send(err.message); } -}); +}; app.post('/add_message', async (req, res) => { try { @@ -179,4 +165,6 @@ app.post('/add_message', async (req, res) => { } }); +function getFollower + module.exports = app; From fe21575088aeca627234aa3498a5326b57316e96 Mon Sep 17 00:00:00 2001 From: emilbartholdy Date: Wed, 29 Apr 2020 18:44:56 +0200 Subject: [PATCH 2/3] Remove incomplete code --- backend/src/custom-server.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/backend/src/custom-server.js b/backend/src/custom-server.js index 5551709..b122355 100644 --- a/backend/src/custom-server.js +++ b/backend/src/custom-server.js @@ -118,11 +118,11 @@ app.get('/user/:username/:currentUserId?', async (req, res) => { }); app.post('/:username/follow', async (req, res) => { - processFollowRequest(req, res, userRepository.addFollow); + await processFollowRequest(req, res, userRepository.addFollow); }); app.post('/:username/unfollow', async (req, res) => { - await processFollowRequest(req, res, userRepository.removeFollow); + await processFollowRequest(req, res, userRepository.removeFollow); }); async function processFollowRequest(req, res, followFunction) { @@ -165,6 +165,4 @@ app.post('/add_message', async (req, res) => { } }); -function getFollower - module.exports = app; From 68f50aa5f42a428912162dd49e33e9b22052ae67 Mon Sep 17 00:00:00 2001 From: emilbartholdy Date: Wed, 29 Apr 2020 18:48:01 +0200 Subject: [PATCH 3/3] Linting --- backend/src/custom-server.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/backend/src/custom-server.js b/backend/src/custom-server.js index b122355..a9e2da7 100644 --- a/backend/src/custom-server.js +++ b/backend/src/custom-server.js @@ -117,14 +117,6 @@ app.get('/user/:username/:currentUserId?', async (req, res) => { } }); -app.post('/:username/follow', async (req, res) => { - await processFollowRequest(req, res, userRepository.addFollow); -}); - -app.post('/:username/unfollow', async (req, res) => { - await processFollowRequest(req, res, userRepository.removeFollow); -}); - async function processFollowRequest(req, res, followFunction) { try { const { currentUserId } = req.body; @@ -143,7 +135,15 @@ async function processFollowRequest(req, res, followFunction) { } catch (err) { return res.status(500).send(err.message); } -}; +} + +app.post('/:username/follow', async (req, res) => { + await processFollowRequest(req, res, userRepository.addFollow); +}); + +app.post('/:username/unfollow', async (req, res) => { + await processFollowRequest(req, res, userRepository.removeFollow); +}); app.post('/add_message', async (req, res) => { try {