Fix/116 thumbnail and member api (#117)

- 멤버 정보를 얻는 api에서 기수(내림차순), 포지션 순서(ANDROID, IOS, FRONTEND, BACKEND,
DESIGNER) 순서로 정렬되어 출력할 수 있게 수정했습니다
- s3에 저장된 이미지의 경우, 브라우저에서 캐싱이 가능하도록, post presigned url을 생성할 때 cache
control 필드를 추가해줬습니다.
- ProjectURLType Enum에 DATA_GITHUB을 추가했습니다.

Author: deveroskp

wacruit/src/apps/common/enums.py

@@ -88,7 +88,6 @@ class Position(Enum):
     IOS = "IOS"
     # INFRA = 6
     # PM = 7
-    # OPERATIONS = 8
 
 
 class SeminarType(Enum):
@@ -108,6 +107,7 @@ class ProjectURLType(Enum):
     WEBSITE = "WEBSITE"
     IOS_GITHUB = "IOS_GITHUB"
     CRAWLER_GITHUB = "CRAWLER_GITHUB"
+    DATA_GITHUB = "DATA_GITHUB"
     BEHANCE = "BEHANCE"
 
 

wacruit/src/apps/member/repositories.py

@@ -1,4 +1,8 @@
 from fastapi import Depends
+from sqlalchemy import case
+from sqlalchemy import cast
+from sqlalchemy import Float
+from sqlalchemy import null
 from sqlalchemy.orm import Session
 
 from wacruit.src.apps.common.enums import Position
@@ -27,7 +31,28 @@ def create_member(self, member: Member) -> Member:
     def get_all_members(
         self, position: Position | None, offset: int, limit: int
     ) -> list[Member]:
-        query = self.session.query(Member)
+        # generation을 숫자로 캐스트하여 내림차순 정렬, NULL은 뒤로 보내기
+        safe_num = case(
+            (
+                Member.generation.op("REGEXP")("^[0-9]+(\\.[0-9]+)?$"),
+                cast(Member.generation, Float),
+            ),
+            else_=null(),
+        )
+
+        # ANDROID, IOS, FRONTEND, BACKEND, DESIGNER 순서로 정렬
+        position_order = case(
+            (Member.position == Position.ANDROID, 1),
+            (Member.position == Position.IOS, 2),
+            (Member.position == Position.FRONTEND, 3),
+            (Member.position == Position.BACKEND, 4),
+            (Member.position == Position.DESIGNER, 5),
+            else_=6,
+        )
+
+        query = self.session.query(Member).order_by(
+            safe_num.desc(), position_order.asc()
+        )
 
         if position is not None:
             query = query.where(Member.position == position)

wacruit/src/apps/member/schemas.py

@@ -21,13 +21,13 @@ class MemberInfoResponse(OrmModel):
     first_name: str
     last_name: str
     introduction: str | None = None
-    department: str
-    college: str
-    phone_number: str
-    github_id: str
+    department: str | None = None
+    college: str | None = None
+    phone_number: str | None = None
+    github_id: str | None = None
     is_active: bool
     generation: str
-    position: Position
+    position: Position | None = None
 
 
 class MemberBriefResponse(OrmModel):

wacruit/src/apps/project/services.py

@@ -234,6 +234,7 @@ def generate_presigned_url_for_post_image(
             s3_client=self._s3_client.client,
             s3_bucket=self._s3_config.bucket_name,
             s3_object=object_name,
+            fields={"Cache-Control": "max-age=7889400"},
             expires_in=_10_MIN,
             conditions=[
                 ["content-length-range", 0, _50_MB],
@@ -299,6 +300,7 @@ def update_project_image(self, file_id: int) -> PresignedUrlWithIdResponse:
             s3_bucket=self._s3_config.bucket_name,
             s3_object=project_image.object_key,
             expires_in=_10_MIN,
+            fields={"Cache-Control": "max-age=7889400"},
             conditions=[["content-length-range", 0, _50_MB]],
         )
         return PresignedUrlWithIdResponse(

wacruit/src/apps/project/views.py

@@ -91,4 +91,4 @@ def delete_project_image(
     file_id: int,
     project_service: Annotated[ProjectService, Depends()],
 ) -> None:
-    project_service.delete_project_image(file_id=file_id)
+    return project_service.delete_project_image(file_id=file_id)

wacruit/src/database/migrations/versions/2025_11_12_2303-564952e2cd49_add_data_github_in_projecturltype.py

@@ -0,0 +1,80 @@
+"""add DATA_GITHUB in ProjectURLType
+
+Revision ID: 564952e2cd49
+Revises: 13ccaabc3ec3
+Create Date: 2025-11-12 23:03:32.895041
+
+"""
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import mysql
+
+# revision identifiers, used by Alembic.
+revision = "564952e2cd49"
+down_revision = "13ccaabc3ec3"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.alter_column(
+        "project_url",
+        "url_type",
+        existing_type=mysql.ENUM(
+            "ANDROID_STORE",
+            "IOS_STORE",
+            "FRONTEND_GITHUB",
+            "BACKEND_GITHUB",
+            "ANDROID_GITHUB",
+            "WEBSITE",
+            "IOS_GITHUB",
+            "CRAWLER_GITHUB",
+            "BEHANCE",
+        ),
+        type_=mysql.ENUM(
+            "ANDROID_STORE",
+            "IOS_STORE",
+            "FRONTEND_GITHUB",
+            "BACKEND_GITHUB",
+            "ANDROID_GITHUB",
+            "WEBSITE",
+            "IOS_GITHUB",
+            "CRAWLER_GITHUB",
+            "DATA_GITHUB",
+            "BEHANCE",
+        ),
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.alter_column(
+        "project_url",
+        "url_type",
+        existing_type=mysql.ENUM(
+            "ANDROID_STORE",
+            "IOS_STORE",
+            "FRONTEND_GITHUB",
+            "BACKEND_GITHUB",
+            "ANDROID_GITHUB",
+            "WEBSITE",
+            "IOS_GITHUB",
+            "CRAWLER_GITHUB",
+            "DATA_GITHUB",
+            "BEHANCE",
+        ),
+        type_=mysql.ENUM(
+            "ANDROID_STORE",
+            "IOS_STORE",
+            "FRONTEND_GITHUB",
+            "BACKEND_GITHUB",
+            "ANDROID_GITHUB",
+            "WEBSITE",
+            "IOS_GITHUB",
+            "CRAWLER_GITHUB",
+            "BEHANCE",
+        ),
+    )
+    # ### end Alembic commands ###