[BE/FEAT] be merge to main

BE/eeos/build.gradle

@@ -24,6 +24,9 @@ plugins {
     id 'org.asciidoctor.jvm.convert' version "${asciidoctorVersion}"
     id 'com.epages.restdocs-api-spec' version "${epagesRestDocsApiSpecVersion}"
     id 'org.hidetake.swagger.generator' version '2.18.2'
+
+    // flyway
+    id 'org.flywaydb.flyway' version '8.5.13'
 }
 
 group = 'com.econovation'
@@ -68,6 +71,8 @@ dependencies {
     // database
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
     implementation 'mysql:mysql-connector-java'
+    implementation 'org.flywaydb:flyway-core'
+    implementation 'org.flywaydb:flyway-mysql'
 
     // openfeign
     implementation 'org.springframework.cloud:spring-cloud-starter-openfeign'

BE/eeos/docker-compose.yml

@@ -29,7 +29,10 @@ services:
       SPRING_DATASOURCE_URL: jdbc:mysql://eeos-mysql:3306/eeos?useSSL=false&serverTimezone=Asia/Seoul&useLegacyDatetimeCode=false&allowPublicKeyRetrieval=true
       SPRING_DATASOURCE_USERNAME: root
       SPRING_DATASOURCE_PASSWORD: root
-      SPRING_PROFILES_ACTIVE: ${SPRING_PROFILES}
+      SPRING_FLYWAY_URL: jdbc:mysql://eeos-mysql:3306/eeos?useSSL=false&serverTimezone=Asia/Seoul&useLegacyDatetimeCode=false&allowPublicKeyRetrieval=true
+      SPRING_FLWYAY_USERNAME: root
+      SPRING_FLYWAY_PASSWORD: root
+      SPRING_PROFILES_ACTIVE: dev
     networks: #사용할 네트워크 지정
       - eeos-network
 networks:

BE/eeos/src/main/java/com/blackcompany/eeos/attend/application/dto/AttendInfoActiveStatusResponse.java

@@ -0,0 +1,18 @@
+package com.blackcompany.eeos.attend.application.dto;
+
+import com.blackcompany.eeos.common.support.dto.AbstractResponseDto;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder(toBuilder = true)
+public class AttendInfoActiveStatusResponse implements AbstractResponseDto {
+	private Long memberId;
+	private String name;
+	private String activeStatus;
+	private String attendStatus;
+}

BE/eeos/src/main/java/com/blackcompany/eeos/attend/application/dto/QueryAttendActiveStatusResponse.java

@@ -0,0 +1,16 @@
+package com.blackcompany.eeos.attend.application.dto;
+
+import com.blackcompany.eeos.common.support.dto.AbstractResponseDto;
+import java.util.List;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder(toBuilder = true)
+public class QueryAttendActiveStatusResponse implements AbstractResponseDto {
+	private List<AttendInfoActiveStatusResponse> members;
+}

BE/eeos/src/main/java/com/blackcompany/eeos/attend/application/dto/converter/AttendInfoActiveStatusConverter.java

@@ -0,0 +1,18 @@
+package com.blackcompany.eeos.attend.application.dto.converter;
+
+import com.blackcompany.eeos.attend.application.dto.AttendInfoActiveStatusResponse;
+import com.blackcompany.eeos.member.application.model.MemberModel;
+import org.springframework.stereotype.Component;
+
+@Component
+public class AttendInfoActiveStatusConverter {
+	public AttendInfoActiveStatusResponse from(
+			MemberModel source, String attendStatus, String activeStatus) {
+		return AttendInfoActiveStatusResponse.builder()
+				.memberId(source.getId())
+				.name(source.getName())
+				.activeStatus(activeStatus)
+				.attendStatus(attendStatus)
+				.build();
+	}
+}

BE/eeos/src/main/java/com/blackcompany/eeos/attend/application/dto/converter/QueryAttendActiveStatusConverter.java

@@ -0,0 +1,13 @@
+package com.blackcompany.eeos.attend.application.dto.converter;
+
+import com.blackcompany.eeos.attend.application.dto.AttendInfoActiveStatusResponse;
+import com.blackcompany.eeos.attend.application.dto.QueryAttendActiveStatusResponse;
+import java.util.List;
+import org.springframework.stereotype.Component;
+
+@Component
+public class QueryAttendActiveStatusConverter {
+	public QueryAttendActiveStatusResponse of(List<AttendInfoActiveStatusResponse> response) {
+		return QueryAttendActiveStatusResponse.builder().members(response).build();
+	}
+}

BE/eeos/src/main/java/com/blackcompany/eeos/attend/application/model/AttendModel.java

@@ -2,7 +2,10 @@
 
 import com.blackcompany.eeos.attend.application.exception.DeniedSaveAttendException;
 import com.blackcompany.eeos.attend.application.exception.NotSameBeforeAttendStatusException;
+import com.blackcompany.eeos.common.application.model.MemberIdModel;
 import com.blackcompany.eeos.common.support.AbstractModel;
+import java.util.List;
+import java.util.stream.Collectors;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
@@ -14,15 +17,24 @@
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder(toBuilder = true)
-public class AttendModel implements AbstractModel {
+public class AttendModel implements AbstractModel, MemberIdModel {
 	private Long id;
 	private Long memberId;
 	private Long programId;
 	private AttendStatus status;
 
-	public void changeStatus(String beforeStatus, String afterStatus) {
+	public AttendModel changeStatus(String beforeStatus, String afterStatus) {
 		validateChange(beforeStatus);
 		this.status = AttendStatus.find(afterStatus);
+
+		return this;
+	}
+
+	public AttendModel changeStatusByManager(String beforeStatus, String afterStatus) {
+		validateChangeByManager(beforeStatus);
+		this.status = AttendStatus.find(afterStatus);
+
+		return this;
 	}
 
 	public String getStatus() {
@@ -33,18 +45,34 @@ public static AttendModel of() {
 		return AttendModel.builder().status(AttendStatus.NONRELATED).build();
 	}
 
+	public static List<AttendModel> of(List<Long> memberIds, Long programId) {
+		return memberIds.stream().map(memberId -> of(memberId, programId)).collect(Collectors.toList());
+	}
+
+	public static AttendModel of(Long memberId, Long programId) {
+		return AttendModel.builder()
+				.memberId(memberId)
+				.programId(programId)
+				.status(AttendStatus.NONRELATED)
+				.build();
+	}
+
 	private void validateChange(String beforeStatus) {
-		validateCanChange(beforeStatus);
-		validateSame(beforeStatus);
+		canChange(beforeStatus);
+		isSameBeforeStatus(beforeStatus);
+	}
+
+	private void validateChangeByManager(String beforeStatus) {
+		isSameBeforeStatus(beforeStatus);
 	}
 
-	private void validateCanChange(String beforeStatus) {
+	private void canChange(String beforeStatus) {
 		if (AttendStatus.isSame(beforeStatus, AttendStatus.NONRELATED)) {
 			throw new DeniedSaveAttendException();
 		}
 	}
 
-	private void validateSame(String status) {
+	private void isSameBeforeStatus(String status) {
 		if (AttendStatus.isSame(status, this.status)) {
 			return;
 		}

BE/eeos/src/main/java/com/blackcompany/eeos/attend/application/service/AttendService.java

@@ -1,11 +1,15 @@
 package com.blackcompany.eeos.attend.application.service;
 
+import com.blackcompany.eeos.attend.application.dto.AttendInfoActiveStatusResponse;
 import com.blackcompany.eeos.attend.application.dto.AttendInfoResponse;
 import com.blackcompany.eeos.attend.application.dto.ChangeAttendStatusRequest;
 import com.blackcompany.eeos.attend.application.dto.ChangeAttendStatusResponse;
+import com.blackcompany.eeos.attend.application.dto.QueryAttendActiveStatusResponse;
 import com.blackcompany.eeos.attend.application.dto.QueryAttendStatusResponse;
+import com.blackcompany.eeos.attend.application.dto.converter.AttendInfoActiveStatusConverter;
 import com.blackcompany.eeos.attend.application.dto.converter.AttendInfoConverter;
 import com.blackcompany.eeos.attend.application.dto.converter.ChangeAttendStatusConverter;
+import com.blackcompany.eeos.attend.application.dto.converter.QueryAttendActiveStatusConverter;
 import com.blackcompany.eeos.attend.application.dto.converter.QueryAttendStatusResponseConverter;
 import com.blackcompany.eeos.attend.application.exception.NotFoundAttendException;
 import com.blackcompany.eeos.attend.application.model.AttendModel;
@@ -48,6 +52,8 @@ public class AttendService
 	private final MemberEntityConverter memberEntityConverter;
 	private final AttendInfoConverter attendInfoConverter;
 	private final QueryAttendStatusResponseConverter attendStatusResponseConverter;
+	private final AttendInfoActiveStatusConverter attendInfoActiveStatusConverter;
+	private final QueryAttendActiveStatusConverter queryAttendActiveStatusConverter;
 
 	@Override
 	public List<AttendInfoResponse> findAttendInfo(final Long programId) {
@@ -79,36 +85,37 @@ public ChangeAttendStatusResponse changeStatus(
 			final Long memberId, final ChangeAttendStatusRequest request, final Long programId) {
 		AttendModel model = getAttend(memberId, programId);
 
-		model.changeStatus(request.getBeforeAttendStatus(), request.getAfterAttendStatus());
-		AttendEntity updated = attendRepository.save(attendEntityConverter.toEntity(model));
+		AttendModel changedModel =
+				model.changeStatus(request.getBeforeAttendStatus(), request.getAfterAttendStatus());
+		AttendEntity updated = attendRepository.save(attendEntityConverter.toEntity(changedModel));
 
 		String name = queryMemberService.getName(memberId);
 		return changeAttendStatusConverter.from(name, updated.getStatus().getStatus());
 	}
 
 	@Override
 	public ChangeAttendStatusResponse getStatus(Long memberId, Long programId) {
-		boolean isAttend = getAttendDefault(memberId, programId);
+		boolean isAttend = isExistAttend(memberId, programId);
 		String name = queryMemberService.getName(memberId);
 
 		if (isAttend) {
-			AttendModel model = getAttend(memberId, programId);
-			return changeAttendStatusConverter.from(name, model.getStatus());
+			AttendModel existModel = getAttend(memberId, programId);
+			return changeAttendStatusConverter.from(name, existModel.getStatus());
 		}
 
 		return changeAttendStatusConverter.from(name, AttendStatus.NONRELATED.getStatus());
 	}
 
 	@Override
-	public QueryAttendStatusResponse execute(Long programId, String activeStatus) {
-		List<MemberModel> members = findMembers(activeStatus);
+	public QueryAttendActiveStatusResponse getAttendInfo(Long programId, String activeStatus) {
+		List<MemberModel> members = findMembersByActiveStatus(activeStatus);
 
-		List<AttendInfoResponse> response =
+		List<AttendInfoActiveStatusResponse> response =
 				members.stream()
-						.map(member -> combine(member, findAttend(programId)))
+						.map(member -> combine(member, findAttend(programId), member.getActiveStatus()))
 						.collect(Collectors.toList());
 
-		return attendStatusResponseConverter.of(response);
+		return queryAttendActiveStatusConverter.of(response);
 	}
 
 	private AttendModel getAttend(final Long memberId, final Long programId) {
@@ -118,7 +125,7 @@ private AttendModel getAttend(final Long memberId, final Long programId) {
 				.orElseThrow(() -> new NotFoundAttendException(programId));
 	}
 
-	private boolean getAttendDefault(final Long memberId, final Long programId) {
+	private boolean isExistAttend(final Long memberId, final Long programId) {
 		return attendRepository.findByProgramIdAndMemberId(programId, memberId).isPresent();
 	}
 
@@ -138,15 +145,16 @@ private AttendInfoResponse combine(
 		return attendInfoConverter.from(member, model.getStatus());
 	}
 
-	private AttendInfoResponse combine(MemberModel member, List<AttendModel> attends) {
+	private AttendInfoActiveStatusResponse combine(
+			MemberModel member, List<AttendModel> attends, String activeStatus) {
 
 		AttendModel model =
 				attends.stream()
 						.filter(attend -> member.validateSame(attend.getMemberId()))
 						.findAny()
 						.orElse(AttendModel.of());
 
-		return attendInfoConverter.from(member, model.getStatus());
+		return attendInfoActiveStatusConverter.from(member, model.getStatus(), activeStatus);
 	}
 
 	private List<MemberModel> findMembers(List<AttendModel> attends) {
@@ -171,7 +179,7 @@ private List<AttendModel> findAttend(final Long programId) {
 				.collect(Collectors.toList());
 	}
 
-	private List<MemberModel> findMembers(final String activeStatus) {
+	private List<MemberModel> findMembersByActiveStatus(final String activeStatus) {
 		if (ActiveStatus.isSame(activeStatus, ActiveStatus.ALL)) {
 			return memberRepository.findMembers().stream()
 					.map(memberEntityConverter::from)

BE/eeos/src/main/java/com/blackcompany/eeos/attend/application/service/CandidateService.java → BE/eeos/src/main/java/com/blackcompany/eeos/attend/application/service/AttendTargetService.java

@@ -5,8 +5,8 @@
 import java.util.List;
 
 /** 관련 있는 대상자를 선택한다. */
-public interface CandidateService {
-	void saveCandidate(final Long programId, final List<ProgramMembers> members);
+public interface AttendTargetService {
+	void save(final Long programId, final List<ProgramMembers> members);
 
-	void updateCandidate(final Long programId, final List<ChangeAllAttendStatusRequest> requests);
+	void update(final Long programId, final List<ChangeAllAttendStatusRequest> requests);
 }

BE/eeos/src/main/java/com/blackcompany/eeos/attend/application/service/CommandAttendService.java

@@ -2,17 +2,20 @@
 
 import com.blackcompany.eeos.attend.persistence.AttendRepository;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 @Service
 @RequiredArgsConstructor
 @Transactional(readOnly = true)
+@Slf4j
 public class CommandAttendService {
 	private final AttendRepository attendRepository;
 
 	@Transactional
 	public void deleteByProgram(Long programId) {
+		log.info("프로그램 삭제로 인한 해당 프로그램의 참석 정보 삭제");
 		attendRepository.deleteAllByProgramId(programId);
 	}
 }