diff --git a/db.sqlite3 b/db.sqlite3 index bf6677d..c82c142 100644 Binary files a/db.sqlite3 and b/db.sqlite3 differ diff --git a/registered_user/admin.py b/registered_user/admin.py index 3f1cba1..4f521ee 100644 --- a/registered_user/admin.py +++ b/registered_user/admin.py @@ -5,7 +5,7 @@ from .models import * # Register your models here. @admin.register(RegisteredUser) class RegisteredUserAdmin(admin.ModelAdmin): - list_display = ("first_name", "jwt_token") + list_display = ("first_name", "last_name", "nick_name", "has_nsfw_toggle", "jwt_token") def jwt_token(self, obj): return Token.objects.get(user=obj.user).key \ No newline at end of file diff --git a/registered_user/migrations/0003_registereduser_has_nsfw_toggle.py b/registered_user/migrations/0003_registereduser_has_nsfw_toggle.py new file mode 100644 index 0000000..a24e0b4 --- /dev/null +++ b/registered_user/migrations/0003_registereduser_has_nsfw_toggle.py @@ -0,0 +1,18 @@ +# Generated by Django 4.2.2 on 2023-06-18 02:14 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('registered_user', '0002_remove_registereduser_phone_number'), + ] + + operations = [ + migrations.AddField( + model_name='registereduser', + name='has_nsfw_toggle', + field=models.BooleanField(default=False), + ), + ] diff --git a/registered_user/models.py b/registered_user/models.py index 8f9af98..28568cb 100644 --- a/registered_user/models.py +++ b/registered_user/models.py @@ -9,6 +9,7 @@ class RegisteredUser(models.Model): last_name = models.CharField(max_length=100, blank=True, null=True) image = models.TextField(blank=True, null=True) nick_name = models.CharField(max_length=100, blank=True, null=True) + has_nsfw_toggle = models.BooleanField(default=False) user = models.ForeignKey( settings.AUTH_USER_MODEL, diff --git a/registered_user/serializers.py b/registered_user/serializers.py index 636c8c7..2d9e06a 100644 --- a/registered_user/serializers.py +++ b/registered_user/serializers.py @@ -16,12 +16,12 @@ class RegisteredUserSerializer(serializers.ModelSerializer): class Meta: model = RegisteredUser - exclude = ('user', ) + exclude = ('user', 'has_nsfw_toggle') class GetRegisteredUserSerializer(serializers.ModelSerializer): class Meta: model = RegisteredUser - exclude = ('user','created_at', 'updated_at', ) + exclude = ('user','created_at', 'updated_at', 'has_nsfw_toggle') class CreateRegisteredUserSerializer(serializers.ModelSerializer): class Meta: diff --git a/workout/serializers.py b/workout/serializers.py index fcad271..e79096d 100644 --- a/workout/serializers.py +++ b/workout/serializers.py @@ -32,11 +32,12 @@ class CompleteWorkoutSerializer(serializers.ModelSerializer): class WorkoutSerializer(serializers.ModelSerializer): # exercise = WorkoutExerciseSerializer(source='workout_exercise_workout', many=True) - + registered_user = GetRegisteredUserSerializer(many=False, read_only=True) + class Meta: model = Workout fields = '__all__' - depth = 1 + # depth = 1 class WorkoutDetailSerializer(serializers.ModelSerializer): exercises = serializers.SerializerMethodField()