diff --git a/campics_/content/urls.py b/campics_/content/urls.py index 351165c72c51f72e4c917537be209d2baf415eaa..05f812bd6a96f33a4585b02d129f9f2b3c2b9007 100644 --- a/campics_/content/urls.py +++ b/campics_/content/urls.py @@ -4,7 +4,7 @@ from .views import UploadFeed, CreateReply, LikeFeed, ViewFeed, BookmarkFeed, De urlpatterns = [ path('upload', UploadFeed.as_view(), name='upload_feed'), - path('delete', DeleteFeed.as_view(), name='delete_feed'), + path('like', LikeFeed.as_view(), name='like'), path('view', ViewFeed.as_view(), name='view'), path('bookmark', BookmarkFeed.as_view(), name='bookmark'), diff --git a/campics_/content/views.py b/campics_/content/views.py index 8ae167a32cee0596a0dde0db49695861c184bd8b..39e1d4c33984bc318856fcf2c35fe8fe94fb2378 100644 --- a/campics_/content/views.py +++ b/campics_/content/views.py @@ -10,25 +10,6 @@ from uuid import uuid4 from datetime import datetime from django.db.models import Q -class DetailFeed(APIView): - def get(self, request): - email = request.session.get('email', None) - if email is None: - return render(request, 'user/login.html') - - user = User.objects.filter(email=email).first() - if user is None: - return render(request, 'user/login.html') - - # feed 가지고 오기 - feed = Feed.objects.get(feed_id=id) - - if feed.email == user.email: - return(request, 'deatil_delete.html', feed) - else: - return(request, 'detail.html', feed) - - class UploadFeed(APIView): def post(self, request): file = request.FILES['file'] @@ -116,24 +97,6 @@ class CreateReply(APIView): return Response(status=500, data=dict(message='삭제 실패')) ## 시환님꺼 -class DetailFeed(APIView): - def get(self, request): - email = request.session.get('email', None) - if email is None: - return render(request, 'user/login.html') - - user = User.objects.filter(email=email).first() - if user is None: - return render(request, 'user/login.html') - - # feed 가지고 오기 - feed = Feed.objects.get(feed_id=id) - - if feed.email == user.email: - return(request, 'deatil_delete.html', feed) - else: - return(request, 'detail.html', feed) - class DeleteFeed(APIView): def post(self, request): feed_id = request.data.get('feed_id') diff --git a/campics_/jinstagram/views.py b/campics_/jinstagram/views.py index dc1d830156053017d761b219f39888696eb3e79a..af972a77582e9318c07c9197e326d85e75a45d45 100644 --- a/campics_/jinstagram/views.py +++ b/campics_/jinstagram/views.py @@ -133,22 +133,6 @@ class Detail(APIView): context=dict(feed_list=feed_list, user=user)) - -class Ranking(APIView): - def get(self, request): - - univ_list = Feed.objects.values('univ')\ - .annotate(score=Count('univ') + Sum('views') + Sum('like_count'))\ - .order_by('-score') - - print(univ_list) - for i in range(len(univ_list)): - print(i, univ_list[i]['univ']) - return render(request, - 'jinstagram/ranking.html', - context=dict(univ_list=univ_list)) - - class Profile(APIView): def get(self, request): email = request.session.get('email', None)