prod 배포 (#108)

* 병합 충돌이 있어 수정해주었습니다.

---------

Co-authored-by: Minkyu Lee <whizkyu@snu.ac.kr>
Co-authored-by: Kyeongpyo Lee <70705786+deveroskp@users.noreply.github.com>
Co-authored-by: deveroskp <imsmile2004@naver.com>

Author: 3 people

.coderabbit.yaml

@@ -0,0 +1,11 @@
+language: "ko-KR"
+
+reviews:
+  profile: "chill"
+  request_changes_workflow: false
+  high_level_summary: false
+  poem: false
+  review_status: true
+  auto_review:
+    enabled: true
+    drafts: false

.github/workflows/deploy-dev.yaml

@@ -7,7 +7,7 @@ on:
 jobs:
   deploy:
     name: deploy dev
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04-arm
 
     env:
       IMAGE_TAG: ${{ github.run_number }}

.github/workflows/deploy-prod.yaml

@@ -7,7 +7,7 @@ on:
 jobs:
   deploy:
     name: deploy prod
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04-arm
 
     env:
       IMAGE_TAG: ${{ github.run_number }}

.github/workflows/test.yaml

@@ -30,13 +30,13 @@ jobs:
       - name: change mysql charset
         run: mysql -h 127.0.0.1 -P 3307 -u root -p'root-password' -e "ALTER DATABASE testdb CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci"
 
-      - name: Install poetry
-        run: pipx install poetry
-
       - uses: actions/setup-python@v4
         with:
           python-version: 3.11
 
+      - name: Install poetry
+        run: pipx install poetry --python python3.11
+
       - name: Set poetry environment & install dependencies
         run: |
           poetry config virtualenvs.in-project true

.pre-commit-config.yaml

@@ -23,7 +23,7 @@ repos:
       - id: pyright
 
   - repo: https://github.com/hadialqattan/pycln
-    rev: v2.1.3
+    rev: v2.5.0
     hooks:
       - id: pycln
         args: [--config=pyproject.toml]

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.11-buster as builder
+FROM python:3.11-bookworm as builder
 
 RUN pip install poetry==1.5.0
 
@@ -13,7 +13,7 @@ COPY pyproject.toml poetry.lock ./
 
 RUN --mount=type=cache,target=$POETRY_CACHE_DIR poetry install --without dev --no-root
 
-FROM python:3.11-slim-buster as runtime
+FROM python:3.11-slim-bookworm as runtime
 
 ARG ENV
 

poetry.lock

@@ -27,6 +27,7 @@ pyjwt = "^2.8.0"
 pytest-mock = "3.8.2"
 moto = {version = "4.2.7", extras = ["all", "ec2", "s3"]}
 tenacity = "^9.0.0"
+pyyaml = "6.0.2"
 
 
 [tool.poetry.group.dev.dependencies]

pyproject.toml

@@ -26,3 +26,15 @@ def formatter(model: type[DeclarativeBase], attribute: str):
         )
 
     return formatter
+
+
+def member_formatter(model: type[DeclarativeBase], attribute: str) -> str | None:
+    member = getattr(model, "member")
+    return member and f"{member.last_name} {member.first_name}"
+
+
+def timeline_category_formatter(
+    model: type[DeclarativeBase], attribute: str
+) -> str | None:
+    category = getattr(model, "category")
+    return category and category.title

wacruit/src/admin/formatters.py

@@ -2,18 +2,32 @@
 
 from sqladmin import ModelView
 from sqlalchemy import Column
+from wtforms import TextAreaField
 
+from wacruit.src.admin.formatters import member_formatter
 from wacruit.src.admin.formatters import recruiting_formatter
 from wacruit.src.admin.formatters import shorten_column
+from wacruit.src.admin.formatters import timeline_category_formatter
 from wacruit.src.admin.formatters import user_formatter
 from wacruit.src.apps.announcement.models import Announcement
+from wacruit.src.apps.faq.models import FAQ
+from wacruit.src.apps.history.models import History
+from wacruit.src.apps.member.models import Member
+from wacruit.src.apps.pre_registration.models import PreRegistration
 from wacruit.src.apps.problem.models import CodeSubmission
 from wacruit.src.apps.problem.models import Problem
 from wacruit.src.apps.problem.models import Testcase
+from wacruit.src.apps.project.models import Project
 from wacruit.src.apps.recruiting.models import Recruiting
 from wacruit.src.apps.recruiting.models import RecruitingApplication
+from wacruit.src.apps.recruiting_info.models import RecruitingInfo
 from wacruit.src.apps.resume.models import ResumeQuestion
 from wacruit.src.apps.resume.models import ResumeSubmission
+from wacruit.src.apps.review.models import Review
+from wacruit.src.apps.seminar.models import Seminar
+from wacruit.src.apps.sponsor.models import Sponsor
+from wacruit.src.apps.timeline.models import Timeline
+from wacruit.src.apps.timeline.models import TimelineCategory
 from wacruit.src.apps.user.models import User
 
 
@@ -84,6 +98,7 @@ class RecruitingAdmin(ModelView, model=Recruiting):
         Recruiting.to_date,
         Recruiting.description,
         Recruiting.short_description,
+        Recruiting.recruiting_info,
     ]
 
     column_formatters = {
@@ -179,6 +194,8 @@ class TestcaseAdmin(ModelView, model=Testcase):
         Testcase.expected_output: shorten_column(),  # type: ignore
     }
 
+    form_overrides = {"stdin": TextAreaField, "expected_output": TextAreaField}
+
     form_excluded_columns = [
         Testcase.submission_results,
     ]
