Skip to content

Commit

Permalink
Merge branch 'develop' into 25-be-리뷰-수정
Browse files Browse the repository at this point in the history
  • Loading branch information
jsilver01 authored Aug 3, 2024
2 parents c0c7f68 + 5e0d056 commit 7f060d8
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,10 @@ public enum BaseExceptionResponseStatus implements ResponseStatus{
* 11000 : Review 관련
*/
CANNOT_FOUND_REVIEW(11000, HttpStatus.BAD_REQUEST.value(), "리뷰를 찾을 수 없습니다."),
ALREADY_EXIST_REVIEW(11001, HttpStatus.BAD_REQUEST.value(), "이미 등록한 리뷰가 있습니다. 수정으로 작성해주세요"),
ALREADY_EXIST_REVIEW(11001, HttpStatus.BAD_REQUEST.value(), "이미 등록한 리뷰가 있습니다. 수정으로 작성해주세요."),
CANNOT_SET_SCORE(11002, HttpStatus.BAD_REQUEST.value(), "점수가 너무 높거나 낮습니다. 1~5점으로 평가해주세요"); // 추가된 상수



private final int code;
private final int status;
private final String message;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,5 +62,4 @@ public BaseResponse<String> updateReview(@RequestHeader("Authorization") String

return new BaseResponse<>("리뷰가 성공적으로 업데이트되었습니다");
}

}
10 changes: 5 additions & 5 deletions src/main/java/com/example/likelion12/domain/Facility.java
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@ public class Facility extends BaseTime {
private String facilityName;

@Column(nullable = false)
private String facilityAddress;
private String facilityCity; // 시 정보

private String facilityGu; // 구 정보

private String facilityDong; // 동 정보

private String facilityPhone;
private String facilitySize;
private String administer;
private LocalDateTime weekday;
private LocalDateTime weekend;

@Enumerated(EnumType.STRING)
@Column(nullable = false)
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/application-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ spring:
enabled: false
jpa:
hibernate:
ddl-auto: create
ddl-auto: update
properties:
hibernate:
format_sql: true
Expand Down
3 changes: 1 addition & 2 deletions src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@ spring:
registration:
kakao:
client-id: ${CLIENT_ID}
# redirect-uri: http://43.202.94.241:8080/auth/kakao/callback
redirect-uri: http://localhost:8080/auth/kakao/callback
redirect-uri: http://43.202.94.241:8080/auth/kakao/callback

---
jwt:
Expand Down

0 comments on commit 7f060d8

Please sign in to comment.