Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion serverless.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,14 @@ provider:
Resource:
- arn:aws:dynamodb:${self:provider.region}:${aws:accountId}:table/${self:provider.environment.SESSION_TABLE}
- arn:aws:dynamodb:${self:provider.region}:${aws:accountId}:table/${self:provider.environment.SESSION_TABLE}/index/*
- Effect: Allow
Action:
- s3:ListBucket
- s3:GetObject
- s3:PutObject
Resource:
- arn:aws:s3:::${file(envs/config.${self:provider.stage}.json):BILL_BUCKET_NAME}
- arn:aws:s3:::${file(envs/config.${self:provider.stage}.json):BILL_BUCKET_NAME}/*
httpApi:
cors:
allowedOrigins: ${file(envs/config.${self:provider.stage}.json):CORS_ORIGINS}
Expand Down Expand Up @@ -173,6 +181,6 @@ functions:
bucket: ${file(envs/config.${self:provider.stage}.json):BILL_BUCKET_NAME}
event: s3:ObjectCreated:Put
rules:
- prefix: "bills/*"
- prefix: "bills/"
existing: true
forceDeploy: true
14 changes: 10 additions & 4 deletions src/handlers/overnight_stays_handler.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,14 @@ def create(event, context):
return responses.create_error_response(validation_error, 400)

user_info = event.get("user_info", {})
student_no = user_info.get("username")
if not student_no:
username = user_info.get("username")
if not username:
logger.error("❌ Unauthorized request: student number missing in session")
return responses.create_error_response("Unauthorized", 401)

# Cognito username을 대문자로 변환 (DB의 studentNo와 일치시키기 위해)
student_no = username.upper()

result, error = overnight_stays_service.create_overnight_stay(
student_no=student_no,
start_date=request_dto.startDate,
Expand Down Expand Up @@ -80,12 +83,15 @@ def get_student_requests(event, context):
logger.info("✅ Processing get student overnight stays request")

user_info = event.get("user_info", {})
student_no = user_info.get("username")
username = user_info.get("username")

if not student_no:
if not username:
logger.error("❌ Unauthorized request: student number missing in session")
return responses.create_error_response("Unauthorized", 401)

# Cognito username을 대문자로 변환 (DB의 studentNo와 일치시키기 위해)
student_no = username.upper()

try:
data, summary, error = overnight_stays_service.get_student_overnight_stays(
student_no
Expand Down
20 changes: 13 additions & 7 deletions src/handlers/subscriptions_handler.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,10 @@ def create_subscription_handler(event, context):
"Unauthorized: user information not found", 401
)

logger.info(f"📱 사용자 {username}의 FCM 구독 생성 요청")
# Cognito username을 대문자로 변환 (DB의 studentNo와 일치시키기 위해)
student_no = username.upper()

logger.info(f"📱 사용자 {student_no}의 FCM 구독 생성 요청")

# 2. JSON 파싱
try:
Expand All @@ -70,14 +73,14 @@ def create_subscription_handler(event, context):
return create_error_response(error_msg, 400)

# 5. 서비스 호출 (student_no를 별도로 전달)
subscription_dto, error = create_subscription(request_dto, username)
subscription_dto, error = create_subscription(request_dto, student_no)
if error:
logger.error(f"❌ 구독 생성 실패: {error}")
return create_error_response(error, 500)

# 6. 성공 응답
logger.info(
f"✅ FCM 구독 생성 완료: id={subscription_dto.id}, student_no={username}"
f"✅ FCM 구독 생성 완료: id={subscription_dto.id}, student_no={student_no}"
)
return create_success_response(subscription_dto.to_dict())

Expand Down Expand Up @@ -145,6 +148,9 @@ def patch_subscription_handler(event, context):
"Unauthorized: user information not found", 401
)

# Cognito username을 대문자로 변환 (DB의 studentNo와 일치시키기 위해)
student_no = username.upper()

# 2. JSON 파싱
try:
body = json.loads(event.get("body", "{}"))
Expand Down Expand Up @@ -173,11 +179,11 @@ def patch_subscription_handler(event, context):
return create_error_response(error_msg, 400)

action = "활성화" if request_dto.active else "비활성화"
logger.info(f"📱 사용자 {username}의 모든 FCM 구독 {action} 요청")
logger.info(f"📱 사용자 {student_no}의 모든 FCM 구독 {action} 요청")

# 6. 서비스 호출
updated_count, error = update_all_subscriptions_active_by_student_no(
username, request_dto.active
student_no, request_dto.active
)

if error:
Expand All @@ -188,13 +194,13 @@ def patch_subscription_handler(event, context):
response_dto = SubscriptionUpdateResponseDTO(
message=f"Subscription(s) {'activated' if request_dto.active else 'deactivated'} successfully",
updated_count=updated_count,
student_no=username,
student_no=student_no,
active=request_dto.active,
)

# 8. 성공 응답
logger.info(
f"✅ FCM 구독 상태 변경 완료: student_no={username}, updated_count={updated_count}, active={request_dto.active}"
f"✅ FCM 구독 상태 변경 완료: student_no={student_no}, updated_count={updated_count}, active={request_dto.active}"
)
return create_success_response(response_dto.to_dict())

Expand Down