From f69c5efbe700ec993c6e5ba93985671ad7cd9fba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=A4=80?= Date: Wed, 2 Nov 2022 21:51:07 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20challenge=20softdelete=20=EC=A0=84?= =?UTF-8?q?=EB=9E=B5=20=EC=9E=A0=EC=8B=9C=20=EC=82=AD=EC=A0=9C=20#261?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ChallengeController.java | 26 +++++++++---------- .../com/ceos/bankids/domain/Challenge.java | 6 ++--- .../ceos/bankids/domain/ChallengeUser.java | 6 ++--- .../java/com/ceos/bankids/domain/Comment.java | 6 ++--- .../com/ceos/bankids/domain/Progress.java | 6 ++--- 5 files changed, 21 insertions(+), 29 deletions(-) diff --git a/src/main/java/com/ceos/bankids/controller/ChallengeController.java b/src/main/java/com/ceos/bankids/controller/ChallengeController.java index 22ef4c0..34ca33d 100644 --- a/src/main/java/com/ceos/bankids/controller/ChallengeController.java +++ b/src/main/java/com/ceos/bankids/controller/ChallengeController.java @@ -187,17 +187,17 @@ public CommonResponse patchProgress(@AuthenticationPrincipal User a return CommonResponse.onSuccess(progressDTO); } - @ApiOperation(value = "자녀 측 돈길 히스토리") - @GetMapping(value = "/history", produces = "application/json; charset=utf-8") - public CommonResponse> getChallengeHistory( - @AuthenticationPrincipal User authUser, @RequestParam String status) { - - log.info("api = 자녀 측 돈길 히스토리 가져오기, user = {}, status = {}", authUser, status); - - List challengeHistoryDTOList = challengeMapper.readChallengeHistoryMapper( - authUser, - status); - - return CommonResponse.onSuccess(challengeHistoryDTOList); - } +// @ApiOperation(value = "자녀 측 돈길 히스토리") +// @GetMapping(value = "/history", produces = "application/json; charset=utf-8") +// public CommonResponse> getChallengeHistory( +// @AuthenticationPrincipal User authUser, @RequestParam String status) { +// +// log.info("api = 자녀 측 돈길 히스토리 가져오기, user = {}, status = {}", authUser, status); +// +// List challengeHistoryDTOList = challengeMapper.readChallengeHistoryMapper( +// authUser, +// status); +// +// return CommonResponse.onSuccess(challengeHistoryDTOList); +// } } diff --git a/src/main/java/com/ceos/bankids/domain/Challenge.java b/src/main/java/com/ceos/bankids/domain/Challenge.java index 341387f..65a1615 100644 --- a/src/main/java/com/ceos/bankids/domain/Challenge.java +++ b/src/main/java/com/ceos/bankids/domain/Challenge.java @@ -29,8 +29,6 @@ import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import org.hibernate.annotations.SQLDelete; -import org.hibernate.annotations.Where; @Getter @Setter @@ -41,8 +39,8 @@ @DynamicInsert @DynamicUpdate @ToString(exclude = {"progressList", "challengeUserList"}) -@Where(clause = "deleted_at is Null") -@SQLDelete(sql = "UPDATE challenge SET deleted_at = CURRENT_TIMESTAMP where id = ?") +//@Where(clause = "deleted_at is Null") +//@SQLDelete(sql = "UPDATE challenge SET deleted_at = CURRENT_TIMESTAMP where id = ?") public class Challenge extends AbstractTimestamp { @Id diff --git a/src/main/java/com/ceos/bankids/domain/ChallengeUser.java b/src/main/java/com/ceos/bankids/domain/ChallengeUser.java index 45171e8..5d94e53 100644 --- a/src/main/java/com/ceos/bankids/domain/ChallengeUser.java +++ b/src/main/java/com/ceos/bankids/domain/ChallengeUser.java @@ -18,8 +18,6 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import org.hibernate.annotations.SQLDelete; -import org.hibernate.annotations.Where; @Entity @Getter @@ -27,8 +25,8 @@ @Table(name = "ChallengeUser") @NoArgsConstructor @EqualsAndHashCode(of = "id") -@Where(clause = "deleted_at is Null") -@SQLDelete(sql = "UPDATE challenge_user SET deleted_at = CURRENT_TIMESTAMP where id = ?") +//@Where(clause = "deleted_at is Null") +//@SQLDelete(sql = "UPDATE challenge_user SET deleted_at = CURRENT_TIMESTAMP where id = ?") public class ChallengeUser extends AbstractTimestamp { @Id diff --git a/src/main/java/com/ceos/bankids/domain/Comment.java b/src/main/java/com/ceos/bankids/domain/Comment.java index 0b2626c..967201a 100644 --- a/src/main/java/com/ceos/bankids/domain/Comment.java +++ b/src/main/java/com/ceos/bankids/domain/Comment.java @@ -20,8 +20,6 @@ import lombok.NoArgsConstructor; import lombok.Setter; import org.hibernate.annotations.DynamicUpdate; -import org.hibernate.annotations.SQLDelete; -import org.hibernate.annotations.Where; @Getter @Setter @@ -30,8 +28,8 @@ @NoArgsConstructor @DynamicUpdate @EqualsAndHashCode(of = "id") -@Where(clause = "deleted_at is Null") -@SQLDelete(sql = "UPDATE comment SET deleted_at = CURRENT_TIMESTAMP where id = ?") +//@Where(clause = "deleted_at is Null") +//@SQLDelete(sql = "UPDATE comment SET deleted_at = CURRENT_TIMESTAMP where id = ?") public class Comment { @Id diff --git a/src/main/java/com/ceos/bankids/domain/Progress.java b/src/main/java/com/ceos/bankids/domain/Progress.java index 7199c9e..346ddae 100644 --- a/src/main/java/com/ceos/bankids/domain/Progress.java +++ b/src/main/java/com/ceos/bankids/domain/Progress.java @@ -19,8 +19,6 @@ import lombok.Setter; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; -import org.hibernate.annotations.SQLDelete; -import org.hibernate.annotations.Where; @Entity @Getter @@ -29,8 +27,8 @@ @NoArgsConstructor @DynamicInsert @EqualsAndHashCode(of = "id") -@Where(clause = "deleted_at is Null") -@SQLDelete(sql = "UPDATE progress SET deleted_at = CURRENT_TIMESTAMP where id = ?") +//@Where(clause = "deleted_at is Null") +//@SQLDelete(sql = "UPDATE progress SET deleted_at = CURRENT_TIMESTAMP where id = ?") public class Progress extends AbstractTimestamp { @Id