@@ -284,6 +301,196 @@ class RecruitingApplicationAdmin(ModelView, model=RecruitingApplication):
     column_sortable_list = RecruitingApplication.__table__.columns.keys()
 
 
+class ProjectAdmin(ModelView, model=Project):
+    column_list = [
+        Project.id,
+        Project.name,
+        Project.summary,
+        Project.introduction,
+        Project.thumbnail_url,
+        Project.project_type,
+        Project.is_active,
+    ]
+
+    form_excluded_columns = [
+        Project.images,
+        Project.urls,
+    ]
+
+    column_searchable_list = [
+        Project.name,
+        Project.summary,
+        Project.introduction,
+    ]
+
+    column_sortable_list = Project.__table__.columns.keys()
+
+
+class MemberAdmin(ModelView, model=Member):
+    column_list = [
+        Member.id,
+        Member.first_name,
+        Member.last_name,
+        Member.introduction,
+        Member.department,
+        Member.college,
+        Member.phone_number,
+        Member.github_id,
+        Member.generation,
+        Member.is_active,
+        Member.created_at,
+        Member.position,
+    ]
+
+    column_searchable_list = [Member.first_name, Member.last_name]
+
+    column_sortable_list = Member.__table__.columns.keys()
+
+
+class ReviewAdmin(ModelView, model=Review):
+    column_list = [
+        Review.id,
+        Review.member,
+        Review.title,
+        Review.content,
+    ]
+
+    column_formatters = {
+        Review.member: member_formatter,  # type: ignore
+    }
+
+    column_searchable_list = [
+        Review.title,
+    ]
+
+    column_sortable_list = Review.__table__.columns.keys()
+
+
+class SeminarAdmin(ModelView, model=Seminar):
+    column_list = [
+        Seminar.id,
+        Seminar.seminar_type,
+        Seminar.curriculum_info,
+        Seminar.prerequisite_info,
+        Seminar.is_active,
+    ]
+
+    column_searchable_list = [Seminar.seminar_type]
+
+    column_sortable_list = Seminar.__table__.columns.keys()
+
+
+class PreRegistrationAdmin(ModelView, model=PreRegistration):
+    column_list = [
+        PreRegistration.id,
+        PreRegistration.url,
+        PreRegistration.generation,
+        PreRegistration.is_active,
+    ]
+    column_searchable_list = [
+        PreRegistration.url,
+        PreRegistration.generation,
+    ]
+
+    column_sortable_list = PreRegistration.__table__.columns.keys()
+
+
+class SponsorAdmin(ModelView, model=Sponsor):
+    column_list = [
+        Sponsor.id,
+        Sponsor.name,
+        Sponsor.amount,
+        Sponsor.email,
+        Sponsor.phone_number,
+        Sponsor.sponsored_date,
+    ]
+
+    column_searchable_list = [
+        Sponsor.name,
+    ]
+
+    column_sortable_list = Sponsor.__table__.columns.keys()
+
+
+class TimelineAdmin(ModelView, model=Timeline):
+    column_list = [
+        Timeline.id,
+        Timeline.title,
+        Timeline.category,
+        Timeline.group,
+        Timeline.start_date,
+        Timeline.end_date,
+    ]
+    column_formatters = {
+        Timeline.category: timeline_category_formatter,  # type: ignore
+    }
+    column_searchable_list = [
+        Timeline.title,
+    ]
+
+    column_sortable_list = Timeline.__table__.columns.keys()
+
+
+class TimelineCategoryAdmin(ModelView, model=TimelineCategory):
+    column_list = [
+        TimelineCategory.id,
+        TimelineCategory.title,
+    ]
+
+    column_searchable_list = [
+        TimelineCategory.title,
+    ]
+
+    column_sortable_list = TimelineCategory.__table__.columns.keys()
+
+
+class FAQAdmin(ModelView, model=FAQ):
+    column_list = [
+        FAQ.id,
+        FAQ.question,
+        FAQ.answer,
+    ]
+
+    column_searchable_list = [
+        FAQ.question,
+    ]
+
+    column_sortable_list = FAQ.__table__.columns.keys()
+
+
+class RecruitingInfoAdmin(ModelView, model=RecruitingInfo):
+    column_list = [
+        RecruitingInfo.id,
+        RecruitingInfo.recruiting,
+        RecruitingInfo.info_num,
+    ]
+
+    column_formatters = {
+        RecruitingInfo.recruiting: recruiting_formatter  # type: ignore
+    }
+
+    column_searchable_list = [
+        "recruiting.name",
+        RecruitingInfo.info_num,
+    ]
+
+    column_sortable_list = RecruitingInfo.__table__.columns.keys()
+
+
+class HistoryAdmin(ModelView, model=History):
+    column_list = [
+        History.id,
+        History.history_key,
+        History.history_value,
+    ]
+
+    column_searchable_list = [
+        History.history_key,
+    ]
+
+    column_sortable_list = History.__table__.columns.keys()
+
+
 admin_views = [
     UserAdmin,
     RecruitingAdmin,
@@ -294,4 +501,15 @@ class RecruitingApplicationAdmin(ModelView, model=RecruitingApplication):
     ResumeQuestionAdmin,
     ResumeSubmissionAdmin,
     RecruitingApplicationAdmin,
+    ProjectAdmin,
+    MemberAdmin,
+    ReviewAdmin,
+    SeminarAdmin,
+    PreRegistrationAdmin,
+    SponsorAdmin,
+    TimelineAdmin,
+    TimelineCategoryAdmin,
+    FAQAdmin,
+    RecruitingInfoAdmin,
+    HistoryAdmin,
 ]