Skip to content

Commit

Permalink
Merge pull request #194 from dd-jiyun/main
Browse files Browse the repository at this point in the history
ν•„μš”ν•˜μ§€ μ•Šμ€ λ©”μ†Œλ“œ & 클래슀 μˆ˜μ •
  • Loading branch information
dd-jiyun authored Mar 28, 2024
2 parents 2c983e3 + b492c29 commit f154cc8
Show file tree
Hide file tree
Showing 9 changed files with 2 additions and 56 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ public ResponseEntity<String> deleteUser(@PathVariable("userId") Long userId) {
summary = "νšŒμ› λž­ν‚Ή 쑰회",
description = "νšŒμ› λž­ν‚Ήμ„ μ‘°νšŒν•©λ‹ˆλ‹€.",
responses = {
@ApiResponse(responseCode = "200", description = "νšŒμ› νƒˆν‡΄ 성곡"),
@ApiResponse(responseCode = "200", description = "쑰회 성곡"),
@ApiResponse(responseCode = "404", description = "νšŒμ›μ„ 찾을 수 μ—†μŒ")
})
public ResponseEntity<List<UserRankingDto>> getUserRanking() {
Expand Down
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ public TokenDTO.ServiceToken joinAndLogin(UserDTO.LoginRequest dto) {
HttpEntity<String> requestEntity = new HttpEntity<>(headers);
ResponseEntity<String> responseEntity = restTemplate.exchange(reqURL, HttpMethod.POST, requestEntity,
String.class);
System.out.printf(Objects.requireNonNull(responseEntity.getBody()));

String email, profileImage = "";
long kakaoId = 0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ public TokenDTO.ServiceToken joinAndLogin(UserDTO.LoginRequest dto) {
HttpEntity<String> requestEntity = new HttpEntity<>(headers);
ResponseEntity<String> responseEntity = restTemplate.exchange(reqURL, HttpMethod.POST, requestEntity,
String.class);
System.out.println(responseEntity.getBody());

String email = "";
String profileImage = "";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,4 @@ List<Message> findBySenderAndReceiverAndDeletedBySenderFalseOrReceiverAndSenderA
User sender1, User receiver1, User receiver2, User sender2);

List<Message> findBySenderAndDeletedBySenderFalseOrReceiverAndDeletedByReceiverFalseOrderBySentAtDesc(User sender, User receiver);

List<Message> findBySenderAndDeletedBySenderFalseOrderBySentAtDesc(User user);

List<Message> findByReceiverAndDeletedByReceiverFalseOrderBySentAtDesc(User user);
}

0 comments on commit f154cc8

Please sign in to comment.