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 @@ -5,6 +5,7 @@
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;

import in.koreatech.koin.domain.timetable.dto.SemesterResponse;
import in.koreatech.koin.domain.timetable.dto.LectureResponse;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.media.Content;
Expand All @@ -29,4 +30,16 @@ public interface TimetableApi {
ResponseEntity<List<LectureResponse>> getLecture(
String semesterDate
);

@ApiResponses(
value = {
@ApiResponse(responseCode = "200"),
@ApiResponse(responseCode = "401", content = @Content(schema = @Schema(hidden = true))),
@ApiResponse(responseCode = "403", content = @Content(schema = @Schema(hidden = true))),
@ApiResponse(responseCode = "404", content = @Content(schema = @Schema(hidden = true)))
}
)
@Operation(summary = "학기 정보 조회")
@GetMapping("/semesters")
ResponseEntity<List<SemesterResponse>> getSemesters();
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
import org.springframework.web.bind.annotation.RestController;

import in.koreatech.koin.domain.timetable.dto.LectureResponse;
import in.koreatech.koin.domain.timetable.dto.SemesterResponse;
import in.koreatech.koin.domain.timetable.service.SemesterService;
import in.koreatech.koin.domain.timetable.service.TimetableService;
import lombok.RequiredArgsConstructor;

Expand All @@ -16,6 +18,7 @@
public class TimetableController implements TimetableApi {

private final TimetableService timetableService;
private final SemesterService semesterService;

@GetMapping("/lectures")
public ResponseEntity<List<LectureResponse>> getLecture(
Expand All @@ -24,4 +27,10 @@ public ResponseEntity<List<LectureResponse>> getLecture(
List<LectureResponse> lectures = timetableService.getLecturesBySemester(semester);
return ResponseEntity.ok(lectures);
}

@GetMapping("/semesters")
public ResponseEntity<List<SemesterResponse>> getSemesters() {
List<SemesterResponse> semesterResponse = semesterService.getSemesters();
return ResponseEntity.ok(semesterResponse);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package in.koreatech.koin.domain.timetable.dto;

import com.fasterxml.jackson.databind.PropertyNamingStrategies.SnakeCaseStrategy;
import com.fasterxml.jackson.databind.annotation.JsonNaming;

import in.koreatech.koin.domain.timetable.model.Semester;
import io.swagger.v3.oas.annotations.media.Schema;

@JsonNaming(value = SnakeCaseStrategy.class)
public record SemesterResponse(
@Schema(description = "id", example = "1")
Long id,

@Schema(description = "학기", example = "20241")
String semester
) {
public static SemesterResponse from(Semester semester) {
return new SemesterResponse(
semester.getId(),
semester.getSemester()
);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
package in.koreatech.koin.domain.timetable.model;

import static jakarta.persistence.GenerationType.*;
import static lombok.AccessLevel.*;

import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Size;
import lombok.AccessLevel;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;

@Getter
@Entity
@Table(name = "semester")
@NoArgsConstructor(access = PROTECTED)
public class Semester {
@Id
@Column(name = "id", nullable = false)
@GeneratedValue(strategy = IDENTITY)
private Long id;

@Size(max = 10)
@NotNull
@Column(name = "semester", nullable = false)
private String semester;

@Builder
private Semester(String semester) {
this.semester = semester;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package in.koreatech.koin.domain.timetable.repository;

import java.util.List;

import org.springframework.data.repository.Repository;

import in.koreatech.koin.domain.timetable.model.Semester;

public interface SemesterRepository extends Repository<Semester, Long> {

List<Semester> findAll();

Semester save(Semester semester);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package in.koreatech.koin.domain.timetable.service;

import java.util.List;

import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import in.koreatech.koin.domain.timetable.dto.SemesterResponse;
import in.koreatech.koin.domain.timetable.repository.SemesterRepository;
import lombok.RequiredArgsConstructor;

@Service
@Transactional(readOnly = true)
@RequiredArgsConstructor
public class SemesterService {

private final SemesterRepository semesterRepository;

public List<SemesterResponse> getSemesters() {
return semesterRepository.findAll().stream()
.map(SemesterResponse::from)
.toList();
}
}
27 changes: 27 additions & 0 deletions src/test/java/in/koreatech/koin/acceptance/TimetableApiTest.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package in.koreatech.koin.acceptance;

import static org.assertj.core.api.Assertions.assertThat;

import java.util.List;

import org.assertj.core.api.SoftAssertions;
Expand All @@ -10,7 +12,9 @@

import in.koreatech.koin.AcceptanceTest;
import in.koreatech.koin.domain.timetable.model.Lecture;
import in.koreatech.koin.domain.timetable.model.Semester;
import in.koreatech.koin.domain.timetable.repository.LectureRepository;
import in.koreatech.koin.domain.timetable.repository.SemesterRepository;
import io.restassured.RestAssured;
import io.restassured.response.ExtractableResponse;
import io.restassured.response.Response;
Expand All @@ -20,6 +24,9 @@ class TimetableApiTest extends AcceptanceTest {
@Autowired
private LectureRepository lectureRepository;

@Autowired
private SemesterRepository semesterRepository;

@Test
@DisplayName("특정 학기 강의를 조회한다")
void getSemesterLecture() {
Expand Down Expand Up @@ -214,4 +221,24 @@ void isNotSemester() {
.statusCode(HttpStatus.NOT_FOUND.value())
.extract();
}

@Test
@DisplayName("모든 학기를 조회한다.")
void findAllSemesters() {
Semester request1 = Semester.builder().semester("20221").build();
Semester request2 = Semester.builder().semester("20222").build();
semesterRepository.save(request1);
semesterRepository.save(request2);

ExtractableResponse<Response> response = RestAssured
.given()
.when()
.get("/semesters")
.then()
.log().all()
.statusCode(HttpStatus.OK.value())
.extract();

assertThat(response.body().jsonPath().getList(".")).hasSize(2);
}
}