From c8c73db779a23b9a6e31f5ae18710342ee55727e Mon Sep 17 00:00:00 2001 From: joeun-01 Date: Mon, 19 Dec 2022 21:23:00 +0900 Subject: [PATCH] =?UTF-8?q?pull=20=EB=B0=9B=EA=B8=B0=20=EC=A0=84=20commit?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/sesac/gmd/src/user/UserDao.java | 2 +- src/main/java/com/sesac/gmd/src/user/model/GetCommentRes.java | 4 ++-- src/main/java/com/sesac/gmd/utils/Validation.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/sesac/gmd/src/user/UserDao.java b/src/main/java/com/sesac/gmd/src/user/UserDao.java index 0502b12..125cbfd 100644 --- a/src/main/java/com/sesac/gmd/src/user/UserDao.java +++ b/src/main/java/com/sesac/gmd/src/user/UserDao.java @@ -26,7 +26,7 @@ public int createUser(PostUserReq postUserReq) { Object[] params = new Object[] { postUserReq.getNickname(), postUserReq.getGender(), postUserReq.getAge(), postUserReq.getEmail(), postUserReq.getState(), postUserReq.getCity(), postUserReq.getStreet(), - postUserReq.getPushId(), postUserReq.getOauthId() }; + postUserReq.getPushId(), postUserReq.getAccessToken() }; this.jdbcTemplate.update(query, params); diff --git a/src/main/java/com/sesac/gmd/src/user/model/GetCommentRes.java b/src/main/java/com/sesac/gmd/src/user/model/GetCommentRes.java index 3d9ef1e..9e805a9 100644 --- a/src/main/java/com/sesac/gmd/src/user/model/GetCommentRes.java +++ b/src/main/java/com/sesac/gmd/src/user/model/GetCommentRes.java @@ -15,9 +15,9 @@ public class GetCommentRes { private int commentIdx; private int pinIdx; private int userIdx; - private String singer; + private String artist; private String songTitle; - private String album; + private String albumTitle; private String content; private String state; private String city; diff --git a/src/main/java/com/sesac/gmd/utils/Validation.java b/src/main/java/com/sesac/gmd/utils/Validation.java index 3f9d8c3..2d51660 100644 --- a/src/main/java/com/sesac/gmd/utils/Validation.java +++ b/src/main/java/com/sesac/gmd/utils/Validation.java @@ -27,7 +27,7 @@ public static BaseResponseStatus userValidation(PostUserReq postUserReq) { if(postUserReq.getPushId().isBlank()) { return POST_USERS_EMPTY_PUSH; } - if(postUserReq.getOauthId().isBlank()) { + if(postUserReq.getAccessToken().isBlank()) { return POST_USERS_EMPTY_OAUTH; }