From 288e1bf92c168b7287d1eda7c21d61117886c041 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A1=B0=EC=9E=AC=EC=A4=91?= <126754298+m-a-king@users.noreply.github.com> Date: Fri, 17 Jan 2025 14:05:24 +0900 Subject: [PATCH 1/4] cicd: kakao --- .github/workflows/CD.yml | 4 ++++ .github/workflows/CI.yml | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml index a78bdc63..f8c69d3f 100644 --- a/.github/workflows/CD.yml +++ b/.github/workflows/CD.yml @@ -24,6 +24,10 @@ jobs: NAVER_CLIENT_SECRET: ${{ secrets.NAVER_CLIENT_SECRET }} NAVER_SCOPE: ${{ secrets.NAVER_SCOPE }} NAVER_REDIRECT_URL: ${{ secrets.NAVER_REDIRECT_URL }} + KAKAO_CLIENT_ID: ${{ secrets.KAKAO_CLIENT_ID }} + KAKAO_CLIENT_SECRET: ${{ secrets.KAKAO_CLIENT_SECRET }} + KAKAO_SCOPE: ${{ secrets.KAKAO_SCOPE }} + KAKAO_REDIRECT_URL: ${{ secrets.KAKAO_REDIRECT_URL }} JWT_SECRET: ${{ secrets.JWT_SECRET }} FRONT_URL: ${{ secrets.FRONT_URL }} BACK_URL: ${{ secrets.BACK_URL }} diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index c1f9c81f..754b8d88 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -32,6 +32,10 @@ jobs: NAVER_CLIENT_SECRET: ${{ secrets.NAVER_CLIENT_SECRET }} NAVER_SCOPE: ${{ secrets.NAVER_SCOPE }} NAVER_REDIRECT_URL: ${{ secrets.NAVER_REDIRECT_URL }} + KAKAO_CLIENT_ID: ${{ secrets.KAKAO_CLIENT_ID }} + KAKAO_CLIENT_SECRET: ${{ secrets.KAKAO_CLIENT_SECRET }} + KAKAO_SCOPE: ${{ secrets.KAKAO_SCOPE }} + KAKAO_REDIRECT_URL: ${{ secrets.KAKAO_REDIRECT_URL }} JWT_SECRET: ${{ secrets.JWT_SECRET }} FRONT_URL: ${{ secrets.FRONT_URL }} BACK_URL: ${{ secrets.BACK_URL }} From 6d8ee7e301e15eda5335360bf61f81f25aa050c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A1=B0=EC=9E=AC=EC=A4=91?= <126754298+m-a-king@users.noreply.github.com> Date: Fri, 17 Jan 2025 14:14:58 +0900 Subject: [PATCH 2/4] =?UTF-8?q?feat:=20=EB=B4=89=EC=82=AC=EC=9E=90=20?= =?UTF-8?q?=ED=85=8C=EC=9D=B4=EB=B8=94=20=EB=AA=85=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/somemore/domains/volunteer/domain/Volunteer.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/somemore/domains/volunteer/domain/Volunteer.java b/src/main/java/com/somemore/domains/volunteer/domain/Volunteer.java index 52bc5549..d3f802f6 100644 --- a/src/main/java/com/somemore/domains/volunteer/domain/Volunteer.java +++ b/src/main/java/com/somemore/domains/volunteer/domain/Volunteer.java @@ -22,8 +22,9 @@ @Getter @NoArgsConstructor(access = AccessLevel.PROTECTED) @Entity -@Table(name = "volunteer_old") // TODO 삭제될 엔티티(테이블) +@Table(name = "volunteer") // TODO 삭제될 엔티티(테이블) public class Volunteer extends BaseEntity { + @Id @GeneratedValue(strategy = GenerationType.UUID) @Column(name = "id", nullable = false, columnDefinition = "BINARY(16)") From d901ac9ecea8658914007b16d373205786c9466e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A1=B0=EC=9E=AC=EC=A4=91?= <126754298+m-a-king@users.noreply.github.com> Date: Fri, 17 Jan 2025 14:16:23 +0900 Subject: [PATCH 3/4] =?UTF-8?q?feat:=20=ED=85=8C=EC=9D=B4=EB=B8=94=20?= =?UTF-8?q?=EB=AA=85=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/somemore/domains/center/domain/Center.java | 2 ++ .../java/com/somemore/domains/center/domain/PreferItem.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/main/java/com/somemore/domains/center/domain/Center.java b/src/main/java/com/somemore/domains/center/domain/Center.java index eaaf36a2..31f526d1 100644 --- a/src/main/java/com/somemore/domains/center/domain/Center.java +++ b/src/main/java/com/somemore/domains/center/domain/Center.java @@ -8,6 +8,7 @@ import jakarta.persistence.GenerationType; import jakarta.persistence.Id; import jakarta.persistence.Lob; +import jakarta.persistence.Table; import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; @@ -19,6 +20,7 @@ @NoArgsConstructor(access = AccessLevel.PROTECTED) @Getter @Entity +@Table(name = "center") public class Center extends BaseEntity { @Id diff --git a/src/main/java/com/somemore/domains/center/domain/PreferItem.java b/src/main/java/com/somemore/domains/center/domain/PreferItem.java index 777942c5..f2a48e5b 100644 --- a/src/main/java/com/somemore/domains/center/domain/PreferItem.java +++ b/src/main/java/com/somemore/domains/center/domain/PreferItem.java @@ -5,6 +5,7 @@ import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.Id; +import jakarta.persistence.Table; import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; @@ -15,6 +16,7 @@ @NoArgsConstructor(access = AccessLevel.PROTECTED) @Getter @Entity +@Table(name = "prefer_item") public class PreferItem { @Id From 25f618eb0ffeae01e1d7618853d7c63137e3748a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A1=B0=EC=9E=AC=EC=A4=91?= <126754298+m-a-king@users.noreply.github.com> Date: Fri, 17 Jan 2025 14:21:04 +0900 Subject: [PATCH 4/4] =?UTF-8?q?feat:=20=ED=85=8C=EC=9D=B4=EB=B8=94=20?= =?UTF-8?q?=EB=AA=85=20=EB=A1=A4=EB=B0=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/somemore/domains/volunteer/domain/VolunteerDetail.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/somemore/domains/volunteer/domain/VolunteerDetail.java b/src/main/java/com/somemore/domains/volunteer/domain/VolunteerDetail.java index fcd1f22f..ae7ec823 100644 --- a/src/main/java/com/somemore/domains/volunteer/domain/VolunteerDetail.java +++ b/src/main/java/com/somemore/domains/volunteer/domain/VolunteerDetail.java @@ -20,7 +20,7 @@ @Getter @NoArgsConstructor(access = AccessLevel.PROTECTED) @Entity -@Table(name = "volunteer_detail_old") // TODO 삭제될 엔티티(테이블) +@Table(name = "volunteer_detail") // TODO 삭제될 엔티티(테이블) public class VolunteerDetail extends BaseEntity { @Id