From e16b3430a77ab21d6977ea786a7d5e2d352d1662 Mon Sep 17 00:00:00 2001 From: Songmin17 Date: Thu, 9 Nov 2023 13:32:41 +0900 Subject: [PATCH 1/4] detailed event page: fixed merge conflict bug --- backend/post/views.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/backend/post/views.py b/backend/post/views.py index 0e51db9..4397c34 100644 --- a/backend/post/views.py +++ b/backend/post/views.py @@ -162,15 +162,15 @@ def get(self, request, post_id): post_response_data = serializer.data post_response_data['image'] = presigned_url elem = post_response_data['image'] - print(f'get presigned_url:\n{elem}') + post_response_data['is_liked'] = is_liked + post_response_data['is_favorite'] = is_favorite + # print(f'get presigned_url:\n{elem}') else: print(f'image is not in s3. Image_name=\n{post_image}') serializer = PostSerializer(post) post_response_data = serializer.data - - post_response_data = serializer.data - post_response_data['is_liked'] = is_liked - post_response_data['is_favorite'] = is_favorite + post_response_data['is_liked'] = is_liked + post_response_data['is_favorite'] = is_favorite return Response(post_response_data, status=200) From d6a7b5ccecc5060657aefc30fd67babc5719b3a5 Mon Sep 17 00:00:00 2001 From: Songmin17 Date: Thu, 9 Nov 2023 13:45:26 +0900 Subject: [PATCH 2/4] CD: workflow fix --- .github/workflows/docker_build_push.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docker_build_push.yml b/.github/workflows/docker_build_push.yml index 01376a7..a69eb0f 100644 --- a/.github/workflows/docker_build_push.yml +++ b/.github/workflows/docker_build_push.yml @@ -36,6 +36,7 @@ jobs: docker rm haeng echo "Removing unused Docker images..." docker image prune -f + docker rmi "${{ secrets.DOCKER_USERNAME }}/haengsha-backend:latest" echo "Pulling new image..." docker pull "${{ secrets.DOCKER_USERNAME }}/haengsha-backend:latest" docker run -d --name haeng -p 8080:8000 --env-file haengsha-env/.env "${{ secrets.DOCKER_USERNAME }}/haengsha-backend:latest" From dfaafd192e242231513f64d71f2483a672878f46 Mon Sep 17 00:00:00 2001 From: Songmin17 Date: Thu, 9 Nov 2023 13:46:06 +0900 Subject: [PATCH 3/4] workflow: comment delete --- .github/workflows/docker_build_push.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/docker_build_push.yml b/.github/workflows/docker_build_push.yml index a69eb0f..c22bd84 100644 --- a/.github/workflows/docker_build_push.yml +++ b/.github/workflows/docker_build_push.yml @@ -35,7 +35,6 @@ jobs: docker stop haeng docker rm haeng echo "Removing unused Docker images..." - docker image prune -f docker rmi "${{ secrets.DOCKER_USERNAME }}/haengsha-backend:latest" echo "Pulling new image..." docker pull "${{ secrets.DOCKER_USERNAME }}/haengsha-backend:latest" From 4e27536a909696068d277ac8641552076026f815 Mon Sep 17 00:00:00 2001 From: Songmin17 Date: Thu, 9 Nov 2023 16:45:49 +0900 Subject: [PATCH 4/4] updated gitignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 5c39962..fed964c 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,7 @@ .vscode/ swpp-env/ .ssh - +.idea *.iml .gradle