diff --git a/src/main/java/fun/sast/evento/lark/api/security/Permission.java b/src/main/java/fun/sast/evento/lark/api/security/Permission.java index 3b39c51..0a0a190 100644 --- a/src/main/java/fun/sast/evento/lark/api/security/Permission.java +++ b/src/main/java/fun/sast/evento/lark/api/security/Permission.java @@ -1,11 +1,7 @@ package fun.sast.evento.lark.api.security; -import fun.sast.evento.lark.infrastructure.error.BusinessException; -import fun.sast.evento.lark.infrastructure.error.ErrorEnum; import lombok.Getter; -import java.util.Arrays; - @Getter public enum Permission { LOGIN(0), @@ -18,11 +14,4 @@ public enum Permission { Permission(int num) { this.num = num; } - - public Permission getPermissionByNum(int num) { - return Arrays.stream(Permission.values()) - .filter(permission -> permission.num == num) - .findAny() - .orElseThrow(() -> new BusinessException(ErrorEnum.DEFAULT, "permission not exist")); - } } diff --git a/src/main/java/fun/sast/evento/lark/domain/lark/service/impl/LarkRoomServiceImpl.java b/src/main/java/fun/sast/evento/lark/domain/lark/service/impl/LarkRoomServiceImpl.java index 656831a..2f3151d 100644 --- a/src/main/java/fun/sast/evento/lark/domain/lark/service/impl/LarkRoomServiceImpl.java +++ b/src/main/java/fun/sast/evento/lark/domain/lark/service/impl/LarkRoomServiceImpl.java @@ -46,7 +46,7 @@ public List list() { .build()); if (!resp.success()) { log.error("failed to list room: {}", resp.getMsg()); - throw new BusinessException(ErrorEnum.LARK_ERROR, resp.getMsg()); + throw new BusinessException(ErrorEnum.LARK_ERROR_LIST_ROOM, resp.getMsg()); } if (resp.getData().getRooms() != null) { Arrays.stream(resp.getData().getRooms()).forEach(room -> larkRooms.add(new LarkRoom( @@ -60,8 +60,8 @@ public List list() { } while (hasMore); return larkRooms; } catch (Exception e) { - log.error("list room error", e); - throw new BusinessException(ErrorEnum.LARK_ERROR, e.getMessage()); + log.error("list room error: {}", e.getMessage()); + throw new RuntimeException(e.getMessage(), e); } } @@ -73,7 +73,7 @@ public LarkRoom get(String id) { .build()); if (!resp.success()) { log.error("failed to get room: {}", resp.getMsg()); - throw new BusinessException(ErrorEnum.LARK_ERROR, resp.getMsg()); + throw new BusinessException(ErrorEnum.LARK_ERROR_GET_ROOM, resp.getMsg()); } return new LarkRoom( resp.getData().getRoom().getRoomId(), @@ -81,8 +81,8 @@ public LarkRoom get(String id) { resp.getData().getRoom().getCapacity() ); } catch (Exception e) { - log.error("get room error", e); - throw new BusinessException(ErrorEnum.LARK_ERROR, e.getMessage()); + log.error("get room error: {}", e.getMessage()); + throw new RuntimeException(e.getMessage(), e); } } @@ -104,12 +104,12 @@ public Boolean isAvailable(String id, LocalDateTime start, LocalDateTime end) { return node.get("data").get("free_busy").isEmpty(); } else { log.error("failed to check room availability: {}", msg); - throw new BusinessException(ErrorEnum.LARK_ERROR, msg); + throw new BusinessException(ErrorEnum.LARK_ERROR_CHECK_ROOM_AVAILABLE, msg); } } catch (Exception e) { - log.error("check room availability error", e); - throw new BusinessException(ErrorEnum.LARK_ERROR, e.getMessage()); + log.error("check room availability error: {}", e.getMessage()); + throw new RuntimeException(e.getMessage(), e); } } diff --git a/src/main/java/fun/sast/evento/lark/infrastructure/auth/InterceptorConfig.java b/src/main/java/fun/sast/evento/lark/infrastructure/auth/InterceptorConfig.java index 32db2b2..c05fccd 100644 --- a/src/main/java/fun/sast/evento/lark/infrastructure/auth/InterceptorConfig.java +++ b/src/main/java/fun/sast/evento/lark/infrastructure/auth/InterceptorConfig.java @@ -16,7 +16,7 @@ public void addInterceptors(InterceptorRegistry registry) { registry.addInterceptor(jwtInterceptor) //TODO delete after test // .addPathPatterns("/**") - .excludePathPatterns("/api/login/**"); + .excludePathPatterns("/api/v2/login/**"); } } diff --git a/src/main/java/fun/sast/evento/lark/infrastructure/error/ErrorEnum.java b/src/main/java/fun/sast/evento/lark/infrastructure/error/ErrorEnum.java index 7f4d2f0..c53842a 100644 --- a/src/main/java/fun/sast/evento/lark/infrastructure/error/ErrorEnum.java +++ b/src/main/java/fun/sast/evento/lark/infrastructure/error/ErrorEnum.java @@ -22,6 +22,9 @@ public enum ErrorEnum { LARK_ERROR_LIST_DEPARTMENT(2010, "Failed to list department"), LARK_ERROR_GET_DEPARTMENT(2011, "Failed to get department"), LARK_ERROR_GET_DEPARTMENT_USER(2012, "Failed to get user list"), + LARK_ERROR_LIST_ROOM(2013, "Failed to list room"), + LARK_ERROR_GET_ROOM(2014, "Failed to get room"), + LARK_ERROR_CHECK_ROOM_AVAILABLE(2015, "Failed to check room available"), FEEDBACK_ALREADY_GIVEN(3001, "You have already given feedback for this event"), ;