[17기_서혜준] HTTPS 과제 제출합니다

.github/workflows/deploy.yml

@@ -3,7 +3,7 @@ name: Deploy to EC2
 on:
  push:
  branches:
- - dev
+ - master
 
 jobs:
 
@@ -16,8 +16,8 @@ jobs:
 
  - name: create env file
  run: |
- touch .env
- echo "${{ secrets.ENV_VARS }}" >> .env
+ touch .env.prod
+ echo "${{ secrets.ENV_VARS }}" >> .env.prod
 
  - name: create remote directory
  uses: appleboy/ssh-action@master

.gitignore

@@ -132,8 +132,10 @@ celerybeat.pid
 *.sage.py
 
 # Environments
-.env
+venv/.env
 .venv
+.env
+.env.prod
 env/
 venv/
 ENV/

Dockerfile

@@ -15,4 +15,4 @@ COPY requirements.txt /app/requirements.txt
 RUN pip install -r requirements.txt
 
 # Now copy in our code, and run it
-COPY . /app/
+COPY . /app/

Dockerfile.prod

@@ -45,7 +45,7 @@ WORKDIR $APP_HOME
 RUN apk update && apk add libpq
 RUN apk update \
  && apk add --virtual build-deps gcc python3-dev musl-dev \
- && apk add --no-cache mariadb-dev
+ && apk add --no-cache jpeg-dev zlib-dev mariadb-dev
 COPY --from=builder /usr/src/app/wheels /wheels
 COPY --from=builder /usr/src/app/requirements.txt .
 RUN pip install mysqlclient

account/admin.py

@@ -0,0 +1,7 @@
+from django.contrib import admin
+
+from account.models import *
+
+# admin.site.register(Profile)
+admin.site.register(School)
+admin.site.register(MyUser)

account/apps.py

@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class UserConfig(AppConfig):
+ default_auto_field = 'django.db.models.BigAutoField'
+ name = 'account'

account/migrations/0001_initial.py

@@ -0,0 +1,46 @@
+# Generated by Django 3.2.16 on 2023-04-11 14:56
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ initial = True
+
+ dependencies = [
+ migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name='School',
+ fields=[
+ ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('status', models.CharField(default='A', max_length=10)),
+ ('created_at', models.DateTimeField(auto_now_add=True)),
+ ('updated_at', models.DateTimeField(auto_now=True)),
+ ('name', models.CharField(max_length=60)),
+ ('campus', models.CharField(blank=True, max_length=60)),
+ ],
+ options={
+ 'abstract': False,
+ },
+ ),
+ migrations.CreateModel(
+ name='Profile',
+ fields=[
+ ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('status', models.CharField(default='A', max_length=10)),
+ ('created_at', models.DateTimeField(auto_now_add=True)),
+ ('updated_at', models.DateTimeField(auto_now=True)),
+ ('profile_img_path', models.URLField(blank=True)),
+ ('friends', models.ManyToManyField(blank=True, related_name='_account_profile_friends_+', to='account.Profile')),
+ ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+ ],
+ options={
+ 'abstract': False,
+ },
+ ),
+ ]

account/migrations/0002_profile_school.py

@@ -0,0 +1,20 @@
+# Generated by Django 3.2.16 on 2023-04-11 15:59
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('account', '0001_initial'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='profile',
+ name='school',
+ field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to='account.school'),
+ preserve_default=False,
+ ),
+ ]

account/migrations/0003_alter_profile_friends.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.16 on 2023-04-13 09:15
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('account', '0002_profile_school'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='profile',
+ name='friends',
+ field=models.ManyToManyField(blank=True, null=True, related_name='_account_profile_friends_+', to='account.Profile'),
+ ),
+ ]

account/migrations/0004_alter_profile_friends.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.16 on 2023-04-13 09:16
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('account', '0003_alter_profile_friends'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='profile',
+ name='friends',
+ field=models.ManyToManyField(blank=True, related_name='_account_profile_friends_+', to='account.Profile'),
+ ),
+ ]

account/migrations/0005_auto_20230504_1050.py

@@ -0,0 +1,23 @@
+# Generated by Django 3.2.16 on 2023-05-04 10:50
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('account', '0004_alter_profile_friends'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='profile',
+ name='deleted_at',
+ field=models.DateTimeField(blank=True, null=True),
+ ),
+ migrations.AddField(
+ model_name='school',
+ name='deleted_at',
+ field=models.DateTimeField(blank=True, null=True),
+ ),
+ ]

account/migrations/0006_myuser.py

@@ -0,0 +1,34 @@
+# Generated by Django 3.2.16 on 2023-05-05 20:42
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('account', '0005_auto_20230504_1050'),
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name='MyUser',
+ 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(max_length=255, unique=True)),
+ ('nickname', models.CharField(max_length=100, unique=True)),
+ ('profile_img_path', models.URLField(blank=True, null=True)),
+ ('is_admin', models.BooleanField(default=False)),
+ ('is_active', models.BooleanField(default=True)),
+ ('created_at', models.DateTimeField(auto_now_add=True)),
+ ('updated_at', models.DateTimeField(auto_now=True)),
+ ('friends', models.ManyToManyField(blank=True, null=True, related_name='_account_myuser_friends_+', to='account.MyUser')),
+ ('school', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='account.school')),
+ ],
+ options={
+ 'abstract': False,
+ },
+ ),
+ ]

