Skip to content

Chore : 권한 수정 #187

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
saeeyes merged 2 commits into from
May 26, 2025
Merged

Chore : 권한 수정 #187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e56b75
chore : 권한 수정
saeeyes May 26, 2025
f63479c
chore : 시간 오류로 잠시 주석
saeeyes May 26, 2025
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
24 changes: 12 additions & 12 deletions ...java/com/example/smartair/controller/customUserController/UserSatisfactionController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ public ResponseEntity<?> setUsersSatisfaction(@AuthenticationPrincipal CustomUse

User user = userDetails.getUser();

if(user.getRole() == Role.USER){
return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body("접근 권한이 없습니다");
}
// if(user.getRole() == Role.USER){
// return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body("접근 권한이 없습니다");
// }
userSatisfactionService.setUserSatisfaction(user, satisfaction, roomId);
return ResponseEntity.ok("sucess");
}
Expand All @@ -49,9 +49,9 @@ public ResponseEntity<?> getUsersSatisfaction(@AuthenticationPrincipal CustomUse

User user = userDetails.getUser();

if(user.getRole() == Role.USER){
return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body("접근 권한이 없습니다");
}
// if(user.getRole() == Role.USER){
// return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body("접근 권한이 없습니다");
// }
List<UserSatisfactionResponseDto> list = userSatisfactionService.getUserSatisfaction(user, roomId);
return ResponseEntity.ok(list);
}
Expand All @@ -67,9 +67,9 @@ public ResponseEntity<?> updateUserSatisfaction(@AuthenticationPrincipal CustomU

User user = userDetails.getUser();

if (user.getRole() == Role.USER) {
return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body("접근 권한이 없습니다");
}
// if (user.getRole() == Role.USER) {
// return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body("접근 권한이 없습니다");
// }

try {
userSatisfactionService.updateUserSatisfaction(user, satisfactionId, newSatisfaction);
Expand All @@ -89,9 +89,9 @@ public ResponseEntity<?> deleteUserSatisfaction(@AuthenticationPrincipal CustomU

User user = userDetails.getUser();

if (user.getRole() == Role.USER) {
return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body("접근 권한이 없습니다");
}
// if (user.getRole() == Role.USER) {
// return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body("접근 권한이 없습니다");
// }

try {
userSatisfactionService.deleteUserSatisfaction(user, satisfactionId);
Expand Down
20 changes: 11 additions & 9 deletions ...main/java/com/example/smartair/service/airQualityService/report/AnomalyReportService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,13 @@ public String setAnomalyReport(AnomalyReportDto dto) throws Exception {

LocalDateTime anomalyDate = LocalDateTime.parse(dto.getAnomalyTimestamp(), ANOMALY_TIMESTAMP_FORMATTER);

HourlySensorAirQualitySnapshot hourlySnapshot = hourlyDeviceAirQualitySnapshotRepository
.findBySensorAndSnapshotHour(sensor, anomalyDate)
.orElseThrow(() -> new CustomException(ErrorCode.SNAPSHOT_NOT_FOUND, String.format("해당 센서의 시간별 스냅샷을 찾을 수 없습니다. 시리얼 번호: %s, 날짜: %s", sensor.getSerialNumber(), anomalyDate)));

DailySensorAirQualityReport dailyReport = dailySensorAirQualityReportRepository
.findBySensorAndReportDate(sensor, LocalDate.from(anomalyDate))
.orElseThrow(() -> new CustomException(ErrorCode.NO_DAILY_REPORTS_FOUND, String.format("해당 센서의 일일 보고서를 찾을 수 없습니다. 시리얼 번호: %s, 날짜: %s", sensor.getSerialNumber(), LocalDate.from(anomalyDate))));
// HourlySensorAirQualitySnapshot hourlySnapshot = hourlyDeviceAirQualitySnapshotRepository
// .findBySensorAndSnapshotHour(sensor, anomalyDate)
// .orElseThrow(() -> new CustomException(ErrorCode.SNAPSHOT_NOT_FOUND, String.format("해당 센서의 시간별 스냅샷을 찾을 수 없습니다. 시리얼 번호: %s, 날짜: %s", sensor.getSerialNumber(), anomalyDate)));
//
// DailySensorAirQualityReport dailyReport = dailySensorAirQualityReportRepository
// .findBySensorAndReportDate(sensor, LocalDate.from(anomalyDate))
// .orElseThrow(() -> new CustomException(ErrorCode.NO_DAILY_REPORTS_FOUND, String.format("해당 센서의 일일 보고서를 찾을 수 없습니다. 시리얼 번호: %s, 날짜: %s", sensor.getSerialNumber(), LocalDate.from(anomalyDate))));

String description = generateDescription(
dto.getPollutant(),
Expand All @@ -84,8 +84,10 @@ public String setAnomalyReport(AnomalyReportDto dto) throws Exception {
.pollutant(Pollutant.valueOf(dto.getPollutant()))
.pollutantValue(dto.getPollutantValue())
.description(description)
.relatedHourlySnapshot(hourlySnapshot)
.relatedDailyReport(dailyReport)
.relatedDailyReport(null)
.relatedHourlySnapshot(null)
//.relatedHourlySnapshot(hourlySnapshot)
//.relatedDailyReport(dailyReport)
.build();
anomalyReportRepository.save(anomalyReport);
log.info("Anomaly report saved: {}", anomalyReport.getId());
Expand Down