Skip to content

Commit

Permalink
'FEAT:03-03'
Browse files Browse the repository at this point in the history
  • Loading branch information
RatlyREM committed Aug 3, 2023
1 parent 616207a commit 2dacad5
Show file tree
Hide file tree
Showing 27 changed files with 104 additions and 3 deletions.
3 changes: 3 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Empty file added Exer/__init__.py
Empty file.
Binary file added Exer/__pycache__/__init__.cpython-310.pyc
Binary file not shown.
Binary file added Exer/__pycache__/admin.cpython-310.pyc
Binary file not shown.
Binary file added Exer/__pycache__/apps.cpython-310.pyc
Binary file not shown.
Binary file added Exer/__pycache__/models.cpython-310.pyc
Binary file not shown.
Binary file added Exer/__pycache__/serializers.cpython-310.pyc
Binary file not shown.
Binary file added Exer/__pycache__/urls.cpython-310.pyc
Binary file not shown.
Binary file added Exer/__pycache__/views.cpython-310.pyc
Binary file not shown.
3 changes: 3 additions & 0 deletions Exer/admin.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
from django.contrib import admin

# Register your models here.
6 changes: 6 additions & 0 deletions Exer/apps.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
from django.apps import AppConfig


class ExerConfig(AppConfig):
default_auto_field = 'django.db.models.BigAutoField'
name = 'Exer'
Empty file added Exer/migrations/__init__.py
Empty file.
Binary file added Exer/migrations/__pycache__/__init__.cpython-310.pyc
Binary file not shown.
14 changes: 14 additions & 0 deletions Exer/models.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
from django.db import models

# Create your models here.
class Exercise(models.Model):
exercise_id = models.IntegerField(primary_key=True)
usebody_id = models.ForeignKey('Usebody', on_delete=models.CASCADE, max_length=11)
exerciseName_English= models.CharField(max_length=50, blank=True, null=True)
exerciseName_Korean = models.CharField(max_length=50, blank=True, null=True)
equipment_name = models.CharField(max_length=50, blank=True, null=True)
videolink = models.CharField(max_length=150, blank=True, null=True)

class Meta:
managed = False
db_table = 'exercise'
12 changes: 12 additions & 0 deletions Exer/serializers.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
from rest_framework import serializers
from .models import Exercise

class ExerciseDetailSerializer(serializers.ModelSerializer):
class Meta:
model = Exercise
fields = ['exerciseName_English', 'exerciseName_Korean', 'equipment_name', 'videolink']

class ExerciseSerializer(serializers.ModelSerializer):
class Meta:
model = Exercise
fields = ['usebody_id', 'exerciseName_English', 'exerciseName_Korean']
3 changes: 3 additions & 0 deletions Exer/tests.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
from django.test import TestCase

# Create your tests here.
8 changes: 8 additions & 0 deletions Exer/urls.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
from django.urls import path
from . import views

urlpatterns = [
path('', views.ExerciseSearchAPIView.as_view()),
path('<int:pk>/', views.ExerciseDetailAPIView.as_view()),
path('body/<int:pk>/', views.ExerciseBodyAPIiew.as_view()),
]
43 changes: 43 additions & 0 deletions Exer/views.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
from rest_framework.views import APIView
from rest_framework.response import Response

from Exer.models import Exercise
from Exer.serializers import ExerciseSerializer
from Exer.serializers import ExerciseDetailSerializer
from django.shortcuts import get_object_or_404


#03-01 부위별 운동 간단 조회
#usebody의 id 대신 name이 나오게 하려면 model을 수정해야 할 것으로 보임
class ExerciseBodyAPIiew(APIView):
def get_object(self,pk):
return Exercise.objects.filter(usebody_id=pk)

def get(self,request,pk):
exercise = self.get_object(pk)
serializer = ExerciseSerializer(exercise)
return Response(serializer.data)


#03-02 운동 상세 조회
class ExerciseDetailAPIView(APIView):
def get_object(self, pk):
return get_object_or_404(Exercise, pk=pk)

def get(self, request,pk):
exercise = self.get_object(pk)
serializer = ExerciseDetailSerializer(exercise)
return Response(serializer.data)

#03-03 운동 검색
class ExerciseSearchAPIView(APIView):
def post(self,request):
data = request.data

exercise = Exercise.objects.filter(exerciseName_Korean=data)
serializer = ExerciseSerializer(exercise)

if serializer.is_valid():
return Response(serializer.data)
return Response(serializer.errors)

Binary file added __pycache__/my_settings.cpython-310.pyc
Binary file not shown.
Binary file added broccoli/__pycache__/__init__.cpython-310.pyc
Binary file not shown.
Binary file added broccoli/__pycache__/settings.cpython-310.pyc
Binary file not shown.
Binary file added broccoli/__pycache__/urls.cpython-310.pyc
Binary file not shown.
Binary file added broccoli/__pycache__/wsgi.cpython-310.pyc
Binary file not shown.
2 changes: 2 additions & 0 deletions broccoli/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@
'django.contrib.sessions',
'django.contrib.messages',
'django.contrib.staticfiles',
'rest_framework',
'Exer.apps.ExerConfig',
]

MIDDLEWARE = [
Expand Down
3 changes: 2 additions & 1 deletion broccoli/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@
2. Add a URL to urlpatterns: path('blog/', include('blog.urls'))
"""
from django.contrib import admin
from django.urls import path
from django.urls import path, include

urlpatterns = [
path('admin/', admin.site.urls),
path('exercise/', include('Exer.urls')),
]
4 changes: 2 additions & 2 deletions my_settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
'ENGINE': 'django.db.backends.mysql',
'NAME': 'bibim',
'USER': 'root',
'PASSWORD': '1234',
'PASSWORD': 'apolonlee9',
'HOST': 'localhost',
'PORT': '3306',
'PORT': '3308',
}
}

Expand Down

0 comments on commit 2dacad5

Please sign in to comment.