Merge pull request #341 from Team-Sopetit/develop

[DEPLOY] 실서버 배포
Team-Sopetit · Aug 29, 2024 · 19d77db · 19d77db
2 parents eb82dc9 + 12638c9
commit 19d77db
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/src/main/java/com/soptie/server/api/web/advice/ErrorHandler.java b/src/main/java/com/soptie/server/api/web/advice/ErrorHandler.java
@@ -15,15 +15,15 @@
 public class ErrorHandler {
 
 	@ExceptionHandler(SoftieException.class)
-	public ResponseEntity<ErrorResponse> authException(SoftieException exception) {
+	public ResponseEntity<ErrorResponse> softieException(SoftieException exception) {
 		log.error(exception.getMessage());
 		return ResponseEntity
 			.status(exception.getStatusCode())
-			.body(ErrorResponse.of(exception.getDefaultMessage() + "\n" + exception.getDetailMessage()));
+			.body(ErrorResponse.of("[" + exception.getDefaultMessage() + "] " + exception.getDetailMessage()));
 	}
 
 	@ExceptionHandler(RuntimeException.class)
-	public ResponseEntity<ErrorResponse> makerException(RuntimeException exception) {
+	public ResponseEntity<ErrorResponse> exception(RuntimeException exception) {
 		log.error(exception.getMessage());
 		return ResponseEntity
 			.status(HttpStatus.INTERNAL_SERVER_ERROR.value())

diff --git a/src/main/java/com/soptie/server/domain/member/MemberCotton.java b/src/main/java/com/soptie/server/domain/member/MemberCotton.java
@@ -23,4 +23,11 @@ public void subtractCotton(CottonType type) {
 			case HAPPINESS -> rainbowCottonCount--;
 		}
 	}
+
+	public int getCottonCount(CottonType type) {
+		return switch (type) {
+			case DAILY -> basicCottonCount;
+			case HAPPINESS -> rainbowCottonCount;
+		};
+	}
 }
diff --git a/src/main/java/com/soptie/server/domain/member/MemberService.java b/src/main/java/com/soptie/server/domain/member/MemberService.java
@@ -8,6 +8,8 @@
 import com.soptie.server.api.controller.dto.request.member.CreateProfileRequest;
 import com.soptie.server.api.controller.dto.response.member.GetHomeInfoResponse;
 import com.soptie.server.api.controller.dto.response.member.GiveMemberCottonResponse;
+import com.soptie.server.common.exception.ExceptionCode;
+import com.soptie.server.common.exception.SoftieException;
 import com.soptie.server.domain.conversation.Conversation;
 import com.soptie.server.domain.doll.DollType;
 import com.soptie.server.domain.memberdoll.MemberDoll;
@@ -42,6 +44,11 @@ public void createMemberProfile(long memberId, CreateProfileRequest request) {
 	@Transactional
 	public GiveMemberCottonResponse giveCotton(long memberId, CottonType cottonType) {
 		val member = memberAdapter.findById(memberId);
+
+		if (member.getCottonInfo().getCottonCount(cottonType) <= 0) {
+			throw new SoftieException(ExceptionCode.BAD_REQUEST, "솜뭉치가 없습니다.");
+		}
+
 		member.getCottonInfo().subtractCotton(cottonType);
 		memberAdapter.update(member);