Merge branch 'develop' into feat/#31-record-post

Author: JangInho

.gitignore

@@ -39,6 +39,7 @@ out/
 ### .DS_Store
 .DS_Store
 ### Sensitive configuration
+.env
 application-local.yaml
 
 ### K8s secrets (contains real credentials)

build.gradle

@@ -21,6 +21,7 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
 	implementation 'org.springframework.boot:spring-boot-starter-web'
 	implementation 'org.springframework.boot:spring-boot-starter-security'
+	implementation 'org.springframework.boot:spring-boot-starter-validation'
 	compileOnly 'org.projectlombok:lombok'
 	runtimeOnly 'org.postgresql:postgresql'
 	annotationProcessor 'org.projectlombok:lombok'
@@ -42,6 +43,9 @@ dependencies {
 
 	// FCM
 	implementation 'com.google.firebase:firebase-admin:9.8.0'
+
+	// Redis
+	implementation 'org.springframework.boot:spring-boot-starter-data-redis'
 }
 
 jar { enabled = false }

k8s/kustomization.yaml

@@ -7,6 +7,9 @@ resources:
   - postgres/deployment.yaml
   - postgres/service.yaml
   - postgres/pvc.yaml
+  - redis/deployment.yaml
+  - redis/service.yaml
+  - redis/pvc.yaml
 images:
   - name: ghcr.io/semosan/semosan_be
     newTag: d478edb1ff6f35bd62da2ca5902af0b38a4914fe

k8s/redis/deployment.yaml

@@ -0,0 +1,27 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: redis
+  namespace: semosan
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: redis
+  template:
+    metadata:
+      labels:
+        app: redis
+    spec:
+      containers:
+        - name: redis
+          image: redis:7-alpine
+          ports:
+            - containerPort: 6379
+          volumeMounts:
+            - name: redis-data
+              mountPath: /data
+      volumes:
+        - name: redis-data
+          persistentVolumeClaim:
+            claimName: redis-pvc

k8s/redis/pvc.yaml

@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: redis-pvc
+  namespace: semosan
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 1Gi

k8s/redis/service.yaml

@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: redis
+  namespace: semosan
+spec:
+  selector:
+    app: redis
+  ports:
+    - port: 6379
+      targetPort: 6379

src/main/java/com/semosan/api/common/config/RedisConfig.java

@@ -0,0 +1,15 @@
+package com.semosan.api.common.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.core.StringRedisTemplate;
+
+@Configuration
+public class RedisConfig {
+
+    @Bean
+    public StringRedisTemplate stringRedisTemplate(RedisConnectionFactory connectionFactory) {
+        return new StringRedisTemplate(connectionFactory);
+    }
+}

src/main/java/com/semosan/api/common/config/RedisStreamConfig.java

@@ -0,0 +1,29 @@
+package com.semosan.api.common.config;
+
+import jakarta.annotation.PostConstruct;
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.RedisSystemException;
+import org.springframework.data.redis.connection.stream.ReadOffset;
+import org.springframework.data.redis.core.StringRedisTemplate;
+
+@Configuration
+@RequiredArgsConstructor
+public class RedisStreamConfig {
+
+    private final StringRedisTemplate redisTemplate;
+    private final TrackingProperties trackingProperties;
+
+    @PostConstruct
+    public void createConsumerGroup() {
+        try {
+            redisTemplate.opsForStream().createGroup(
+                    trackingProperties.getStreamKey(),
+                    ReadOffset.from("0"),
+                    trackingProperties.getConsumerGroup()
+            );
+        } catch (RedisSystemException e) {
+            // consumer group already exists
+        }
+    }
+}

src/main/java/com/semosan/api/common/config/TrackingProperties.java

@@ -0,0 +1,16 @@
+package com.semosan.api.common.config;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+@Getter
+@Setter
+@Component
+@ConfigurationProperties(prefix = "tracking")
+public class TrackingProperties {
+
+    private String streamKey;
+    private String consumerGroup;
+}

src/main/java/com/semosan/api/common/jwt/JwtFilter.java

@@ -4,6 +4,7 @@
 import com.semosan.api.common.config.SecurityConfig;
 import com.semosan.api.common.exception.GeneralException;
 import com.semosan.api.common.response.ApiResponse;
+import com.semosan.api.common.status.ErrorStatus;
 import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
@@ -56,6 +57,9 @@ protected void doFilterInternal(
             // SecurityConfig의 .anyRequest().authenticated()에서 인가 처리됨
             if (accessToken != null) {
                 jwtService.validateAccessToken(accessToken);
+                if (jwtService.isAccessTokenBlacklisted(accessToken)) {
+                    throw new GeneralException(ErrorStatus.JWT_BLACKLISTED);
+                }
                 Long userId = jwtService.getUserIdFromJwtToken(accessToken);
 
                 UsernamePasswordAuthenticationToken authentication =