Merge pull request #84 from git1uv/feature/#83

[Fix] 달력 엔티티 null 수정
git1uv · Sep 25, 2024 · 7637e82 · 7637e82
2 parents c8ecea0 + 1a0174e
commit 7637e82
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 60 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,11 @@
 FROM openjdk:21
+
+# JAR 파일을 정확히 지정
 ARG JAR_FILE=build/libs/simter-0.0.1-SNAPSHOT.jar
-COPY ${JAR_FILE} app.jar
-ENTRYPOINT ["java", "-jar", "/app.jar"]
+
+# JAR 파일을 컨테이너로 복사
+COPY ${JAR_FILE} /app/app.jar
+
+# JAR 파일 실행
+ENTRYPOINT ["java", "-jar", "/app/app.jar"]
+
diff --git a/docker-compose.yml b/docker-compose.yml
diff --git a/src/main/java/com/simter/domain/calendar/entity/Calendars.java b/src/main/java/com/simter/domain/calendar/entity/Calendars.java
@@ -27,12 +27,12 @@ public class Calendars {
     private LocalDate date;
 
     @Column(length = 100)
-    @ColumnDefault("none")
-    private String emotion;
+    @Builder.Default
+    private String emotion = "none";
 
     @Column(length = 300)
-    @ColumnDefault("")
-    private String diary;
+    @Builder.Default
+    private String diary = "";
 
     public void setDiary(String content) {
         this.diary = content;

diff --git a/src/main/java/com/simter/domain/member/controller/OAuthController.java b/src/main/java/com/simter/domain/member/controller/OAuthController.java
@@ -2,7 +2,9 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
+import com.simter.apiPayload.ApiResponse;
 import com.simter.domain.member.dto.JwtTokenDto;
+import com.simter.domain.member.dto.MemberRequestDto.SocialLoginDto;
 import com.simter.domain.member.repository.MemberRepository;
 import com.simter.domain.member.service.KakaoOAuthService;
 import jakarta.servlet.http.HttpServletResponse;
@@ -21,7 +23,7 @@ public class OAuthController {
     private final MemberRepository memberRepository;
 
     @PostMapping("/api/v1/login/kakao")
-    public void login(@RequestParam("code") String code, HttpServletResponse response)
+    public ApiResponse<SocialLoginDto> login(@RequestParam("code") String code)
         throws IOException {
         JsonNode res = kakaoOAuthService.getAccessToken(code);
         String accessToken = res.get("access_token").toString();
@@ -34,18 +36,14 @@ public void login(@RequestParam("code") String code, HttpServletResponse respons
             .build();
 
         String email = kakaoOAuthService.getEmail(accessToken);
-        String redirectUrl;
 
-        if (memberRepository.existsByEmail(email)) {
-            redirectUrl = "/api/v1/main";
-        } else {
-            redirectUrl = UriComponentsBuilder.fromUriString("/signup/nickname")
-                .queryParam("token", token)
-                .queryParam("email", email)
-                .queryParam("loginType", "kakao")
-                .build().toUriString();
-        }
-        response.sendRedirect(redirectUrl);
+        SocialLoginDto response = SocialLoginDto.builder()
+            .loginType("kakao")
+            .token(token)
+            .email(email)
+            .isMember(memberRepository.existsByEmail(email))
+            .build();
+        return ApiResponse.onSuccess(response);
 
     }
 }
diff --git a/src/main/java/com/simter/domain/member/dto/MemberRequestDto.java b/src/main/java/com/simter/domain/member/dto/MemberRequestDto.java
@@ -70,4 +70,15 @@ public static class PasswordChangeDto {
         @NotNull String oldPassword;
         @NotNull String newPassword;
     }
+
+    @Builder
+    @Getter
+    @AllArgsConstructor(access = AccessLevel.PROTECTED)
+    @NoArgsConstructor(access = AccessLevel.PROTECTED)
+    public static class SocialLoginDto {
+        @NotNull String email;
+        @NotNull JwtTokenDto token;
+        @NotNull String loginType;
+        @NotNull boolean isMember;
+    }
 }
diff --git a/src/main/java/com/simter/domain/member/service/MemberService.java b/src/main/java/com/simter/domain/member/service/MemberService.java
@@ -153,9 +153,7 @@ public void deleteAccount(String email) {
         LocalDateTime dateTime = LocalDateTime.now();
         Member member = memberRepository.findByEmail(email)
             .orElseThrow(() -> new ErrorHandler(ErrorStatus.MEMBER_NOT_FOUND));
-        member.changeStatusToInactive();;
-        member.setInactiveDate(dateTime);
-        memberRepository.save(member);
+        memberRepository.delete(member);
     }
 
     //닉네임, 비밀번호, 이메일 유효 검증