Merge pull request #16 from Sopo2023/feat/#1

fix: enum
Sopo2023 · Jul 26, 2024 · 89842a8 · 89842a8
2 parents c777372 + dcd0e73
commit 89842a8
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -48,3 +48,11 @@ jobs:
             docker rmi ${{ secrets.DOCKER_USERNAME }}/sopo_v2
             docker pull ${{ secrets.DOCKER_USERNAME }}/sopo_v2
             docker run -d -p 8080:8080 --name sopo_v2 ${{ secrets.DOCKER_USERNAME }}/sopo_v2
+            
+            sudo docker pull redis:latest
+            sudo docker run -d --name redis -p 6379:6379 --network redis-network redis:latest
+            sudo docker rm -f alimo_redis alimo_app
+            docker rmi ${{ secrets.DOCKER_USERNAME }}/alimo:latest
+            docker pull ${{ secrets.DOCKER_USERNAME }}/alimo:latest
+            sudo docker run -d --name alimo_redis_new redis:latest
+            docker run -d -p 80:8080 --name alimo ${{ secrets.DOCKER_USERNAME }}/alimo:latest
diff --git a/src/main/java/kr/hs/dgsw/SOPO_server_v2/domain/member/entity/MemberEntity.java b/src/main/java/kr/hs/dgsw/SOPO_server_v2/domain/member/entity/MemberEntity.java
@@ -41,9 +41,11 @@ public class MemberEntity extends BaseTimeEntity {
     private String memberSchool;
 
     @Column(name = "member_category")
+    @Enumerated(EnumType.STRING)
     private MemberCategory memberCategory;
 
     @Builder.Default
+    @Enumerated(EnumType.STRING)
     private MemberState memberState = MemberState.ACTIVE;
 
     @Column(name = "member_fcm_token", columnDefinition = "TEXT")

diff --git a/src/main/java/kr/hs/dgsw/SOPO_server_v2/global/config/security/SecurityConfig.java b/src/main/java/kr/hs/dgsw/SOPO_server_v2/global/config/security/SecurityConfig.java
@@ -56,10 +56,10 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
                 .requestMatchers("/auth/**").permitAll()
                 .requestMatchers("/email/**").permitAll()
                 .requestMatchers("/re_provide/**").permitAll()
-                .requestMatchers("/file").hasRole("ACTIVE")
-                .requestMatchers("/board").hasRole("ACTIVE")
-                .requestMatchers("/contest").hasRole("ACTIVE")
-                .requestMatchers("/like").hasRole("ACTIVE")
+                .requestMatchers("/file/**").hasRole("ACTIVE")
+                .requestMatchers("/board/**").hasRole("ACTIVE")
+                .requestMatchers("/contest/**").hasRole("ACTIVE")
+                .requestMatchers("/like/**").hasRole("ACTIVE")
                 .anyRequest().authenticated()
                 .and()
                 .formLogin().disable()