Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[#68] Refactor : Refactor review posting api #69

Merged
merged 4 commits into from
Aug 2, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 37 additions & 0 deletions api/migrations/0004_auto_20220803_0138.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# Generated by Django 3.0.8 on 2022-08-03 01:38

import api.models
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion


class Migration(migrations.Migration):

dependencies = [
('api', '0003_auto_20220729_0200'),
]

operations = [
migrations.AddField(
model_name='brand',
name='brand_desc_detail',
field=models.TextField(default=0),
preserve_default=False,
),
migrations.AlterField(
model_name='review',
name='product',
field=models.ForeignKey(blank=True, on_delete=django.db.models.deletion.CASCADE, related_name='product_review', to='api.Product'),
),
migrations.AlterField(
model_name='review',
name='review_img_main',
field=models.ImageField(blank=True, upload_to=api.models.review_path),
),
migrations.AlterField(
model_name='review',
name='user',
field=models.ForeignKey(blank=True, on_delete=django.db.models.deletion.CASCADE, related_name='user_review', to=settings.AUTH_USER_MODEL),
),
]
7 changes: 4 additions & 3 deletions api/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ class Brand(models.Model):
brand_img_logo = models.ImageField(upload_to=brand_path)
brand_link = models.URLField()
brand_desc = models.TextField()
brand_desc_detail = models.TextField()
brand_img_bg = models.ImageField(upload_to=brand_path)
curation = models.BooleanField(default=False)

Expand Down Expand Up @@ -188,13 +189,13 @@ class Review(models.Model):
(1, 1),
]

product = models.ForeignKey(Product, on_delete=models.CASCADE, related_name='product_review')
user = models.ForeignKey(User, on_delete=models.CASCADE, related_name='user_review')
product = models.ForeignKey(Product, on_delete=models.CASCADE, related_name='product_review', blank=True)
user = models.ForeignKey(User, on_delete=models.CASCADE, related_name='user_review', blank=True)

star_rate = models.IntegerField(choices=RATE_CHOICE)
review_tag_arr = models.TextField(null=True, blank=True)
review_text = models.TextField(null=True, blank=True)
review_img_main = models.ImageField(upload_to=review_path)
review_img_main = models.ImageField(upload_to=review_path, blank=True)
created_at = models.DateTimeField(auto_now_add=True)

def __str__(self):
Expand Down
25 changes: 14 additions & 11 deletions api/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -291,20 +291,23 @@ def get(self, request, pk): # μƒν’ˆμ˜ pk
}, status=status.HTTP_200_OK)

def post(self, request, pk):
form = ReviewForm(request.POST)
if form.is_valid():
review = form.save(commit=False)
review.user = request.user

try:
review = Review.objects.get(product_id=pk, user=review.user)
return Response("ν›„κΈ°λŠ” ν•œ 번만 μž‘μ„±ν•  수 μžˆμŠ΅λ‹ˆλ‹€!", status=status.HTTP_403_FORBIDDEN)
except Review.DoesNotExist:

if Review.objects.filter(product_id=pk, user=request.user.id).exists():
return Response("ν›„κΈ°λŠ” ν•œ 번만 μž‘μ„±ν•  수 μžˆμŠ΅λ‹ˆλ‹€!", status=status.HTTP_403_FORBIDDEN)

else:

form = ReviewForm(request.POST)

if form.is_valid():
review = form.save(commit=False)
review.user = request.user
review.product = Product.objects.get(pk=pk)
review.review_main_img = request.data['review_main_img']
review.review_img_main = request.data['review_img_main']

total_review = Review.objects.filter(product_id=pk).count()
star_rate = ((review.product.star_rate_avg * total_review) + review.star_rate) / (total_review + 1)

review.product.star_rate_avg = round(star_rate, 1)
review.product.save()
review.save()
Expand All @@ -317,7 +320,7 @@ def post(self, request, pk):
review_media.save()
return Response("Created Successfully", status=status.HTTP_201_CREATED)

return Response(form.errors, status=status.HTTP_400_BAD_REQUEST)
return Response(form.errors, status=status.HTTP_400_BAD_REQUEST)


class MagazineView(APIView):
Expand Down