Skip to content

Commit

Permalink
fix : enum 병합 에러 수정
Browse files Browse the repository at this point in the history
  • Loading branch information
hyun2371 committed Dec 28, 2023
1 parent d46e1b2 commit b7fd664
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,12 @@ public enum ErrorCode {
ALREADY_PREOCCUPIED_RESERVATION_TIME("이미 타인에게 선점권이 있는 예약시간입니다."),
ALREADY_OCCUPIED_RESERVATION_TIME("이미 예약된 시간입니다."),
NOT_EXIST_SHOP("존재하지 않는 매장입니다."),
NOT_EXIST_TIME("존재하지 않는 예약 시간입니다.");
NOT_EXIST_TIME("존재하지 않는 예약 시간입니다."),

ALREADY_CANCELED_WAITING("이미 웨이팅을 취소하였습니다."),
EXISTING_MEMBER_WAITING("이미 회원이 웨이팅 중인 가게가 존재합니다."),
SHOP_NOT_RUNNING("가게가 영업시간이 아닙니다."),
INTERNAL_SERVER_ERROR("내부 서버 오류입니다.");

private final String message;
}
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
package com.prgrms.catchtable.waiting.domain;

import static com.prgrms.catchtable.common.exception.ErrorCode.ALREADY_CANCELED_WAITING;
import static jakarta.persistence.ConstraintMode.NO_CONSTRAINT;
import static jakarta.persistence.EnumType.STRING;
import static jakarta.persistence.FetchType.LAZY;
import static jakarta.persistence.GenerationType.IDENTITY;
import static lombok.AccessLevel.PROTECTED;

import com.prgrms.catchtable.common.BaseEntity;
import com.prgrms.catchtable.common.exception.custom.BadRequestCustomException;
import com.prgrms.catchtable.member.domain.Member;
import com.prgrms.catchtable.shop.domain.Shop;
import jakarta.persistence.Column;
Expand Down

0 comments on commit b7fd664

Please sign in to comment.