Merge pull request #131 from swyp-app-team-4/feat#129-point-event

Feat#129 포인트 버그 개선

Author: chltmdgh522

src/main/java/boombimapi/domain/member/presentation/controller/MemberController.java

@@ -6,6 +6,7 @@
 import boombimapi.domain.member.presentation.dto.member.req.NicknameReq;
 import boombimapi.domain.member.presentation.dto.member.res.*;
 import boombimapi.domain.member.presentation.dto.member.res.mypage.GetCongestionHistoryRes;
+import boombimapi.domain.member.presentation.dto.member.res.mypage.GetMemberResV1;
 import boombimapi.domain.member.presentation.dto.member.res.mypage.GetMemberResV2;
 import boombimapi.global.response.BaseOKResponse;
 import io.swagger.v3.oas.annotations.Operation;
@@ -42,7 +43,7 @@ public class MemberController {
     })
     @PatchMapping("/name")
     public ResponseEntity<BaseOKResponse<Void>> updateNickname(@AuthenticationPrincipal String userId, @RequestBody NicknameReq req) {
-        memberService1.updateNickname(userId, req.name());
+        memberService.updateNickname(userId, req.name());
         return ResponseEntity.ok(
                 BaseOKResponse.of(
                         HttpStatus.OK,
@@ -55,8 +56,8 @@ public ResponseEntity<BaseOKResponse<Void>> updateNickname(@AuthenticationPrinci
             @ApiResponse(responseCode = "404", description = "유저 존재하지 않음")
     })
     @GetMapping
-    public ResponseEntity<GetMemberResV2> getMember(@AuthenticationPrincipal String userId) {
-        return ResponseEntity.ok(memberService.getMember(userId));
+    public ResponseEntity<GetMemberResV1> getMember(@AuthenticationPrincipal String userId) {
+        return ResponseEntity.ok(memberService1.getMember(userId));
     }
 
 

src/main/java/boombimapi/domain/point/application/impl/PointServiceImpl.java

@@ -80,12 +80,12 @@ public void usePointForEvent(String memberId, Long balance) {
         Point point = pointRepository.findByMember(member)
                 .orElseThrow(() -> new BoombimException(POINT_NOT_EXIST));
 
-        if (point.getBalance() - balance <= 0) {
+        if (point.getBalance() - balance < 0) {
             throw new BoombimException(INSUFFICIENT_POINT_FOR_EVENT);
         }
 
         if (point.getApplyEventCount() == 5) {
-            throw new BoombimException(INSUFFICIENT_POINT_FOR_EVENT);
+            throw new BoombimException(EVENT_PARTICIPATION_LIMIT_EXCEEDED);
         }
 
         point.subtractBalance(balance);

src/main/java/boombimapi/domain/point/domain/entity/PointHistory.java

@@ -25,7 +25,7 @@ public class PointHistory {
     private Long id;
 
     @OneToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "member_id", nullable = false, unique = true)
+    @JoinColumn(name = "member_id", nullable = false)
     private Member member;
 
     @Enumerated(EnumType.STRING)