From 5ede41317b02fecf5bd5cf82358a9010ffa6971e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=8B=A0=ED=9D=AC=EC=84=B1?= Date: Mon, 1 Apr 2024 01:28:09 +0900 Subject: [PATCH] Update delete team --- .../domain/team/service/impl/TeamDeleteServiceImpl.java | 4 +++- .../main/java/team/gsmgogo/global/config/SecurityConfig.java | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gsmgogo-api/src/main/java/team/gsmgogo/domain/team/service/impl/TeamDeleteServiceImpl.java b/gsmgogo-api/src/main/java/team/gsmgogo/domain/team/service/impl/TeamDeleteServiceImpl.java index 6d18e477..66cf312c 100644 --- a/gsmgogo-api/src/main/java/team/gsmgogo/domain/team/service/impl/TeamDeleteServiceImpl.java +++ b/gsmgogo-api/src/main/java/team/gsmgogo/domain/team/service/impl/TeamDeleteServiceImpl.java @@ -12,6 +12,8 @@ import team.gsmgogo.global.exception.error.ExpectedException; import team.gsmgogo.global.facade.UserFacade; +import java.util.Objects; + @Service @RequiredArgsConstructor public class TeamDeleteServiceImpl implements TeamDeleteService { @@ -27,7 +29,7 @@ public void deleteTeam(TeamDeleteRequest request) { UserEntity currentUser = userFacade.getCurrentUser(); - if (team.getTeamGrade() != currentUser.getUserGrade() || team.getTeamClass() != currentUser.getUserClass()) { + if (!Objects.equals(team.getAuthor().getUserId(), currentUser.getUserId())) { throw new ExpectedException("팀을 동록한 사람이 아닙니다.", HttpStatus.BAD_REQUEST); } diff --git a/gsmgogo-api/src/main/java/team/gsmgogo/global/config/SecurityConfig.java b/gsmgogo-api/src/main/java/team/gsmgogo/global/config/SecurityConfig.java index a0d850c5..5f470a0b 100644 --- a/gsmgogo-api/src/main/java/team/gsmgogo/global/config/SecurityConfig.java +++ b/gsmgogo-api/src/main/java/team/gsmgogo/global/config/SecurityConfig.java @@ -42,7 +42,6 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti authorizeHttpRequests .requestMatchers(HttpMethod.POST, "/team").hasAuthority("LEADER") .requestMatchers(HttpMethod.POST, "/team/normal").hasAuthority("LEADER") - .requestMatchers(HttpMethod.DELETE, "/team").hasAuthority("LEADER") .anyRequest().permitAll() );