feat: 버그수정

Author: HuitaePark

src/main/java/com/waitit/capstone/domain/dashboard/repository/QueueLogRepository.java

@@ -27,16 +27,18 @@ Double findAverageWaitTimeInSeconds(
             @Param("startDate") LocalDateTime startDate,
             @Param("endDate") LocalDateTime endDate);
 
-    @Query("SELECT new com.waitit.capstone.domain.dashboard.dto.HourlyMetricsQueryResult( " +
-           "    FUNCTION('HOUR', q.registeredAt), " +
-           "    COUNT(q.id), " +
-           "    SUM(CASE WHEN q.status = 'ENTERED' THEN 1 ELSE 0 END), " +
-           "    SUM(CASE WHEN q.status = 'CANCELLED' THEN 1 ELSE 0 END) " +
-           ") " +
-           "FROM QueueLog q " +
-           "WHERE q.host.id = :hostId AND q.registeredAt BETWEEN :startDate AND :endDate " +
-           "GROUP BY FUNCTION('HOUR', q.registeredAt) " +
-           "ORDER BY FUNCTION('HOUR', q.registeredAt)")
+    @Query("""
+    SELECT new com.waitit.capstone.domain.dashboard.dto.HourlyMetricsQueryResult(
+        CAST(FUNCTION('HOUR', q.registeredAt) AS integer),
+        COUNT(q.id),
+        SUM(CASE WHEN q.status = 'ENTERED' THEN 1 ELSE 0 END),
+        SUM(CASE WHEN q.status = 'CANCELLED' THEN 1 ELSE 0 END)
+    )
+    FROM QueueLog q
+    WHERE q.host.id = :hostId AND q.registeredAt BETWEEN :startDate AND :endDate
+    GROUP BY FUNCTION('HOUR', q.registeredAt)
+    ORDER BY FUNCTION('HOUR', q.registeredAt)
+""")
     List<HourlyMetricsQueryResult> findHourlyMetrics(
             @Param("hostId") Long hostId,
             @Param("startDate") LocalDateTime startDate,

src/main/java/com/waitit/capstone/global/config/RedissonSpringDataConfig.java

@@ -1,14 +1,12 @@
 package com.waitit.capstone.global.config;
 
-import java.io.IOException;
 import org.redisson.Redisson;
 import org.redisson.api.RedissonClient;
 import org.redisson.config.Config;
 import org.redisson.spring.data.connection.RedissonConnectionFactory;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.core.io.Resource;
 
 @Configuration
 public class RedissonSpringDataConfig {
@@ -19,9 +17,21 @@ public RedissonConnectionFactory redissonConnectionFactory(RedissonClient rediss
     }
 
     @Bean(destroyMethod = "shutdown")
-    public RedissonClient redisson(@Value("classpath:/redisson.yaml") Resource configFile) throws IOException {
-        Config config = Config.fromYAML(configFile.getInputStream());
+    public RedissonClient redisson(
+            @Value("${spring.data.redis.host}") String host,
+            @Value("${spring.data.redis.port}") int port
+    ) {
+        Config config = new Config();
+        config.useSingleServer()
+                .setAddress("redis://" + host + ":" + port)
+                .setDatabase(0)
+                .setPassword("abcd1234")
+                .setConnectionPoolSize(64)
+                .setConnectionMinimumIdleSize(10)
+                .setConnectTimeout(10000)
+                .setTimeout(3000);
+        config.setCodec(new org.redisson.codec.JsonJacksonCodec());
+
         return Redisson.create(config);
     }
-
-}
+}