Skip to content

Commit a13edb2

Browse files
committed
fix: NPE 터지는 오류 수정
1 parent ba2016e commit a13edb2

File tree

6 files changed

+70
-167
lines changed

6 files changed

+70
-167
lines changed

.gitignore

+2-5
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,10 @@ out/
3636
### VS Code ###
3737
.vscode/
3838

39-
/src/main/resources/application.properties
4039
/src/main/resources/application-dev.properties
41-
/src/main/resources/application-prod.properties
42-
/src/main/resources/application.yml
43-
/src/test/resources/application.properties
44-
/src/test/resources/application.yml
4540

4641
/src/main/resources/static/firebase/likeknu-2023-firebase-adminsdk-ehw5i-31d25209d8.json
4742

4843
.DS_Store
44+
45+
src/main/resources/db/schema.sql

src/main/java/ac/knu/likeknujobserver/menu/service/MenuService.java

+4-7
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,12 @@ void init() {
4848
private void importFromMenuRepositoryAndCache(CafeteriaInformation cafeteriaInformation) {
4949
LocalDate thisSunday = LocalDate.now()
5050
.with(TemporalAdjusters.previousOrSame(DayOfWeek.SUNDAY));
51-
Cafeteria cafeteria = cafeteriaRepository.findCafeteriaByCampusAndCafeteriaName(
52-
cafeteriaInformation.getCampus(), cafeteriaInformation.getCafeteriaName()
53-
)
54-
.orElseThrow(NullPointerException::new);
55-
56-
menuRepository.findMenusByMenuDateAfterAndCafeteria(thisSunday, cafeteria)
51+
cafeteriaRepository.findCafeteriaByCampusAndCafeteriaName(
52+
cafeteriaInformation.getCampus(), cafeteriaInformation.getCafeteriaName()
53+
).ifPresent(cafeteria -> menuRepository.findMenusByMenuDateAfterAndCafeteria(thisSunday, cafeteria)
5754
.forEach(menu -> {
5855
caching(MenuMessage.of(menu, cafeteria));
59-
});
56+
}));
6057
}
6158

6259
public void updateMenu(MenuMessage menuMessage) {
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
server.port=8081
2+
3+
spring.datasource.url=jdbc:mysql://${DB_HOST}:${DB_PORT}/${DB_SCHEMA}?characterEncoding=UTF-8&serverTimezone=UTC
4+
spring.datasource.username=${DB_USERNAME}
5+
spring.datasource.password=${DB_PASSWORD}
6+
7+
spring.jpa.hibernate.ddl-auto=validate
8+
9+
spring.rabbitmq.username=${RABBITMQ_USERNAME}
10+
spring.rabbitmq.password=${RABBITMQ_PASSWORD}
11+
12+
rabbitmq.bus-arrival-time-queue-name=knu.bus
13+
rabbitmq.announcement-queue-name=knu.announcement
14+
rabbitmq.menu-queue-name=knu.menu
15+
rabbitmq.calendar-queue-name=knu.calendar
16+
17+
openai.token=${OPEN_AI_TOKEN}
18+
openai.fine-tuning-url=https://api.openai.com/v1/chat/completions
19+
openai.fine-tuning-model=${FINE_TUNING_MODEL}
20+
21+
firebase.key-path=/home/ubuntu/likeknu-2023-firebase-adminsdk-ehw5i-31d25209d8.json
+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
server.port=8081
2+
3+
spring.datasource.url=jdbc:mysql://${DB_HOST}:${DB_PORT}/${DB_SCHEMA}?characterEncoding=UTF-8&serverTimezone=UTC
4+
spring.datasource.username=${DB_USERNAME}
5+
spring.datasource.password=${DB_PASSWORD}
6+
7+
spring.jpa.hibernate.ddl-auto=validate
8+
9+
spring.rabbitmq.username=${RABBITMQ_USERNAME}
10+
spring.rabbitmq.password=${RABBITMQ_PASSWORD}
11+
12+
rabbitmq.bus-arrival-time-queue-name=knu.bus
13+
rabbitmq.announcement-queue-name=knu.announcement
14+
rabbitmq.menu-queue-name=knu.menu
15+
rabbitmq.calendar-queue-name=knu.calendar
16+
17+
openai.token=${OPEN_AI_TOKEN}
18+
openai.fine-tuning-url=https://api.openai.com/v1/chat/completions
19+
openai.fine-tuning-model=${FINE_TUNING_MODEL}
20+
21+
firebase.key-path=/home/ubuntu/likeknu-2023-firebase-adminsdk-ehw5i-31d25209d8.json

src/main/resources/db/schema.sql

-155
This file was deleted.
+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
server.port=8081
2+
3+
spring.jpa.properties.hibernate.format_sql=true
4+
spring.jpa.properties.hibernate.highlight_sql=true
5+
spring.jpa.hibernate.ddl-auto=update
6+
7+
logging.level.org.hibernate.SQL=debug
8+
logging.level.org.hibernate.orm.jdbc.bind=trace
9+
10+
spring.rabbitmq.username=test
11+
spring.rabbitmq.password=test
12+
13+
rabbitmq.bus-arrival-time-queue-name=knu.bus
14+
rabbitmq.announcement-queue-name=knu.announcement
15+
rabbitmq.menu-queue-name=knu.menu
16+
rabbitmq.calendar-queue-name=knu.calendar
17+
18+
openai.token=test
19+
openai.fine-tuning-url=test
20+
openai.fine-tuning-model=test
21+
22+
firebase.key-path=/Users/jcw/likeknu-2023-firebase-adminsdk-ehw5i-31d25209d8.json

0 commit comments

Comments
 (0)