diff --git a/.github/workflows/docker_build_push.yml b/.github/workflows/docker_build_push.yml index 01376a7..c22bd84 100644 --- a/.github/workflows/docker_build_push.yml +++ b/.github/workflows/docker_build_push.yml @@ -35,7 +35,7 @@ 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" docker run -d --name haeng -p 8080:8000 --env-file haengsha-env/.env "${{ secrets.DOCKER_USERNAME }}/haengsha-backend:latest" diff --git a/.gitignore b/.gitignore index fca1306..f61072c 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,7 @@ .vscode/ swpp-env/ .ssh - +.idea *.iml .gradle diff --git a/backend/post/views.py b/backend/post/views.py index d8aaa10..081014f 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)