Merge branch 'develop' into deploy

.github/workflows/github-actions.yml

@@ -3,7 +3,7 @@ name: CI/CD using GitHub Actions & Docker
 # main, deploy 브랜치에 push하면 워크플로우 실행
 on:
   push:
-    branches: [ "main", "deploy", "test-deploy"]
+    branches: [ "main", "deploy"]
 
 jobs:
   deploy:

src/main/java/sws/songpin/domain/member/entity/Member.java

@@ -53,6 +53,11 @@ public class Member extends BaseTimeEntity {
     @Enumerated(EnumType.STRING)
     private Status status;
 
+    @Column(name = "role", length = 20)
+    @NotNull
+    @Enumerated(EnumType.STRING)
+    private Role role;
+
     @OneToMany(mappedBy = "creator", cascade = CascadeType.ALL, orphanRemoval = true)
     private List<Pin> pins;
 
@@ -65,6 +70,7 @@ public Member(Long memberId, String email, String encodedPassword, String nickna
         this.handle= handle;
         this.profileImg = ProfileImg.POP;
         this.status = Status.ACTIVE;
+        this.role = Role.ROLE_USER;
         this.pins = new ArrayList<>();
     }
 

src/main/java/sws/songpin/domain/member/entity/Role.java

@@ -0,0 +1,6 @@
+package sws.songpin.domain.member.entity;
+
+public enum Role {
+    ROLE_USER,
+    ROLE_ADMIN
+}