diff --git a/pophory-api/src/main/java/com/pophory/pophoryapi/member/application/MemberService.java b/pophory-api/src/main/java/com/pophory/pophoryapi/member/application/MemberService.java index 98d1b74..85bb2f2 100644 --- a/pophory-api/src/main/java/com/pophory/pophoryapi/member/application/MemberService.java +++ b/pophory-api/src/main/java/com/pophory/pophoryapi/member/application/MemberService.java @@ -61,7 +61,8 @@ public MemberCreateResponseDto updateV2(MemberCreateV2RequestDto request, Long m } @Transactional(readOnly = true) - public MemberGetResponseDto getMember(Long id) { + public MemberGetResponseDto getMember(Long id) + { return MemberGetResponseDto.of(findMemberById(id)); } diff --git a/pophory-domain/src/main/java/com/pophory/pophorydomain/advertisement/Advertisement.java b/pophory-domain/src/main/java/com/pophory/pophorydomain/advertisement/Advertisement.java index 649500c..2fcd29f 100644 --- a/pophory-domain/src/main/java/com/pophory/pophorydomain/advertisement/Advertisement.java +++ b/pophory-domain/src/main/java/com/pophory/pophorydomain/advertisement/Advertisement.java @@ -13,7 +13,7 @@ public class Advertisement { @Id - @GeneratedValue(strategy = GenerationType.AUTO) + @GeneratedValue(strategy = GenerationType.IDENTITY) private Integer id; private String adId; diff --git a/pophory-domain/src/main/java/com/pophory/pophorydomain/album/Album.java b/pophory-domain/src/main/java/com/pophory/pophorydomain/album/Album.java index 0beef42..bf7118c 100644 --- a/pophory-domain/src/main/java/com/pophory/pophorydomain/album/Album.java +++ b/pophory-domain/src/main/java/com/pophory/pophorydomain/album/Album.java @@ -16,6 +16,7 @@ import java.util.List; import static jakarta.persistence.FetchType.LAZY; +import static jakarta.persistence.GenerationType.IDENTITY; @Entity @@ -23,7 +24,7 @@ @NoArgsConstructor public class Album extends BaseTimeEntity { - @Id @GeneratedValue + @Id @GeneratedValue(strategy = IDENTITY) private Long id; private String title = "기본 앨범"; diff --git a/pophory-domain/src/main/java/com/pophory/pophorydomain/albumtheme/AlbumCover.java b/pophory-domain/src/main/java/com/pophory/pophorydomain/albumtheme/AlbumCover.java index 9aa624e..9205070 100644 --- a/pophory-domain/src/main/java/com/pophory/pophorydomain/albumtheme/AlbumCover.java +++ b/pophory-domain/src/main/java/com/pophory/pophorydomain/albumtheme/AlbumCover.java @@ -9,6 +9,7 @@ import java.util.List; import static jakarta.persistence.EnumType.STRING; +import static jakarta.persistence.GenerationType.IDENTITY; @Entity @@ -17,8 +18,7 @@ @Getter public class AlbumCover { - @Id - @GeneratedValue + @Id @GeneratedValue(strategy = IDENTITY) private Long id; private int coverNumber; diff --git a/pophory-domain/src/main/java/com/pophory/pophorydomain/albumtheme/AlbumDesign.java b/pophory-domain/src/main/java/com/pophory/pophorydomain/albumtheme/AlbumDesign.java index 3ead8b7..1f7b2cd 100644 --- a/pophory-domain/src/main/java/com/pophory/pophorydomain/albumtheme/AlbumDesign.java +++ b/pophory-domain/src/main/java/com/pophory/pophorydomain/albumtheme/AlbumDesign.java @@ -5,13 +5,15 @@ import lombok.Getter; import lombok.NoArgsConstructor; +import static jakarta.persistence.GenerationType.IDENTITY; + @Entity @NoArgsConstructor @Getter public class AlbumDesign { - @Id @GeneratedValue + @Id @GeneratedValue(strategy = IDENTITY) private Long id; @JoinColumn(name = "album_cover_id") diff --git a/pophory-domain/src/main/java/com/pophory/pophorydomain/fcm/FcmEntity.java b/pophory-domain/src/main/java/com/pophory/pophorydomain/fcm/FcmEntity.java index 47ea74d..3fd5398 100644 --- a/pophory-domain/src/main/java/com/pophory/pophorydomain/fcm/FcmEntity.java +++ b/pophory-domain/src/main/java/com/pophory/pophorydomain/fcm/FcmEntity.java @@ -8,6 +8,7 @@ import static jakarta.persistence.EnumType.STRING; import static jakarta.persistence.FetchType.LAZY; +import static jakarta.persistence.GenerationType.IDENTITY; @Table(name = "fcm") @@ -16,7 +17,7 @@ @Getter public class FcmEntity { - @Id @GeneratedValue + @Id @GeneratedValue(strategy = IDENTITY) private Long id; private String fcmToken; diff --git a/pophory-domain/src/main/java/com/pophory/pophorydomain/member/Member.java b/pophory-domain/src/main/java/com/pophory/pophorydomain/member/Member.java index 5318f82..ba3b03c 100644 --- a/pophory-domain/src/main/java/com/pophory/pophorydomain/member/Member.java +++ b/pophory-domain/src/main/java/com/pophory/pophorydomain/member/Member.java @@ -17,6 +17,7 @@ import java.util.Objects; import static jakarta.persistence.EnumType.STRING; +import static jakarta.persistence.GenerationType.IDENTITY; @Entity @@ -26,7 +27,7 @@ public class Member extends BaseTimeEntity { private static final int MEMBER_DELETE_EXPIRE_TIME = 7; - @Id @GeneratedValue + @Id @GeneratedValue(strategy = IDENTITY) private Long id; @Column(length = 6) diff --git a/pophory-domain/src/main/java/com/pophory/pophorydomain/photo/Photo.java b/pophory-domain/src/main/java/com/pophory/pophorydomain/photo/Photo.java index 2a78dab..9ef7983 100644 --- a/pophory-domain/src/main/java/com/pophory/pophorydomain/photo/Photo.java +++ b/pophory-domain/src/main/java/com/pophory/pophorydomain/photo/Photo.java @@ -14,6 +14,7 @@ import java.util.Objects; import static jakarta.persistence.FetchType.LAZY; +import static jakarta.persistence.GenerationType.IDENTITY; @Entity @@ -21,7 +22,7 @@ @Getter public class Photo extends BaseTimeEntity { - @Id @GeneratedValue + @Id @GeneratedValue(strategy = IDENTITY) private Long id; private String imageUrl; diff --git a/pophory-domain/src/main/java/com/pophory/pophorydomain/studio/Studio.java b/pophory-domain/src/main/java/com/pophory/pophorydomain/studio/Studio.java index e39c796..cd3b72d 100644 --- a/pophory-domain/src/main/java/com/pophory/pophorydomain/studio/Studio.java +++ b/pophory-domain/src/main/java/com/pophory/pophorydomain/studio/Studio.java @@ -8,14 +8,15 @@ import lombok.Getter; import lombok.NoArgsConstructor; +import static jakarta.persistence.GenerationType.IDENTITY; + @Entity @Getter @NoArgsConstructor public class Studio { - @Id - @GeneratedValue + @Id @GeneratedValue(strategy = IDENTITY) private Long id; @Column(unique = true) diff --git a/pophory-domain/src/main/java/com/pophory/pophorydomain/version/ServiceVersion.java b/pophory-domain/src/main/java/com/pophory/pophorydomain/version/ServiceVersion.java index 04a4755..14b7d21 100644 --- a/pophory-domain/src/main/java/com/pophory/pophorydomain/version/ServiceVersion.java +++ b/pophory-domain/src/main/java/com/pophory/pophorydomain/version/ServiceVersion.java @@ -6,6 +6,7 @@ import lombok.NoArgsConstructor; import static jakarta.persistence.EnumType.STRING; +import static jakarta.persistence.GenerationType.IDENTITY; @Entity @@ -13,8 +14,7 @@ @NoArgsConstructor public class ServiceVersion { - @Id - @GeneratedValue + @Id @GeneratedValue(strategy = IDENTITY) private Long id; @Column(name = "os_type") diff --git a/pophory-external/src/main/java/com/pophory/pophoryexternal/slack/SlackService.java b/pophory-external/src/main/java/com/pophory/pophoryexternal/slack/SlackService.java index c5ac3ab..daf994e 100644 --- a/pophory-external/src/main/java/com/pophory/pophoryexternal/slack/SlackService.java +++ b/pophory-external/src/main/java/com/pophory/pophoryexternal/slack/SlackService.java @@ -22,7 +22,6 @@ public class SlackService { private final Environment env; - public void sendMessage(String channel, String text) { try { Slack slack = Slack.getInstance();