From 1a8af514e8732121ebef3293d3c9d51d78dd525c Mon Sep 17 00:00:00 2001 From: minahkim03 Date: Wed, 25 Sep 2024 18:25:52 +0900 Subject: [PATCH 1/2] =?UTF-8?q?:bug:=20=EC=98=A4=EB=8A=98=EC=9D=BC?= =?UTF-8?q?=EA=B8=B0,=20=EA=B0=90=EC=A0=95=20default=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 14 ++++--- docker-compose.yml | 39 ------------------- .../java/com/simter/SimterApplication.java | 2 +- .../domain/calendar/entity/Calendars.java | 8 ++-- .../member/controller/OAuthController.java | 22 +++++------ .../domain/member/dto/MemberRequestDto.java | 11 ++++++ .../domain/member/service/MemberService.java | 4 +- 7 files changed, 36 insertions(+), 64 deletions(-) delete mode 100644 docker-compose.yml diff --git a/Dockerfile b/Dockerfile index b97a34f..d9c4465 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,10 @@ FROM openjdk:21 -ARG JAR_FILE=*.jar -COPY ${JAR_FILE} app.jar -ENTRYPOINT ["java", "-jar", "/app.jar"] -RUN apt-get update && apt-get install -y --no-install-recommends \ - curl && rm -rf /var/lib/apt/lists/* \ No newline at end of file + +# JAR 파일을 정확히 지정 +ARG JAR_FILE=build/libs/simter-0.0.1-SNAPSHOT.jar + +# JAR 파일을 컨테이너로 복사 +COPY ${JAR_FILE} /app/app.jar + +# JAR 파일 실행 +ENTRYPOINT ["java", "-jar", "/app/app.jar"] \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index 2e331f9..0000000 --- a/docker-compose.yml +++ /dev/null @@ -1,39 +0,0 @@ -services: - app: - image: mysql:8 - env_file: - - .env - environment: - MYSQL_ROOT_PASSWORD: ${DB_ROOTPW} - MYSQL_DATABASE: simter_database - MYSQL_USER: ${DB_USER} - MYSQL_PASSWORD: ${DB_PW} - networks: - - app_network - depends_on: - - mysql - restart: always #자동 재시작. 필요없으면 없애도 됨 - - mysql: - image: mysql:8.0 - container_name: simter_mysql_container - env_file: - - .env - environment: - MYSQL_ROOT_PASSWORD: ${DB_ROOTPW} - MYSQL_DATABASE: simter_database - MYSQL_USER: ${DB_USER} - MYSQL_PASSWORD: ${DB_PW} - ports: - - ${DB_PORT}:${DB_PORT} - volumes: - - mysql_data:/var/lib/mysql - - ./init.sql/init.sql:/docker-entrypoint-initdb.d/init.sql - networks: - - app_network - -volumes: - mysql_data: - -networks: - app_network: \ No newline at end of file diff --git a/src/main/java/com/simter/SimterApplication.java b/src/main/java/com/simter/SimterApplication.java index ed079bb..b00577e 100644 --- a/src/main/java/com/simter/SimterApplication.java +++ b/src/main/java/com/simter/SimterApplication.java @@ -6,7 +6,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication -public class SimterApplication { +public class ㅎㅑㅅSimterApplication { public static void main(String[] args) { diff --git a/src/main/java/com/simter/domain/calendar/entity/Calendars.java b/src/main/java/com/simter/domain/calendar/entity/Calendars.java index f3f8186..2b68d72 100644 --- 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 index 6018644..d659796 100644 --- 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 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 index 7b30a7c..4538007 100644 --- 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 index e8f887c..c8d0424 100644 --- 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); } //닉네임, 비밀번호, 이메일 유효 검증 From 816c59c270f3d8f77fd02a1d0ddbad166b5c6eb7 Mon Sep 17 00:00:00 2001 From: minahkim03 Date: Wed, 25 Sep 2024 18:28:11 +0900 Subject: [PATCH 2/2] =?UTF-8?q?:bug:=20=EC=98=A4=EB=8A=98=EC=9D=BC?= =?UTF-8?q?=EA=B8=B0,=20=EA=B0=90=EC=A0=95=20default=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/simter/SimterApplication.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/simter/SimterApplication.java b/src/main/java/com/simter/SimterApplication.java index b00577e..ed079bb 100644 --- a/src/main/java/com/simter/SimterApplication.java +++ b/src/main/java/com/simter/SimterApplication.java @@ -6,7 +6,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication -public class ㅎㅑㅅSimterApplication { +public class SimterApplication { public static void main(String[] args) {