From 08dd9aba2297a4be1bade08bc911f5f4af8b971c Mon Sep 17 00:00:00 2001 From: T K Sourabh Date: Mon, 15 May 2017 01:16:24 +0530 Subject: [PATCH] Revert "Updated api endpoints" --- README.md | 2 - code_share/api_app/views.py | 49 ++++++++----------- .../templates/app_code_share/homepage.html | 2 +- code_share/app_code_share/views.py | 6 +-- 4 files changed, 24 insertions(+), 35 deletions(-) diff --git a/README.md b/README.md index 50b1a54..be7f918 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,2 @@ # CodeShare A django application for sharing code snippets. - - diff --git a/code_share/api_app/views.py b/code_share/api_app/views.py index 86a6ed4..9b07dcf 100644 --- a/code_share/api_app/views.py +++ b/code_share/api_app/views.py @@ -5,33 +5,22 @@ from rest_framework.response import Response from django.http import HttpResponse,JsonResponse from rest_framework import status -import random @api_view(['GET','POST']) def api_home(request): - if request.method == 'GET': - return Response({"id": 25,"code":"print 'hello world'","hash_value": "1950850", "file_name": "file1"}) + if request.method == 'GET': + return Response({"id": 25,"code":"print 'hello world'","hash_value": "1950850", "file_name": "file1"}) if request.method == 'POST': - serializer =Codeserializer(data=request.data) - if serializer.is_valid(): - a=random.randrange(1,6) - hash_value = str(hash(serializer.validated_data["code"]))[a:a+8] - if "file_name" in serializer.validated_data.keys(): - file=serializer.validated_data["file_name"] - if CodeShare.objects.filter(file_name=file).exists() == True and serializer.validated_data["file_name"] != '': - return Response({"error":'Awww!! An error . Probably we might have a file with same name . Damn those folks.'}) - else: - file=None - try: - CodeShare.objects.create(code= serializer.validated_data["code"], - hash_value=hash_value, - file_name= file) - return redirect('return_by_hash', hash_id=hash_value) - except: - return Response({"error":'same hash error '}) - else: - return Response("error occured") + code_share = request.POST.get('code_snippet') + file_name = request.POST.get('file_name') + hash_value = str(hash(code_share))[1:8] + if CodeShare.objects.filter(file_name=file_name).exists() == True and file_name != '': + return JsonResponse({"error":'Awww!! An error . Probably we might have a file with same name . Damn those folks.'},safe=False) + CodeShare.objects.create(code=code_share, + hash_value=hash_value, + file_name=file_name) + return redirect('return_by_hash', hash_id=hash_value) @@ -46,14 +35,16 @@ def code_by_hash(request,hash_id,format=None): serialized_code=Codeserializer(code_share) return Response(serialized_code.data) if request.method == 'POST': + code_share = request.POST.get('code_snippet') code_obj=goo404(CodeShare,hash_value=hash_id) serializer=Codeserializer(code_obj,data=request.data) if serializer.is_valid(): - serializer.validated_data["file_name"]=code_obj.file_name - serializer.save() + obj=serializer.save() + obj.code=code_share + obj.save() return Response(serializer.data) else: - return Response("error occured") + return JsonResponse("error occured") @@ -64,11 +55,13 @@ def code_by_filename(request, file_name,format=None): serialized_code=Codeserializer(code_share) return Response(serialized_code.data) if request.method == 'POST': + code_share = request.POST.get('code_snippet') code_obj = goo404(CodeShare,file_name=file_name) serializer=Codeserializer(code_obj,data=request.data) if serializer.is_valid(): - serializer.validated_data["file_name"]=code_obj.file_name - serializer.save() + obj=serializer.save() + obj.code=code_share + obj.save() return Response(serializer.data) - return Response("error occured") + return JsonResponse("error occured") # Create your views here. diff --git a/code_share/app_code_share/templates/app_code_share/homepage.html b/code_share/app_code_share/templates/app_code_share/homepage.html index c8dc4dc..12dcf53 100644 --- a/code_share/app_code_share/templates/app_code_share/homepage.html +++ b/code_share/app_code_share/templates/app_code_share/homepage.html @@ -55,4 +55,4 @@

Shitty Code Share

- + \ No newline at end of file diff --git a/code_share/app_code_share/views.py b/code_share/app_code_share/views.py index 5992e98..3088ee0 100644 --- a/code_share/app_code_share/views.py +++ b/code_share/app_code_share/views.py @@ -3,7 +3,6 @@ from .models import CodeShare import hashlib from django.contrib import messages -import random def home(request): if request.method == 'GET': @@ -11,8 +10,7 @@ def home(request): if request.method == 'POST': code_share = request.POST.get('code_snippet') file_name = request.POST.get('file_name') - a=random.randrange(0,6) - hash_value = str(hash(code_share))[a:a+8] + hash_value = str(hash(code_share))[1:8] if CodeShare.objects.filter(file_name=file_name).exists() == True and file_name != '': messages.error(request,'Awww!! An error. Probably we might have a file with same name. Damn those folks.') return render(request, 'app_code_share/homepage.html',{}) @@ -47,4 +45,4 @@ def view_by_file(request, file_name): return redirect('code_share:view_by_file', file_name=file_name) - + \ No newline at end of file