Skip to content

Commit ded0d26

Browse files
ymkim97ymkim97
authored
[TNT-106] feat: 트레이너 - 트레이니 연결 API 구현 (#26)
* [TNT-106] chore: 일부 설정 변경 * [TNT-106] feat: 트레이너 초대코드 재발급 기능 구현 * [TNT-106] feat: 필요 엔티티 구현 및 기존 엔티티 수정 * [TNT-106] feat: 트레이니 - 트레이너 연결 기능 구현 * [TNT-106] feat: 필요 DTO, Request, Response 구현 * [TNT-106] refactor: 정리 * [TNT-106] fix: profile에 따라 FCM 작동 다르도록 수정 - local에서는 FCM 요청 없음 - 그외에서는 FCM 요청 * [TNT-106] refactor: Querydsl repository 구현 * [TNT-106] test: 테스트 코드 추가 * [TNT-106] test: Fixture 추가 * [TNT-106] feat: 트레이너에게 최초로 연결된 트레이니 정보 전달 기능 구현
1 parent 076684f commit ded0d26

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+1397
-77
lines changed

‎build.gradle

+4-3
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ sonar {
4141
property "sonar.host.url", "https://sonarcloud.io"
4242
property "sonar.coverage.jacoco.xmlReportPaths", "build/reports/jacoco/test/jacocoTestReport.xml"
4343
property "sonar.exclusions", "**/*Application*.java, **/*Config*.java, **/*GlobalExceptionHandler.java, **/Q*.java, **/DynamicQuery.java, " +
44-
"**/*Exception.java, **/*Adapter.java, **/CustomOAuth2UserService.java"
44+
"**/*Exception.java, **/*Adapter.java, **/CustomOAuth2UserService.java, **/*SearchRepository.java"
4545
property "sonar.java.coveragePlugin", "jacoco"
4646
}
4747
}
@@ -85,7 +85,8 @@ jacocoTestReport {
8585
"**/*Application*",
8686
"**/*Config*",
8787
"**/*DynamicQuery*",
88-
"**/*error*"
88+
"**/*error*",
89+
"**/*Repository*"
8990
] + Qdomains)
9091
})
9192
)
@@ -122,6 +123,7 @@ jacocoTestCoverageVerification {
122123
'*.Q*',
123124
'*.DynamicQuery',
124125
'*.*Adapter',
126+
'*.*SearchRepository'
125127
]
126128
}
127129
}
@@ -180,7 +182,6 @@ dependencies {
180182
testImplementation 'org.springframework.security:spring-security-test'
181183

182184
// Testcontainer
183-
testImplementation "org.junit.jupiter:junit-jupiter:5.8.1"
184185
testImplementation "org.testcontainers:testcontainers:1.20.4"
185186
testImplementation "org.testcontainers:junit-jupiter:1.20.4"
186187

‎gradlew

100644100755
File mode changed.

‎infra/docker-compose-dev.yml

+3
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,16 @@ services:
22
tnt:
33
image: ${DOCKER_HUB_USERNAME}/${DOCKER_HUB_REPOSITORY}:latest
44
container_name: tnt-spring-dev
5+
# platform: linux/arm64/v8
56
restart: unless-stopped
67
ports:
78
- "80:8080"
89
depends_on:
910
- mysql
1011
environment:
1112
SPRING_ACTIVE_PROFILE: ${SPRING_ACTIVE_PROFILE}
13+
volumes:
14+
- ../logs:/logs
1215

1316
mysql:
1417
image: mysql:8.0.40

‎src/main/java/com/tnt/application/auth/SessionService.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
@RequiredArgsConstructor
2020
public class SessionService {
2121

22-
static final long SESSION_DURATION = 2L * 24 * 60 * 60; // 48시간
22+
private static final long SESSION_DURATION = 2L * 24 * 60 * 60; // 48시간
2323
private static final String AUTHORIZATION_HEADER = "Authorization";
2424
private static final String SESSION_ID_PREFIX = "SESSION-ID ";
2525

‎src/main/java/com/tnt/application/member/MemberService.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ private Member createMember(SignUpRequest request, String defaultImageUrl) {
9595
private Long createTrainer(SignUpRequest request) {
9696
Member member = createMember(request, TRAINER_DEFAULT_IMAGE);
9797
Trainer trainer = Trainer.builder()
98-
.memberId(member.getId())
98+
.member(member)
9999
.build();
100100

101101
trainerRepository.save(trainer);
@@ -106,7 +106,7 @@ private Long createTrainer(SignUpRequest request) {
106106
private Long createTrainee(SignUpRequest request) {
107107
Member member = createMember(request, TRAINEE_DEFAULT_IMAGE);
108108
Trainee trainee = Trainee.builder()
109-
.memberId(member.getId())
109+
.member(member)
110110
.height(request.height())
111111
.weight(request.weight())
112112
.cautionNote(isNotBlank(request.cautionNote()) ? request.cautionNote() : "")

‎src/main/java/com/tnt/application/member/NotificationService.java

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
package com.tnt.application.member;
2+
3+
import java.util.HashMap;
4+
import java.util.Map;
5+
6+
import org.springframework.stereotype.Service;
7+
8+
import com.tnt.infrastructure.fcm.FcmAdapter;
9+
10+
import lombok.RequiredArgsConstructor;
11+
12+
@Service
13+
@RequiredArgsConstructor
14+
public class NotificationService {
15+
16+
private final FcmAdapter fcmAdapter;
17+
18+
public void sendConnectNotificationToTrainer(String fcmToken, String traineeName, Long trainerId, Long traineeId) {
19+
String title = "트레이니와 연결 완료";
20+
String body = traineeName + " 트레이니와 연결되었어요!";
21+
22+
Map<String, String> data = new HashMap<>();
23+
data.put("trainerId", String.valueOf(trainerId));
24+
data.put("traineeId", String.valueOf(traineeId));
25+
26+
fcmAdapter.sendNotificationByToken(fcmToken, title, body, data);
27+
}
28+
}

‎src/main/java/com/tnt/application/pt/PtService.java

+132
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,132 @@
1+
package com.tnt.application.pt;
2+
3+
import static com.tnt.global.error.model.ErrorMessage.PT_TRAINEE_ALREADY_EXIST;
4+
import static com.tnt.global.error.model.ErrorMessage.PT_TRAINER_TRAINEE_ALREADY_EXIST;
5+
import static java.util.Objects.isNull;
6+
7+
import java.time.LocalDate;
8+
import java.util.List;
9+
10+
import org.springframework.stereotype.Service;
11+
import org.springframework.transaction.annotation.Transactional;
12+
13+
import com.tnt.application.trainee.TraineeService;
14+
import com.tnt.application.trainer.TrainerService;
15+
import com.tnt.domain.member.Member;
16+
import com.tnt.domain.pt.PtTrainerTrainee;
17+
import com.tnt.domain.trainee.PtGoal;
18+
import com.tnt.domain.trainee.Trainee;
19+
import com.tnt.domain.trainer.Trainer;
20+
import com.tnt.dto.trainer.ConnectWithTrainerDto;
21+
import com.tnt.dto.trainer.request.ConnectWithTrainerRequest;
22+
import com.tnt.dto.trainer.response.ConnectWithTraineeResponse;
23+
import com.tnt.global.error.exception.ConflictException;
24+
import com.tnt.global.error.exception.NotFoundException;
25+
import com.tnt.global.error.model.ErrorMessage;
26+
import com.tnt.infrastructure.mysql.repository.pt.PtTrainerTraineeRepository;
27+
import com.tnt.infrastructure.mysql.repository.trainee.PtGoalRepository;
28+
29+
import lombok.RequiredArgsConstructor;
30+
31+
@Service
32+
@Transactional(readOnly = true)
33+
@RequiredArgsConstructor
34+
public class PtService {
35+
36+
private final TraineeService traineeService;
37+
private final TrainerService trainerService;
38+
private final PtTrainerTraineeRepository ptTrainerTraineeRepository;
39+
private final PtGoalRepository ptGoalRepository;
40+
41+
@Transactional
42+
public ConnectWithTrainerDto connectWithTrainer(String memberId, ConnectWithTrainerRequest request) {
43+
Trainer trainer = trainerService.getTrainerWithInvitationCode(request.invitationCode());
44+
Trainee trainee = traineeService.getTraineeWithMemberId(memberId);
45+
46+
validateNotAlreadyConnected(trainer.getId(), trainee.getId());
47+
48+
PtTrainerTrainee ptTrainerTrainee = PtTrainerTrainee.builder()
49+
.trainerId(trainer.getId())
50+
.traineeId(trainee.getId())
51+
.startedAt(request.startDate())
52+
.finishedPtCount(request.finishedPtCount())
53+
.totalPtCount(request.totalPtCount())
54+
.build();
55+
56+
ptTrainerTraineeRepository.save(ptTrainerTrainee);
57+
58+
Member trainerMember = trainer.getMember(); // fetch join 으로 가져온 member
59+
Member traineeMember = trainee.getMember(); // fetch join 으로 가져온 member
60+
61+
return new ConnectWithTrainerDto(trainerMember.getFcmToken(), trainerMember.getName(), traineeMember.getName(),
62+
trainerMember.getProfileImageUrl(), traineeMember.getProfileImageUrl(), trainer.getId(), trainee.getId());
63+
}
64+
65+
public ConnectWithTraineeResponse getFirstTrainerTraineeConnect(String memberId, String trainerId,
66+
String traineeId) {
67+
validateIfNotConnected(trainerId, traineeId);
68+
69+
Trainer trainer = trainerService.getTrainerWithMemberId(memberId);
70+
Trainee trainee = traineeService.getTraineeWithId(traineeId);
71+
72+
Member trainerMember = trainer.getMember(); // fetch join 으로 가져온 member
73+
Member traineeMember = trainee.getMember(); // fetch join 으로 가져온 member
74+
75+
String traineeAge = calculateCurrentAge(traineeMember.getBirthday());
76+
77+
List<PtGoal> ptGoals = ptGoalRepository.findAllByTraineeId(Long.valueOf(traineeId));
78+
String ptGoal = getPtGoals(ptGoals);
79+
80+
return new ConnectWithTraineeResponse(trainerMember.getName(), traineeMember.getName(),
81+
trainerMember.getProfileImageUrl(), traineeMember.getProfileImageUrl(), traineeAge, trainee.getHeight(),
82+
trainee.getWeight(), ptGoal, trainee.getCautionNote());
83+
}
84+
85+
private void validateNotAlreadyConnected(Long trainerId, Long traineeId) {
86+
ptTrainerTraineeRepository.findByTraineeIdAndDeletedAtIsNull(traineeId)
87+
.ifPresent(pt -> { // 이미 다른 트레이너와 연결 중인지 확인
88+
throw new ConflictException(PT_TRAINEE_ALREADY_EXIST);
89+
});
90+
91+
ptTrainerTraineeRepository.findByTrainerIdAndTraineeIdAndDeletedAtIsNull(trainerId, traineeId)
92+
.ifPresent(pt -> { // 이미 해당 트레이너와 연결 중인지 확인
93+
throw new ConflictException(PT_TRAINER_TRAINEE_ALREADY_EXIST);
94+
});
95+
}
96+
97+
private void validateIfNotConnected(String trainerId, String traineeId) {
98+
ptTrainerTraineeRepository.findByTrainerIdAndTraineeIdAndDeletedAtIsNull(Long.valueOf(trainerId),
99+
Long.valueOf(traineeId))
100+
.orElseThrow(() -> new NotFoundException(ErrorMessage.PT_TRAINER_TRAINEE_NOT_FOUND));
101+
}
102+
103+
private String calculateCurrentAge(LocalDate birthDay) {
104+
if (isNull(birthDay)) {
105+
return "비공개";
106+
}
107+
108+
LocalDate currentDate = LocalDate.now();
109+
int age = currentDate.getYear() - birthDay.getYear();
110+
111+
// 생일이 아직 지나지 않았으면 나이를 1 줄임
112+
if (currentDate.isBefore(birthDay.withYear(currentDate.getYear()))) {
113+
age--;
114+
}
115+
116+
return String.valueOf(age);
117+
}
118+
119+
private String getPtGoals(List<PtGoal> ptGoals) {
120+
StringBuilder sb = new StringBuilder();
121+
122+
for (int i = 0; i < ptGoals.size(); i++) {
123+
sb.append(ptGoals.get(i).getContent());
124+
125+
if (i != ptGoals.size() - 1) {
126+
sb.append(", ");
127+
}
128+
}
129+
130+
return sb.toString();
131+
}
132+
}

‎src/main/java/com/tnt/application/trainee/TraineeService.java

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
package com.tnt.application.trainee;
2+
3+
import static com.tnt.global.error.model.ErrorMessage.TRAINEE_NOT_FOUND;
4+
5+
import org.springframework.stereotype.Service;
6+
import org.springframework.transaction.annotation.Transactional;
7+
8+
import com.tnt.domain.trainee.Trainee;
9+
import com.tnt.global.error.exception.NotFoundException;
10+
import com.tnt.infrastructure.mysql.repository.trainee.TraineeSearchRepository;
11+
12+
import lombok.RequiredArgsConstructor;
13+
14+
@Service
15+
@RequiredArgsConstructor
16+
@Transactional(readOnly = true)
17+
public class TraineeService {
18+
19+
private final TraineeSearchRepository traineeSearchRepository;
20+
21+
public Trainee getTraineeWithMemberId(String memberId) {
22+
return traineeSearchRepository.findByMemberIdAndDeletedAtIsNull(Long.valueOf(memberId))
23+
.orElseThrow(() -> new NotFoundException(TRAINEE_NOT_FOUND));
24+
}
25+
26+
public Trainee getTraineeWithId(String traineeId) {
27+
return traineeSearchRepository.findByIdAndDeletedAtIsNull(Long.valueOf(traineeId))
28+
.orElseThrow(() -> new NotFoundException(TRAINEE_NOT_FOUND));
29+
}
30+
}

‎src/main/java/com/tnt/application/trainer/TrainerService.java

+20-6
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
package com.tnt.application.trainer;
22

3-
import static com.tnt.global.error.model.ErrorMessage.*;
3+
import static com.tnt.global.error.model.ErrorMessage.TRAINER_NOT_FOUND;
44

55
import org.springframework.stereotype.Service;
66
import org.springframework.transaction.annotation.Transactional;
77

88
import com.tnt.domain.trainer.Trainer;
99
import com.tnt.dto.trainer.response.InvitationCodeResponse;
10+
import com.tnt.dto.trainer.response.InvitationCodeVerifyResponse;
1011
import com.tnt.global.error.exception.NotFoundException;
1112
import com.tnt.infrastructure.mysql.repository.trainer.TrainerRepository;
13+
import com.tnt.infrastructure.mysql.repository.trainer.TrainerSearchRepository;
1214

1315
import lombok.RequiredArgsConstructor;
1416

@@ -18,23 +20,35 @@
1820
public class TrainerService {
1921

2022
private final TrainerRepository trainerRepository;
23+
private final TrainerSearchRepository trainerSearchRepository;
2124

2225
public InvitationCodeResponse getInvitationCode(String memberId) {
23-
Trainer trainer = getTrainer(memberId);
26+
Trainer trainer = getTrainerWithMemberId(memberId);
2427

25-
return new InvitationCodeResponse(String.valueOf(trainer.getId()), trainer.getInvitationCode());
28+
return new InvitationCodeResponse(trainer.getInvitationCode());
29+
}
30+
31+
public InvitationCodeVerifyResponse verifyInvitationCode(String invitationCode) {
32+
boolean isVerified = trainerRepository.findByInvitationCodeAndDeletedAtIsNull(invitationCode).isPresent();
33+
34+
return new InvitationCodeVerifyResponse(isVerified);
2635
}
2736

2837
@Transactional
2938
public InvitationCodeResponse reissueInvitationCode(String memberId) {
30-
Trainer trainer = getTrainer(memberId);
39+
Trainer trainer = getTrainerWithMemberId(memberId);
3140
trainer.setNewInvitationCode();
3241

33-
return new InvitationCodeResponse(String.valueOf(trainer.getId()), trainer.getInvitationCode());
42+
return new InvitationCodeResponse(trainer.getInvitationCode());
3443
}
3544

36-
public Trainer getTrainer(String memberId) {
45+
public Trainer getTrainerWithMemberId(String memberId) {
3746
return trainerRepository.findByMemberIdAndDeletedAtIsNull(Long.valueOf(memberId))
3847
.orElseThrow(() -> new NotFoundException(TRAINER_NOT_FOUND));
3948
}
49+
50+
public Trainer getTrainerWithInvitationCode(String invitationCode) {
51+
return trainerSearchRepository.findByInvitationCodeAndDeletedAtIsNull(invitationCode)
52+
.orElseThrow(() -> new NotFoundException(TRAINER_NOT_FOUND));
53+
}
4054
}

‎src/main/java/com/tnt/domain/pt/PtTrainerTrainee.java

+16-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
package com.tnt.domain.pt;
22

3+
import static java.util.Objects.requireNonNull;
4+
35
import java.time.LocalDate;
46

57
import com.tnt.global.common.entity.BaseTimeEntity;
8+
import com.tnt.global.error.model.ErrorMessage;
69

710
import jakarta.persistence.Column;
811
import jakarta.persistence.Entity;
@@ -11,6 +14,7 @@
1114
import jakarta.persistence.Id;
1215
import jakarta.persistence.Table;
1316
import lombok.AccessLevel;
17+
import lombok.Builder;
1418
import lombok.Getter;
1519
import lombok.NoArgsConstructor;
1620

@@ -35,11 +39,21 @@ public class PtTrainerTrainee extends BaseTimeEntity {
3539
private LocalDate startedAt;
3640

3741
@Column(name = "finished_pt_count", nullable = false)
38-
private int finishedPtCount;
42+
private Integer finishedPtCount;
3943

4044
@Column(name = "total_pt_count", nullable = false)
41-
private int totalPtCount;
45+
private Integer totalPtCount;
4246

4347
@Column(name = "deleted_at")
4448
private LocalDate deletedAt;
49+
50+
@Builder
51+
public PtTrainerTrainee(Long trainerId, Long traineeId, LocalDate startedAt, Integer finishedPtCount,
52+
Integer totalPtCount) {
53+
this.trainerId = requireNonNull(trainerId, ErrorMessage.TRAINER_NULL_ID.getMessage());
54+
this.traineeId = requireNonNull(traineeId, ErrorMessage.TRAINEE_NULL_ID.getMessage());
55+
this.startedAt = requireNonNull(startedAt);
56+
this.finishedPtCount = requireNonNull(finishedPtCount);
57+
this.totalPtCount = requireNonNull(totalPtCount);
58+
}
4559
}

0 commit comments

Comments
 (0)