diff --git a/.github/workflows/CI_MVP.yml b/.github/workflows/CI_MVP.yml index 5f39ebeb..81462648 100644 --- a/.github/workflows/CI_MVP.yml +++ b/.github/workflows/CI_MVP.yml @@ -2,23 +2,9 @@ name: CI FOR MVP on: push: - branches: - - mvp/apply - - mvp/member - - mvp/career - - mvp/portfolio - - feature/record - - feature/home - - feature/recruit-tag - - feature/login - - feature/login-memberTest - - refactor/career - - feature/login-recruit - - fix/record - - feature/errorFix - - fix/credential - - feature/dashboard - - feature/career-refactor + branches-ignore: + - main + - develop jobs: CI: diff --git a/src/main/java/umc/kkijuk/server/recruit/controller/RecruitController.java b/src/main/java/umc/kkijuk/server/recruit/controller/RecruitController.java index fbed9cb2..39921d24 100644 --- a/src/main/java/umc/kkijuk/server/recruit/controller/RecruitController.java +++ b/src/main/java/umc/kkijuk/server/recruit/controller/RecruitController.java @@ -35,10 +35,6 @@ public class RecruitController { private final ReviewService reviewService; private final MemberService memberService; -// private final Member requestMember = Member.builder() -// .id(LoginUser.get().getId()) -// .build(); - @Operation( summary = "지원 공고 생성", description = "주어진 정보를 바탕으로 지원 공고 데이터를 생성합니다.") diff --git a/src/main/java/umc/kkijuk/server/recruit/controller/RecruitTagController.java b/src/main/java/umc/kkijuk/server/recruit/controller/RecruitTagController.java index b5c747ac..cbbd7ece 100644 --- a/src/main/java/umc/kkijuk/server/recruit/controller/RecruitTagController.java +++ b/src/main/java/umc/kkijuk/server/recruit/controller/RecruitTagController.java @@ -5,14 +5,12 @@ import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; -import umc.kkijuk.server.common.LoginUser; import umc.kkijuk.server.login.argumentresolver.Login; import umc.kkijuk.server.login.controller.dto.LoginInfo; import umc.kkijuk.server.member.domain.Member; import umc.kkijuk.server.member.service.MemberService; import umc.kkijuk.server.recruit.controller.response.RecruitTagResponse; -import java.util.ArrayList; import java.util.List; @Tag(name = "recruitTag", description = "모집 공고 태그 API") @@ -22,11 +20,6 @@ public class RecruitTagController { private final MemberService memberService; -// private final Member requestMember = Member.builder() -// .id(LoginUser.get().getId()) -// .recruitTags(new ArrayList<>(List.of("인턴", "정규직", "대외활동", "동아리"))) -// .build(); - @Operation( summary = "지원 공고 태그", description = "사용자의 지원 공고 태그 정보들을 요청합니다") diff --git a/src/main/java/umc/kkijuk/server/recruit/controller/port/RecruitService.java b/src/main/java/umc/kkijuk/server/recruit/controller/port/RecruitService.java index 79e115dd..d16208aa 100644 --- a/src/main/java/umc/kkijuk/server/recruit/controller/port/RecruitService.java +++ b/src/main/java/umc/kkijuk/server/recruit/controller/port/RecruitService.java @@ -1,6 +1,5 @@ package umc.kkijuk.server.recruit.controller.port; -import org.springframework.transaction.annotation.Transactional; import umc.kkijuk.server.member.domain.Member; import umc.kkijuk.server.recruit.domain.*; @@ -9,7 +8,6 @@ import java.util.List; public interface RecruitService { - @Transactional Recruit create(Member member, RecruitCreate recruitCreate); Recruit update(Member member, Long recruitId, RecruitUpdate recruitUpdate); diff --git a/src/main/java/umc/kkijuk/server/recruit/controller/response/RecruitCountByDay.java b/src/main/java/umc/kkijuk/server/recruit/controller/response/RecruitCountByDay.java index 2bbc1e58..e79851ee 100644 --- a/src/main/java/umc/kkijuk/server/recruit/controller/response/RecruitCountByDay.java +++ b/src/main/java/umc/kkijuk/server/recruit/controller/response/RecruitCountByDay.java @@ -1,10 +1,8 @@ package umc.kkijuk.server.recruit.controller.response; -import lombok.Builder; import lombok.Getter; import umc.kkijuk.server.recruit.domain.RecruitListByMonthDto; import umc.kkijuk.server.recruit.domain.RecruitStatus; -import umc.kkijuk.server.recruit.domain.ValidRecruitDto; import java.util.Map; import java.util.function.Consumer; diff --git a/src/main/java/umc/kkijuk/server/recruit/controller/response/RecruitListByMonthResponse.java b/src/main/java/umc/kkijuk/server/recruit/controller/response/RecruitListByMonthResponse.java index 0750a80d..b1a2e534 100644 --- a/src/main/java/umc/kkijuk/server/recruit/controller/response/RecruitListByMonthResponse.java +++ b/src/main/java/umc/kkijuk/server/recruit/controller/response/RecruitListByMonthResponse.java @@ -3,7 +3,6 @@ import lombok.Builder; import lombok.Getter; import umc.kkijuk.server.recruit.domain.RecruitListByMonthDto; -import umc.kkijuk.server.recruit.domain.RecruitStatus; import java.util.ArrayList; import java.util.Comparator; diff --git a/src/main/java/umc/kkijuk/server/recruit/controller/response/ValidRecruitList.java b/src/main/java/umc/kkijuk/server/recruit/controller/response/ValidRecruitList.java index 0c76e3eb..bd3e2b93 100644 --- a/src/main/java/umc/kkijuk/server/recruit/controller/response/ValidRecruitList.java +++ b/src/main/java/umc/kkijuk/server/recruit/controller/response/ValidRecruitList.java @@ -1,6 +1,5 @@ package umc.kkijuk.server.recruit.controller.response; -import lombok.Builder; import lombok.Getter; import umc.kkijuk.server.recruit.domain.ValidRecruitDto; diff --git a/src/main/java/umc/kkijuk/server/review/controller/ReviewController.java b/src/main/java/umc/kkijuk/server/review/controller/ReviewController.java index 5f74c10c..f65f65b3 100644 --- a/src/main/java/umc/kkijuk/server/review/controller/ReviewController.java +++ b/src/main/java/umc/kkijuk/server/review/controller/ReviewController.java @@ -29,10 +29,6 @@ public class ReviewController { private final RecruitService recruitService; private final MemberService memberService; -// private final Member requestMember = Member.builder() -// .id(LoginUser.get().getId()) -// .build(); - @Operation( summary = "지원 공고 후기 추가", description = "주어진 지원 공고에 후기를 생성합니다") diff --git a/src/main/java/umc/kkijuk/server/review/domain/RecruitReviewDto.java b/src/main/java/umc/kkijuk/server/review/domain/RecruitReviewDto.java index d108c888..84e351ed 100644 --- a/src/main/java/umc/kkijuk/server/review/domain/RecruitReviewDto.java +++ b/src/main/java/umc/kkijuk/server/review/domain/RecruitReviewDto.java @@ -3,6 +3,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; import umc.kkijuk.server.recruit.domain.RecruitStatus; +import umc.kkijuk.server.review.infrastructure.RecruitReviewDtoInterface; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/src/main/java/umc/kkijuk/server/review/domain/RecruitReviewDtoInterface.java b/src/main/java/umc/kkijuk/server/review/infrastructure/RecruitReviewDtoInterface.java similarity index 93% rename from src/main/java/umc/kkijuk/server/review/domain/RecruitReviewDtoInterface.java rename to src/main/java/umc/kkijuk/server/review/infrastructure/RecruitReviewDtoInterface.java index fec304d1..2fbe14b1 100644 --- a/src/main/java/umc/kkijuk/server/review/domain/RecruitReviewDtoInterface.java +++ b/src/main/java/umc/kkijuk/server/review/infrastructure/RecruitReviewDtoInterface.java @@ -1,4 +1,4 @@ -package umc.kkijuk.server.review.domain; +package umc.kkijuk.server.review.infrastructure; import org.springframework.beans.factory.annotation.Value; import umc.kkijuk.server.recruit.domain.RecruitStatus; diff --git a/src/main/java/umc/kkijuk/server/review/infrastructure/ReviewJpaRepository.java b/src/main/java/umc/kkijuk/server/review/infrastructure/ReviewJpaRepository.java index ed2188af..7d3c2af7 100644 --- a/src/main/java/umc/kkijuk/server/review/infrastructure/ReviewJpaRepository.java +++ b/src/main/java/umc/kkijuk/server/review/infrastructure/ReviewJpaRepository.java @@ -3,7 +3,6 @@ import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import umc.kkijuk.server.review.domain.RecruitReviewDtoInterface; import java.util.List;