Merge pull request #94 from SWYP-mingling/fix/SW-99-midpoint-score

Fix/sw 99 midpoint score

Author: sik2Boii

Dockerfile

@@ -1,6 +1,10 @@
 FROM eclipse-temurin:21-jre-alpine AS builder
 WORKDIR /app
 COPY build/libs/*.jar app.jar
+
+RUN mkdir /logs
+VOLUME /logs
+
 RUN java -Djarmode=layertools -jar app.jar extract
 
 FROM eclipse-temurin:21-jre-alpine

src/main/java/swyp/mingling/domain/meeting/dto/response/midpoint/MidPointCandidate.java

@@ -15,6 +15,7 @@ public class MidPointCandidate {
     private int avgTime;                  // 평균 이동시간 or 총합
     private boolean isHot;                // 가장 장소가 많은 곳
     private int placeCount;               // 주변 장소 개수
+    private double totalScore;            // 편차, 이동시간 고려한 최종 점수
 
     public void setHot(boolean hot) {
         isHot = hot;

src/main/java/swyp/mingling/domain/meeting/service/MidPointAsyncUseCase.java

@@ -170,7 +170,9 @@ public List<GetMidPointResponse> execute(UUID meetingId) {
 
                         int avgTime = sum / routes.size();
 
-                        return new MidPointCandidate(routes, deviation, avgTime, false, placeCount);
+                        double totalScore = (avgTime * 0.6) + (deviation * 0.4);
+
+                        return new MidPointCandidate(routes, deviation, avgTime, false, placeCount, totalScore);
                     });
                 })
                 .toList();
@@ -193,8 +195,7 @@ public List<GetMidPointResponse> execute(UUID meetingId) {
         List<MidPointCandidate> sortedByFairness =
                 candidates.stream()
                         .sorted(
-                                Comparator.comparing(MidPointCandidate::getDeviation)
-                                        .thenComparing(MidPointCandidate::getAvgTime)
+                                Comparator.comparing(MidPointCandidate::getTotalScore)
                         )
                         .limit(2)
                         .toList();

src/main/java/swyp/mingling/domain/meeting/service/MidPointUseCase.java

@@ -113,16 +113,17 @@ public List<GetMidPointResponse> execute(UUID meetingId) {
 
             int avgTime = sum / routes.size();
 
+            double totalScore = (avgTime * 0.6) + (deviation * 0.4);
+
             candidates.add(
-                    new MidPointCandidate(routes, deviation, avgTime, false, 0)
+                    new MidPointCandidate(routes, deviation, avgTime, false, 0, totalScore)
             );
         }
 
         List<List<SubwayRouteInfo>> midlist =
                 candidates.stream()
                         .sorted(
-                                Comparator.comparing(MidPointCandidate::getDeviation)
-                                        .thenComparing(MidPointCandidate::getAvgTime)
+                                Comparator.comparing(MidPointCandidate::getTotalScore)
                         )
                         .limit(3)
                         .map(MidPointCandidate::getRoutes)

src/main/resources/logback-spring.xml

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <include resource="org/springframework/boot/logging/logback/defaults.xml" />
+
+    <property name="LOG_PATH" value="/logs" />
+
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>${CONSOLE_LOG_PATTERN}</pattern> </encoder>
+    </appender>
+
+    <appender name="WARN_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${LOG_PATH}/warn.log</file>
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>WARN</level> </filter>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_PATH}/warn-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <maxFileSize>10MB</maxFileSize>
+            <maxHistory>30</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${LOG_PATH}/error.log</file>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>ERROR</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_PATH}/error-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <maxFileSize>10MB</maxFileSize>
+            <maxHistory>30</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="CONSOLE" />
+        <appender-ref ref="WARN_FILE" />
+        <appender-ref ref="ERROR_FILE" />
+    </root>
+</configuration>