Merge pull request #380 from mosu-dev/develop

prod

Author: polyglot-k

build.gradle

@@ -54,7 +54,6 @@ dependencies {
 
     // redis
     implementation 'org.springframework.boot:spring-boot-starter-data-redis'
-    implementation 'org.springframework.boot:spring-boot-starter-data-redis-reactive'
 
     // mail
     implementation 'org.springframework.boot:spring-boot-starter-mail'

src/main/java/life/mosu/mosuserver/domain/application/repository/ApplicationJpaRepository.java

@@ -32,16 +32,17 @@ AND a.status IN ('PENDING', 'ABORT')
 
     @Query("""
             SELECT new life.mosu.mosuserver.presentation.application.dto.SchoolApplicationCountResponse(
-                e.schoolName,
+                p.schoolInfo.schoolName,
                 COUNT(a.id)
             )
             FROM ApplicationJpaEntity a
             JOIN ExamApplicationJpaEntity ea ON ea.applicationId = a.id
             JOIN ExamJpaEntity e ON e.id = ea.examId
+            JOIN ProfileJpaEntity p ON p.userId = a.userId
             WHERE a.deleted = false
             AND a.status = 'APPROVED'
-            GROUP BY e.schoolName
-            ORDER BY e.schoolName
+            GROUP BY p.schoolInfo.schoolName
+            ORDER BY p.schoolInfo.schoolName
             """)
     List<SchoolApplicationCountResponse> findPaidApplicationCountBySchool();
 

src/main/java/life/mosu/mosuserver/global/config/RedisConfig.java

@@ -1,8 +1,11 @@
 package life.mosu.mosuserver.global.config;
 
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.connection.RedisStandaloneConfiguration;
+import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.serializer.GenericToStringSerializer;
 import org.springframework.data.redis.serializer.StringRedisSerializer;
@@ -19,4 +22,15 @@ public RedisTemplate<String, Long> redisTemplate(
         redisTemplate.setValueSerializer(new GenericToStringSerializer<>(Long.class));
         return redisTemplate;
     }
+
+    @Bean
+    public LettuceConnectionFactory redisConnectionFactory(
+            @Value("${spring.data.redis.host}") String redisHost,
+            @Value("${spring.data.redis.port}") int redisPort
+    ) {
+        RedisStandaloneConfiguration config = new RedisStandaloneConfiguration();
+        config.setHostName(redisHost);
+        config.setPort(redisPort);
+        return new LettuceConnectionFactory(config);
+    }
 }