Skip to content

Commit 9792a45

Browse files
authored
Merge branch 'develop' into fix/#349
2 parents 506c05f + 29c251d commit 9792a45

File tree

4 files changed

+6
-4
lines changed

4 files changed

+6
-4
lines changed

api/src/main/java/com/sponus/sponusbe/domain/bookmark/exception/BookmarkErrorCode.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
@AllArgsConstructor
1313
public enum BookmarkErrorCode implements BaseErrorCode {
1414

15-
BOOKMARK_ERROR(HttpStatus.BAD_REQUEST, "BMK4000", "북마크 관련 에러");
15+
BOOKMARK_ERROR(HttpStatus.BAD_REQUEST, "BMK4000", "북마크 관련 에러"),
16+
CANNOT_BOOKMARK_TO_SELF(HttpStatus.BAD_REQUEST, "PROP4011", "본인에게는 북마크할 수 없습니다.");
1617

1718
private final HttpStatus httpStatus;
1819
private final String code;

api/src/main/java/com/sponus/sponusbe/domain/bookmark/service/BookmarkService.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public class BookmarkService {
2929
public BookmarkToggleResponse bookmarkToggle(Organization organization, BookmarkToggleRequest request) {
3030

3131
if (organization.getId().equals(request.target()))
32-
throw new BookmarkException(BookmarkErrorCode.BOOKMARK_ERROR);
32+
throw new BookmarkException(BookmarkErrorCode.CANNOT_BOOKMARK_TO_SELF);
3333

3434
final Organization target = organizationRepository.findById(request.target())
3535
.orElseThrow(() -> new OrganizationException(OrganizationErrorCode.ORGANIZATION_NOT_FOUND));

api/src/main/java/com/sponus/sponusbe/domain/propose/exception/ProposeErrorCode.java

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ public enum ProposeErrorCode implements BaseErrorCode {
1515
INVALID_PROPOSE_STATUS(HttpStatus.BAD_REQUEST, "PROP4005", "유효하지 않은 제안 상태입니다."),
1616
PROPOSE_LIMIT_ERROR(HttpStatus.CONFLICT, "PROP4009", "하루 제안 5회 초과하였습니다."),
1717
PROFILE_NOT_COMPLETED(HttpStatus.BAD_REQUEST, "PROP4010", "프로필이 작성되지 않았습니다."),
18+
CANNOT_PROPOSE_TO_SELF(HttpStatus.BAD_REQUEST, "PROP4011", "본인에게는 제안할 수 없습니다."),
1819
PROPOSE_NOT_FOUND(HttpStatus.NOT_FOUND, "PROP4040", "해당 제안이 존재하지 않습니다.");
1920

2021
private final HttpStatus httpStatus;

api/src/main/java/com/sponus/sponusbe/domain/propose/service/ProposeService.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@ public class ProposeService {
3131
public ProposeCreateResponse createPropose(Organization organization, ProposeCreateRequest request) {
3232

3333
if (organization.getId().equals(request.target()))
34-
throw new ProposeException(ProposeErrorCode.PROPOSE_ERROR);
34+
throw new ProposeException(ProposeErrorCode.CANNOT_PROPOSE_TO_SELF);
3535

3636
final Organization target = organizationRepository.findById(request.target())
3737
.orElseThrow(() -> new OrganizationException(OrganizationErrorCode.ORGANIZATION_NOT_FOUND));
3838

3939
if (organization.getImageUrl() == null || organization.getImageUrl().isEmpty())
4040
throw new ProposeException(ProposeErrorCode.PROFILE_NOT_COMPLETED);
41-
41+
4242
final Long count = proposeRepository.countProposesByOrganizationToday(organization,
4343
LocalDateTime.now().toLocalDate().atStartOfDay());
4444

0 commit comments

Comments
 (0)