Hotfix/project api (#110)

- Project 테이블에 formed_at (팀 결성 날짜) 속성을 추가했고, 불러올 때 formed_at이 작은 순서대로
불러오게 수정했습니다
- 어드민 페이지에서 Project Url을 추가할 수 있도록 수정했습니다.
- RecruitingInfo의 date_info의 자료형을 str으로 바꾸었습니다.
- get_recruiting_infos_by_type에서 query 날릴 때 오류가 있어서 수정했습니다.

Author: deveroskp

wacruit/src/admin/formatters.py

@@ -38,3 +38,11 @@ def timeline_category_formatter(
 ) -> str | None:
     category = getattr(model, "category")
     return category and category.title
+
+
+def project_urls_formatter(model: type[DeclarativeBase], attribute: str):
+    urls = getattr(model, "urls", None) or []
+    return [
+        getattr(getattr(u, "url_type", None), "name", str(getattr(u, "url_type", "")))
+        for u in urls
+    ]

wacruit/src/admin/views.py

@@ -5,6 +5,7 @@
 from wtforms import TextAreaField
 
 from wacruit.src.admin.formatters import member_formatter
+from wacruit.src.admin.formatters import project_urls_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
@@ -18,6 +19,7 @@
 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.project.models import ProjectURL
 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
@@ -310,13 +312,16 @@ class ProjectAdmin(ModelView, model=Project):
         Project.thumbnail_url,
         Project.project_type,
         Project.is_active,
-    ]
-
-    form_excluded_columns = [
-        Project.images,
+        Project.formed_at,
         Project.urls,
     ]
 
+    form_excluded_columns = [Project.images, Project.urls]
+
+    column_formatters = {
+        Project.urls: project_urls_formatter,  # type: ignore
+    }
+
     column_searchable_list = [
         Project.name,
         Project.summary,
@@ -326,6 +331,25 @@ class ProjectAdmin(ModelView, model=Project):
     column_sortable_list = Project.__table__.columns.keys()
 
 
+class ProjectURLAdmin(ModelView, model=ProjectURL):
+    column_list = [
+        ProjectURL.id,
+        ProjectURL.url,
+        ProjectURL.url_type,
+        ProjectURL.project_id,
+    ]
+
+    form_columns = [ProjectURL.url, ProjectURL.url_type, ProjectURL.source_project]
+
+    form_ajax_refs = {
+        "source_project": {
+            "fields": (Project.name,),
+        }
+    }
+
+    column_sortable_list = ProjectURL.__table__.columns.keys()
+
+
 class MemberAdmin(ModelView, model=Member):
     column_list = [
         Member.id,
@@ -502,6 +526,7 @@ class HistoryAdmin(ModelView, model=History):
     ResumeSubmissionAdmin,
     RecruitingApplicationAdmin,
     ProjectAdmin,
+    ProjectURLAdmin,
     MemberAdmin,
     ReviewAdmin,
     SeminarAdmin,

wacruit/src/apps/project/models.py

@@ -1,3 +1,4 @@
+from datetime import datetime
 from typing import TYPE_CHECKING
 
 from sqlalchemy import Column
@@ -31,6 +32,7 @@ class Project(DeclarativeBase):
     thumbnail_url: Mapped[str255 | None]
     project_type: Mapped[ProjectType]
     is_active: Mapped[bool] = mapped_column(default=True)
+    formed_at: Mapped[datetime | None] = mapped_column(default=None)
     urls: Mapped[list["ProjectURL"] | None] = relationship(
         back_populates="source_project"
     )

wacruit/src/apps/project/repositories.py

@@ -34,7 +34,14 @@ def get_project_by_name(self, name: str) -> Project | None:
         return self.session.query(Project).filter(Project.name == name).first()
 
     def get_projects(self, offset: int = 0, limit: int = 10) -> list[Project]:
-        return self.session.query(Project).offset(offset).limit(limit).all()
+        # formed_at이 작은 순서대로 정렬
+        return (
+            self.session.query(Project)
+            .order_by(Project.formed_at)
+            .offset(offset)
+            .limit(limit)
+            .all()
+        )
 
     def create_project(self, project: Project) -> Project:
         with self.transaction:

wacruit/src/apps/project/schemas.py

@@ -1,5 +1,7 @@
 from __future__ import annotations
 
+from datetime import datetime
+
 from pydantic import BaseModel
 from pydantic import Field
 
@@ -19,6 +21,7 @@ class ProjectCreateRequest(BaseModel):
     introduction: str | None = Field(None, max_length=255)
     thumbnail_url: str | None = Field(None, max_length=255)
     project_type: ProjectType
+    formed_at: datetime | None
     is_active: bool
     urls: list[ProjectLinkDto] | None
 
@@ -29,6 +32,7 @@ class ProjectUpdateRequest(BaseModel):
     introduction: str | None = Field(None, max_length=255)
     thumbnail_url: str | None = Field(None, max_length=255)
     project_type: ProjectType | None
+    formed_at: datetime | None
     is_active: bool | None
     urls: list[ProjectLinkDto] | None
 
@@ -54,6 +58,7 @@ class ProjectDetailResponse(OrmModel):
     introduction: str | None
     thumbnail_url: str | None
     project_type: ProjectType
+    formed_at: datetime | None
     is_active: bool
     images: list[PresignedUrlWithIdResponse] | None
     urls: list[ProjectLinkDto] | None
@@ -66,6 +71,7 @@ class ProjectBriefResponse(OrmModel):
     thumbnail_url: str | None
     project_type: ProjectType
     is_active: bool
+    formed_at: datetime | None
 
     @classmethod
     def from_orm(cls, obj):
@@ -76,6 +82,7 @@ def from_orm(cls, obj):
             thumbnail_url=obj.thumbnail_url,
             project_type=obj.project_type.name,
             is_active=obj.is_active,
+            formed_at=obj.formed_at,
         )
 
 

wacruit/src/apps/project/services.py

@@ -51,6 +51,7 @@ def create_project(self, request: ProjectCreateRequest):
             introduction=request.introduction,
             thumbnail_url=request.thumbnail_url,
             project_type=request.project_type,
+            formed_at=request.formed_at,
             is_active=request.is_active,
         )
 
