Skip to content

Commit

Permalink
Merge pull request #65 from WE-ARE-RACCOONS/RAC-187
Browse files Browse the repository at this point in the history
RAC-187 fix: ์œ ํšจ์„ฑ ๊ฒ€์‚ฌ
  • Loading branch information
ay-eonii authored Dec 11, 2023
2 parents c09fe86 + 973b502 commit 8ba5a72
Show file tree
Hide file tree
Showing 34 changed files with 335 additions and 329 deletions.
1 change: 1 addition & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ dependencies {
implementation 'org.springframework.boot:spring-boot-starter-security'
implementation 'org.springframework.boot:spring-boot-starter-web'
implementation 'org.springframework.boot:spring-boot-starter-webflux'
implementation 'org.springframework.boot:spring-boot-starter-validation'
compileOnly 'org.projectlombok:lombok'
runtimeOnly 'com.mysql:mysql-connector-j'
annotationProcessor 'org.projectlombok:lombok'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ public static Account mapToAccount(Senior senior, SeniorAccountRequest accountRe
return Account.builder()
.senior(senior)
.accountNumber(accountNumber)
.accountHolder(accountRequest.getAccountHolder())
.bank(accountRequest.getBank())
.accountHolder(accountRequest.accountHolder())
.bank(accountRequest.bank())
.build();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,8 @@

import com.postgraduate.domain.senior.domain.entity.constant.Status;
import jakarta.validation.constraints.NotNull;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;

@Getter
@AllArgsConstructor
@NoArgsConstructor
public class SeniorStatusRequest {
@NotNull
private Status status;
}
public record SeniorStatusRequest(
@NotNull
Status certificationStatus
) { }
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public CertificationDetailsResponse getCertificationDetails(Long seniorId) {

public void updateSeniorStatus(Long seniorId, SeniorStatusRequest request) {
Senior senior = seniorGetService.bySeniorId(seniorId);
seniorUpdateService.updateCertificationStatus(senior, request.getStatus());
seniorUpdateService.updateCertificationStatus(senior, request.certificationStatus());
}

public SeniorManageResponse getSeniors() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,31 +7,19 @@
import com.postgraduate.global.dto.ResponseDto;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;

import static com.postgraduate.domain.mentoring.presentation.constant.MentoringResponseCode.MENTORING_FIND;
import static com.postgraduate.domain.mentoring.presentation.constant.MentoringResponseMessage.GET_MENTORING_DETAIL_INFO;
import static com.postgraduate.domain.mentoring.presentation.constant.MentoringResponseMessage.GET_MENTORING_LIST_INFO;
import static com.postgraduate.domain.payment.presentation.constant.PaymentResponseCode.PAYMENT_FIND;
import static com.postgraduate.domain.payment.presentation.constant.PaymentResponseMessage.GET_PAYMENT_LIST_INFO;
import static com.postgraduate.domain.salary.presentation.constant.SalaryResponseCode.SALARY_FIND;
import static com.postgraduate.domain.salary.presentation.constant.SalaryResponseCode.SALARY_UPDATE;
import static com.postgraduate.domain.salary.presentation.constant.SalaryResponseMessage.GET_SALARY_INFO;
import static com.postgraduate.domain.salary.presentation.constant.SalaryResponseMessage.UPDATE_SALARY_STATUS;
import static com.postgraduate.domain.senior.presentation.constant.SeniorResponseCode.SENIOR_FIND;
import static com.postgraduate.domain.senior.presentation.constant.SeniorResponseCode.SENIOR_UPDATE;
import static com.postgraduate.domain.senior.presentation.constant.SeniorResponseMessage.*;
import static com.postgraduate.domain.user.presentation.constant.UserResponseCode.USER_FIND;
import static com.postgraduate.domain.user.presentation.constant.UserResponseMessage.GET_USER_LIST_INFO;
import static com.postgraduate.domain.wish.presentation.constant.WishResponseCode.WISH_FIND;
import static com.postgraduate.domain.wish.presentation.constant.WishResponseMessage.GET_WISH_INFO;
import static com.postgraduate.domain.admin.presentation.constant.AdminResponseCode.ADMIN_FIND;
import static com.postgraduate.domain.admin.presentation.constant.AdminResponseCode.ADMIN_UPDATE;
import static com.postgraduate.domain.admin.presentation.constant.AdminResponseMessage.*;


@RestController
@RequiredArgsConstructor
@RequestMapping("/admin")
@Tag(name = "ADMIN Controller")
@Tag(name = "ADMIN Controller", description = "๊ด€๋ฆฌ์ž์˜ ๋ชจ๋“  API๋Š” ํ† ํฐ์ด ํ•„์š”ํ•ฉ๋‹ˆ๋‹ค.")
public class AdminController {
private final SeniorManageByAdminUseCase seniorManageUseCase;
private final UserManageByAdminUseCase userManageUseCase;
Expand All @@ -43,7 +31,7 @@ public class AdminController {
@Operation(summary = "[๊ด€๋ฆฌ์ž] ์„ ๋ฐฐ ํ”„๋กœํ•„ ์Šน์ธ ์š”์ฒญ ์กฐํšŒ", description = "์„ ๋ฐฐ ์‹ ์ฒญ ์‹œ ์ž‘์„ฑํ•œ ์‚ฌ์ „ ์ž‘์„ฑ์ •๋ณด ๋ฐ ์ฒจ๋ถ€์‚ฌ์ง„์„ ์กฐํšŒํ•ฉ๋‹ˆ๋‹ค.")
public ResponseDto<CertificationDetailsResponse> getCertificationDetails(@PathVariable Long seniorId) {
CertificationDetailsResponse certification = seniorManageUseCase.getCertificationDetails(seniorId);
return ResponseDto.create(SENIOR_FIND.getCode(), GET_SENIOR_PROFILE.getMessage(), certification);
return ResponseDto.create(ADMIN_FIND.getCode(), GET_DETAILS.getMessage(), certification);
}

// @GetMapping("/certification")
Expand All @@ -55,78 +43,79 @@ public ResponseDto<CertificationDetailsResponse> getCertificationDetails(@PathVa

@PatchMapping("/certification/{seniorId}")
@Operation(summary = "[๊ด€๋ฆฌ์ž] ์„ ๋ฐฐ ํ”„๋กœํ•„ ์Šน์ธ ์š”์ฒญ ์‘๋‹ต", description = "์„ ๋ฐฐ ์Šน์ธ ์‹ ์ฒญํ•œ ์œ ์ €๋ฅผ ์Šน์ธ ๋˜๋Š” ๊ฑฐ๋ถ€ํ•ฉ๋‹ˆ๋‹ค.")
public ResponseDto updateSeniorStatus(@PathVariable Long seniorId, @RequestBody SeniorStatusRequest request) {
public ResponseDto updateSeniorStatus(@PathVariable Long seniorId,
@RequestBody @Valid SeniorStatusRequest request) {
seniorManageUseCase.updateSeniorStatus(seniorId, request);
return ResponseDto.create(SENIOR_UPDATE.getCode(), UPDATE_STATUS.getMessage());
return ResponseDto.create(ADMIN_UPDATE.getCode(), UPDATE_SENIOR_STATUS.getMessage());
}

@GetMapping("/users")
@Operation(summary = "[๊ด€๋ฆฌ์ž] ํ›„๋ฐฐ ์ •๋ณด ๋ชฉ๋ก", description = "๋Œ€ํ•™์ƒ ํ›„๋ฐฐ ์ •๋ณด ๋ชฉ๋ก์„ ์กฐํšŒํ•ฉ๋‹ˆ๋‹ค.")
public ResponseDto<UserManageResponse> getUsers() {
UserManageResponse users = userManageUseCase.getUsers();
return ResponseDto.create(USER_FIND.getCode(), GET_USER_LIST_INFO.getMessage(), users);
return ResponseDto.create(ADMIN_FIND.getCode(), GET_LIST.getMessage(), users);
}

@GetMapping("/wish/{wishId}")
@Operation(summary = "[๊ด€๋ฆฌ์ž] ํ›„๋ฐฐ ๋งค์นญ ์ง€์› ์ •๋ณด", description = "๋Œ€ํ•™์ƒ ํ›„๋ฐฐ ๋งค์นญ ์ง€์› ์ •๋ณด๋ฅผ ์ƒ์„ธ ์กฐํšŒํ•ฉ๋‹ˆ๋‹ค.")
public ResponseDto<WishResponse> getWish(@PathVariable Long wishId) {
WishResponse wish = userManageUseCase.getWish(wishId);
return ResponseDto.create(WISH_FIND.getCode(), GET_WISH_INFO.getMessage(), wish);
return ResponseDto.create(ADMIN_FIND.getCode(), GET_DETAILS.getMessage(), wish);
}

@GetMapping("/seniors")
@Operation(summary = "[๊ด€๋ฆฌ์ž] ์„ ๋ฐฐ ์ •๋ณด ๋ชฉ๋ก", description = "๋Œ€ํ•™์›์ƒ ์„ ๋ฐฐ ์ •๋ณด ๋ชฉ๋ก์„ ์กฐํšŒํ•ฉ๋‹ˆ๋‹ค.")
public ResponseDto<SeniorManageResponse> getSeniors() {
SeniorManageResponse seniors = seniorManageUseCase.getSeniors();
return ResponseDto.create(SENIOR_FIND.getCode(), GET_SENIOR_LIST_INFO.getMessage(), seniors);
return ResponseDto.create(ADMIN_FIND.getCode(), GET_LIST.getMessage(), seniors);
}

@GetMapping("/salary")
@Operation(summary = "[๊ด€๋ฆฌ์ž] ์ •์‚ฐ ๋ชฉ๋ก ์กฐํšŒ", description = "ํ•œ ๋‹ฌ ๊ธฐ์ค€์œผ๋กœ ์ •์‚ฐ ๋ชฉ๋ก์„ ์กฐํšŒํ•ฉ๋‹ˆ๋‹ค. ๊ธฐ์ค€์ผ์€ [11์ผ ~ ๋‚ด์›” 10์ผ]์ž…๋‹ˆ๋‹ค.")
public ResponseDto<SalaryManageResponse> getSalaries() {
SalaryManageResponse salaries = salaryManageUseCase.getSalaries();
return ResponseDto.create(SALARY_FIND.getCode(), GET_SALARY_INFO.getMessage(), salaries);
return ResponseDto.create(ADMIN_FIND.getCode(), GET_LIST.getMessage(), salaries);
}

@GetMapping("/salary/{seniorId}")
@Operation(summary = "[๊ด€๋ฆฌ์ž] ์„ ๋ฐฐ ์ •์‚ฐ ์ƒ์„ธ ์ •๋ณด", description = "๋Œ€ํ•™์›์ƒ ์„ ๋ฐฐ ์ •์‚ฐ ์ƒ์„ธ ์ •๋ณด๋ฅผ ์กฐํšŒํ•ฉ๋‹ˆ๋‹ค.")
public ResponseDto<SalaryDetailsResponse> getSalary(@PathVariable Long seniorId) {
SalaryDetailsResponse salary = salaryManageUseCase.getSalary(seniorId);
return ResponseDto.create(SALARY_FIND.getCode(), GET_SALARY_INFO.getMessage(), salary);
return ResponseDto.create(ADMIN_FIND.getCode(), GET_DETAILS.getMessage(), salary);
}

@PatchMapping("/salary/{seniorId}")
@Operation(summary = "[๊ด€๋ฆฌ์ž] ์ •์‚ฐ ์ƒํƒœ ๋ณ€๊ฒฝ", description = "๋Œ€ํ•™์›์ƒ ์„ ๋ฐฐ ์ •์‚ฐ ์ƒํƒœ๋ฅผ ๋ณ€๊ฒฝํ•ฉ๋‹ˆ๋‹ค.")
public ResponseDto updateSalaryStatus(@PathVariable Long seniorId, @RequestParam Boolean status) {
salaryManageUseCase.updateSalaryStatus(seniorId, status);
return ResponseDto.create(SALARY_UPDATE.getCode(), UPDATE_SALARY_STATUS.getMessage());
return ResponseDto.create(ADMIN_UPDATE.getCode(), UPDATE_SALARY_STATUS.getMessage());
}

@GetMapping("/user/{userId}/mentoring")
@Operation(summary = "[๊ด€๋ฆฌ์ž] ํ›„๋ฐฐ ๋ฉ˜ํ† ๋ง ์กฐํšŒ", description = "ํ›„๋ฐฐ์˜ ๋ฉ˜ํ† ๋ง ๋ชฉ๋ก์„ ์กฐํšŒํ•ฉ๋‹ˆ๋‹ค.")
public ResponseDto<MentoringManageResponse> getUserMentorings(@PathVariable Long userId) {
MentoringManageResponse mentorings = mentoringManageUseCase.getUserMentorings(userId);
return ResponseDto.create(MENTORING_FIND.getCode(), GET_MENTORING_LIST_INFO.getMessage(), mentorings);
return ResponseDto.create(ADMIN_FIND.getCode(), GET_LIST.getMessage(), mentorings);
}

@GetMapping("/senior/{seniorId}/mentoring")
@Operation(summary = "[๊ด€๋ฆฌ์ž] ์„ ๋ฐฐ ๋ฉ˜ํ† ๋ง ์กฐํšŒ", description = "์„ ๋ฐฐ์˜ ๋ฉ˜ํ† ๋ง ๋ชฉ๋ก์„ ์กฐํšŒํ•ฉ๋‹ˆ๋‹ค.")
public ResponseDto<MentoringManageResponse> getSeniorMentorings(@PathVariable Long seniorId) {
MentoringManageResponse mentorings = mentoringManageUseCase.getSeniorMentorings(seniorId);
return ResponseDto.create(MENTORING_FIND.getCode(), GET_MENTORING_LIST_INFO.getMessage(), mentorings);
return ResponseDto.create(ADMIN_FIND.getCode(), GET_LIST.getMessage(), mentorings);
}

@GetMapping("/payments")
@Operation(summary = "[๊ด€๋ฆฌ์ž] ๊ฒฐ์ œ ์ •๋ณด ๋ชฉ๋ก", description = "๊ฒฐ์ œ ์ •๋ณด ๋ชฉ๋ก์„ ์กฐํšŒํ•ฉ๋‹ˆ๋‹ค.")
public ResponseDto<PaymentManageResponse> getPayments() {
PaymentManageResponse payments = paymentManageUseCase.getPayments();
return ResponseDto.create(PAYMENT_FIND.getCode(), GET_PAYMENT_LIST_INFO.getMessage(), payments);
return ResponseDto.create(ADMIN_FIND.getCode(), GET_LIST.getMessage(), payments);
}

@GetMapping("/payments/{mentoringId}")
@Operation(summary = "[๊ด€๋ฆฌ์ž] ๊ฒฐ์ œ๋œ ๋ฉ˜ํ† ๋ง ์ •๋ณด", description = "๊ฒฐ์ œ๋œ ๋ฉ˜ํ† ๋ง ์ •๋ณด๋ฅผ ์กฐํšŒํ•ฉ๋‹ˆ๋‹ค.")
public ResponseDto<MentoringWithPaymentResponse> getPayments(@PathVariable Long mentoringId) {
MentoringWithPaymentResponse mentoringWithPayment = mentoringManageUseCase.getMentoringWithPayment(mentoringId);
return ResponseDto.create(MENTORING_FIND.getCode(), GET_MENTORING_DETAIL_INFO.getMessage(), mentoringWithPayment);
return ResponseDto.create(ADMIN_FIND.getCode(), GET_DETAILS.getMessage(), mentoringWithPayment);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package com.postgraduate.domain.admin.presentation.constant;

import lombok.Getter;
import lombok.RequiredArgsConstructor;

@Getter
@RequiredArgsConstructor
public enum AdminResponseCode {
ADMIN_FIND("ADM200"),
ADMIN_CREATE("ADM201"),
ADMIN_UPDATE("ADM202"),
ADMIN_DELETE("ADM203");

private final String code;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package com.postgraduate.domain.admin.presentation.constant;

import lombok.Getter;
import lombok.RequiredArgsConstructor;

@Getter
@RequiredArgsConstructor
public enum AdminResponseMessage {
GET_DETAILS("์ƒ์„ธ ์กฐํšŒ์— ์„ฑ๊ณตํ•˜์˜€์Šต๋‹ˆ๋‹ค."),
GET_LIST("๋ชฉ๋ก ์กฐํšŒ์— ์„ฑ๊ณตํ•˜์˜€์Šต๋‹ˆ๋‹ค."),
UPDATE_SENIOR_STATUS("์„ ๋ฐฐ ์Šน์ธ ์ƒํƒœ ์ˆ˜์ •์— ์„ฑ๊ณตํ•˜์˜€์Šต๋‹ˆ๋‹ค."),
UPDATE_SALARY_STATUS("์ •์‚ฐ ์ƒํƒœ ์ˆ˜์ •์— ์„ฑ๊ณตํ•˜์˜€์Šต๋‹ˆ๋‹ค.");

private final String message;
}
Original file line number Diff line number Diff line change
@@ -1,24 +1,18 @@
package com.postgraduate.domain.auth.application.dto.req;

import jakarta.validation.constraints.NotNull;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;

@Getter
@AllArgsConstructor
@NoArgsConstructor
public class SignUpRequest {
@NotNull
private Long socialId;
@NotNull
private String phoneNumber;
@NotNull
private String nickName;
@NotNull
private Boolean marketingReceive;
private String major;
private String field;
@NotNull
private Boolean matchingReceive;
}
public record SignUpRequest(
@NotNull
Long socialId,
@NotNull
String phoneNumber,
@NotNull
String nickName,
@NotNull
Boolean marketingReceive,
String major,
String field,
@NotNull
Boolean matchingReceive
) { }
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import org.springframework.security.core.annotation.AuthenticationPrincipal;
import org.springframework.web.bind.annotation.*;
Expand All @@ -36,7 +37,7 @@ public class AuthController {

@PostMapping("/login/{provider}")
@Operation(summary = "์†Œ์…œ ๋กœ๊ทธ์ธ", description = "ํšŒ์›์ธ ๊ฒฝ์šฐ JWT๋ฅผ, ํšŒ์›์ด ์•„๋‹Œ ๊ฒฝ์šฐ socialId๋ฅผ ๋ฐ˜ํ™˜ํ•ฉ๋‹ˆ๋‹ค(ํšŒ์›๊ฐ€์ž…์€ ์ง„ํ–‰ํ•˜์ง€ ์•Š์Šต๋‹ˆ๋‹ค).")
public ResponseDto<?> authLogin(@RequestBody CodeRequest request, @PathVariable Provider provider) {
public ResponseDto<?> authLogin(@RequestBody @Valid CodeRequest request, @PathVariable String provider) {
SignInUseCase signInUseCase = selectOauth.selectStrategy(provider);
AuthUserResponse authUser = signInUseCase.getUser(request);
if (authUser.getUser().isEmpty())
Expand All @@ -54,32 +55,32 @@ public ResponseDto logout(@AuthenticationPrincipal User user) {

@PostMapping("/user/signup")
@Operation(summary = "๋Œ€ํ•™์ƒ ํšŒ์›๊ฐ€์ž…", description = "๋กœ๊ทธ์ธ API์—์„œ ๋ฐ˜ํ™˜ํ•œ socialId, ๋‹‰๋„ค์ž„, ๋ฒˆํ˜ธ, ๋งˆ์ผ€ํŒ… ์ˆ˜์‹ ์—ฌ๋ถ€, ํฌ๋ง ํ•™๊ณผ, ํฌ๋ง ๋ถ„์•ผ, ๋งค์นญ ํฌ๋ง ์—ฌ๋ถ€")
public ResponseDto<JwtTokenResponse> signUpUser(@RequestBody SignUpRequest request) {
public ResponseDto<JwtTokenResponse> signUpUser(@RequestBody @Valid SignUpRequest request) {
User user = signUpUseCase.userSignUp(request);
JwtTokenResponse jwtToken = jwtUseCase.signIn(user);
return ResponseDto.create(AUTH_CREATE.getCode(), SUCCESS_AUTH.getMessage(), jwtToken);
}

@PostMapping("/senior/signup")
@Operation(summary = "๋Œ€ํ•™์›์ƒ ๊ฐ€์ž… - ํ•„์ˆ˜ ๊ณผ์ •๋งŒ", description = "๋Œ€ํ•™์›์ƒ ํšŒ์›๊ฐ€์ž… - ํ•„์ˆ˜ ๊ณผ์ •๋งŒ")
public ResponseDto<JwtTokenResponse> singUpSenior(@RequestBody SeniorSignUpRequest request) {
public ResponseDto<JwtTokenResponse> singUpSenior(@RequestBody @Valid SeniorSignUpRequest request) {
User user = signUpUseCase.seniorSignUp(request);
JwtTokenResponse jwtToken = jwtUseCase.signIn(user);
return ResponseDto.create(SENIOR_CREATE.getCode(), CREATE_SENIOR.getMessage(), jwtToken);
}

@PostMapping("/senior/change")
@Operation(summary = "์„ ๋ฐฐ๋กœ ์—…๋ฐ์ดํŠธ", description = "๋Œ€ํ•™์ƒ ๋Œ€ํ•™์›์ƒ์œผ๋กœ ๋ณ€๊ฒฝ")
@Operation(summary = "์„ ๋ฐฐ๋กœ ์—…๋ฐ์ดํŠธ | ํ† ํฐ ํ•„์š”", description = "๋Œ€ํ•™์ƒ ๋Œ€ํ•™์›์ƒ์œผ๋กœ ๋ณ€๊ฒฝ")
public ResponseDto<JwtTokenResponse> changeSenior(@AuthenticationPrincipal User user,
@RequestBody SeniorChangeRequest changeRequest) {
@RequestBody @Valid SeniorChangeRequest changeRequest) {
User changeUser = signUpUseCase.changeSenior(user, changeRequest);
JwtTokenResponse jwtToken = jwtUseCase.signIn(changeUser);
return ResponseDto.create(SENIOR_CREATE.getCode(), CREATE_SENIOR.getMessage(), jwtToken);
}


@PostMapping("/refresh")
@Operation(summary = "ํ† ํฐ ์žฌ๋ฐœ๊ธ‰ - ํ† ํฐ ํ•„์š”", description = "refreshToken ์œผ๋กœ ํ† ํฐ ์žฌ๋ฐœ๊ธ‰")
@Operation(summary = "ํ† ํฐ ์žฌ๋ฐœ๊ธ‰ | ํ† ํฐ ํ•„์š”", description = "refreshToken ์œผ๋กœ ํ† ํฐ ์žฌ๋ฐœ๊ธ‰")
public ResponseDto<JwtTokenResponse> refresh(@AuthenticationPrincipal User user, HttpServletRequest request) {
JwtTokenResponse jwtToken = jwtUseCase.regenerateToken(user, request);
return ResponseDto.create(AUTH_UPDATE.getCode(), SUCCESS_REGENERATE_TOKEN.getMessage(), jwtToken);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,20 +1,14 @@
package com.postgraduate.domain.mentoring.application.dto.req;

import jakarta.validation.constraints.NotNull;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;

@Getter
@AllArgsConstructor
@NoArgsConstructor
public class MentoringApplyRequest {
@NotNull
private Long seniorId;
@NotNull
private String topic;
@NotNull
private String question;
@NotNull
private String date;
}
public record MentoringApplyRequest(
@NotNull
Long seniorId,
@NotNull
String topic,
@NotNull
String question,
@NotNull
String date
) { }
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,9 @@ public static Mentoring mapToMentoring(User user, Senior senior, MentoringApplyR
return Mentoring.builder()
.user(user)
.senior(senior)
.topic(request.getTopic())
.question(request.getQuestion())
.date(request.getDate())
.topic(request.topic())
.question(request.question())
.date(request.date())
.build();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public class MentoringApplyUseCase {
private final SeniorGetService seniorGetService;

public void applyMentoring(User user, MentoringApplyRequest request) {
Senior senior = seniorGetService.bySeniorId(request.getSeniorId());
Senior senior = seniorGetService.bySeniorId(request.seniorId());
Mentoring mentoring = MentoringMapper.mapToMentoring(user, senior, request);
mentoringSaveService.save(mentoring);
}
Expand Down
Loading

0 comments on commit 8ba5a72

Please sign in to comment.