Skip to content

Commit b8dfce7

Browse files
authored
[REFACTOR] Category enum 도메인 수정 (#178)
* refactor: Category enum 도메인 수정 (#177) * refactor: 코드 리팩토링 (#177)
1 parent 2328ec6 commit b8dfce7

File tree

5 files changed

+9
-12
lines changed

5 files changed

+9
-12
lines changed

src/main/java/com/smunity/server/domain/course/entity/Standard.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ public class Standard {
1919
@JoinColumn(name = "year_id")
2020
private Year year;
2121

22-
@Column(nullable = false)
2322
@Enumerated(EnumType.STRING)
2423
private Category category;
2524

src/main/java/com/smunity/server/domain/course/service/CourseCommandService.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import com.smunity.server.domain.course.entity.Course;
99
import com.smunity.server.domain.course.repository.course.CourseRepository;
1010
import com.smunity.server.global.common.entity.Member;
11-
import com.smunity.server.global.common.entity.enums.Category;
1211
import com.smunity.server.global.common.repository.MemberRepository;
1312
import com.smunity.server.global.exception.GeneralException;
1413
import com.smunity.server.global.exception.code.ErrorCode;
@@ -38,7 +37,7 @@ public ResultResponseDto<CourseResponseDto> createCourses(Long memberId, AuthReq
3837
.toList();
3938
courseRepository.saveAll(courses);
4039
List<CourseResponseDto> responseDtoList = CourseResponseDto.from(member.getCourses());
41-
int total = standardService.getTotal(member.getYear(), Category.ALL);
40+
int total = standardService.getTotal(member.getYear());
4241
return ResultResponseDto.of(total, member.getCompletedCredits(), responseDtoList);
4342
}
4443

src/main/java/com/smunity/server/domain/course/service/CourseQueryService.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@ public ResultResponseDto<CourseResponseDto> readCourses(Long memberId, Category
3535
.orElseThrow(() -> new GeneralException(ErrorCode.MEMBER_NOT_FOUND));
3636
List<Course> courses = courseRepository.findByMemberIdAndCategory(memberId, category);
3737
List<CourseResponseDto> responseDtoList = CourseResponseDto.from(courses);
38-
int total = standardService.getTotal(member.getYear(), member.getDepartment(), getCategory(category));
38+
int total = standardService.getTotal(member.getYear(), member.getDepartment(), category);
3939
int completed = calculateCompleted(courses);
4040
return ResultResponseDto.of(total, completed, responseDtoList);
4141
}
4242

4343
public CreditResponseDto readCoursesCredit(Long memberId) {
4444
Member member = memberRepository.findById(memberId)
4545
.orElseThrow(() -> new GeneralException(ErrorCode.MEMBER_NOT_FOUND));
46-
int total = standardService.getTotal(member.getYear(), Category.ALL);
46+
int total = standardService.getTotal(member.getYear());
4747
return CreditResponseDto.from(total, member);
4848
}
4949

@@ -57,10 +57,6 @@ public ResultResponseDto<CultureResponseDto> readCultureCourses(Long memberId, D
5757
return ResultResponseDto.of(total, completed, responseDtoList);
5858
}
5959

60-
private Category getCategory(Category category) {
61-
return category != null ? category : Category.ALL;
62-
}
63-
6460
private int calculateCompleted(List<Course> courses) {
6561
return courses.stream()
6662
.mapToInt(Course::getCredit)

src/main/java/com/smunity/server/domain/course/service/StandardService.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,16 @@ public int getCultureTotal(int size, Domain domain) {
2525
};
2626
}
2727

28+
public int getTotal(Year year) {
29+
return getTotal(year, null);
30+
}
31+
2832
public int getTotal(Year year, Department department, Category category) {
2933
int total = getTotal(year, category);
30-
return department.isHasAdvanced() ? total : getTotal(total, category);
34+
return department.isHasAdvanced() || category == null ? total : getTotal(total, category);
3135
}
3236

33-
public int getTotal(Year year, Category category) {
37+
private int getTotal(Year year, Category category) {
3438
return standardRepository.findByYearAndCategory(year, category)
3539
.map(Standard::getTotal)
3640
.orElse(0);

src/main/java/com/smunity/server/global/common/entity/enums/Category.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
@RequiredArgsConstructor
1111
public enum Category {
1212

13-
ALL("전체"),
1413
MAJOR_ADVANCED("1전심"),
1514
MAJOR_OPTIONAL("1전선"),
1615
CULTURE("교양"),

0 commit comments

Comments
 (0)