feat: Routine updates

Exer/models.py

@@ -3,11 +3,13 @@
 class Exercise(models.Model):
     exercise_id = models.IntegerField(primary_key=True)
     usebody = models.ForeignKey('usebody.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'

Exer/serializers.py

@@ -1,12 +1,22 @@
 from rest_framework import serializers
 from .models import Exercise
+from usebody.models import Usebody
 
+class BodySerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Usebody
+        fields= '__all__'
 class ExerciseDetailSerializer(serializers.ModelSerializer):
     class Meta:
         model = Exercise
-        fields = ['exerciseName_English', 'exerciseName_Korean', 'equipment_name', 'videolink']
+        fields = ['usebody_id','exerciseName_English', 'exerciseName_Korean', 'equipment_name', 'videolink']
 
 class ExerciseSerializer(serializers.ModelSerializer):
+    #usebody_name = serializers.SerializerMethodField()
+
+    # def get_usebody_name(self, obj):
+    #     return obj.usebody_name
     class Meta:
         model = Exercise
+
         fields = ['usebody_id', 'exerciseName_English', 'exerciseName_Korean']

Exer/views.py

@@ -7,16 +7,28 @@
 from Exer.serializers import ExerciseDetailSerializer
 from django.shortcuts import get_object_or_404
 
+from django.db import connection
 
 #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):
+        #pk를 usebody_id를 가지는 객체를 가져온다
+        cursor = connection.cursor()
+        sql = "select usebody_name from usebody where usebody_id = %s"
+        cursor.execute(sql, [pk])
+        result = cursor.fetchall()
+
         exercise = self.get_object(pk)
         serializer = ExerciseSerializer(exercise, many=True)
+
+        for i in serializer.data:
+            key = f'usebody_name'
+            value= result[0][0]
+            i[key] = value
+
         return Response(serializer.data)
 
 
@@ -33,12 +45,36 @@ def get(self, request,pk):
 #03-03 운동 검색
 class ExerciseSearchAPIView(APIView):
     def post(self,request):
-        data = request.data
+        if request.body:
+            objectsKor = Exercise.objects.filter(exerciseName_English__icontains=request.data.get('searchData'))
+            objectsEng = Exercise.objects.filter(exerciseName_Korean__icontains=request.data.get('searchData'))
+
+            combined_objects = list(objectsKor) + list(objectsEng)
+
+            body = []
 
-        exercise = Exercise.objects.filter(exerciseName_Korean=data)
-        serializer = ExerciseSerializer(exercise)
+            for i in combined_objects:
+                u_id = i.usebody_id
+
+                cursor = connection.cursor()
+                sql = "select usebody_name from usebody where usebody_id = %s"
+                cursor.execute(sql, [u_id])
+                result = cursor.fetchall()
+                body.append(result[0][0])
+
+            serializer = ExerciseSerializer(combined_objects, many=True)
+
+            index = 0
+            for i in serializer.data:
+
+                key = f'usebody_name'
+                value = body[index]
+                i[key] = value
+                index+=1
 
-        if serializer.is_valid():
             return Response(serializer.data)
-        return Response(serializer.errors)
+        else:
+            objects = Exercise.objects.all()
+            serializer = ExerciseSerializer(objects, many=True)
 
+            return Response(serializer.data)

accounts/backends.py

@@ -0,0 +1,18 @@
+import bcrypt
+from django.contrib.auth import get_user_model
+from django.contrib.auth.backends import ModelBackend
+from django.contrib.auth.hashers import check_password
+from django.db.models import Q
+
+
+class EmailBackend(ModelBackend):
+    def authenticate(self, request, username=None, password=None, **kwargs):
+        UserModel = get_user_model()
+        try:
+            user = UserModel.objects.get(email=username)
+        except UserModel.DoesNotExist:
+            return None
+        else:
+            if user.check_password(password):
+                return user
+        return None

accounts/migrations/0001_initial.py

@@ -0,0 +1,35 @@
+# Generated by Django 4.2.3 on 2023-08-15 16:59
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('auth', '0012_alter_user_first_name_max_length'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='User',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('password', models.CharField(max_length=128, verbose_name='password')),
+                ('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')),
+                ('email', models.EmailField(blank=True, max_length=100, unique=True)),
+                ('nickname', models.CharField(blank=True, max_length=20, unique=True)),
+                ('is_superuser', models.BooleanField(default=False)),
+                ('is_active', models.BooleanField(default=True)),
+                ('is_staff', models.BooleanField(default=False)),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('updated_at', models.DateTimeField(auto_now=True)),
+                ('groups', models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.group', verbose_name='groups')),
+                ('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.permission', verbose_name='user permissions')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+    ]