account/migrations/0007_auto_20230505_2341.py

@@ -0,0 +1,24 @@
+# Generated by Django 3.2.16 on 2023-05-05 23:41
+
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('timetable', '0004_auto_20230505_2341'),
+ ('community', '0004_auto_20230505_2341'),
+ ('account', '0006_myuser'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='myuser',
+ name='friends',
+ field=models.ManyToManyField(blank=True, related_name='_account_myuser_friends_+', to=settings.AUTH_USER_MODEL),
+ ),
+ migrations.DeleteModel(
+ name='Profile',
+ ),
+ ]

account/models.py

@@ -0,0 +1,69 @@
+from django.db import models
+from django.contrib.auth.models import User
+from utils.models import BaseModel
+from django.contrib.auth.models import BaseUserManager, AbstractBaseUser
+
+
+class School(BaseModel):
+ name = models.CharField(max_length=60)
+ campus = models.CharField(max_length=60, blank=True)
+
+ def __str__(self):
+ return self.name
+
+
+class MyUserManager(BaseUserManager):
+ def create_user(self, email, nickname, school=None, password=None, **extra_fields):
+ if not email:
+ raise ValueError("Users must have an email address")
+
+ user = self.model(
+ email=email,
+ nickname=nickname,
+ school=school,
+ )
+ user.set_password(password)
+ user.save(using=self._db)
+ return user
+
+ def create_superuser(self, email, nickname, school=None, password=None, **extra_fields):
+ superuser = self.create_user(
+ email=email,
+ nickname=nickname,
+ school=school,
+ password=password,
+ )
+ superuser.is_admin = True
+ superuser.save(using=self._db)
+ return superuser
+
+
+class MyUser(AbstractBaseUser):
+ email = models.EmailField(max_length=255, unique=True)
+ nickname = models.CharField(max_length=100, unique=True)
+ # password, last_login 은 기본 제공
+ profile_img_path = models.URLField(blank=True, null=True)
+ friends = models.ManyToManyField('self', blank=True)
+ school = models.ForeignKey("School", on_delete=models.CASCADE)
+ is_admin = models.BooleanField(default=False)
+ is_active = models.BooleanField(default=True)
+ created_at = models.DateTimeField(auto_now_add=True)
+ updated_at = models.DateTimeField(auto_now=True)
+
+ objects = MyUserManager()
+
+ USERNAME_FIELD = "email"
+ REQUIRED_FIELDS = ["nickname"]
+
+ def __str__(self):
+ return self.email
+
+
+# class Profile(BaseModel):
+# user = models.OneToOneField(User, on_delete=models.CASCADE)
+# profile_img_path = models.URLField(blank=True)
+# friends = models.ManyToManyField('self', blank=True)
+# school = models.ForeignKey("School", on_delete=models.CASCADE)
+#
+# def __str__(self):
+# return self.user.username

account/permissions.py

@@ -0,0 +1,14 @@
+from rest_framework import permissions
+
+
+class IsOwnerOrReadonly(permissions.BasePermission):
+ def has_permission(self, request, view):
+ # 로그인한 사용자인 경우 API 사용 가능
+ return request.user and request.user.is_authenticated
+
+ def has_object_permission(self, request, view, obj):
+ # GET, OPTION, HEAD 요청일 때는 그냥 허용
+ if request.method in permissions.SAFE_METHODS:
+ return True
+ # DELETE, PATCH 일 때는 현재 사용자와 객체가 참조 중인 사용자가 일치할 때만 허용
+ return obj.myUser == request.user

account/serializers.py

@@ -0,0 +1,38 @@
+from rest_framework import serializers
+from account.models import *
+
+
+class SchoolSerializer(serializers.ModelSerializer):
+ class Meta:
+ model = School
+ fields = '__all__'
+
+
+class MyUserSerializer(serializers.ModelSerializer):
+ school = SchoolSerializer
+
+ class Meta:
+ model = MyUser
+ fields = '__all__'
+
+ def create(self, validated_data):
+ email = validated_data.get('email')
+ nickname = validated_data.get('nickname')
+ school = validated_data.get('school')
+ password = validated_data.get('password')
+ user = MyUser(
+ email=email,
+ nickname=nickname,
+ school=school
+ )
+ user.set_password(password)
+ user.save()
+ return user
+
+
+# class ProfileSerializer(serializers.ModelSerializer):
+# school = SchoolSerializer(read_only=True)
+#
+# class Meta:
+# model = Profile
+# fields = '__all__'

account/urls.py

@@ -0,0 +1,12 @@
+from django.urls import path, include
+from account import views
+
+
+urlpatterns = [
+ path("register/", views.RegisterAPIView.as_view()),
+ path("login/", views.LoginAPIView.as_view()),
+ path("logout/", views.LogoutAPIView.as_view()),
+ path("token-refresh/", views.RefreshAccessToken.as_view()),
+ path("health-check/", views.HealthCheck.as_view()),
+ path("schools/", views.SchoolListAPIView.as_view()),
+]