From c76e94e6de5c76a473ff395183e2c216ef234164 Mon Sep 17 00:00:00 2001 From: SyedArshikJavedMoinee Date: Thu, 13 Jun 2024 16:11:41 +0500 Subject: [PATCH 1/8] First one for demo --- .github/workflows/pr-review.yml | 44 +++++++++++---------------------- mern-ecommerce/routes/auth.js | 3 +++ 2 files changed, 18 insertions(+), 29 deletions(-) diff --git a/.github/workflows/pr-review.yml b/.github/workflows/pr-review.yml index 218082c..95eec20 100644 --- a/.github/workflows/pr-review.yml +++ b/.github/workflows/pr-review.yml @@ -13,32 +13,18 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v3 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - - name: Cache Docker layers - uses: actions/cache@v3 - with: - path: /tmp/.buildx-cache - key: ${{ runner.os }}-docker-${{ github.sha }} - restore-keys: | - ${{ runner.os }}-docker- - + - name: Pull Docker image - run: | - docker buildx create --use - docker pull arshikjaved/pr-review:v1.0 || true - docker buildx build --cache-from=type=local,src=/tmp/.buildx-cache \ - --cache-to=type=local,dest=/tmp/.buildx-cache-new \ - -t arshikjaved/pr-review:v1.0 . - - - name: Update Docker cache - if: success() - run: | - rm -rf /tmp/.buildx-cache - mv /tmp/.buildx-cache-new /tmp/.buildx-cache - + run: docker pull arshikjaved/pr-review:v1.0 + + - name: Get commit SHA + id: commit_sha + run: echo "::set-output name=commit_sha::${{ github.event.pull_request.head.sha }}" + + - name: Get PR number + id: pr_number + run: echo "::set-output name=pr_number::${{ github.event.pull_request.number }}" + - name: Set script name id: script_name run: | @@ -59,13 +45,13 @@ jobs: LINE_NUMBER: ${{ github.event.comment.line }} REPOSITORY_OWNER: ${{ github.repository_owner }} REPOSITORY_NAME: ${{ github.event.repository.name }} - SCRIPT: ${{ steps.script_name.outputs.script }} + SCRIPT: ${{ github.event_name == 'pull_request' && 'generate_response.py' || 'reply_thread.py' }} COMMIT_SHA: ${{ github.event.pull_request.head.sha }} PR_NUMBER: ${{ github.event.pull_request.number }} run: | if [ "${{ env.SCRIPT }}" == "generate_response.py" ]; then - docker run --rm -e OWNER='${{env.REPOSITORY_OWNER}}' -e REPO_NAME='${{env.REPOSITORY_NAME}}' -e COMMIT_SHA="${{ github.event.pull_request.head.sha }}" -e PR_NUMBER="${{ github.event.pull_request.number }}" -e ACTION="${{env.ACTION}}" -e EVENT_NAME="${{ env.EVENT_NAME }}" arshikjaved/pr-review:v1.0 sh -c "python /app/generate_response.py --owner '${{env.REPOSITORY_OWNER}}' --repo-name '${{env.REPOSITORY_NAME}}' --commit-sha '${{ env.COMMIT_SHA }}' --pr-number '${{ env.PR_NUMBER }}' --event-name '${{ env.EVENT_NAME }}' --action '${{ env.ACTION }}'" + docker run --rm -e OWNER='SyedArshikJavedMoinee' -e REPO_NAME='pr_auto' -e COMMIT_SHA="${{ steps.commit_sha.outputs.commit_sha }}" -e PR_NUMBER="${{ steps.pr_number.outputs.pr_number }}" -e ACTION="${{env.ACTION}}" -e EVENT_NAME="${{ env.EVENT_NAME }}" arshikjaved/pr-review:v1.0 sh -c "python /app/generate_response.py --owner 'SyedArshikJavedMoinee' --repo-name 'pr_auto' --commit-sha '${{ env.COMMIT_SHA }}' --pr-number '${{ env.PR_NUMBER }}' --event-name '${{ env.EVENT_NAME }}' --action '${{ env.ACTION }}'" else - docker run --rm -e OWNER='${{env.REPOSITORY_OWNER}}' -e REPO_NAME='${{env.REPOSITORY_NAME}}' -e COMMIT_SHA="${{ github.event.pull_request.head.sha }}" -e PR_NUMBER="${{ github.event.pull_request.number }}" -e EVENT_NAME="${{ env.EVENT_NAME }}" arshikjaved/pr-review:v1.0 sh -c "python /app/reply_thread.py --owner '${{env.REPOSITORY_OWNER}}' --repo-name '${{env.REPOSITORY_NAME}}' --commit-sha '${{ env.COMMIT_SHA }}' --pr-number '${{ env.PR_NUMBER }}' --event-name '${{ env.EVENT_NAME }}' --comment-body '${{ env.COMMENT_BODY }}' --comment-id '${{ env.COMMENT_ID }}' --file-path '${{ env.FILE_PATH }}' --line-number '${{ env.LINE_NUMBER }}'" - fi + docker run --rm -e OWNER='SyedArshikJavedMoinee' -e REPO_NAME='pr_auto' -e COMMIT_SHA="${{ steps.commit_sha.outputs.commit_sha }}" -e PR_NUMBER="${{ steps.pr_number.outputs.pr_number }}" -e EVENT_NAME="${{ env.EVENT_NAME }}" arshikjaved/pr-review:v1.0 sh -c "python /app/reply_thread.py --owner 'SyedArshikJavedMoinee' --repo-name 'pr_auto' --commit-sha '${{ env.COMMIT_SHA }}' --pr-number '${{ env.PR_NUMBER }}' --event-name '${{ env.EVENT_NAME }}' --comment-body '${{ env.COMMENT_BODY }}' --comment-id '${{ env.COMMENT_ID }}' --file-path '${{ env.FILE_PATH }}' --line-number '${{ env.LINE_NUMBER }}'" + fi \ No newline at end of file diff --git a/mern-ecommerce/routes/auth.js b/mern-ecommerce/routes/auth.js index ac167a8..c45c0a4 100644 --- a/mern-ecommerce/routes/auth.js +++ b/mern-ecommerce/routes/auth.js @@ -12,5 +12,8 @@ const { userSignupValidator } = require('../validator'); router.post('/signup', userSignupValidator, signup); router.post('/signin', signin); router.get('/signout', signout); +router.get('/hello', requireSignin, (req, res) => { + res.send('hello there'); +}); module.exports = router; From 9af595a5480786825857cffb5edfd27e7292b1b6 Mon Sep 17 00:00:00 2001 From: SyedArshikJavedMoinee Date: Thu, 13 Jun 2024 16:17:06 +0500 Subject: [PATCH 2/8] First one for demo --- mern-ecommerce/routes/auth.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mern-ecommerce/routes/auth.js b/mern-ecommerce/routes/auth.js index c45c0a4..c5162d3 100644 --- a/mern-ecommerce/routes/auth.js +++ b/mern-ecommerce/routes/auth.js @@ -16,4 +16,8 @@ router.get('/hello', requireSignin, (req, res) => { res.send('hello there'); }); +router.get('/hello', requireSignin, (req, res) => { + res.send('hello there'); +}); + module.exports = router; From 4b83e9b8594568e0edd6f476f50bfdbb2c21986d Mon Sep 17 00:00:00 2001 From: SyedArshikJavedMoinee Date: Thu, 13 Jun 2024 16:21:42 +0500 Subject: [PATCH 3/8] First one for demo --- .github/workflows/pr-review.yml | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/.github/workflows/pr-review.yml b/.github/workflows/pr-review.yml index 95eec20..bffa191 100644 --- a/.github/workflows/pr-review.yml +++ b/.github/workflows/pr-review.yml @@ -16,15 +16,7 @@ jobs: - name: Pull Docker image run: docker pull arshikjaved/pr-review:v1.0 - - - name: Get commit SHA - id: commit_sha - run: echo "::set-output name=commit_sha::${{ github.event.pull_request.head.sha }}" - - - name: Get PR number - id: pr_number - run: echo "::set-output name=pr_number::${{ github.event.pull_request.number }}" - + - name: Set script name id: script_name run: | @@ -51,7 +43,9 @@ jobs: run: | if [ "${{ env.SCRIPT }}" == "generate_response.py" ]; then - docker run --rm -e OWNER='SyedArshikJavedMoinee' -e REPO_NAME='pr_auto' -e COMMIT_SHA="${{ steps.commit_sha.outputs.commit_sha }}" -e PR_NUMBER="${{ steps.pr_number.outputs.pr_number }}" -e ACTION="${{env.ACTION}}" -e EVENT_NAME="${{ env.EVENT_NAME }}" arshikjaved/pr-review:v1.0 sh -c "python /app/generate_response.py --owner 'SyedArshikJavedMoinee' --repo-name 'pr_auto' --commit-sha '${{ env.COMMIT_SHA }}' --pr-number '${{ env.PR_NUMBER }}' --event-name '${{ env.EVENT_NAME }}' --action '${{ env.ACTION }}'" + docker run --rm -e OWNER='${{env.REPOSITORY_OWNER}}' -e REPO_NAME='${{env.REPOSITORY_NAME}}' -e COMMIT_SHA="${{ github.event.pull_request.head.sha }}" -e PR_NUMBER="${{ github.event.pull_request.number }}" -e ACTION="${{env.ACTION}}" -e EVENT_NAME="${{ env.EVENT_NAME }}" arshikjaved/pr-review:v1.0 sh -c "python /app/generate_response.py --owner '${{env.REPOSITORY_OWNER}}' --repo-name '${{env.REPOSITORY_NAME}}' --commit-sha '${{ env.COMMIT_SHA }}' --pr-number '${{ env.PR_NUMBER }}' --event-name '${{ env.EVENT_NAME }}' --action '${{ env.ACTION }}'" else - docker run --rm -e OWNER='SyedArshikJavedMoinee' -e REPO_NAME='pr_auto' -e COMMIT_SHA="${{ steps.commit_sha.outputs.commit_sha }}" -e PR_NUMBER="${{ steps.pr_number.outputs.pr_number }}" -e EVENT_NAME="${{ env.EVENT_NAME }}" arshikjaved/pr-review:v1.0 sh -c "python /app/reply_thread.py --owner 'SyedArshikJavedMoinee' --repo-name 'pr_auto' --commit-sha '${{ env.COMMIT_SHA }}' --pr-number '${{ env.PR_NUMBER }}' --event-name '${{ env.EVENT_NAME }}' --comment-body '${{ env.COMMENT_BODY }}' --comment-id '${{ env.COMMENT_ID }}' --file-path '${{ env.FILE_PATH }}' --line-number '${{ env.LINE_NUMBER }}'" - fi \ No newline at end of file + docker run --rm -e OWNER='${{env.REPOSITORY_OWNER}}' -e REPO_NAME='${{env.REPOSITORY_NAME}}' -e COMMIT_SHA="${{ github.event.pull_request.head.sha }}" -e PR_NUMBER="${{ github.event.pull_request.number }}" -e EVENT_NAME="${{ env.EVENT_NAME }}" arshikjaved/pr-review:v1.0 sh -c "python /app/reply_thread.py --owner '${{env.REPOSITORY_OWNER}}' --repo-name '${{env.REPOSITORY_NAME}}' --commit-sha '${{ env.COMMIT_SHA }}' --pr-number '${{ env.PR_NUMBER }}' --event-name '${{ env.EVENT_NAME }}' --comment-body '${{ env.COMMENT_BODY }}' --comment-id '${{ env.COMMENT_ID }}' --file-path '${{ env.FILE_PATH }}' --line-number '${{ env.LINE_NUMBER }}'" + fi + + \ No newline at end of file From 3d9b4cac759ab8bedcd6ddcfa0ee4c66736d50d8 Mon Sep 17 00:00:00 2001 From: SyedArshikJavedMoinee Date: Thu, 13 Jun 2024 16:33:19 +0500 Subject: [PATCH 4/8] First one for demo --- mern-ecommerce/controllers/category.js | 2 +- mern-ecommerce/routes/auth.js | 7 ------- mern-ecommerce/routes/category.js | 1 - 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/mern-ecommerce/controllers/category.js b/mern-ecommerce/controllers/category.js index 845c70b..b822911 100644 --- a/mern-ecommerce/controllers/category.js +++ b/mern-ecommerce/controllers/category.js @@ -59,7 +59,7 @@ exports.remove = (req, res) => { }; exports.list = (req, res) => { - Category.find().exec((err, data) => { + Categoryy.find().exec((err, data) => { if (err) { return res.status(400).json({ error: errorHandler(err), diff --git a/mern-ecommerce/routes/auth.js b/mern-ecommerce/routes/auth.js index c5162d3..ac167a8 100644 --- a/mern-ecommerce/routes/auth.js +++ b/mern-ecommerce/routes/auth.js @@ -12,12 +12,5 @@ const { userSignupValidator } = require('../validator'); router.post('/signup', userSignupValidator, signup); router.post('/signin', signin); router.get('/signout', signout); -router.get('/hello', requireSignin, (req, res) => { - res.send('hello there'); -}); - -router.get('/hello', requireSignin, (req, res) => { - res.send('hello there'); -}); module.exports = router; diff --git a/mern-ecommerce/routes/category.js b/mern-ecommerce/routes/category.js index 1ac1760..c4c2448 100644 --- a/mern-ecommerce/routes/category.js +++ b/mern-ecommerce/routes/category.js @@ -29,7 +29,6 @@ router.delete( remove ); router.get('/categories', list); - router.param('categoryId', categoryById); router.param('userId', userById); From 6b97fc13f6149d6f182036b5dc836ca4b921c729 Mon Sep 17 00:00:00 2001 From: SyedArshikJavedMoinee Date: Thu, 13 Jun 2024 16:40:05 +0500 Subject: [PATCH 5/8] First one for demo --- mern-ecommerce/controllers/category.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mern-ecommerce/controllers/category.js b/mern-ecommerce/controllers/category.js index b822911..a275edd 100644 --- a/mern-ecommerce/controllers/category.js +++ b/mern-ecommerce/controllers/category.js @@ -37,7 +37,7 @@ exports.update = (req, res) => { category.save((err, data) => { if (err) { return res.status(400).json({ - error: errorHandler(err), + error: errorHandlerr(err), }); } res.json(data); From 6fb2dc72feb81caed52a5730e2a79045bb853f89 Mon Sep 17 00:00:00 2001 From: SyedArshikJavedMoinee Date: Thu, 13 Jun 2024 16:44:38 +0500 Subject: [PATCH 6/8] First one for demo --- mern-ecommerce/routes/auth.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mern-ecommerce/routes/auth.js b/mern-ecommerce/routes/auth.js index ac167a8..e9c36fd 100644 --- a/mern-ecommerce/routes/auth.js +++ b/mern-ecommerce/routes/auth.js @@ -9,8 +9,8 @@ const { } = require('../controllers/auth'); const { userSignupValidator } = require('../validator'); -router.post('/signup', userSignupValidator, signup); -router.post('/signin', signin); -router.get('/signout', signout); +router.post('/signup', userSignupValidator, signups); +router.post('/signin', signins); +router.get('/signout', signouts); module.exports = router; From 662bf931488f55afea4e2302f644421267b52863 Mon Sep 17 00:00:00 2001 From: SyedArshikJavedMoinee Date: Thu, 13 Jun 2024 16:52:11 +0500 Subject: [PATCH 7/8] First one for demo --- mern-ecommerce/routes/auth.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mern-ecommerce/routes/auth.js b/mern-ecommerce/routes/auth.js index e9c36fd..af83bca 100644 --- a/mern-ecommerce/routes/auth.js +++ b/mern-ecommerce/routes/auth.js @@ -11,6 +11,6 @@ const { userSignupValidator } = require('../validator'); router.post('/signup', userSignupValidator, signups); router.post('/signin', signins); -router.get('/signout', signouts); +router.get('/signout', signoutss); module.exports = router; From 052577eacccf24442622211b2a6499c88771a96b Mon Sep 17 00:00:00 2001 From: SyedArshikJavedMoinee Date: Thu, 13 Jun 2024 16:57:48 +0500 Subject: [PATCH 8/8] First one for demo --- mern-ecommerce/routes/auth.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mern-ecommerce/routes/auth.js b/mern-ecommerce/routes/auth.js index af83bca..ff517ab 100644 --- a/mern-ecommerce/routes/auth.js +++ b/mern-ecommerce/routes/auth.js @@ -9,8 +9,8 @@ const { } = require('../controllers/auth'); const { userSignupValidator } = require('../validator'); -router.post('/signup', userSignupValidator, signups); -router.post('/signin', signins); +router.post('/signup', userSignupValidator, signupss); +router.post('/signin', signinss); router.get('/signout', signoutss); module.exports = router;