Skip to content

refactor create sunrise and sunset time to use public city id #87

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
doraerdelyi merged 1 commit into from
May 8, 2025
Merged

refactor create sunrise and sunset time to use public city id #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions backend/src/main/java/com/codecool/solarwatch/controller/AdminController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ public void deleteCity(@PathVariable UUID id) {
this.solarWatchService.deleteCity(id);
}

@PostMapping("/sunrise-sunset")
public SunriseSunsetDTO createSunriseSunsetTimes(@RequestBody SunriseSunsetCreateDTO sunriseSunsetCreateDTO) {
return this.solarWatchService.createSunriseSunsetTimes(sunriseSunsetCreateDTO);
@PostMapping("/sunrise-sunset/{cityId}")
public SunriseSunsetDTO createSunriseSunsetTimes(@PathVariable UUID cityId, @RequestBody SunriseSunsetCreateDTO sunriseSunsetCreateDTO) {
return this.solarWatchService.createSunriseSunsetTimes(cityId, sunriseSunsetCreateDTO);
}

@PutMapping("/sunrise-sunset/{cityId}")
Expand Down
8 changes: 4 additions & 4 deletions backend/src/main/java/com/codecool/solarwatch/service/SolarWatchService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,8 @@ public void deleteCity(UUID publicId) {
* @param sunriseSunsetCreateDTO data transfer object containing the sunrise/sunset data to create
* @return created sunrise and sunset time data as a data transfer object
*/
public SunriseSunsetDTO createSunriseSunsetTimes(SunriseSunsetCreateDTO sunriseSunsetCreateDTO) {
City city = this.cityRepository.findByName(sunriseSunsetCreateDTO.cityName())
public SunriseSunsetDTO createSunriseSunsetTimes(UUID publicCityId, SunriseSunsetCreateDTO sunriseSunsetCreateDTO) {
City city = this.cityRepository.findByPublicId(publicCityId)
.orElseGet(() -> saveCityFromAPI(sunriseSunsetCreateDTO.cityName()));
SunriseSunsetTime sunriseSunsetTime = this.sunriseSunsetTimeRepository
.save(new SunriseSunsetTime(sunriseSunsetCreateDTO.sunrise(),
Expand All @@ -136,8 +136,8 @@ public SunriseSunsetDTO createSunriseSunsetTimes(SunriseSunsetCreateDTO sunriseS
* @throws NoSuchCityException if the city does not exist
* @throws NoSunriseSunsetDataException if the sunrise/sunset data cannot be found
*/
public SunriseSunsetDTO updateSunriseSunsetTimes(SunriseSunsetUpdateDTO sunriseSunsetUpdateDTO) {
City city = this.cityRepository.findByName(sunriseSunsetUpdateDTO.cityName())
public SunriseSunsetDTO updateSunriseSunsetTimes(UUID cityPublicId, SunriseSunsetUpdateDTO sunriseSunsetUpdateDTO) {
City city = this.cityRepository.findByPublicId(cityPublicId)
.orElseThrow(NoSuchCityException::new);
SunriseSunsetTime sunriseSunsetTime = this.sunriseSunsetTimeRepository.findByCityIdAndDate(city.getId(), sunriseSunsetUpdateDTO.date())
.map(sunriseSunset -> {
Expand Down
Loading