Skip to content

Commit

Permalink
Merge pull request #139 from UMC5th-bias/develop
Browse files Browse the repository at this point in the history
[FIX #121] 카카오 회원가입 AuthKakaoLoginDto json 매핑 못하는 문제 해결
  • Loading branch information
JungYoonShin authored Aug 30, 2024
2 parents 0983701 + c1275b6 commit 965062e
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ name: develop branch PR build
on:
pull_request:
branches: [ "develop" ]
push:
branches: [ "develop" ]


permissions:
contents: read
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ name: Spring Boot & Gradle CI/CD
on:
push:
branches: [ main ]
pull_request:
branches: [ main ]


# 본인이 설정한 값을 여기서 채워넣습니다.
# 리전, 버킷 이름, CodeDeploy 앱 이름, CodeDeploy 배포 그룹 이름
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
package com.favoriteplace.app.dto.member;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;

@JsonIgnoreProperties(ignoreUnknown = true)
public record AuthKakaoLoginDto(
@JsonProperty("kakao_account")
KakaoAccount kakaoAccount

) {
@JsonIgnoreProperties(ignoreUnknown = true)
public record KakaoAccount(
String email
) {
Expand Down

0 comments on commit 965062e

Please sign in to comment.