diff --git a/Titto_Backend/src/main/java/com/example/titto_backend/auth/controller/UserController.java b/Titto_Backend/src/main/java/com/example/titto_backend/auth/controller/UserController.java index 1ace2a8..358cab4 100644 --- a/Titto_Backend/src/main/java/com/example/titto_backend/auth/controller/UserController.java +++ b/Titto_Backend/src/main/java/com/example/titto_backend/auth/controller/UserController.java @@ -215,7 +215,7 @@ public ResponseEntity deleteUser(@PathVariable("userId") Long userId) { summary = "회원 랭킹 조회", description = "회원 랭킹을 조회합니다.", responses = { - @ApiResponse(responseCode = "200", description = "회원 탈퇴 성공"), + @ApiResponse(responseCode = "200", description = "조회 성공"), @ApiResponse(responseCode = "404", description = "회원을 찾을 수 없음") }) public ResponseEntity> getUserRanking() { diff --git a/Titto_Backend/src/main/java/com/example/titto_backend/auth/domain/BadgeType.java b/Titto_Backend/src/main/java/com/example/titto_backend/auth/domain/BadgeType.java index e44bbdd..8658723 100644 --- a/Titto_Backend/src/main/java/com/example/titto_backend/auth/domain/BadgeType.java +++ b/Titto_Backend/src/main/java/com/example/titto_backend/auth/domain/BadgeType.java @@ -1,6 +1,6 @@ package com.example.titto_backend.auth.domain; -// TODO: 어떤 뱃지 넣을 지 정하기 + public enum BadgeType { // 신입 답변러, 초보 답변러, 견습 답변러, 프로 답변러, 전문 답변러 NOVICE_RESPONDER, BEGINNER_RESPONDER, TRAINEE_RESPONDER, PROFESSIONAL_RESPONDER, EXPERT_RESPONDER, diff --git a/Titto_Backend/src/main/java/com/example/titto_backend/auth/domain/User.java b/Titto_Backend/src/main/java/com/example/titto_backend/auth/domain/User.java index 66aeca0..7414d7c 100644 --- a/Titto_Backend/src/main/java/com/example/titto_backend/auth/domain/User.java +++ b/Titto_Backend/src/main/java/com/example/titto_backend/auth/domain/User.java @@ -127,11 +127,6 @@ public class User extends BaseEntity { @Column(name = "level") private Integer level; // 사용자의 레벨 - // TODO : isDeleted 로 유저가 삭제되었는지 안되었는지 확인하고 삭제되었을 경우에는 사용자의 닉네임을 '알수없음'으로 담은 dto를 반환하도록 하기 -// @Setter -// @Column(name = "is_deleted") -// private boolean isDeleted; - @Builder public User(String email, String profile, String socialId, SocialType socialType) { this.email = email; diff --git a/Titto_Backend/src/main/java/com/example/titto_backend/auth/service/OAuthKakaoService.java b/Titto_Backend/src/main/java/com/example/titto_backend/auth/service/OAuthKakaoService.java index d584222..1a514b4 100644 --- a/Titto_Backend/src/main/java/com/example/titto_backend/auth/service/OAuthKakaoService.java +++ b/Titto_Backend/src/main/java/com/example/titto_backend/auth/service/OAuthKakaoService.java @@ -88,7 +88,6 @@ public TokenDTO.ServiceToken joinAndLogin(UserDTO.LoginRequest dto) { HttpEntity requestEntity = new HttpEntity<>(headers); ResponseEntity responseEntity = restTemplate.exchange(reqURL, HttpMethod.POST, requestEntity, String.class); - System.out.printf(Objects.requireNonNull(responseEntity.getBody())); String email, profileImage = ""; long kakaoId = 0; diff --git a/Titto_Backend/src/main/java/com/example/titto_backend/auth/service/OAuthNaverService.java b/Titto_Backend/src/main/java/com/example/titto_backend/auth/service/OAuthNaverService.java index 80b5956..02156cf 100644 --- a/Titto_Backend/src/main/java/com/example/titto_backend/auth/service/OAuthNaverService.java +++ b/Titto_Backend/src/main/java/com/example/titto_backend/auth/service/OAuthNaverService.java @@ -89,7 +89,6 @@ public TokenDTO.ServiceToken joinAndLogin(UserDTO.LoginRequest dto) { HttpEntity requestEntity = new HttpEntity<>(headers); ResponseEntity responseEntity = restTemplate.exchange(reqURL, HttpMethod.POST, requestEntity, String.class); - System.out.println(responseEntity.getBody()); String email = ""; String profileImage = ""; diff --git a/Titto_Backend/src/main/java/com/example/titto_backend/auth/service/UserService.java b/Titto_Backend/src/main/java/com/example/titto_backend/auth/service/UserService.java index 0b2b641..c1affc1 100644 --- a/Titto_Backend/src/main/java/com/example/titto_backend/auth/service/UserService.java +++ b/Titto_Backend/src/main/java/com/example/titto_backend/auth/service/UserService.java @@ -37,7 +37,6 @@ public class UserService { private final QuestionRepository questionRepository; private final MatchingPostReviewRepository matchingPostReviewRepository; - // 닉네임, 학번 중복 여부 확인 @Transactional public void signUp(SignUpDTO signUpDTO, String email) { User user = userRepository.findByEmail(email) diff --git a/Titto_Backend/src/main/java/com/example/titto_backend/matchingBoard/domain/matchingBoard/MatchingBoard.java b/Titto_Backend/src/main/java/com/example/titto_backend/matchingBoard/domain/matchingBoard/MatchingBoard.java deleted file mode 100644 index f200bb8..0000000 --- a/Titto_Backend/src/main/java/com/example/titto_backend/matchingBoard/domain/matchingBoard/MatchingBoard.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.example.titto_backend.matchingBoard.domain.matchingBoard; - -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.JoinColumn; -import jakarta.persistence.OneToOne; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; - -@Entity -@Getter -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class MatchingBoard { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "matchingBoard_id") - private Integer matchingBoardId; - - // 1대1 관계 매핑 - @OneToOne - @JoinColumn(name = "matchingPost_id", unique = true, nullable = false) - private MatchingPost matchingPost; - - // 검색 키워드 - @Column(name = "key_word") - private String keyWord; -} diff --git a/Titto_Backend/src/main/java/com/example/titto_backend/matchingBoard/domain/matchingBoard/MatchingPost.java b/Titto_Backend/src/main/java/com/example/titto_backend/matchingBoard/domain/matchingBoard/MatchingPost.java index 40588ed..d780a66 100644 --- a/Titto_Backend/src/main/java/com/example/titto_backend/matchingBoard/domain/matchingBoard/MatchingPost.java +++ b/Titto_Backend/src/main/java/com/example/titto_backend/matchingBoard/domain/matchingBoard/MatchingPost.java @@ -2,19 +2,16 @@ import com.example.titto_backend.auth.domain.User; import com.example.titto_backend.common.BaseEntity; -import jakarta.persistence.CascadeType; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.EnumType; import jakarta.persistence.Enumerated; -import jakarta.persistence.FetchType; import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.Id; import jakarta.persistence.JoinColumn; import jakarta.persistence.Lob; import jakarta.persistence.ManyToOne; -import jakarta.persistence.OneToOne; import jakarta.persistence.PrePersist; import lombok.AllArgsConstructor; import lombok.Builder; @@ -40,10 +37,6 @@ public class MatchingPost extends BaseEntity { @JoinColumn(name = "author") private User user; - // 매칭게시판 - @OneToOne(mappedBy = "matchingPost", cascade = CascadeType.ALL, fetch = FetchType.LAZY) - private MatchingBoard matchingBoard; - // 카테고리(멘토, 멘티, 한솥밥, 스터디) @Enumerated(EnumType.STRING) @Column(name = "category") diff --git a/Titto_Backend/src/main/java/com/example/titto_backend/message/repository/MessageRepository.java b/Titto_Backend/src/main/java/com/example/titto_backend/message/repository/MessageRepository.java index bf12f02..0c324be 100644 --- a/Titto_Backend/src/main/java/com/example/titto_backend/message/repository/MessageRepository.java +++ b/Titto_Backend/src/main/java/com/example/titto_backend/message/repository/MessageRepository.java @@ -14,8 +14,4 @@ List findBySenderAndReceiverAndDeletedBySenderFalseOrReceiverAndSenderA User sender1, User receiver1, User receiver2, User sender2); List findBySenderAndDeletedBySenderFalseOrReceiverAndDeletedByReceiverFalseOrderBySentAtDesc(User sender, User receiver); - - List findBySenderAndDeletedBySenderFalseOrderBySentAtDesc(User user); - - List findByReceiverAndDeletedByReceiverFalseOrderBySentAtDesc(User user); }