Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,10 @@ public ApiResponse<CreateTimetableResponseDto> createTimetable(
@Parameter(description = "학교 ID (커리어넷 학교 정보 오픈API의 seq 값, 예: '767', '14')", required = true)
String schoolId,

@RequestParam("schoolName")
@Parameter(description = "학교 이름", required = true)
String schoolName,

@RequestParam("semester")
@Parameter(
description = "학기",
Expand All @@ -69,7 +73,7 @@ public ApiResponse<CreateTimetableResponseDto> createTimetable(

Semester semester = Semester.from(semesterLabel);
Long userId = Utils.getUserId();
Timetable createdTimetable = timetableCommandService.createTimetableWithImage(schoolId, semester, image, userId);
Timetable createdTimetable = timetableCommandService.createTimetableWithImage(schoolId, schoolName, semester, image, userId);
CreateTimetableResponseDto response = timetableConverter.toCreateResponse(createdTimetable);

return ApiResponse.onSuccess(response,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ public CreateTimetableResponseDto toCreateResponse(Timetable timetable) {
return CreateTimetableResponseDto.of(
timetable.getId(),
timetable.getSchoolId(),
timetable.getSchoolName(),
timetable.getSemester(),
timetable.getTimeTableImage()
);
Expand All @@ -21,6 +22,7 @@ public GetTimetableResponseDto toGetResponse(Timetable timetable, String schoolI
return GetTimetableResponseDto.of(
timetable.getId(),
schoolId,
timetable.getSchoolName(),
timetable.getSemester(),
timetable.getTimeTableImage()
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,15 @@ public class CreateTimetableResponseDto {

private Long timetableId;
private String schoolId;
private String schoolName;
private Semester semester;
private String imageUrl;

public static CreateTimetableResponseDto of(Long timetableId, String schoolId, Semester semester, String imageUrl) {
public static CreateTimetableResponseDto of(Long timetableId, String schoolId, String schoolName, Semester semester, String imageUrl) {
return CreateTimetableResponseDto.builder()
.timetableId(timetableId)
.schoolId(schoolId)
.schoolName(schoolName)
.semester(semester)
.imageUrl(imageUrl)
.build();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,15 @@ public class GetTimetableResponseDto {

private Long timetableId;
private String schoolId;
private String schoolName;
private Semester semester;
private String imageUrl;

public static GetTimetableResponseDto of(Long timetableId, String schoolId, Semester semester, String imageUrl) {
public static GetTimetableResponseDto of(Long timetableId, String schoolId, String schoolName, Semester semester, String imageUrl) {
return GetTimetableResponseDto.builder()
.timetableId(timetableId)
.schoolId(schoolId)
.schoolName(schoolName)
.semester(semester)
.imageUrl(imageUrl)
.build();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,20 @@ public class Timetable extends BaseEntity {
@Column(name = "school_id", nullable = false)
private String schoolId;

@Column(name = "school_name", nullable = false)
private String schoolName;

@Column(name = "semester", nullable = false)
private Semester semester;

@Column(name = "time_table_image", nullable = false, length = 512)
private String timeTableImage;

@Builder
public Timetable(Long userId, String schoolId, Semester semester, String timeTableImage) {
public Timetable(Long userId, String schoolId, String schoolName, Semester semester, String timeTableImage) {
this.userId = userId;
this.schoolId = schoolId;
this.schoolName = schoolName;
this.semester = semester;
this.timeTableImage = timeTableImage;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

public interface TimetableCommandService {

Timetable createTimetableWithImage(String schoolId, Semester semester, MultipartFile image, Long userId);
Timetable createTimetableWithImage(String schoolId, String schoolName, Semester semester, MultipartFile image, Long userId);

void deleteTimetable(Long userId, Long timetableId);
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public class TimetableCommandServiceImpl implements TimetableCommandService {
private final S3Uploader s3Uploader;

@Override
public Timetable createTimetableWithImage(String schoolId, Semester semester, MultipartFile image, Long userId) {
public Timetable createTimetableWithImage(String schoolId, String schoolName, Semester semester, MultipartFile image, Long userId) {
if (timetableRepository.existsByUserIdAndSemester(userId, semester)) {
throw new TimetableException(ErrorStatus.TIMETABLE_DUPLICATE_SEMESTER);
}
Expand All @@ -29,6 +29,7 @@ public Timetable createTimetableWithImage(String schoolId, Semester semester, Mu
Timetable timetable = Timetable.builder()
.userId(userId)
.schoolId(schoolId)
.schoolName(schoolName)
.semester(semester)
.timeTableImage(imageUrl)
.build();
Expand Down