Skip to content

Commit adfbcd4

Browse files
authored
Merge pull request #219 from DevKor-github/develop
main <- develop
2 parents 0e556c7 + 16feafd commit adfbcd4

5 files changed

Lines changed: 47 additions & 75 deletions

File tree

src/main/java/devkor/com/teamcback/domain/routes/service/RouteService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import devkor.com.teamcback.domain.routes.repository.NodeRepository;
1515
import devkor.com.teamcback.global.exception.exception.AdminException;
1616
import devkor.com.teamcback.global.exception.exception.GlobalException;
17-
import devkor.com.teamcback.global.logging.service.LogUtil;
17+
import devkor.com.teamcback.global.logging.LogUtil;
1818
import lombok.RequiredArgsConstructor;
1919
import lombok.extern.slf4j.Slf4j;
2020
import org.springframework.stereotype.Service;

src/main/java/devkor/com/teamcback/domain/search/service/SearchService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import devkor.com.teamcback.domain.user.entity.User;
2424
import devkor.com.teamcback.domain.user.repository.UserRepository;
2525
import devkor.com.teamcback.global.exception.exception.GlobalException;
26-
import devkor.com.teamcback.global.logging.service.LogUtil;
26+
import devkor.com.teamcback.global.logging.LogUtil;
2727
import devkor.com.teamcback.global.response.CursorPageRes;
2828
import lombok.RequiredArgsConstructor;
2929
import lombok.extern.slf4j.Slf4j;
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
package devkor.com.teamcback.global.logging;
2+
3+
import devkor.com.teamcback.domain.building.entity.Building;
4+
import devkor.com.teamcback.domain.place.entity.Place;
5+
import devkor.com.teamcback.domain.routes.entity.Conditions;
6+
import lombok.extern.slf4j.Slf4j;
7+
import org.springframework.stereotype.Component;
8+
9+
import java.util.List;
10+
11+
import static net.logstash.logback.argument.StructuredArguments.kv;
12+
13+
@Slf4j
14+
@Component
15+
public class LogUtil {
16+
public void logClick(String buildingName, String placeName, Double floor, String categoryName) {
17+
log.info("click_event",
18+
kv("buildingName", buildingName),
19+
kv("placeName", placeName),
20+
kv("floor", floor),
21+
kv("categoryName", categoryName)
22+
);
23+
}
24+
25+
public void logSearch(String keyword) {
26+
log.info("search_event", kv("keyword", keyword));
27+
}
28+
29+
public void logRoute(Building startBuilding, Place startPlace, Building endBuilding, Place endPlace, List<Conditions> conditions) {
30+
log.info("route_event",
31+
kv("startBuildingName", (startBuilding != null) ? startBuilding.getName() : startPlace.getBuilding().getName()),
32+
kv("endBuildingName", (endBuilding != null) ? endBuilding.getName() : endPlace.getBuilding().getName()),
33+
kv("startPlaceName", (startPlace != null) ? startPlace.getName() : null),
34+
kv("endPlaceName", (endPlace != null) ? endPlace.getName() : null),
35+
kv("conditions", (conditions != null) ? conditions.stream().map(Enum::name).toList() : null)
36+
);
37+
}
38+
}

src/main/java/devkor/com/teamcback/global/logging/service/LogUtil.java

Lines changed: 0 additions & 59 deletions
This file was deleted.

src/main/resources/logback-spring.xml

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,12 @@
2525
<encoder class="net.logstash.logback.encoder.LoggingEventCompositeJsonEncoder">
2626
<providers>
2727
<timestamp/>
28-
<pattern>
29-
<pattern>
30-
{
31-
"level": "%level",
32-
"traceId": "%X{traceId}",
33-
"endpoint": "%X{endpoint}",
34-
"status": "%X{status}",
35-
"latencyMs": "%X{latencyMs}",
36-
"message": "%msg",
37-
"userId": "%X{userId}"
38-
}
39-
</pattern>
40-
</pattern>
28+
<logLevel/>
29+
<loggerName/>
30+
<threadName/>
31+
<mdc/>
32+
<message/>
33+
<arguments/>
4134
</providers>
4235
</encoder>
4336
</appender>
@@ -46,4 +39,4 @@
4639
<appender-ref ref="CONSOLE"/>
4740
<appender-ref ref="JSON_FILE"/>
4841
</root>
49-
</configuration>
42+
</configuration>

0 commit comments

Comments
 (0)