Skip to content

Commit a31bdcf

Browse files
committed
[feat] 활동 이름 변경
1 parent 3631260 commit a31bdcf

File tree

5 files changed

+11
-16
lines changed

5 files changed

+11
-16
lines changed

src/main/java/nambang_swag/bada_on/config/DataLoader.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
import lombok.RequiredArgsConstructor;
1111
import nambang_swag.bada_on.request.PlaceRegister;
12-
import nambang_swag.bada_on.service.ExternalApiService;
1312
import nambang_swag.bada_on.service.PlaceService;
1413

1514
@RequiredArgsConstructor
@@ -21,7 +20,7 @@ public class DataLoader implements CommandLineRunner {
2120
@Override
2221
public void run(String... args) {
2322
List<String> commonActivities = Arrays.asList("diving", "snorkeling", "swimming", "surfing",
24-
"kayakingPaddleBoarding");
23+
"padding");
2524

2625
List<PlaceRegister> places = new ArrayList<>();
2726
places.add(new PlaceRegister("협재 해수욕장", 33.394, 126.239, "제주 제주시 한림읍 한림로 329-10", commonActivities));

src/main/java/nambang_swag/bada_on/entity/Place.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public class Place {
4747
private boolean canDiving;
4848
private boolean canSwimming;
4949
private boolean canSurfing;
50-
private boolean canKayakingPaddleBoarding;
50+
private boolean canPadding;
5151

5252
@Builder
5353
public Place(String name, Double latitude, Double longitude, String address, int nx, int ny) {
@@ -65,7 +65,7 @@ public void updateActivityStatus(Activity activity, boolean isEnabled) {
6565
case DIVING -> canDiving = isEnabled;
6666
case SWIMMING -> canSwimming = isEnabled;
6767
case SURFING -> canSurfing = isEnabled;
68-
case KAYAKING_AND_PADDLE_BOARDING -> canKayakingPaddleBoarding = isEnabled;
68+
case PADDING -> canPadding = isEnabled;
6969
}
7070
}
7171

@@ -83,8 +83,8 @@ public List<String> getStringActivities() {
8383
if (this.canSurfing) {
8484
activities.add(SURFING.getValue());
8585
}
86-
if (this.canKayakingPaddleBoarding) {
87-
activities.add(KAYAKING_AND_PADDLE_BOARDING.getValue());
86+
if (this.canPadding) {
87+
activities.add(PADDING.getValue());
8888
}
8989
return activities;
9090
}
Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
package nambang_swag.bada_on.repository;
22

33
import java.util.List;
4-
import java.util.Optional;
54

65
import org.springframework.data.jpa.repository.JpaRepository;
76

87
import nambang_swag.bada_on.entity.Place;
98

109
public interface PlaceRepository extends JpaRepository<Place, Long> {
1110

12-
Optional<Place> findByName(String name);
13-
1411
List<Place> findAllByCanSnorkelingIsTrue();
1512

1613
List<Place> findAllByCanDivingIsTrue();
@@ -19,5 +16,5 @@ public interface PlaceRepository extends JpaRepository<Place, Long> {
1916

2017
List<Place> findAllByCanSurfingIsTrue();
2118

22-
List<Place> findAllByCanKayakingPaddleBoardingIsTrue();
19+
List<Place> findAllByCanPaddingIsTrue();
2320
}

src/main/java/nambang_swag/bada_on/service/PlaceService.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ private List<Place> getPlaceByActivity(Activity activity) {
103103
case SURFING -> {
104104
return placeRepository.findAllByCanSurfingIsTrue();
105105
}
106-
case KAYAKING_AND_PADDLE_BOARDING -> {
107-
return placeRepository.findAllByCanKayakingPaddleBoardingIsTrue();
106+
case PADDING -> {
107+
return placeRepository.findAllByCanPaddingIsTrue();
108108
}
109109
default -> {
110110
return new ArrayList<>();

src/main/java/nambang_swag/bada_on/service/WeatherService.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ private List<String> getRecommendActivities(Weather weather, List<TideRecord> ti
107107
activityScores.put(SNORKELING, calculateSnorkelingScore(weather, tideRecords));
108108
activityScores.put(SWIMMING, calculateSwimmingScore(weather, tideRecords));
109109
activityScores.put(DIVING, calculateDivingScore(weather, tideRecords));
110-
activityScores.put(KAYAKING_AND_PADDLE_BOARDING, calculateKayakingPaddleBoardingScore(weather, tideRecords));
110+
activityScores.put(PADDING, calculatePaddingScore(weather, tideRecords));
111111
activityScores.put(SURFING, calculateSurfingScore(weather, tideRecords));
112112

113113
int maxScore = Collections.max(activityScores.values());
@@ -479,7 +479,7 @@ private int calculateSwimmingScore(Weather weather, List<TideRecord> tideRecords
479479
return totalScore;
480480
}
481481

482-
private int calculateKayakingPaddleBoardingScore(Weather weather, List<TideRecord> tideRecords) {
482+
private int calculatePaddingScore(Weather weather, List<TideRecord> tideRecords) {
483483
int totalScore = 0;
484484

485485
SkyCondition skyCondition = weather.getSkyCondition();
@@ -602,8 +602,7 @@ private List<ActivityScore> getAllScores(Weather weather, List<TideRecord> tideR
602602
scores.add(new ActivityScore(DIVING.getValue(), calculateDivingScore(weather, tideRecords)));
603603
scores.add(new ActivityScore(SURFING.getValue(), calculateSurfingScore(weather, tideRecords)));
604604
scores.add(new ActivityScore(SWIMMING.getValue(), calculateSwimmingScore(weather, tideRecords)));
605-
scores.add(new ActivityScore(KAYAKING_AND_PADDLE_BOARDING.getValue(),
606-
calculateKayakingPaddleBoardingScore(weather, tideRecords)));
605+
scores.add(new ActivityScore(PADDING.getValue(), calculatePaddingScore(weather, tideRecords)));
607606
return scores;
608607
}
609608

0 commit comments

Comments
 (0)