From 7e3ea8e118a334e94de7516a9b277e2d6482159d Mon Sep 17 00:00:00 2001 From: Jo Seonggyu Date: Thu, 10 Aug 2023 00:37:14 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20main=EC=97=90=EC=84=9C=20develop?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20pr=20(#16)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: merge develop to main (#13) * feat: 공지사항 생성, 공지사항 읽기 기능 추가 (#1) * :sparkles: 패키지 및 엔티티 생성 * :sparkles: BaseTimeEntity 생성, PostEntity 기본 내용 작성 * :sparkles: PostController 생성 및 기본 내용 작성 * :sparkles: postService 생성 * :sparkles: Exceptions.kt 생성 * :sparkles: postDto 생성 * :sparkles: postRepository 생성 및 기본 내용 작성 * :green_heart: application.yaml 로컬 환경에서 작동하도록 설정 * feat: createPost 기능 생성 * refactor: 리뷰 주신 거 수정 * refactor: post -> notice 수정 등 * chore: .idea 디렉토리 삭제 * chore: PR 템플릿 생성 (#2) * feat: 로컬 db용 docker-compose 파일 추가 및 application.yaml 수정 (#4) * feat: 공지사항 수정, 삭제, 태그 기능 추가 (#3) * fix: ExceptionHandler 추가 * feat: updateNotice 추가, valid 추가 * feat: deleteNotice 추가 * feat: enrollTag 기능 추가, noticeTag 연관 엔티티 추가 * feat: 공지사항 작성할 때 태그 생성 및 수정 * fix: 로컬 db 없앰 * fix: pr 리뷰 수정 * fix: pr 리뷰 수정 * fix: noticeTag assign * feat: 구성원(교수) 생성 및 조회 API 구현 (#8) * feat: 교수 엔티티 및 DTO 설계 * feat: 교수 생성 및 조회 * Docs: Swagger 추가 (#7) * Docs: Add swagger dependency * Docs: Add basic config for swagger * Docs: Add basic configuration for swagger. * feat: 페이지네이션+검색 기능 추가 (#5) * feat: isPublic, isSlide, isPinned 추가 * feat: queryDsl 적용 위해 gradle 추가 fix: javax -> jakarta 변경 * feat: queryDsl 도입 * feat: 키워드+태그 검색 추가 * feat: search query에 isDeleted, isPublic 추가 및 isPinned 우선순위 설정 * fix: requestBody -> requestParam 수정 * feat: 페이지네이션 추가 * fix: 키워드 booleanBuilder 추가, application.yaml 수정 * fix: searchNotice readOnly 추가 * fix: SearchRequest 삭제 * fix: NoticeDto tags 추가 * fix: pr 리뷰 수정 / feat: 검색 기능 보강 및 수정 * fix:코드 수정 * fix: SearchResponse isPinned 추가 * fix: SearchResponse에 total 추가 * fix: 페이지 개수 수정 * fix: searchNotice queryDsl 오류 수정 * fix: local 설정 변경 * CICD: 배포 자동화 (#6) * CICD: Change expose port and added image tag * CICD: Change ddl-auto to create in prod profile for test * CICD: Added Deploy github action * CICD: Merge jobs to one job * Fix: Change checkout order to first step * CICD: Add context for docker build action * Fix: Change spring profile arg position * CICD: Change openjdk version to 17 * CICD: Change docker compose build image tag to latest * CICD: Change to use ghcr repository. * Fix: change list to string in docker push tags. * Fix: Change registry to ghcr.io * Fix: change env to pass to github action instead of ssh export command * Fix: unwrap bracket. * Fix: wrap Profile with "" * CICD: Add .env file * CICD: Change prod ddl-auto to create (for developing), and add TODO comment. * CICD: Remove cicd/deploy branch for condition. * feat: 구성원(교수) 수정 및 삭제 API (#9) * feat: 교수 조회시 최종학력이 앞으로 오게끔 정렬 * feat: 교수 수정 및 삭제 API * feat: 학력과 경력 엔티티 필드 변경, 수정 API 구현 * feat: 구성원(행정직원) CRUD API (#10) * feat: 행정직원 엔티티 및 DTO 설계 * feat: 행정직원 CRUD * feat: 교수 조회시 이름순 정렬 * fix: 교수 연구 분야 Set -> List 로 변경 * feat: 행정직원 주요업무 업데이트 구현 * feat: news 패키지 추가, 디벨롭 및 프론트에 맞게 엔티티 변경 (#12) * feat: news 패키지 생성 * feat: readNews 생성, news 패키지 추가로 인한 명칭 변경 * feat: createNews, enrollTag(새소식) 추가, news 패키지로 인한 명칭 추가 변경 * feat: updateNews, deleteNews 추가 * fix: searchNotice 관련 명칭 변경 * feat: searchNews 추가 * fix: develop 브랜치 반영, 프론트 요구사항 반영 * feat: readNotice, readNews에 이전글 다음글 추가 * 태그 업데이트 코드 리팩터링중 * refactor: 코드 수정, 이전제목 추가 * fix: 게시글 하나일때 read 가능 * fix: prevNext null 없애기 * fix: 이전글 다음글 null 수정 --------- Co-authored-by: Jo Seonggyu Co-authored-by: 우혁준 (HyukJoon Woo) * hotfix: 사용하지않는 Dto 및 엔티티 삭제 (#14) --------- Co-authored-by: Junhyeong Kim Co-authored-by: 우혁준 (HyukJoon Woo) --- .../core/member/database/CareerEntity.kt | 1 - .../core/member/database/EducationEntity.kt | 1 - .../csereal/core/member/dto/CareerDto.kt | 19 ---------------- .../csereal/core/member/dto/EducationDto.kt | 22 ------------------- .../csereal/core/notice/database/TagEntity.kt | 15 ------------- .../core/notice/database/TagRepository.kt | 6 ----- 6 files changed, 64 deletions(-) delete mode 100644 src/main/kotlin/com/wafflestudio/csereal/core/member/dto/CareerDto.kt delete mode 100644 src/main/kotlin/com/wafflestudio/csereal/core/member/dto/EducationDto.kt delete mode 100644 src/main/kotlin/com/wafflestudio/csereal/core/notice/database/TagEntity.kt delete mode 100644 src/main/kotlin/com/wafflestudio/csereal/core/notice/database/TagRepository.kt diff --git a/src/main/kotlin/com/wafflestudio/csereal/core/member/database/CareerEntity.kt b/src/main/kotlin/com/wafflestudio/csereal/core/member/database/CareerEntity.kt index c394d9b8..a6a40da0 100644 --- a/src/main/kotlin/com/wafflestudio/csereal/core/member/database/CareerEntity.kt +++ b/src/main/kotlin/com/wafflestudio/csereal/core/member/database/CareerEntity.kt @@ -1,7 +1,6 @@ package com.wafflestudio.csereal.core.member.database import com.wafflestudio.csereal.common.config.BaseTimeEntity -import com.wafflestudio.csereal.core.member.dto.CareerDto import jakarta.persistence.Entity import jakarta.persistence.FetchType import jakarta.persistence.JoinColumn diff --git a/src/main/kotlin/com/wafflestudio/csereal/core/member/database/EducationEntity.kt b/src/main/kotlin/com/wafflestudio/csereal/core/member/database/EducationEntity.kt index a52589d0..ff4559ce 100644 --- a/src/main/kotlin/com/wafflestudio/csereal/core/member/database/EducationEntity.kt +++ b/src/main/kotlin/com/wafflestudio/csereal/core/member/database/EducationEntity.kt @@ -1,7 +1,6 @@ package com.wafflestudio.csereal.core.member.database import com.wafflestudio.csereal.common.config.BaseTimeEntity -import com.wafflestudio.csereal.core.member.dto.EducationDto import jakarta.persistence.* @Entity(name = "education") diff --git a/src/main/kotlin/com/wafflestudio/csereal/core/member/dto/CareerDto.kt b/src/main/kotlin/com/wafflestudio/csereal/core/member/dto/CareerDto.kt deleted file mode 100644 index ff14cfb2..00000000 --- a/src/main/kotlin/com/wafflestudio/csereal/core/member/dto/CareerDto.kt +++ /dev/null @@ -1,19 +0,0 @@ -package com.wafflestudio.csereal.core.member.dto - -import com.wafflestudio.csereal.core.member.database.CareerEntity - -data class CareerDto( - val duration: String, - val name: String, - val workplace: String -) { - companion object { - fun of(careerEntity: CareerEntity): CareerDto { - return CareerDto( - duration = careerEntity.duration, - name = careerEntity.name, - workplace = careerEntity.workplace - ) - } - } -} diff --git a/src/main/kotlin/com/wafflestudio/csereal/core/member/dto/EducationDto.kt b/src/main/kotlin/com/wafflestudio/csereal/core/member/dto/EducationDto.kt deleted file mode 100644 index 48e2c968..00000000 --- a/src/main/kotlin/com/wafflestudio/csereal/core/member/dto/EducationDto.kt +++ /dev/null @@ -1,22 +0,0 @@ -package com.wafflestudio.csereal.core.member.dto - -import com.wafflestudio.csereal.core.member.database.Degree -import com.wafflestudio.csereal.core.member.database.EducationEntity - -data class EducationDto( - val university: String, - val major: String, - val degree: Degree, - val year: Int -) { - companion object { - fun of(educationEntity: EducationEntity): EducationDto { - return EducationDto( - university = educationEntity.university, - major = educationEntity.major, - degree = educationEntity.degree, - year = educationEntity.year - ) - } - } -} diff --git a/src/main/kotlin/com/wafflestudio/csereal/core/notice/database/TagEntity.kt b/src/main/kotlin/com/wafflestudio/csereal/core/notice/database/TagEntity.kt deleted file mode 100644 index 67c108b9..00000000 --- a/src/main/kotlin/com/wafflestudio/csereal/core/notice/database/TagEntity.kt +++ /dev/null @@ -1,15 +0,0 @@ -package com.wafflestudio.csereal.core.notice.database - -import com.wafflestudio.csereal.common.config.BaseTimeEntity -import jakarta.persistence.CascadeType -import jakarta.persistence.Entity -import jakarta.persistence.OneToMany - -@Entity(name = "tag") -class TagEntity( - var name: String, - - @OneToMany(mappedBy = "tag") - val noticeTags: MutableSet = mutableSetOf() -) : BaseTimeEntity() { -} \ No newline at end of file diff --git a/src/main/kotlin/com/wafflestudio/csereal/core/notice/database/TagRepository.kt b/src/main/kotlin/com/wafflestudio/csereal/core/notice/database/TagRepository.kt deleted file mode 100644 index 34a50416..00000000 --- a/src/main/kotlin/com/wafflestudio/csereal/core/notice/database/TagRepository.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.wafflestudio.csereal.core.notice.database - -import org.springframework.data.jpa.repository.JpaRepository - -interface TagRepository : JpaRepository { -} \ No newline at end of file