@@ -96,6 +97,7 @@ def get_project(self, project_id: int) -> ProjectDetailResponse:
             introduction=project.introduction,
             thumbnail_url=project.thumbnail_url,
             project_type=project.project_type,
+            formed_at=project.formed_at,
             is_active=project.is_active,
             images=images,
             urls=[
@@ -163,6 +165,7 @@ def update_project(
             introduction=updated_project.introduction,
             thumbnail_url=updated_project.thumbnail_url,
             project_type=updated_project.project_type,
+            formed_at=updated_project.formed_at,
             is_active=updated_project.is_active,
             images=images,
             urls=[

wacruit/src/apps/recruiting/schemas.py

@@ -121,17 +121,17 @@ class RecruitingInfoResponse(OrmModel):
     type: RecruitingType
     info_num: int
     title: str
-    date_info: datetime
+    date_info: str | None = None
 
 
 class RecruitingInfoCreateRequest(BaseModel):
     info_num: int
     title: str
-    date_info: datetime
+    date_info: str | None = None
     recruiting_id: int
 
 
 class RecruitingInfoUpdateRequest(BaseModel):
     info_num: int | None = None
     title: str | None = None
-    date_info: datetime | None = None
+    date_info: str | None = None

wacruit/src/apps/recruiting/services.py

@@ -145,16 +145,20 @@ def get_active_recruitings(self) -> ListResponse[RecruitingSummaryResponse]:
         return ListResponse(items=items)
 
     def get_recruiting_infos_by_type(
-        self, recruiting_type: RecruitingType
+        self, recruiting_type: str
     ) -> ListResponse[RecruitingInfoResponse] | None:
-        info = self.recruiting_repository.get_recruiting_infos_by_type(recruiting_type)
+        if isinstance(recruiting_type, str):
+            if recruiting_type not in RecruitingType.__members__:
+                raise InvalidRecruitTypeException(recruiting_type)
+        rt = RecruitingType.ROOKIE
+        for enum_type in RecruitingType:
+            if enum_type.name == recruiting_type:
+                rt = enum_type
+        info = self.recruiting_repository.get_recruiting_infos_by_type(rt)
         if not info:
             return None
         return ListResponse(
-            items=[
-                RecruitingInfoResponse(**item.__dict__, type=recruiting_type)
-                for item in info
-            ]
+            items=[RecruitingInfoResponse(**item.__dict__, type=rt) for item in info]
         )
 
     def create_recruiting(self, request: RecruitingCreateRequest) -> RecruitingResponse:

wacruit/src/apps/recruiting/views_v3.py

@@ -37,7 +37,7 @@ def get_active_recruitings(
 
 @v3_router.get("/info")
 def get_recruiting_infos_by_type(
-    recruiting_type: RecruitingType,
+    recruiting_type: str,
     recruiting_service: Annotated[RecruitingService, Depends()],
 ) -> ListResponse[RecruitingInfoResponse]:
     result = recruiting_service.get_recruiting_infos_by_type(recruiting_type)

wacruit/src/apps/recruiting_info/models.py

@@ -25,7 +25,7 @@ class RecruitingInfo(DeclarativeBase):
     id: Mapped[intpk]
     info_num: Mapped[int]
     title: Mapped[str50]
-    date_info: Mapped[datetime | None] = mapped_column(DateTime(timezone=True))
+    date_info: Mapped[str50 | None] = mapped_column(default=None)
     recruiting_id: Mapped[int] = mapped_column(ForeignKey("recruiting.id"))
 
     recruiting: Mapped["Recruiting"] = relationship(back_populates="recruiting_info")