Skip to content

Commit

Permalink
Merge pull request #46 from snuhcs-course/backend/null_post
Browse files Browse the repository at this point in the history
Fixes to Get API: Merge Conflict Bug and Changes to Workflow
  • Loading branch information
Byeol-Haneul authored Nov 9, 2023
2 parents a726a5c + 4e27536 commit 1779815
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docker_build_push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
.vscode/
swpp-env/
.ssh

.idea

*.iml
.gradle
Expand Down
10 changes: 5 additions & 5 deletions backend/post/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down

0 comments on commit 1779815

Please sign in to comment.