Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FIX] flyway를 재설정한다. #5

Merged
merged 6 commits into from
Mar 13, 2024
Merged

[FIX] flyway를 재설정한다. #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
44b41b4
refactor : 대상 멤버를 저장하는 클래스명 명시적으로 변경
kssumin Mar 12, 2024
a205b73
refactor : service 호출이 아니라 repository에 직접적으로 의존하도록 변경
kssumin Mar 12, 2024
ad6a7e4
refactor : 대상자 member임을 명시하도록 클래스명 변경
kssumin Mar 12, 2024
e9f2a16
refactor : 팀빌딩 대상자 멤버 대상자를 저장한다는걸 나타내기 위해 클래스명 변경
kssumin Mar 12, 2024
637f52f
chore : 팀빌딩 대상자 관련 service teambuilding 패키지로 변경
kssumin Mar 12, 2024
c83d2f9
fix : 모든 테이블을 flyway로 형상관리 하도록 변경
kssumin Mar 13, 2024
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
6 changes: 3 additions & 3 deletions ...ain/java/com/blackcompany/eeos/program/application/event/DeletedProgramEventListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.blackcompany.eeos.program.application.event;

import com.blackcompany.eeos.target.application.service.CommandAttendService;
import com.blackcompany.eeos.target.persistence.AttendRepository;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.scheduling.annotation.Async;
Expand All @@ -15,7 +15,7 @@
@RequiredArgsConstructor
@Slf4j
public class DeletedProgramEventListener {
private final CommandAttendService attendService;
private final AttendRepository attendRepository;

@Async
@TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT)
Expand All @@ -24,6 +24,6 @@ public void handleDeletedProgram(DeletedProgramEvent event) {
log.info(
"프로그램 삭제 Transaction committed: {}",
TransactionSynchronizationManager.isActualTransactionActive());
attendService.deleteByProgram(event.getProgramId());
attendRepository.deleteAllByProgramId(event.getProgramId());
}
}
4 changes: 2 additions & 2 deletions eeos/src/main/java/com/blackcompany/eeos/program/application/service/ProgramService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
import com.blackcompany.eeos.program.persistence.ProgramCategory;
import com.blackcompany.eeos.program.persistence.ProgramEntity;
import com.blackcompany.eeos.program.persistence.ProgramRepository;
import com.blackcompany.eeos.target.application.service.SelectAttendTargetService;
import com.blackcompany.eeos.target.application.service.SelectAttendCommandTargetMemberMemberService;
import java.sql.Timestamp;
import java.time.LocalDate;
import java.util.List;
Expand All @@ -55,7 +55,7 @@ public class ProgramService
private final ProgramEntityConverter entityConverter;
private final ProgramResponseConverter responseConverter;
private final ProgramRepository programRepository;
private final SelectAttendTargetService attendTargetService;
private final SelectAttendCommandTargetMemberMemberService attendTargetService;
private final ProgramPageResponseConverter pageResponseConverter;
private final ProgramStatusServiceComposite programStatusComposite;
private final ApplicationEventPublisher applicationEventPublisher;
Expand Down
21 changes: 0 additions & 21 deletions .../src/main/java/com/blackcompany/eeos/target/application/service/CommandAttendService.java
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ...et/application/service/TargetService.java → ...n/service/CommandTargetMemberService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import com.blackcompany.eeos.target.application.dto.TargetMember;
import java.util.List;

