fix: revert buildspec to build+package only

ServerlessFunction/build.gradle

@@ -35,6 +35,7 @@ dependencies {
     implementation 'software.amazon.awssdk:url-connection-client'
     implementation 'software.amazon.awssdk:ssm'
     implementation 'software.amazon.awssdk:scheduler'
+    implementation 'software.amazon.awssdk:sqs'
 
     // AWS X-Ray SDK (다운스트림 서비스 추적용)
     implementation 'com.amazonaws:aws-xray-recorder-sdk-core:2.15.0'

ServerlessFunction/buildspec-dev.yml

@@ -43,7 +43,10 @@ phases:
           --capabilities CAPABILITY_IAM CAPABILITY_AUTO_EXPAND \
           --no-confirm-changeset \
           --no-fail-on-empty-changeset \
-          --parameter-overrides Environment=$ENVIRONMENT
+          --parameter-overrides \
+            Environment=$ENVIRONMENT \
+            ExistingCognitoUserPoolId=ap-northeast-2_ezDwzFCzR \
+            ExistingCognitoClientId=4ns077jcr1pkue2vvisr6qdpu5
       - echo "Deployment completed on $(date)"
 
 cache:

ServerlessFunction/buildspec-prod.yml

@@ -5,7 +5,6 @@ env:
     SAM_CLI_TELEMETRY: 0
     GRADLE_OPTS: "-Dorg.gradle.daemon=false -Dorg.gradle.parallel=true -Dorg.gradle.caching=true"
     ENVIRONMENT: prod
-    STACK_NAME: group2-englishstudy-prod
 
 phases:
   install:
@@ -28,23 +27,17 @@ phases:
       - echo "Building SAM application for $ENVIRONMENT..."
       - cd $CODEBUILD_SRC_DIR/ServerlessFunction
       - sam build --parallel --cached
-      - echo "Build completed"
+      - echo "Packaging SAM application..."
+      - sam package --s3-bucket group2-englishstudy-pipeline-artifacts --s3-prefix sam-packages/$ENVIRONMENT --output-template-file packaged-template.yaml
 
   post_build:
     commands:
-      - echo "Deploying to $ENVIRONMENT environment..."
-      - cd $CODEBUILD_SRC_DIR/ServerlessFunction
-      - |
-        sam deploy \
-          --stack-name $STACK_NAME \
-          --s3-bucket group2-englishstudy-pipeline-artifacts \
-          --s3-prefix sam-deploy/prod \
-          --region ap-northeast-2 \
-          --capabilities CAPABILITY_IAM CAPABILITY_AUTO_EXPAND \
-          --no-confirm-changeset \
-          --no-fail-on-empty-changeset \
-          --parameter-overrides Environment=$ENVIRONMENT
-      - echo "Deployment completed on $(date)"
+      - echo "Build completed on $(date)"
+
+artifacts:
+  files:
+    - packaged-template.yaml
+  base-directory: ServerlessFunction
 
 cache:
   paths:

ServerlessFunction/buildspec-test.yml

@@ -5,7 +5,6 @@ env:
     SAM_CLI_TELEMETRY: 0
     GRADLE_OPTS: "-Dorg.gradle.daemon=false -Dorg.gradle.parallel=true -Dorg.gradle.caching=true"
     ENVIRONMENT: test
-    STACK_NAME: group2-englishstudy-test
 
 phases:
   install:
@@ -28,23 +27,17 @@ phases:
       - echo "Building SAM application for $ENVIRONMENT..."
       - cd $CODEBUILD_SRC_DIR/ServerlessFunction
       - sam build --parallel --cached
-      - echo "Build completed"
+      - echo "Packaging SAM application..."
+      - sam package --s3-bucket group2-englishstudy-pipeline-artifacts --s3-prefix sam-packages/$ENVIRONMENT --output-template-file packaged-template.yaml
 
   post_build:
     commands:
-      - echo "Deploying to $ENVIRONMENT environment..."
-      - cd $CODEBUILD_SRC_DIR/ServerlessFunction
-      - |
-        sam deploy \
-          --stack-name $STACK_NAME \
-          --resolve-s3 \
-          --s3-prefix $STACK_NAME \
-          --region ap-northeast-2 \
-          --capabilities CAPABILITY_IAM CAPABILITY_AUTO_EXPAND \
-          --no-confirm-changeset \
-          --no-fail-on-empty-changeset \
-          --parameter-overrides Environment=$ENVIRONMENT
-      - echo "Deployment completed on $(date)"
+      - echo "Build completed on $(date)"
+
+artifacts:
+  files:
+    - packaged-template.yaml
+  base-directory: ServerlessFunction
 
 cache:
   paths:

ServerlessFunction/src/main/java/com/mzc/secondproject/serverless/common/config/AwsClients.java

@@ -11,6 +11,7 @@
 import software.amazon.awssdk.services.s3.S3Client;
 import software.amazon.awssdk.services.s3.presigner.S3Presigner;
 import software.amazon.awssdk.services.sns.SnsClient;
+import software.amazon.awssdk.services.sqs.SqsClient;
 import software.amazon.awssdk.services.ssm.SsmClient;
 
 /**
@@ -60,7 +61,12 @@ public final class AwsClients {
 	private static final SsmClient SSM_CLIENT = SsmClient.builder()
 			.overrideConfiguration(XRAY_CONFIG)
 			.build();
-
+
+	// SQS
+	private static final SqsClient SQS_CLIENT = SqsClient.builder()
+			.overrideConfiguration(XRAY_CONFIG)
+			.build();
+
 	private AwsClients() {
 		// 인스턴스화 방지
 	}
@@ -104,4 +110,8 @@ public static ComprehendClient comprehend() {
 	public static SsmClient ssm() {
 		return SSM_CLIENT;
 	}
+
+	public static SqsClient sqs() {
+		return SQS_CLIENT;
+	}
 }

ServerlessFunction/src/main/java/com/mzc/secondproject/serverless/common/config/EnvConfig.java

@@ -15,7 +15,18 @@ public final class EnvConfig {
 	private EnvConfig() {
 		// 유틸리티 클래스 - 인스턴스화 방지
 	}
-
+
+	/**
+	 * 선택적 환경 변수를 가져옵니다.
+	 * 환경 변수가 설정되지 않은 경우 null을 반환합니다.
+	 *
+	 * @param name 환경 변수 이름
+	 * @return 환경 변수 값 또는 null
+	 */
+	public static String get(String name) {
+		return System.getenv(name);
+	}
+
 	/**
 	 * 필수 환경 변수를 가져옵니다.
 	 * 환경 변수가 설정되지 않았거나 빈 문자열인 경우 IllegalStateException을 발생시킵니다.

ServerlessFunction/src/main/java/com/mzc/secondproject/serverless/common/util/JsonUtil.java

@@ -1,5 +1,7 @@
 package com.mzc.secondproject.serverless.common.util;
 
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 
@@ -10,9 +12,25 @@
  * JSON 파싱 관련 공통 유틸리티
  */
 public class JsonUtil {
-
+
+	private static final Gson GSON = new GsonBuilder().create();
+
 	private JsonUtil() {
 	}
+
+	/**
+	 * 객체를 JSON 문자열로 변환
+	 */
+	public static String toJson(Object obj) {
+		return GSON.toJson(obj);
+	}
+
+	/**
+	 * JSON 문자열을 객체로 변환
+	 */
+	public static <T> T fromJson(String json, Class<T> clazz) {
+		return GSON.fromJson(json, clazz);
+	}
 
 	// 응답에서 JSON 부분만 추출
 	public static String extractJson(String response) {

ServerlessFunction/src/main/java/com/mzc/secondproject/serverless/domain/badge/service/BadgeService.java

@@ -7,6 +7,7 @@
 import com.mzc.secondproject.serverless.domain.badge.repository.BadgeRepository;
 import com.mzc.secondproject.serverless.domain.badge.strategy.BadgeConditionStrategy;
 import com.mzc.secondproject.serverless.domain.badge.strategy.BadgeConditionStrategyFactory;
+import com.mzc.secondproject.serverless.domain.notification.service.NotificationPublisher;
 import com.mzc.secondproject.serverless.domain.stats.model.UserStats;
 import com.mzc.secondproject.serverless.domain.stats.repository.UserStatsRepository;
 import org.slf4j.Logger;
@@ -24,20 +25,23 @@ public class BadgeService {
 
 	private final BadgeRepository badgeRepository;
 	private final UserStatsRepository userStatsRepository;
-
+	private final NotificationPublisher notificationPublisher;
+
 	/**
 	 * 기본 생성자 (Lambda에서 사용)
 	 */
 	public BadgeService() {
-		this(new BadgeRepository(), new UserStatsRepository());
+		this(new BadgeRepository(), new UserStatsRepository(), NotificationPublisher.getInstance());
 	}
-	
+
 	/**
 	 * 의존성 주입 생성자 (테스트 용이성)
 	 */
-	public BadgeService(BadgeRepository badgeRepository, UserStatsRepository userStatsRepository) {
+	public BadgeService(BadgeRepository badgeRepository, UserStatsRepository userStatsRepository,
+						NotificationPublisher notificationPublisher) {
 		this.badgeRepository = badgeRepository;
 		this.userStatsRepository = userStatsRepository;
+		this.notificationPublisher = notificationPublisher;
 	}
 
 	/**
@@ -98,6 +102,15 @@ public List<UserBadge> checkAndAwardBadges(String userId, UserStats stats) {
 				badgeRepository.save(badge);
 				newBadges.add(badge);
 				logger.info("Badge awarded: userId={}, badge={}", userId, type.name());
+
+				// 알림 발행
+				notificationPublisher.publishBadgeEarned(
+						userId,
+						type.name(),
+						type.getName(),
+						type.getDescription(),
+						badge.getImageUrl()
+				);
 			}
 		}
 

ServerlessFunction/src/main/java/com/mzc/secondproject/serverless/domain/chatting/enums/MessageType.java

@@ -22,7 +22,25 @@ public enum MessageType {
 
 	// 방 관련 메시지 타입
 	ROOM_STATUS_CHANGE("room_status_change", "방 상태 변경"),
-	HOST_CHANGE("host_change", "방장 변경");
+	HOST_CHANGE("host_change", "방장 변경"),
+
+	// 투표 관련 메시지 타입
+	POLL_CREATE("poll_create", "투표 생성"),
+	POLL_VOTE("poll_vote", "투표 참여"),
+	POLL_END("poll_end", "투표 종료"),
+
+	// 끝말잇기(Word Chain) 게임 메시지 타입
+	WORDCHAIN_START("wordchain_start", "끝말잇기 시작"),
+	WORDCHAIN_TURN("wordchain_turn", "턴 변경"),
+	WORDCHAIN_CORRECT("wordchain_correct", "정답"),
+	WORDCHAIN_WRONG("wordchain_wrong", "오답"),
+	WORDCHAIN_TIMEOUT("wordchain_timeout", "시간 초과"),
+	WORDCHAIN_ELIMINATED("wordchain_eliminated", "탈락"),
+	WORDCHAIN_END("wordchain_end", "끝말잇기 종료"),
+
+	// 유틸리티 메시지 타입
+	CLEAR_CHAT("clear_chat", "채팅 삭제"),
+	LEAVE_ROOM("leave_room", "채팅방 나가기");
 
 	private final String code;
 	private final String displayName;

ServerlessFunction/src/main/java/com/mzc/secondproject/serverless/domain/chatting/exception/ChattingErrorCode.java

@@ -44,6 +44,10 @@ public enum ChattingErrorCode implements DomainErrorCode {
 	GAME_NOT_ALLOWED_IN_CHAT_ROOM("GAME_007", "게임은 게임 방에서만 시작할 수 있습니다", 400),
 	GAME_RESTART_NOT_ALLOWED("GAME_008", "게임 진행 중에는 재시작할 수 없습니다", 400),
 	GAME_START_NOT_HOST("GAME_009", "방장만 게임을 시작할 수 있습니다", 403),
+	GAME_ACTION_FAILED("GAME_010", "게임 액션 처리에 실패했습니다", 400),
+
+	// 일반 입력 에러
+	INVALID_INPUT("INPUT_001", "유효하지 않은 입력입니다", 400),
 	;
 
 	private static final String DOMAIN = "CHATTING";