Merge pull request #168 from sopt-makers/develop

[CHORE] prod 서버 배포

src/main/java/org/sopt/makers/operation/controller/web/AttendanceController.java

@@ -3,7 +3,7 @@
 import static org.sopt.makers.operation.common.ResponseMessage.*;
 
 import org.sopt.makers.operation.common.ApiResponse;
-import org.sopt.makers.operation.dto.attendance.AttendUpdateRequestDTO;
+import org.sopt.makers.operation.dto.attendance.SubAttendanceUpdateRequestDTO;
 import org.sopt.makers.operation.entity.Part;
 import org.sopt.makers.operation.service.AttendanceService;
 import org.springframework.data.domain.Pageable;
@@ -28,19 +28,19 @@ public class AttendanceController {
 
 	@ApiOperation(value = "출석 상태 변경")
 	@PatchMapping
-	public ResponseEntity<ApiResponse> updateAttendanceStatus(@RequestBody AttendUpdateRequestDTO requestDTO) {
-		val response = attendanceService.updateAttendanceStatus(requestDTO);
+	public ResponseEntity<ApiResponse> updateSubAttendance(@RequestBody SubAttendanceUpdateRequestDTO requestDTO) {
+		val response = attendanceService.updateSubAttendance(requestDTO);
 		return ResponseEntity.ok(ApiResponse.success(SUCCESS_UPDATE_ATTENDANCE_STATUS.getMessage(), response));
 	}
 
-	@ApiOperation(value = "유저별 출석 정보 조회")
+	@ApiOperation(value = "회원별 출석 정보 조회")
 	@GetMapping("/{memberId}")
 	public ResponseEntity<ApiResponse> findAttendancesByMember(@PathVariable Long memberId) {
 		val response = attendanceService.findAttendancesByMember(memberId);
 		return ResponseEntity.ok(ApiResponse.success(SUCCESS_GET_MEMBER_ATTENDANCE.getMessage(), response));
 	}
 
-	@ApiOperation(value = "출석 점수 갱신 성공")
+	@ApiOperation(value = "출석 점수 갱신")
 	@PatchMapping("/member/{memberId}")
 	public ResponseEntity<ApiResponse> updateMemberScore(@PathVariable Long memberId) {
 		val response = attendanceService.updateMemberScore(memberId);

src/main/java/org/sopt/makers/operation/dto/attendance/AttendanceMemberResponseDTO.java

@@ -1,7 +1,5 @@
 package org.sopt.makers.operation.dto.attendance;
 
-import static org.sopt.makers.operation.util.Generation32.*;
-
 import java.util.List;
 
 import org.sopt.makers.operation.entity.Attendance;
@@ -36,7 +34,7 @@ record LectureVO(
 	public static LectureVO of(Attendance attendance) {
 		return new LectureVO(
 			attendance.getLecture().getName(),
-			getUpdateScore(attendance.getLecture().getAttribute(), attendance.getStatus()),
+			attendance.getScore(),
 			attendance.getStatus().getName(),
 			attendance.getSubAttendances().stream().map(AttendanceVO::of).toList());
 	}

src/main/java/org/sopt/makers/operation/dto/attendance/MemberResponseDTO.java

@@ -1,9 +1,5 @@
 package org.sopt.makers.operation.dto.attendance;
 
-import static org.sopt.makers.operation.util.Generation32.*;
-
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
 import java.util.List;
 
 import org.sopt.makers.operation.entity.Attendance;
@@ -15,14 +11,15 @@ public record MemberResponseDTO (
 	Long attendanceId,
 	MemberVO member,
 	List<SubAttendanceVO> attendances,
-	float updatedScore) {
+	float updatedScore
+) {
 
 	public static MemberResponseDTO of(Attendance attendance) {
 		return new MemberResponseDTO(
 			attendance.getId(),
 			MemberVO.of(attendance.getMember()),
 			attendance.getSubAttendances().stream().map(SubAttendanceVO::of).toList(),
-			getUpdateScore(attendance.getLecture().getAttribute(), attendance.getStatus()));
+			attendance.getScore());
 	}
 }
 

src/main/java/org/sopt/makers/operation/dto/attendance/SubAttendanceUpdateRequestDTO.java

@@ -0,0 +1,9 @@
+package org.sopt.makers.operation.dto.attendance;
+
+import org.sopt.makers.operation.entity.AttendanceStatus;
+
+public record SubAttendanceUpdateRequestDTO(
+	Long subAttendanceId,
+	AttendanceStatus status
+) {
+}

src/main/java/org/sopt/makers/operation/dto/attendance/AttendUpdateResponseDTO.java → src/main/java/org/sopt/makers/operation/dto/attendance/SubAttendanceUpdateResponseDTO.java

@@ -3,11 +3,11 @@
 import org.sopt.makers.operation.entity.AttendanceStatus;
 import org.sopt.makers.operation.entity.SubAttendance;
 
-public record AttendUpdateResponseDTO(
+public record SubAttendanceUpdateResponseDTO(
 	Long subAttendanceId,
 	AttendanceStatus status
 ) {
-	public static AttendUpdateResponseDTO of(SubAttendance subAttendance) {
-		return new AttendUpdateResponseDTO(subAttendance.getId(), subAttendance.getStatus());
+	public static SubAttendanceUpdateResponseDTO of(SubAttendance subAttendance) {
+		return new SubAttendanceUpdateResponseDTO(subAttendance.getId(), subAttendance.getStatus());
 	}
 }

src/main/java/org/sopt/makers/operation/dto/lecture/LectureDetailResponseDTO.java

@@ -1,7 +1,5 @@
 package org.sopt.makers.operation.dto.lecture;
 
-import java.time.LocalDateTime;
-
 import org.sopt.makers.operation.entity.lecture.Lecture;
 
 import lombok.Builder;
@@ -14,7 +12,8 @@ public record LectureDetailResponseDTO(
 	String place,
 	String attribute,
 	String startDate,
-	String endDate
+	String endDate,
+	int generation
 ) {
 	public static LectureDetailResponseDTO of(Lecture lecture) {
 		return LectureDetailResponseDTO.builder()
@@ -25,6 +24,7 @@ public static LectureDetailResponseDTO of(Lecture lecture) {
 			.attribute(lecture.getAttribute().getName())
 			.startDate(lecture.getStartDate().toString())
 			.endDate(lecture.getEndDate().toString())
+			.generation(lecture.getGeneration())
 			.build();
 	}
 }

src/main/java/org/sopt/makers/operation/entity/Attendance.java

@@ -1,13 +1,16 @@
 package org.sopt.makers.operation.entity;
 
 import static javax.persistence.GenerationType.*;
+import static org.sopt.makers.operation.common.ExceptionMessage.*;
+import static org.sopt.makers.operation.entity.AttendanceStatus.*;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.EntityNotFoundException;
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
 import javax.persistence.FetchType;
@@ -19,8 +22,7 @@
 
 import org.sopt.makers.operation.entity.lecture.Lecture;
 
-import lombok.Getter;
-import lombok.NoArgsConstructor;
+import lombok.*;
 
 @Entity
 @NoArgsConstructor
@@ -51,8 +53,49 @@ public Attendance(Member member, Lecture lecture) {
 		this.status = AttendanceStatus.ABSENT;
 	}
 
-	public void updateStatus(AttendanceStatus status) {
-		this.status = status;
+	public void updateStatus() {
+		this.status = getStatus();
+	}
+
+	public AttendanceStatus getStatus() {
+		val first = getSubAttendanceByRound(1);
+		val second = getSubAttendanceByRound(2);
+		return switch (this.lecture.getAttribute()) {
+			case SEMINAR -> second.getStatus().equals(ATTENDANCE)
+				? first.getStatus().equals(ATTENDANCE) ? ATTENDANCE : TARDY
+				: ABSENT;
+			case EVENT -> second.getStatus().equals(ATTENDANCE) ? ATTENDANCE : ABSENT;
+			case ETC -> second.getStatus().equals(ATTENDANCE) ? PARTICIPATE : NOT_PARTICIPATE;
+		};
+	}
+
+	public float getScore() {
+		return switch (this.lecture.getAttribute()) {
+			case SEMINAR -> {
+				if (this.status.equals(ABSENT)) {
+					yield  -1f;
+				} else if (this.status.equals(TARDY)) {
+					yield -0.5f;
+				} else {
+					yield 0f;
+				}
+			}
+			case EVENT -> this.status.equals(ATTENDANCE) ? 0.5f : 0f;
+			default -> 0f;
+		};
+	}
+
+	public void updateMemberScore() {
+		this.member.updateScore(this.getScore());
+	}
+
+	public void revertMemberScore() {
+		this.member.updateScore((-1) * this.getScore());
+	}
+
+	private SubAttendance getSubAttendanceByRound(int round) {
+		return this.subAttendances.stream().filter(o -> o.getSubLecture().getRound() == round).findFirst()
+			.orElseThrow(() -> new EntityNotFoundException(INVALID_SUB_ATTENDANCE.getName()));
 	}
 
 	private void setMember(Member member) {

src/main/java/org/sopt/makers/operation/entity/Member.java

@@ -1,7 +1,6 @@
 package org.sopt.makers.operation.entity;
 
 import static org.sopt.makers.operation.entity.lecture.LectureStatus.*;
-import static org.sopt.makers.operation.util.Generation32.*;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -68,12 +67,8 @@ public void updateScore(float score) {
 
 	public void updateTotalScore() {
 		this.score = (float) (2 + this.attendances.stream()
-			.mapToDouble(attendance -> {
-				Lecture lecture = attendance.getLecture();
-				return lecture.getLectureStatus().equals(END)
-					? getUpdateScore(lecture.getAttribute(), attendance.getStatus())
-					: 0;
-			})
+			.filter(attendance -> attendance.getLecture().getLectureStatus().equals(END))
+			.mapToDouble(Attendance::getScore)
 			.sum());
 	}
 }

src/main/java/org/sopt/makers/operation/entity/SubAttendance.java

@@ -61,5 +61,6 @@ private void setSubLecture(SubLecture subLecture) {
 
 	public void updateStatus(AttendanceStatus status) {
 		this.status = status;
+		this.attendance.updateStatus();
 	}
 }

src/main/java/org/sopt/makers/operation/entity/lecture/Lecture.java

@@ -1,7 +1,6 @@
 package org.sopt.makers.operation.entity.lecture;
 
 import static javax.persistence.GenerationType.*;
-import static org.sopt.makers.operation.util.Generation32.*;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -16,7 +15,6 @@
 import javax.persistence.OneToMany;
 
 import org.sopt.makers.operation.entity.Attendance;
-import org.sopt.makers.operation.entity.AttendanceStatus;
 import org.sopt.makers.operation.entity.BaseEntity;
 import org.sopt.makers.operation.entity.Part;
 import org.sopt.makers.operation.entity.SubLecture;
@@ -78,12 +76,6 @@ public void updateStatus(LectureStatus status) {
 
 	public void finish() {
 		this.lectureStatus = LectureStatus.END;
-		attendances.forEach(this::updateScore);
-	}
-
-	private void updateScore(Attendance attendance) {
-		Attribute attribute = this.attribute;
-		AttendanceStatus status = attendance.getStatus();
-		attendance.getMember().updateScore(getUpdateScore(attribute, status));
+		attendances.forEach(Attendance::updateMemberScore);
 	}
 }

src/main/java/org/sopt/makers/operation/repository/attendance/AttendanceCustomRepository.java

@@ -1,20 +1,18 @@
 package org.sopt.makers.operation.repository.attendance;
 
 import java.util.List;
-import java.util.Optional;
 
 import org.sopt.makers.operation.entity.Attendance;
+import org.sopt.makers.operation.entity.Member;
 import org.sopt.makers.operation.entity.Part;
 import org.sopt.makers.operation.entity.SubAttendance;
 import org.sopt.makers.operation.entity.lecture.Lecture;
 import org.springframework.data.domain.Pageable;
 
 public interface AttendanceCustomRepository {
 	List<Attendance> findAttendanceByMemberId(Long memberId);
-	List<Attendance> findAttendancesByLecture(Long lectureId, Part part, Pageable pageable);
-	List<Attendance> findAttendancesByMember(Long memberId);
-	Optional<Attendance> findAttendanceBySubAttendance(SubAttendance subAttendance);
-	List<Attendance> findByLecture(Lecture lecture);
+	List<Attendance> findByLecture(Long lectureId, Part part, Pageable pageable);
+	List<Attendance> findByMember(Member member);
 	List<Attendance> findCurrentAttendanceByMember(Long playGroundId);
 	List<SubAttendance> findSubAttendanceByAttendanceId(Long attendanceId);
 }

src/main/java/org/sopt/makers/operation/repository/attendance/AttendanceRepositoryImpl.java

@@ -10,16 +10,14 @@
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.util.List;
-import java.util.Optional;
 
 import lombok.val;
 
 import org.sopt.makers.operation.config.GenerationConfig;
 import org.sopt.makers.operation.entity.Attendance;
+import org.sopt.makers.operation.entity.Member;
 import org.sopt.makers.operation.entity.Part;
-import org.sopt.makers.operation.entity.QSubAttendance;
 import org.sopt.makers.operation.entity.SubAttendance;
-import org.sopt.makers.operation.entity.lecture.Lecture;
 import org.sopt.makers.operation.entity.lecture.LectureStatus;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Repository;
@@ -52,14 +50,13 @@ public List<Attendance> findAttendanceByMemberId(Long memberId) {
 	}
 
 	@Override
-	public List<Attendance> findAttendancesByLecture(Long lectureId, Part part, Pageable pageable) {
+	public List<Attendance> findByLecture(Long lectureId, Part part, Pageable pageable) {
 		return queryFactory
-			.select(attendance)
-			.from(attendance)
-			.join(attendance.subAttendances, subAttendance).fetchJoin()
-			.join(subAttendance.subLecture, subLecture).fetchJoin()
-			.join(attendance.lecture, lecture).fetchJoin()
-			.join(attendance.member, member).fetchJoin().distinct()
+			.selectFrom(attendance)
+			.leftJoin(attendance.subAttendances, subAttendance).fetchJoin().distinct()
+			.leftJoin(subAttendance.subLecture, subLecture).fetchJoin()
+			.leftJoin(attendance.lecture, lecture).fetchJoin()
+			.leftJoin(attendance.member, member).fetchJoin().distinct()
 			.where(
 				attendance.lecture.id.eq(lectureId),
 				partEq(part)
@@ -71,39 +68,17 @@ public List<Attendance> findAttendancesByLecture(Long lectureId, Part part, Page
 	}
 
 	@Override
-	public List<Attendance> findAttendancesByMember(Long memberId) {
+	public List<Attendance> findByMember(Member member) {
 		return queryFactory
-			.select(attendance)
-			.from(attendance)
+			.selectFrom(attendance)
 			.leftJoin(attendance.subAttendances, subAttendance).fetchJoin().distinct()
 			.leftJoin(attendance.lecture, lecture).fetchJoin()
 			.leftJoin(subAttendance.subLecture, subLecture).fetchJoin()
-			.where(attendance.member.id.eq(memberId))
+			.where(attendance.member.eq(member))
 			.orderBy(lecture.startDate.desc())
 			.fetch();
 	}
 
-	@Override
-	public Optional<Attendance> findAttendanceBySubAttendance(SubAttendance subAttendance) {
-		return queryFactory
-			.select(attendance)
-			.from(attendance)
-			.join(attendance.subAttendances, QSubAttendance.subAttendance).fetchJoin()
-			.join(QSubAttendance.subAttendance.subLecture, subLecture).fetchJoin()
-			.where(attendance.subAttendances.contains(subAttendance))
-			.stream().findFirst();
-	}
-
-	@Override
-	public List<Attendance> findByLecture(Lecture lecture) {
-		return queryFactory
-			.select(attendance)
-			.from(attendance)
-			.leftJoin(attendance.member, member).fetchJoin().distinct()
-			.where(attendance.lecture.eq(lecture))
-			.fetch();
-	}
-
 	@Override
 	public List<Attendance> findCurrentAttendanceByMember(Long playGroundId) {
 		val now = LocalDateTime.now();

src/main/java/org/sopt/makers/operation/repository/lecture/LectureCustomRepository.java

@@ -3,8 +3,10 @@
 import org.sopt.makers.operation.entity.Part;
 import org.sopt.makers.operation.entity.lecture.Lecture;
 import java.util.List;
+import java.util.Optional;
 
 public interface LectureCustomRepository {
     List<Lecture> findLectures(int generation, Part part);
     List<Lecture> findLecturesToBeEnd();
+    Optional<Lecture> find(Long lectureId);
 }