public interface TargetService {
public interface CommandTargetMemberService {

/** 관련 대상자를 선택한다. */
<T extends TargetMember> void save(final Long eventId, final List<T> members);
Expand Down
6 changes: 3 additions & 3 deletions ...on/service/SelectAttendTargetService.java → ...tendCommandTargetMemberMemberService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@

@Service
@Transactional(readOnly = true)
public class SelectAttendTargetService extends SelectTargetService
implements TargetService, AttendTargetService {
public class SelectAttendCommandTargetMemberMemberService extends SelectTargetMemberService
implements CommandTargetMemberService, AttendTargetService {
private final AttendRepository attendRepository;
private final AttendEntityConverter entityConverter;

public SelectAttendTargetService(
public SelectAttendCommandTargetMemberMemberService(
MemberRepository memberRepository,
MemberEntityConverter memberEntityConverter,
AttendRepository attendRepository,
Expand Down
2 changes: 1 addition & 1 deletion ...lication/service/SelectTargetService.java → ...on/service/SelectTargetMemberService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

@RequiredArgsConstructor
@Transactional(readOnly = true)
public abstract class SelectTargetService {
public abstract class SelectTargetMemberService {
private final MemberRepository memberRepository;
private final MemberEntityConverter memberEntityConverter;

Expand Down
9 changes: 6 additions & 3 deletions ...vice/SelectTeamBuildingTargetService.java → ...mmandTeamBuildingTargetMemberService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
package com.blackcompany.eeos.target.application.service;
package com.blackcompany.eeos.teamBuilding.application.service;

import com.blackcompany.eeos.member.application.model.converter.MemberEntityConverter;
import com.blackcompany.eeos.member.persistence.MemberRepository;
import com.blackcompany.eeos.target.application.dto.TargetMember;
import com.blackcompany.eeos.target.application.model.converter.TeamBuildingTargetEntityConverter;
import com.blackcompany.eeos.target.application.service.CommandTargetMemberService;
import com.blackcompany.eeos.target.application.service.SelectTargetMemberService;
import com.blackcompany.eeos.target.persistence.TeamBuildingTargetEntity;
import com.blackcompany.eeos.target.persistence.TeamBuildingTargetRepository;
import java.util.List;
Expand All @@ -13,11 +15,12 @@

@Service
@Transactional(readOnly = true)
public class SelectTeamBuildingTargetService extends SelectTargetService implements TargetService {
public class CommandTeamBuildingTargetMemberService extends SelectTargetMemberService
implements CommandTargetMemberService {
private final TeamBuildingTargetEntityConverter entityConverter;
private final TeamBuildingTargetRepository targetRepository;

public SelectTeamBuildingTargetService(
public CommandTeamBuildingTargetMemberService(
MemberRepository memberRepository,
MemberEntityConverter memberEntityConverter,
TeamBuildingTargetEntityConverter entityConverter,
Expand Down
3 changes: 1 addition & 2 deletions ...main/java/com/blackcompany/eeos/teamBuilding/application/service/TeamBuildingService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import com.blackcompany.eeos.member.persistence.MemberRepository;
import com.blackcompany.eeos.target.application.model.TeamBuildingTargetModel;
import com.blackcompany.eeos.target.application.service.QueryTeamBuildingTargetService;
import com.blackcompany.eeos.target.application.service.SelectTeamBuildingTargetService;
import com.blackcompany.eeos.teamBuilding.application.dto.CreateTeamBuildingRequest;
import com.blackcompany.eeos.teamBuilding.application.dto.EachMemberResponse;
import com.blackcompany.eeos.teamBuilding.application.dto.ResultTeamBuildingResponse;
Expand Down Expand Up @@ -55,7 +54,7 @@ public class TeamBuildingService
private final TeamBuildingRequestConverter requestConverter;
private final TeamBuildingEntityConverter entityConverter;
private final TeamBuildingRepository teamBuildingRepository;
private final SelectTeamBuildingTargetService teamBuildingTargetService;
private final CommandTeamBuildingTargetMemberService teamBuildingTargetService;
private final QueryTeamBuildingService queryTeamBuildingService;
private final QueryTeamBuildingTargetService queryTeamBuildingTargetService;
private final ClusteringTeamApiClient clusteringTeamApiClient;
Expand Down
Empty file removed eeos/src/main/resources/db/migration/V00__init__table.sql
View file
Open in desktop
Empty file.
13 changes: 0 additions & 13 deletions eeos/src/main/resources/db/migration/V01__alter_table.sql
View file
Open in desktop

This file was deleted.

22 changes: 0 additions & 22 deletions eeos/src/main/resources/db/migration/V02__add_table.sql
View file
Open in desktop

This file was deleted.

46 changes: 0 additions & 46 deletions eeos/src/main/resources/db/migration/V03__add_teambuilding_table.sql
View file
Open in desktop

This file was deleted.

104 changes: 104 additions & 0 deletions eeos/src/main/resources/db/migration/V1.00.0.0__init_tables.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
CREATE TABLE `member` (
`member_id` bigint NOT NULL AUTO_INCREMENT,
`created_date` datetime NOT NULL,
`is_deleted` tinyint(1) NOT NULL,
`updated_date` datetime NOT NULL,
`member_name` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL,
`member_oath_server_type` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL,
`member_active_status` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL,
PRIMARY KEY (`member_id`),
KEY `idx_member_active_status` (`member_active_status`),
KEY `idx_member_name` (`member_name`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;


CREATE TABLE `oauth_member` (
`oauth_member_id` bigint NOT NULL AUTO_INCREMENT,
`created_date` datetime(6) NOT NULL,
`is_deleted` tinyint(1) NOT NULL,
`updated_date` datetime(6) NOT NULL,
`oauth_member_member_id` bigint NOT NULL,
`oauth_member_oauth_id` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL,
PRIMARY KEY (`oauth_member_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;

CREATE TABLE `program` (
`program_id` bigint NOT NULL AUTO_INCREMENT,
`created_date` datetime NOT NULL,
`is_deleted` tinyint(1) NOT NULL,
`updated_date` datetime NOT NULL,
`program_content` text COLLATE utf8mb4_unicode_ci NOT NULL,
`program_date` timestamp NOT NULL,
`program_title` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL,
`program_category` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL,
`program_type` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL,
`program_writer` bigint NOT NULL,
PRIMARY KEY (`program_id`),
KEY `idx_program_date` (`program_date`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci4;

CREATE TABLE `attend` (
`attend_id` bigint NOT NULL AUTO_INCREMENT,
`created_date` datetime NOT NULL,
`is_deleted` tinyint(1) NOT NULL,
`updated_date` datetime NOT NULL,
`attend_program_id` bigint NOT NULL,
`attend_member_id` bigint NOT NULL,
`attend_status` varchar(40) COLLATE utf8mb4_unicode_ci NOT NULL,
PRIMARY KEY (`attend_id`),
KEY `idx_program` (`attend_program_id`),
KEY `idx_attend_status` (`attend_status`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;

CREATE TABLE `team_building` (
`team_building_id` bigint NOT NULL AUTO_INCREMENT,
`created_date` datetime(6) NOT NULL,
`is_deleted` bit(1) NOT NULL,
`updated_date` datetime(6) NOT NULL,
`team_building_content` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL,
`team_building_max_team_size` int NOT NULL,
`team_building_member_id` bigint NOT NULL,
`team_building_status` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL,
`team_building_title` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL,
PRIMARY KEY (`team_building_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;

CREATE TABLE `team_building_target` (
`team_building_target_id` bigint NOT NULL AUTO_INCREMENT,
`created_date` datetime(6) NOT NULL,
`is_deleted` bit(1) NOT NULL,
`updated_date` datetime(6) NOT NULL,
`team_building_input_content` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
`team_building_input_status` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL,
`team_building_target_member_id` bigint NOT NULL,
`team_building_target_team_building_id` bigint NOT NULL,
PRIMARY KEY (`team_building_target_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;

CREATE TABLE `team_building_result` (
`team_building_result_id` bigint NOT NULL AUTO_INCREMENT,
`created_date` datetime(6) NOT NULL,
`is_deleted` bit(1) NOT NULL,
`updated_date` datetime(6) NOT NULL,
`team_building_result_member_ids` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL,
`team_building_result_status` bigint NOT NULL,
PRIMARY KEY (`team_building_result_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;

CREATE TABLE `restrict_team_building` (
`restrict_team_building_id` bigint NOT NULL AUTO_INCREMENT,
`created_date` datetime(6) NOT NULL,
`is_deleted` bit(1) NOT NULL,
`updated_date` datetime(6) NOT NULL,
`restrict_team_building_total_active_count` bigint NOT NULL,
`version` bigint DEFAULT NULL,
PRIMARY KEY (`restrict_team_building_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;








0 ...on/V04__add_teambuilding_inital_table.sql → ...s/db/migration/V1.00.0.1__init_values.sql
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...ervice/SelectAttendTargetServiceTest.java → ...AttendCommandTargetMemberServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@
import org.mockito.junit.jupiter.MockitoExtension;

@ExtendWith(MockitoExtension.class)
class SelectAttendTargetServiceTest {
class SelectAttendCommandTargetMemberServiceTest {
@Mock private AttendRepository attendRepository;
@Spy private AttendEntityConverter entityConverter;
@Mock private MemberRepository memberRepository;
@Spy private MemberEntityConverter memberEntityConverter;
@InjectMocks private SelectAttendTargetService selectAttendTargetService;
@InjectMocks private SelectAttendCommandTargetMemberMemberService selectAttendTargetService;

@Test
@DisplayName("대상자를 전달받아 참석 대상자로 저장한다.")
Expand Down
4 changes: 2 additions & 2 deletions ...tion/service/SelectTargetServiceTest.java → ...SelectCommandTargetMemberServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
import org.mockito.junit.jupiter.MockitoExtension;

@ExtendWith(MockitoExtension.class)
class SelectTargetServiceTest {
class SelectCommandTargetMemberServiceTest {
@Mock private MemberRepository memberRepository;
@Spy private MemberEntityConverter memberEntityConverter;
@InjectMocks private SelectAttendTargetService selectTargetService;
@InjectMocks private SelectAttendCommandTargetMemberMemberService selectTargetService;

@Test
@DisplayName("주어진 대상 멤버들로 멤버를 조회한다.")
Expand Down
6 changes: 4 additions & 2 deletions .../SelectTeamBuildingTargetServiceTest.java → ...ildingCommandTargetMemberServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import com.blackcompany.eeos.target.fixture.TargetMemberFixture;
import com.blackcompany.eeos.target.persistence.TeamBuildingTargetRepository;
import com.blackcompany.eeos.teamBuilding.application.dto.TeamBuildingMember;
import com.blackcompany.eeos.teamBuilding.application.service.CommandTeamBuildingTargetMemberService;
import java.util.List;
import java.util.stream.Collectors;
import org.junit.jupiter.api.DisplayName;
Expand All @@ -24,12 +25,13 @@
import org.mockito.junit.jupiter.MockitoExtension;

@ExtendWith(MockitoExtension.class)
class SelectTeamBuildingTargetServiceTest {
class SelectTeamBuildingCommandTargetMemberServiceTest {
@Mock private TeamBuildingTargetRepository teamBuildingTargetRepository;
@Spy private TeamBuildingTargetEntityConverter entityConverter;
@Mock private MemberRepository memberRepository;
@Spy private MemberEntityConverter memberEntityConverter;
@InjectMocks private SelectTeamBuildingTargetService selectTeamBuildingTargetService;

@InjectMocks private CommandTeamBuildingTargetMemberService selectTeamBuildingTargetService;

@Test
@DisplayName("대상자를 전달받아 팀빌딩 대상자로 저장한다.")
Expand Down
Loading