From 1f4dab862765ed31888d36925ffb5e312c151c08 Mon Sep 17 00:00:00 2001 From: KarmaPol Date: Sun, 21 Jan 2024 19:51:59 +0900 Subject: [PATCH 01/18] feat: add jwt provider --- .../coresecurity/CoreSecurityApplication.java | 2 +- .../mm/coresecurity/OAuth2UserDetails.java | 62 +++++++++++++++++++ .../mm/coresecurity/jwt/JwtTokenProvider.java | 44 +++++++++++++ .../service/OAuth2UserService.java | 25 ++++++++ .../CoreSecurityApplicationTests.java | 2 +- 5 files changed, 133 insertions(+), 2 deletions(-) rename core/core-security/src/main/java/com/{example => mm}/coresecurity/CoreSecurityApplication.java (89%) create mode 100644 core/core-security/src/main/java/com/mm/coresecurity/OAuth2UserDetails.java create mode 100644 core/core-security/src/main/java/com/mm/coresecurity/jwt/JwtTokenProvider.java create mode 100644 core/core-security/src/main/java/com/mm/coresecurity/service/OAuth2UserService.java rename core/core-security/src/test/java/com/{example => mm}/coresecurity/CoreSecurityApplicationTests.java (84%) diff --git a/core/core-security/src/main/java/com/example/coresecurity/CoreSecurityApplication.java b/core/core-security/src/main/java/com/mm/coresecurity/CoreSecurityApplication.java similarity index 89% rename from core/core-security/src/main/java/com/example/coresecurity/CoreSecurityApplication.java rename to core/core-security/src/main/java/com/mm/coresecurity/CoreSecurityApplication.java index a6a0045..79e3f92 100644 --- a/core/core-security/src/main/java/com/example/coresecurity/CoreSecurityApplication.java +++ b/core/core-security/src/main/java/com/mm/coresecurity/CoreSecurityApplication.java @@ -1,4 +1,4 @@ -package com.example.coresecurity; +package com.mm.coresecurity; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/core/core-security/src/main/java/com/mm/coresecurity/OAuth2UserDetails.java b/core/core-security/src/main/java/com/mm/coresecurity/OAuth2UserDetails.java new file mode 100644 index 0000000..8ced9cd --- /dev/null +++ b/core/core-security/src/main/java/com/mm/coresecurity/OAuth2UserDetails.java @@ -0,0 +1,62 @@ +package com.mm.coresecurity; + +import java.util.Collection; + +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.userdetails.UserDetails; + +import net.minidev.json.annotate.JsonIgnore; + +import lombok.Getter; + +@Getter +public class OAuth2UserDetails implements UserDetails { + private Long id; + private String email; + @JsonIgnore + private String password; + private Collection authorities; + + public OAuth2UserDetails(Long id, String email, String password, + Collection authorities) { + this.id = id; + this.email = email; + this.password = password; + this.authorities = authorities; + } + + @Override + public Collection getAuthorities() { + return authorities; + } + + @Override + public String getPassword() { + return password; + } + + @Override + public String getUsername() { + return email; + } + + @Override + public boolean isAccountNonExpired() { + return true; + } + + @Override + public boolean isAccountNonLocked() { + return true; + } + + @Override + public boolean isCredentialsNonExpired() { + return true; + } + + @Override + public boolean isEnabled() { + return true; + } +} diff --git a/core/core-security/src/main/java/com/mm/coresecurity/jwt/JwtTokenProvider.java b/core/core-security/src/main/java/com/mm/coresecurity/jwt/JwtTokenProvider.java new file mode 100644 index 0000000..da4ca83 --- /dev/null +++ b/core/core-security/src/main/java/com/mm/coresecurity/jwt/JwtTokenProvider.java @@ -0,0 +1,44 @@ +package com.mm.coresecurity.jwt; + +import java.time.Instant; +import java.util.Date; +import java.util.stream.Collectors; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.stereotype.Component; + +import com.mm.coresecurity.OAuth2UserDetails; + +import io.jsonwebtoken.Jwts; +import io.jsonwebtoken.io.Decoders; +import io.jsonwebtoken.security.Keys; + +@Component +public class JwtTokenProvider { + @Value("${jwt.secret-key}") + private String secretKey; + + @Value("${jwt.expiry-seconds}") + private int exprirySeconds; + + public String generateAccessToken(OAuth2UserDetails userDetails) { + Instant expirationTime = Instant.now().plusSeconds(exprirySeconds); + + String authorities = null; + if (userDetails.getAuthorities() != null) { + authorities = userDetails.getAuthorities().stream() + .map(GrantedAuthority::getAuthority) + .collect(Collectors.joining(",")); + } + + return Jwts.builder() + .claim("id", userDetails.getId()) + .subject((userDetails.getUsername())) + .issuedAt(Date.from(Instant.now())) + .expiration(Date.from(expirationTime)) + .claim("authorities", authorities) + .signWith(Keys.hmacShaKeyFor(Decoders.BASE64.decode(secretKey))) + .compact(); + } +} diff --git a/core/core-security/src/main/java/com/mm/coresecurity/service/OAuth2UserService.java b/core/core-security/src/main/java/com/mm/coresecurity/service/OAuth2UserService.java new file mode 100644 index 0000000..e2ba0da --- /dev/null +++ b/core/core-security/src/main/java/com/mm/coresecurity/service/OAuth2UserService.java @@ -0,0 +1,25 @@ +package com.mm.coresecurity.service; + +import java.util.Collections; + +import org.springframework.security.oauth2.client.userinfo.DefaultOAuth2UserService; +import org.springframework.security.oauth2.client.userinfo.OAuth2UserRequest; +import org.springframework.security.oauth2.core.OAuth2AuthenticationException; +import org.springframework.security.oauth2.core.user.DefaultOAuth2User; +import org.springframework.security.oauth2.core.user.OAuth2User; +import org.springframework.stereotype.Service; + +@Service +public class OAuth2UserService extends DefaultOAuth2UserService { + @Override + public OAuth2User loadUser(OAuth2UserRequest userRequest) throws OAuth2AuthenticationException { + OAuth2User oAuth2User = super.loadUser(userRequest); + + String userNameAttributeName = userRequest.getClientRegistration() + .getProviderDetails() + .getUserInfoEndpoint() + .getUserNameAttributeName(); + + return new DefaultOAuth2User(Collections.emptyList(), oAuth2User.getAttributes(), userNameAttributeName); + } +} diff --git a/core/core-security/src/test/java/com/example/coresecurity/CoreSecurityApplicationTests.java b/core/core-security/src/test/java/com/mm/coresecurity/CoreSecurityApplicationTests.java similarity index 84% rename from core/core-security/src/test/java/com/example/coresecurity/CoreSecurityApplicationTests.java rename to core/core-security/src/test/java/com/mm/coresecurity/CoreSecurityApplicationTests.java index 09d35e0..f9ad38f 100644 --- a/core/core-security/src/test/java/com/example/coresecurity/CoreSecurityApplicationTests.java +++ b/core/core-security/src/test/java/com/mm/coresecurity/CoreSecurityApplicationTests.java @@ -1,4 +1,4 @@ -package com.example.coresecurity; +package com.mm.coresecurity; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; From 0e31d0c265ba19909fd71f8ee046c30f662fbc97 Mon Sep 17 00:00:00 2001 From: KarmaPol Date: Mon, 22 Jan 2024 01:37:25 +0900 Subject: [PATCH 02/18] =?UTF-8?q?feat:=20add=20=EC=8A=A4=ED=94=84=EB=A7=81?= =?UTF-8?q?=20=EC=8B=9C=ED=81=90=EB=A6=AC=ED=8B=B0,=20oauth=20=EA=B8=B0?= =?UTF-8?q?=EB=B3=B8=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mm/api/config/WebMvcConfig.java | 15 ++++ .../com/mm/coredomain/CoreDomainConfig.java | 2 +- .../java/com/mm/coredomain/domain/Group.java | 25 ++++--- .../mm/coredomain/domain/GroupPermission.java | 23 ++++-- .../java/com/mm/coredomain/domain/Member.java | 38 +++++++--- .../com/mm/coredomain/domain/Permission.java | 10 ++- .../repository/MemberRepository.java | 11 +++ .../coresecurity/CoreSecurityApplication.java | 13 ---- .../config/WebSecurityConfig.java | 62 +++++++++++++++ .../jwt/JwtAccessDeniedHandler.java | 23 ++++++ .../jwt/JwtAuthenticationEntryPoint.java | 24 ++++++ .../jwt/JwtAuthenticationFilter.java | 47 ++++++++++++ .../mm/coresecurity/jwt/JwtTokenProvider.java | 31 +++++++- .../oauth/OAuth2AuthSuccessHandler.java | 75 +++++++++++++++++++ .../{ => oauth}/OAuth2UserDetails.java | 12 +-- .../mm/coresecurity/oauth/OAuthProvider.java | 5 ++ .../coresecurity/util/HttpResponseUtil.java | 31 ++++++++ 17 files changed, 391 insertions(+), 56 deletions(-) create mode 100644 api/src/main/java/com/mm/api/config/WebMvcConfig.java create mode 100644 core/core-domain/src/main/java/com/mm/coredomain/repository/MemberRepository.java delete mode 100644 core/core-security/src/main/java/com/mm/coresecurity/CoreSecurityApplication.java create mode 100644 core/core-security/src/main/java/com/mm/coresecurity/config/WebSecurityConfig.java create mode 100644 core/core-security/src/main/java/com/mm/coresecurity/jwt/JwtAccessDeniedHandler.java create mode 100644 core/core-security/src/main/java/com/mm/coresecurity/jwt/JwtAuthenticationEntryPoint.java create mode 100644 core/core-security/src/main/java/com/mm/coresecurity/jwt/JwtAuthenticationFilter.java create mode 100644 core/core-security/src/main/java/com/mm/coresecurity/oauth/OAuth2AuthSuccessHandler.java rename core/core-security/src/main/java/com/mm/coresecurity/{ => oauth}/OAuth2UserDetails.java (82%) create mode 100644 core/core-security/src/main/java/com/mm/coresecurity/oauth/OAuthProvider.java create mode 100644 core/core-security/src/main/java/com/mm/coresecurity/util/HttpResponseUtil.java diff --git a/api/src/main/java/com/mm/api/config/WebMvcConfig.java b/api/src/main/java/com/mm/api/config/WebMvcConfig.java new file mode 100644 index 0000000..310fa81 --- /dev/null +++ b/api/src/main/java/com/mm/api/config/WebMvcConfig.java @@ -0,0 +1,15 @@ +package com.mm.api.config; + +import org.springframework.web.servlet.config.annotation.CorsRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +public class WebMvcConfig implements WebMvcConfigurer { + @Override + public void addCorsMappings(CorsRegistry registry) { + registry.addMapping("/**") + .allowedOrigins("/**") + .allowedHeaders("*") + .allowedMethods("GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS") + .allowCredentials(true); + } +} diff --git a/core/core-domain/src/main/java/com/mm/coredomain/CoreDomainConfig.java b/core/core-domain/src/main/java/com/mm/coredomain/CoreDomainConfig.java index 8cb868f..1899760 100644 --- a/core/core-domain/src/main/java/com/mm/coredomain/CoreDomainConfig.java +++ b/core/core-domain/src/main/java/com/mm/coredomain/CoreDomainConfig.java @@ -7,7 +7,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement; @Configuration -@EntityScan("com.pgms.coredomain") +@EntityScan("com.mm.coredomain") @EnableJpaAuditing @EnableTransactionManagement @EnableJpaRepositories("com.mm.coredomain") diff --git a/core/core-domain/src/main/java/com/mm/coredomain/domain/Group.java b/core/core-domain/src/main/java/com/mm/coredomain/domain/Group.java index 8899d0c..708a5b4 100644 --- a/core/core-domain/src/main/java/com/mm/coredomain/domain/Group.java +++ b/core/core-domain/src/main/java/com/mm/coredomain/domain/Group.java @@ -1,18 +1,25 @@ package com.mm.coredomain.domain; -import jakarta.persistence.*; - import java.util.List; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; +import lombok.Getter; + +@Getter @Entity public class Group extends BaseEntity { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long id; + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; - private String name; + private String name; - @OneToMany(mappedBy = "group") - @JoinColumn(name = "group_id") - private List groupPermissions; + @OneToMany(mappedBy = "group") + @JoinColumn(name = "group_id") + private List groupPermissions; } diff --git a/core/core-domain/src/main/java/com/mm/coredomain/domain/GroupPermission.java b/core/core-domain/src/main/java/com/mm/coredomain/domain/GroupPermission.java index f90713e..fc9841b 100644 --- a/core/core-domain/src/main/java/com/mm/coredomain/domain/GroupPermission.java +++ b/core/core-domain/src/main/java/com/mm/coredomain/domain/GroupPermission.java @@ -1,16 +1,23 @@ package com.mm.coredomain.domain; -import jakarta.persistence.*; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import lombok.Getter; +@Getter @Entity public class GroupPermission extends BaseEntity { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long id; + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; - @ManyToOne(fetch = FetchType.LAZY) - private Group group; + @ManyToOne(fetch = FetchType.LAZY) + private Group group; - @ManyToOne(fetch = FetchType.LAZY) - private Permission permission; + @ManyToOne(fetch = FetchType.LAZY) + private Permission permission; } diff --git a/core/core-domain/src/main/java/com/mm/coredomain/domain/Member.java b/core/core-domain/src/main/java/com/mm/coredomain/domain/Member.java index 8c9c7a7..9f62c02 100644 --- a/core/core-domain/src/main/java/com/mm/coredomain/domain/Member.java +++ b/core/core-domain/src/main/java/com/mm/coredomain/domain/Member.java @@ -1,23 +1,37 @@ package com.mm.coredomain.domain; -import jakarta.persistence.*; - +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import lombok.AccessLevel; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter @Entity +@Builder +@AllArgsConstructor +@NoArgsConstructor(access = AccessLevel.PROTECTED) public class Member extends BaseEntity { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private String name; + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; - private String email; + private String name; - private String password; + private String email; - private Integer point; + private Integer point; - private String accountBank; + private String accountBank; - private MemberStatus memberStatus; + private MemberStatus memberStatus; - @ManyToOne(fetch = FetchType.LAZY) - private Group group; + @ManyToOne(fetch = FetchType.LAZY) + private Group group; } diff --git a/core/core-domain/src/main/java/com/mm/coredomain/domain/Permission.java b/core/core-domain/src/main/java/com/mm/coredomain/domain/Permission.java index 9b6e58c..24738d8 100644 --- a/core/core-domain/src/main/java/com/mm/coredomain/domain/Permission.java +++ b/core/core-domain/src/main/java/com/mm/coredomain/domain/Permission.java @@ -3,12 +3,14 @@ import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; +import lombok.Getter; +@Getter @Entity public class Permission extends BaseEntity { - @Id - @GeneratedValue - private Long id; + @Id + @GeneratedValue + private Long id; - private String name; + private String name; } diff --git a/core/core-domain/src/main/java/com/mm/coredomain/repository/MemberRepository.java b/core/core-domain/src/main/java/com/mm/coredomain/repository/MemberRepository.java new file mode 100644 index 0000000..589b176 --- /dev/null +++ b/core/core-domain/src/main/java/com/mm/coredomain/repository/MemberRepository.java @@ -0,0 +1,11 @@ +package com.mm.coredomain.repository; + +import java.util.Optional; + +import org.springframework.data.jpa.repository.JpaRepository; + +import com.mm.coredomain.domain.Member; + +public interface MemberRepository extends JpaRepository { + Optional findByEmail(String email); +} diff --git a/core/core-security/src/main/java/com/mm/coresecurity/CoreSecurityApplication.java b/core/core-security/src/main/java/com/mm/coresecurity/CoreSecurityApplication.java deleted file mode 100644 index 79e3f92..0000000 --- a/core/core-security/src/main/java/com/mm/coresecurity/CoreSecurityApplication.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.mm.coresecurity; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -@SpringBootApplication -public class CoreSecurityApplication { - - public static void main(String[] args) { - SpringApplication.run(CoreSecurityApplication.class, args); - } - -} diff --git a/core/core-security/src/main/java/com/mm/coresecurity/config/WebSecurityConfig.java b/core/core-security/src/main/java/com/mm/coresecurity/config/WebSecurityConfig.java new file mode 100644 index 0000000..5584096 --- /dev/null +++ b/core/core-security/src/main/java/com/mm/coresecurity/config/WebSecurityConfig.java @@ -0,0 +1,62 @@ +package com.mm.coresecurity.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.config.http.SessionCreationPolicy; +import org.springframework.security.web.SecurityFilterChain; +import org.springframework.security.web.authentication.AuthenticationSuccessHandler; +import org.springframework.security.web.context.SecurityContextPersistenceFilter; + +import com.mm.coresecurity.jwt.JwtAccessDeniedHandler; +import com.mm.coresecurity.jwt.JwtAuthenticationEntryPoint; +import com.mm.coresecurity.jwt.JwtAuthenticationFilter; +import com.mm.coresecurity.oauth.OAuth2AuthSuccessHandler; +import com.mm.coresecurity.service.OAuth2UserService; + +import lombok.RequiredArgsConstructor; + +@Configuration +@EnableWebSecurity +@ComponentScan(basePackages = "com.mm.coresecurity") +@RequiredArgsConstructor +public class WebSecurityConfig { + private final JwtAuthenticationFilter jwtAuthenticationFilter; + private final JwtAuthenticationEntryPoint jwtAuthenticationEntryPoint; + private final JwtAccessDeniedHandler jwtAccessDeniedHandler; + private final OAuth2UserService oAuth2UserService; + private final OAuth2AuthSuccessHandler oAuth2AuthSuccessHandler; + private final AuthenticationSuccessHandler authenticationSuccessHandler; + + @Bean + public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { + return http + .csrf().disable() + .anonymous().disable() + .formLogin().disable() + .httpBasic().disable() + .rememberMe().disable() + .logout().disable() + .sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS).and() + .oauth2Login(oauth2Configurer -> + oauth2Configurer + .loginPage("/login") + .successHandler(oAuth2AuthSuccessHandler) + .userInfoEndpoint() + .userService(oAuth2UserService)) + + .authorizeHttpRequests(auth -> auth + .anyRequest().permitAll()) + + .addFilterAfter(jwtAuthenticationFilter, SecurityContextPersistenceFilter.class) + .exceptionHandling(exceptionHandlingConfigurer -> { + exceptionHandlingConfigurer.authenticationEntryPoint(jwtAuthenticationEntryPoint); + exceptionHandlingConfigurer.accessDeniedHandler(jwtAccessDeniedHandler); + }) + + .build(); + } +} + diff --git a/core/core-security/src/main/java/com/mm/coresecurity/jwt/JwtAccessDeniedHandler.java b/core/core-security/src/main/java/com/mm/coresecurity/jwt/JwtAccessDeniedHandler.java new file mode 100644 index 0000000..a355680 --- /dev/null +++ b/core/core-security/src/main/java/com/mm/coresecurity/jwt/JwtAccessDeniedHandler.java @@ -0,0 +1,23 @@ +package com.mm.coresecurity.jwt; + +import java.io.IOException; + +import org.springframework.http.HttpStatus; +import org.springframework.security.access.AccessDeniedException; +import org.springframework.security.web.access.AccessDeniedHandler; +import org.springframework.stereotype.Component; + +import com.mm.coresecurity.util.HttpResponseUtil; + +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + +@Component +public class JwtAccessDeniedHandler implements AccessDeniedHandler { + @Override + public void handle(HttpServletRequest request, HttpServletResponse response, + AccessDeniedException accessDeniedException) throws IOException, ServletException { + HttpResponseUtil.writeErrorResponse(response, HttpStatus.FORBIDDEN, "권한이 없습니다."); + } +} diff --git a/core/core-security/src/main/java/com/mm/coresecurity/jwt/JwtAuthenticationEntryPoint.java b/core/core-security/src/main/java/com/mm/coresecurity/jwt/JwtAuthenticationEntryPoint.java new file mode 100644 index 0000000..1fa9eb3 --- /dev/null +++ b/core/core-security/src/main/java/com/mm/coresecurity/jwt/JwtAuthenticationEntryPoint.java @@ -0,0 +1,24 @@ +package com.mm.coresecurity.jwt; + +import java.io.IOException; + +import org.springframework.http.HttpStatus; +import org.springframework.security.core.AuthenticationException; +import org.springframework.security.web.AuthenticationEntryPoint; +import org.springframework.stereotype.Component; + +import com.mm.coresecurity.util.HttpResponseUtil; + +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + +@Component +public class JwtAuthenticationEntryPoint implements AuthenticationEntryPoint { + @Override + public void commence(HttpServletRequest request, HttpServletResponse response, + AuthenticationException authException) throws IOException, ServletException { + + HttpResponseUtil.writeErrorResponse(response, HttpStatus.FORBIDDEN, "로그인이 필요합니다."); + } +} diff --git a/core/core-security/src/main/java/com/mm/coresecurity/jwt/JwtAuthenticationFilter.java b/core/core-security/src/main/java/com/mm/coresecurity/jwt/JwtAuthenticationFilter.java new file mode 100644 index 0000000..baf8ca5 --- /dev/null +++ b/core/core-security/src/main/java/com/mm/coresecurity/jwt/JwtAuthenticationFilter.java @@ -0,0 +1,47 @@ +package com.mm.coresecurity.jwt; + +import java.io.IOException; + +import org.springframework.stereotype.Component; +import org.springframework.util.StringUtils; +import org.springframework.web.filter.OncePerRequestFilter; + +import io.jsonwebtoken.ExpiredJwtException; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; + +@Slf4j +@Component +@RequiredArgsConstructor +public class JwtAuthenticationFilter extends OncePerRequestFilter { + private final JwtTokenProvider jwtTokenProvider; + + @Override + protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, + FilterChain filterChain) throws ServletException, IOException { + try { + String accessToken = resolveToken(request); + jwtTokenProvider.validateAccessToken(accessToken); + } catch (ExpiredJwtException e) { + log.info(">>>>> access token expired {}", e); + throw e; + } catch (Exception e) { + log.warn(">>>>> Authentication Failed {}", e); + throw e; + } + + filterChain.doFilter(request, response); + } + + private String resolveToken(HttpServletRequest request) { + String authorizationHeader = request.getHeader("Authorization"); + if (StringUtils.hasText(authorizationHeader) && authorizationHeader.startsWith("Bearer")) { + return authorizationHeader.substring(7); + } + return null; + } +} diff --git a/core/core-security/src/main/java/com/mm/coresecurity/jwt/JwtTokenProvider.java b/core/core-security/src/main/java/com/mm/coresecurity/jwt/JwtTokenProvider.java index da4ca83..6db6678 100644 --- a/core/core-security/src/main/java/com/mm/coresecurity/jwt/JwtTokenProvider.java +++ b/core/core-security/src/main/java/com/mm/coresecurity/jwt/JwtTokenProvider.java @@ -4,11 +4,13 @@ import java.util.Date; import java.util.stream.Collectors; +import javax.crypto.SecretKey; + import org.springframework.beans.factory.annotation.Value; import org.springframework.security.core.GrantedAuthority; import org.springframework.stereotype.Component; -import com.mm.coresecurity.OAuth2UserDetails; +import com.mm.coresecurity.oauth.OAuth2UserDetails; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.io.Decoders; @@ -20,10 +22,13 @@ public class JwtTokenProvider { private String secretKey; @Value("${jwt.expiry-seconds}") - private int exprirySeconds; + private int expirySeconds; + + @Value("${jwt.refresh-expiry-seconds}") + private int refreshExpirySeconds; public String generateAccessToken(OAuth2UserDetails userDetails) { - Instant expirationTime = Instant.now().plusSeconds(exprirySeconds); + Instant expirationTime = Instant.now().plusSeconds(expirySeconds); String authorities = null; if (userDetails.getAuthorities() != null) { @@ -38,7 +43,25 @@ public String generateAccessToken(OAuth2UserDetails userDetails) { .issuedAt(Date.from(Instant.now())) .expiration(Date.from(expirationTime)) .claim("authorities", authorities) - .signWith(Keys.hmacShaKeyFor(Decoders.BASE64.decode(secretKey))) + .signWith(getKey()) .compact(); } + + public String generateRefreshToken() { + Instant expirationTime = Instant.now().plusSeconds(refreshExpirySeconds); + + return Jwts.builder() + .issuedAt(Date.from(Instant.now())) + .expiration(Date.from(expirationTime)) + .signWith(getKey()) + .compact(); + } + + private SecretKey getKey() { + return Keys.hmacShaKeyFor(Decoders.BASE64.decode(secretKey)); + } + + public void validateAccessToken(String token) { + Jwts.parser().verifyWith(getKey()).build().parse(token); + } } diff --git a/core/core-security/src/main/java/com/mm/coresecurity/oauth/OAuth2AuthSuccessHandler.java b/core/core-security/src/main/java/com/mm/coresecurity/oauth/OAuth2AuthSuccessHandler.java new file mode 100644 index 0000000..bb27e54 --- /dev/null +++ b/core/core-security/src/main/java/com/mm/coresecurity/oauth/OAuth2AuthSuccessHandler.java @@ -0,0 +1,75 @@ +package com.mm.coresecurity.oauth; + +import java.io.IOException; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.springframework.security.core.Authentication; +import org.springframework.security.core.authority.SimpleGrantedAuthority; +import org.springframework.security.oauth2.core.user.DefaultOAuth2User; +import org.springframework.security.web.authentication.AuthenticationSuccessHandler; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + +import com.mm.coredomain.domain.Member; +import com.mm.coredomain.repository.MemberRepository; +import com.mm.coresecurity.jwt.JwtTokenProvider; +import com.mm.coresecurity.util.HttpResponseUtil; + +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; + +@Slf4j +@Component +@Transactional +@RequiredArgsConstructor +public class OAuth2AuthSuccessHandler implements AuthenticationSuccessHandler { + private final JwtTokenProvider jwtTokenProvider; + private final MemberRepository memberRepository; + + @Override + public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response, + Authentication authentication) throws IOException, ServletException { + DefaultOAuth2User principal = (DefaultOAuth2User)authentication.getPrincipal(); + + Map properties = principal.getAttribute("properties"); + String email = properties.get("email"); + + Member member = getMemberElseCreateMember(email); + List authorities = member.getGroup() + .getGroupPermissions() + .stream() + .map(groupPermission -> new SimpleGrantedAuthority(groupPermission.getPermission().getName())) + .toList(); + + // TODO provider kakao, apple 구분 + OAuth2UserDetails userDetails = OAuth2UserDetails.builder() + .id(member.getId()) + .provider(OAuthProvider.KAKAO) + .authorities(authorities) + .build(); + + String accessToken = jwtTokenProvider.generateAccessToken(userDetails); + String refreshToken = jwtTokenProvider.generateRefreshToken(); + // TODO refreshToken 저장 추가 (레디스) + + Map tokenMap = new HashMap<>(); + tokenMap.put("accessToken", accessToken); + tokenMap.put("refreshToken", refreshToken); + + HttpResponseUtil.writeSuccessResponse(response, tokenMap); + } + + private Member getMemberElseCreateMember(String email) { + return memberRepository.findByEmail(email).orElseGet(() -> { + Member member = Member.builder() + .email(email) + .build(); + return memberRepository.save(member); + }); + } +} diff --git a/core/core-security/src/main/java/com/mm/coresecurity/OAuth2UserDetails.java b/core/core-security/src/main/java/com/mm/coresecurity/oauth/OAuth2UserDetails.java similarity index 82% rename from core/core-security/src/main/java/com/mm/coresecurity/OAuth2UserDetails.java rename to core/core-security/src/main/java/com/mm/coresecurity/oauth/OAuth2UserDetails.java index 8ced9cd..9cdc227 100644 --- a/core/core-security/src/main/java/com/mm/coresecurity/OAuth2UserDetails.java +++ b/core/core-security/src/main/java/com/mm/coresecurity/oauth/OAuth2UserDetails.java @@ -1,4 +1,4 @@ -package com.mm.coresecurity; +package com.mm.coresecurity.oauth; import java.util.Collection; @@ -7,6 +7,7 @@ import net.minidev.json.annotate.JsonIgnore; +import lombok.Builder; import lombok.Getter; @Getter @@ -14,15 +15,16 @@ public class OAuth2UserDetails implements UserDetails { private Long id; private String email; @JsonIgnore - private String password; private Collection authorities; + private OAuthProvider provider; + @Builder public OAuth2UserDetails(Long id, String email, String password, - Collection authorities) { + Collection authorities, OAuthProvider provider) { this.id = id; this.email = email; - this.password = password; this.authorities = authorities; + this.provider = provider; } @Override @@ -32,7 +34,7 @@ public Collection getAuthorities() { @Override public String getPassword() { - return password; + return null; } @Override diff --git a/core/core-security/src/main/java/com/mm/coresecurity/oauth/OAuthProvider.java b/core/core-security/src/main/java/com/mm/coresecurity/oauth/OAuthProvider.java new file mode 100644 index 0000000..d8ba7f4 --- /dev/null +++ b/core/core-security/src/main/java/com/mm/coresecurity/oauth/OAuthProvider.java @@ -0,0 +1,5 @@ +package com.mm.coresecurity.oauth; + +public enum OAuthProvider { + KAKAO, APPLE +} diff --git a/core/core-security/src/main/java/com/mm/coresecurity/util/HttpResponseUtil.java b/core/core-security/src/main/java/com/mm/coresecurity/util/HttpResponseUtil.java new file mode 100644 index 0000000..c9035d7 --- /dev/null +++ b/core/core-security/src/main/java/com/mm/coresecurity/util/HttpResponseUtil.java @@ -0,0 +1,31 @@ +package com.mm.coresecurity.util; + +import java.io.IOException; + +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; + +import com.fasterxml.jackson.databind.ObjectMapper; + +import jakarta.servlet.http.HttpServletResponse; + +public class HttpResponseUtil { + private static final ObjectMapper objectMapper = new ObjectMapper(); + + public static void writeSuccessResponse(HttpServletResponse response, Object data) throws IOException { + String json = objectMapper.writeValueAsString(data); + response.setContentType(MediaType.APPLICATION_JSON_VALUE); + response.setStatus(HttpServletResponse.SC_OK); + response.setCharacterEncoding("UTF-8"); + response.getWriter().write(json); + } + + public static void writeErrorResponse(HttpServletResponse response, HttpStatus httpStatus, Object data) throws + IOException { + String json = objectMapper.writeValueAsString(data); + response.setContentType(MediaType.APPLICATION_JSON_VALUE); + response.setStatus(httpStatus.value()); + response.setCharacterEncoding("UTF-8"); + response.getWriter().write(json); + } +} From f2c508495555cc78318d3b356a11cc31f50bd162 Mon Sep 17 00:00:00 2001 From: KarmaPol Date: Mon, 22 Jan 2024 23:39:13 +0900 Subject: [PATCH 03/18] =?UTF-8?q?fix:=20exception=20handler=20error=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/build.gradle | 7 ++- .../api/exception/GlobalExceptionHandler.java | 53 +++++++++--------- api/src/main/resources/application.yml | 2 +- .../domain/{Group.java => Groups.java} | 2 - .../core-infra-qdsl/build.gradle | 0 .../gradle/wrapper/gradle-wrapper.jar | Bin .../gradle/wrapper/gradle-wrapper.properties | 0 .../coreinfraqdsl/config/QueryDslConfig.java | 0 .../repository/ItemCustomRepository.java | 0 .../repository/ItemCustomRepositoryImpl.java | 0 .../src/main/resources/application.properties | 0 core/core-infra/build.gradle | 6 -- 12 files changed, 34 insertions(+), 36 deletions(-) rename core/core-domain/src/main/java/com/mm/coredomain/domain/{Group.java => Groups.java} (87%) rename core/{core-infra => }/core-infra-qdsl/build.gradle (100%) rename core/{core-infra => }/core-infra-qdsl/gradle/wrapper/gradle-wrapper.jar (100%) rename core/{core-infra => }/core-infra-qdsl/gradle/wrapper/gradle-wrapper.properties (100%) rename core/{core-infra => }/core-infra-qdsl/src/main/java/com/mm/coreinfraqdsl/config/QueryDslConfig.java (100%) rename core/{core-infra => }/core-infra-qdsl/src/main/java/com/mm/coreinfraqdsl/repository/ItemCustomRepository.java (100%) rename core/{core-infra => }/core-infra-qdsl/src/main/java/com/mm/coreinfraqdsl/repository/ItemCustomRepositoryImpl.java (100%) rename core/{core-infra => }/core-infra-qdsl/src/main/resources/application.properties (100%) delete mode 100644 core/core-infra/build.gradle diff --git a/api/build.gradle b/api/build.gradle index cd661d5..c1b73eb 100644 --- a/api/build.gradle +++ b/api/build.gradle @@ -7,7 +7,9 @@ jar { enabled = false } dependencies { implementation project(':core:core-domain'); - implementation project(':core:core-infra:core-infra-qdsl'); + implementation project(':core:core-infra-rdb'); + implementation project(':core:core-infra-qdsl'); + implementation project(':core:core-security'); // validation implementation 'org.springframework.boot:spring-boot-starter-validation' @@ -20,4 +22,7 @@ dependencies { annotationProcessor "com.querydsl:querydsl-apt:5.0.0:jakarta" annotationProcessor "jakarta.annotation:jakarta.annotation-api" annotationProcessor "jakarta.persistence:jakarta.persistence-api" + + // security + implementation 'org.springframework.boot:spring-boot-starter-security' } diff --git a/api/src/main/java/com/mm/api/exception/GlobalExceptionHandler.java b/api/src/main/java/com/mm/api/exception/GlobalExceptionHandler.java index be70fbb..41f59a0 100644 --- a/api/src/main/java/com/mm/api/exception/GlobalExceptionHandler.java +++ b/api/src/main/java/com/mm/api/exception/GlobalExceptionHandler.java @@ -1,6 +1,8 @@ package com.mm.api.exception; -import lombok.extern.slf4j.Slf4j; +import java.util.List; +import java.util.Objects; + import org.springframework.http.ResponseEntity; import org.springframework.validation.BindingResult; import org.springframework.validation.FieldError; @@ -8,40 +10,39 @@ import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; -import java.util.List; -import java.util.Objects; +import lombok.extern.slf4j.Slf4j; @Slf4j @RestControllerAdvice public class GlobalExceptionHandler { - @ExceptionHandler(CustomException.class) - public ResponseEntity handleCustomException(CustomException e){ - log.info(">>>>> CustomException occurred!! {}", e); + @ExceptionHandler(CustomException.class) + public ResponseEntity handleCustomException(CustomException e) { + log.info(">>>>> CustomException occurred!! {}", e); - ErrorResponse errorResponse = new ErrorResponse(e.getCode().getErrorCode(), e.getMessage()); - return ResponseEntity.status(e.getCode().getStatus()).body(errorResponse); - } + ErrorResponse errorResponse = new ErrorResponse(e.getCode().getErrorCode(), e.getMessage()); + return ResponseEntity.status(e.getCode().getStatus()).body(errorResponse); + } - @ExceptionHandler(CustomException.class) - public ResponseEntity handleMethodArgumentException(MethodArgumentNotValidException e){ - log.info(">>>>> MethodArgumentNotValidException occurred!! {}", e); + @ExceptionHandler(MethodArgumentNotValidException.class) + public ResponseEntity handleMethodArgumentException(MethodArgumentNotValidException e) { + log.info(">>>>> MethodArgumentNotValidException occurred!! {}", e); - BindingResult bindingResult = e.getBindingResult(); - String errorMessage = Objects.requireNonNull(bindingResult.getFieldError()) - .getDefaultMessage(); + BindingResult bindingResult = e.getBindingResult(); + String errorMessage = Objects.requireNonNull(bindingResult.getFieldError()) + .getDefaultMessage(); - List fieldErrors = bindingResult.getFieldErrors(); - ErrorResponse errorResponse = new ErrorResponse(ErrorCode.VALIDATION_FAILED.getErrorCode(), errorMessage); - fieldErrors.forEach(error -> errorResponse.addValidation(error.getField(), error.getDefaultMessage())); - return ResponseEntity.status(e.getStatusCode()).body(errorResponse); - } + List fieldErrors = bindingResult.getFieldErrors(); + ErrorResponse errorResponse = new ErrorResponse(ErrorCode.VALIDATION_FAILED.getErrorCode(), errorMessage); + fieldErrors.forEach(error -> errorResponse.addValidation(error.getField(), error.getDefaultMessage())); + return ResponseEntity.status(e.getStatusCode()).body(errorResponse); + } - @ExceptionHandler(Exception.class) - public ResponseEntity handleException(Exception e){ - log.info(">>>>> Internal Server error occurred!! {}", e); + @ExceptionHandler(Exception.class) + public ResponseEntity handleException(Exception e) { + log.info(">>>>> Internal Server error occurred!! {}", e); - ErrorResponse errorResponse = new ErrorResponse("500/0001", e.getMessage()); - return ResponseEntity.internalServerError().body(errorResponse); - } + ErrorResponse errorResponse = new ErrorResponse("500/0001", e.getMessage()); + return ResponseEntity.internalServerError().body(errorResponse); + } } diff --git a/api/src/main/resources/application.yml b/api/src/main/resources/application.yml index 65a0cf7..8cedbdb 100644 --- a/api/src/main/resources/application.yml +++ b/api/src/main/resources/application.yml @@ -1,6 +1,6 @@ spring: profiles: - include: infra-rdb + include: infra-rdb, security active: dev server: diff --git a/core/core-domain/src/main/java/com/mm/coredomain/domain/Group.java b/core/core-domain/src/main/java/com/mm/coredomain/domain/Groups.java similarity index 87% rename from core/core-domain/src/main/java/com/mm/coredomain/domain/Group.java rename to core/core-domain/src/main/java/com/mm/coredomain/domain/Groups.java index 708a5b4..7537335 100644 --- a/core/core-domain/src/main/java/com/mm/coredomain/domain/Group.java +++ b/core/core-domain/src/main/java/com/mm/coredomain/domain/Groups.java @@ -6,7 +6,6 @@ import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.Id; -import jakarta.persistence.JoinColumn; import jakarta.persistence.OneToMany; import lombok.Getter; @@ -20,6 +19,5 @@ public class Group extends BaseEntity { private String name; @OneToMany(mappedBy = "group") - @JoinColumn(name = "group_id") private List groupPermissions; } diff --git a/core/core-infra/core-infra-qdsl/build.gradle b/core/core-infra-qdsl/build.gradle similarity index 100% rename from core/core-infra/core-infra-qdsl/build.gradle rename to core/core-infra-qdsl/build.gradle diff --git a/core/core-infra/core-infra-qdsl/gradle/wrapper/gradle-wrapper.jar b/core/core-infra-qdsl/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from core/core-infra/core-infra-qdsl/gradle/wrapper/gradle-wrapper.jar rename to core/core-infra-qdsl/gradle/wrapper/gradle-wrapper.jar diff --git a/core/core-infra/core-infra-qdsl/gradle/wrapper/gradle-wrapper.properties b/core/core-infra-qdsl/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from core/core-infra/core-infra-qdsl/gradle/wrapper/gradle-wrapper.properties rename to core/core-infra-qdsl/gradle/wrapper/gradle-wrapper.properties diff --git a/core/core-infra/core-infra-qdsl/src/main/java/com/mm/coreinfraqdsl/config/QueryDslConfig.java b/core/core-infra-qdsl/src/main/java/com/mm/coreinfraqdsl/config/QueryDslConfig.java similarity index 100% rename from core/core-infra/core-infra-qdsl/src/main/java/com/mm/coreinfraqdsl/config/QueryDslConfig.java rename to core/core-infra-qdsl/src/main/java/com/mm/coreinfraqdsl/config/QueryDslConfig.java diff --git a/core/core-infra/core-infra-qdsl/src/main/java/com/mm/coreinfraqdsl/repository/ItemCustomRepository.java b/core/core-infra-qdsl/src/main/java/com/mm/coreinfraqdsl/repository/ItemCustomRepository.java similarity index 100% rename from core/core-infra/core-infra-qdsl/src/main/java/com/mm/coreinfraqdsl/repository/ItemCustomRepository.java rename to core/core-infra-qdsl/src/main/java/com/mm/coreinfraqdsl/repository/ItemCustomRepository.java diff --git a/core/core-infra/core-infra-qdsl/src/main/java/com/mm/coreinfraqdsl/repository/ItemCustomRepositoryImpl.java b/core/core-infra-qdsl/src/main/java/com/mm/coreinfraqdsl/repository/ItemCustomRepositoryImpl.java similarity index 100% rename from core/core-infra/core-infra-qdsl/src/main/java/com/mm/coreinfraqdsl/repository/ItemCustomRepositoryImpl.java rename to core/core-infra-qdsl/src/main/java/com/mm/coreinfraqdsl/repository/ItemCustomRepositoryImpl.java diff --git a/core/core-infra/core-infra-qdsl/src/main/resources/application.properties b/core/core-infra-qdsl/src/main/resources/application.properties similarity index 100% rename from core/core-infra/core-infra-qdsl/src/main/resources/application.properties rename to core/core-infra-qdsl/src/main/resources/application.properties diff --git a/core/core-infra/build.gradle b/core/core-infra/build.gradle deleted file mode 100644 index 9893aa7..0000000 --- a/core/core-infra/build.gradle +++ /dev/null @@ -1,6 +0,0 @@ -// 실행가능한 jar로 생성하는 옵션, main이 없는 라이브러리에서는 false로 비활성화함 -// 스프링 부트 2.0 이상이라면 bootRepackage.enabled를 사용해야 함 -bootJar { enabled = false } - -// 외부에서 의존하기 위한 jar로 생성하는 옵션, main이 없는 라이브러리에서는 true로 비활성화함 -jar { enabled = true } From df5c87a352af6d5c27ec769ab8e342bf90c7c7f2 Mon Sep 17 00:00:00 2001 From: KarmaPol Date: Mon, 22 Jan 2024 23:39:46 +0900 Subject: [PATCH 04/18] =?UTF-8?q?feat:=20infra-rdb=20=EB=AA=A8=EB=93=88=20?= =?UTF-8?q?=EB=8B=A4=EC=8B=9C=20=EC=B6=94=EA=B0=80,=20yml=20=EC=84=A4?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core-infra-rdb/build.gradle | 17 +++++++++++++++++ .../gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43462 bytes .../gradle/wrapper/gradle-wrapper.properties | 7 +++++++ 3 files changed, 24 insertions(+) create mode 100644 core/core-infra-rdb/build.gradle create mode 100644 core/core-infra-rdb/gradle/wrapper/gradle-wrapper.jar create mode 100644 core/core-infra-rdb/gradle/wrapper/gradle-wrapper.properties diff --git a/core/core-infra-rdb/build.gradle b/core/core-infra-rdb/build.gradle new file mode 100644 index 0000000..b9f311c --- /dev/null +++ b/core/core-infra-rdb/build.gradle @@ -0,0 +1,17 @@ +// 실행가능한 jar로 생성하는 옵션, main이 없는 라이브러리에서는 false로 비활성화함 +// 스프링 부트 2.0 이상이라면 bootRepackage.enabled를 사용해야 함 +bootJar { enabled = false } + +// 외부에서 의존하기 위한 jar로 생성하는 옵션, main이 없는 라이브러리에서는 true로 비활성화함 +jar { enabled = true } + +dependencies { + // jpa + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + + // h2 + runtimeOnly 'com.h2database:h2' + + // mysql + runtimeOnly 'com.mysql:mysql-connector-j' +} diff --git a/core/core-infra-rdb/gradle/wrapper/gradle-wrapper.jar b/core/core-infra-rdb/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..d64cd4917707c1f8861d8cb53dd15194d4248596 GIT binary patch literal 43462 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 literal 0 HcmV?d00001 diff --git a/core/core-infra-rdb/gradle/wrapper/gradle-wrapper.properties b/core/core-infra-rdb/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..1af9e09 --- /dev/null +++ b/core/core-infra-rdb/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists From e0742e6dcc77a964d949c0da979bb0d8c4804283 Mon Sep 17 00:00:00 2001 From: KarmaPol Date: Mon, 22 Jan 2024 23:40:54 +0900 Subject: [PATCH 05/18] =?UTF-8?q?feat:=20access=20token=20=EC=9D=B8?= =?UTF-8?q?=EC=A6=9D,=20oauth2=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mm/coredomain/domain/Admin.java | 23 +++++++---- .../mm/coredomain/domain/GroupPermission.java | 5 ++- .../java/com/mm/coredomain/domain/Groups.java | 4 +- .../java/com/mm/coredomain/domain/Member.java | 2 +- .../repository/GroupRepository.java | 11 +++++ .../config/WebSecurityConfig.java | 5 +-- .../jwt/JwtAuthenticationEntryPoint.java | 1 - .../jwt/JwtAuthenticationFilter.java | 25 +++++++---- .../mm/coresecurity/jwt/JwtTokenProvider.java | 41 ++++++++++++++++++- .../oauth/OAuth2AuthSuccessHandler.java | 12 ++++-- .../coresecurity/oauth/OAuth2UserDetails.java | 2 +- .../core-security/src/main/resources/data.sql | 8 ++++ settings.gradle | 3 +- 13 files changed, 109 insertions(+), 33 deletions(-) create mode 100644 core/core-domain/src/main/java/com/mm/coredomain/repository/GroupRepository.java create mode 100644 core/core-security/src/main/resources/data.sql diff --git a/core/core-domain/src/main/java/com/mm/coredomain/domain/Admin.java b/core/core-domain/src/main/java/com/mm/coredomain/domain/Admin.java index f767c45..1eef737 100644 --- a/core/core-domain/src/main/java/com/mm/coredomain/domain/Admin.java +++ b/core/core-domain/src/main/java/com/mm/coredomain/domain/Admin.java @@ -1,19 +1,24 @@ package com.mm.coredomain.domain; -import jakarta.persistence.*; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; @Entity public class Admin extends BaseEntity { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long id; + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; - private String name; + private String name; - private String email; + private String email; - private String password; + private String password; - @ManyToOne(fetch = FetchType.LAZY) - private Group group; + @ManyToOne(fetch = FetchType.LAZY) + private Groups groups; } diff --git a/core/core-domain/src/main/java/com/mm/coredomain/domain/GroupPermission.java b/core/core-domain/src/main/java/com/mm/coredomain/domain/GroupPermission.java index fc9841b..f80d0b8 100644 --- a/core/core-domain/src/main/java/com/mm/coredomain/domain/GroupPermission.java +++ b/core/core-domain/src/main/java/com/mm/coredomain/domain/GroupPermission.java @@ -5,6 +5,7 @@ import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; import jakarta.persistence.ManyToOne; import lombok.Getter; @@ -15,9 +16,11 @@ public class GroupPermission extends BaseEntity { @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; + @JoinColumn(name = "groups_id") @ManyToOne(fetch = FetchType.LAZY) - private Group group; + private Groups groups; + @JoinColumn(name = "permission_id") @ManyToOne(fetch = FetchType.LAZY) private Permission permission; } diff --git a/core/core-domain/src/main/java/com/mm/coredomain/domain/Groups.java b/core/core-domain/src/main/java/com/mm/coredomain/domain/Groups.java index 7537335..6ffa0da 100644 --- a/core/core-domain/src/main/java/com/mm/coredomain/domain/Groups.java +++ b/core/core-domain/src/main/java/com/mm/coredomain/domain/Groups.java @@ -11,13 +11,13 @@ @Getter @Entity -public class Group extends BaseEntity { +public class Groups extends BaseEntity { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; private String name; - @OneToMany(mappedBy = "group") + @OneToMany(mappedBy = "groups") private List groupPermissions; } diff --git a/core/core-domain/src/main/java/com/mm/coredomain/domain/Member.java b/core/core-domain/src/main/java/com/mm/coredomain/domain/Member.java index 9f62c02..76d09b5 100644 --- a/core/core-domain/src/main/java/com/mm/coredomain/domain/Member.java +++ b/core/core-domain/src/main/java/com/mm/coredomain/domain/Member.java @@ -33,5 +33,5 @@ public class Member extends BaseEntity { private MemberStatus memberStatus; @ManyToOne(fetch = FetchType.LAZY) - private Group group; + private Groups groups; } diff --git a/core/core-domain/src/main/java/com/mm/coredomain/repository/GroupRepository.java b/core/core-domain/src/main/java/com/mm/coredomain/repository/GroupRepository.java new file mode 100644 index 0000000..a9df25e --- /dev/null +++ b/core/core-domain/src/main/java/com/mm/coredomain/repository/GroupRepository.java @@ -0,0 +1,11 @@ +package com.mm.coredomain.repository; + +import java.util.Optional; + +import org.springframework.data.jpa.repository.JpaRepository; + +import com.mm.coredomain.domain.Groups; + +public interface GroupRepository extends JpaRepository { + Optional findByName(String name); +} diff --git a/core/core-security/src/main/java/com/mm/coresecurity/config/WebSecurityConfig.java b/core/core-security/src/main/java/com/mm/coresecurity/config/WebSecurityConfig.java index 5584096..ade4928 100644 --- a/core/core-security/src/main/java/com/mm/coresecurity/config/WebSecurityConfig.java +++ b/core/core-security/src/main/java/com/mm/coresecurity/config/WebSecurityConfig.java @@ -8,7 +8,7 @@ import org.springframework.security.config.http.SessionCreationPolicy; import org.springframework.security.web.SecurityFilterChain; import org.springframework.security.web.authentication.AuthenticationSuccessHandler; -import org.springframework.security.web.context.SecurityContextPersistenceFilter; +import org.springframework.security.web.authentication.logout.LogoutFilter; import com.mm.coresecurity.jwt.JwtAccessDeniedHandler; import com.mm.coresecurity.jwt.JwtAuthenticationEntryPoint; @@ -42,7 +42,6 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti .sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS).and() .oauth2Login(oauth2Configurer -> oauth2Configurer - .loginPage("/login") .successHandler(oAuth2AuthSuccessHandler) .userInfoEndpoint() .userService(oAuth2UserService)) @@ -50,7 +49,7 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti .authorizeHttpRequests(auth -> auth .anyRequest().permitAll()) - .addFilterAfter(jwtAuthenticationFilter, SecurityContextPersistenceFilter.class) + .addFilterAfter(jwtAuthenticationFilter, LogoutFilter.class) .exceptionHandling(exceptionHandlingConfigurer -> { exceptionHandlingConfigurer.authenticationEntryPoint(jwtAuthenticationEntryPoint); exceptionHandlingConfigurer.accessDeniedHandler(jwtAccessDeniedHandler); diff --git a/core/core-security/src/main/java/com/mm/coresecurity/jwt/JwtAuthenticationEntryPoint.java b/core/core-security/src/main/java/com/mm/coresecurity/jwt/JwtAuthenticationEntryPoint.java index 1fa9eb3..ac82b7d 100644 --- a/core/core-security/src/main/java/com/mm/coresecurity/jwt/JwtAuthenticationEntryPoint.java +++ b/core/core-security/src/main/java/com/mm/coresecurity/jwt/JwtAuthenticationEntryPoint.java @@ -18,7 +18,6 @@ public class JwtAuthenticationEntryPoint implements AuthenticationEntryPoint { @Override public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException authException) throws IOException, ServletException { - HttpResponseUtil.writeErrorResponse(response, HttpStatus.FORBIDDEN, "로그인이 필요합니다."); } } diff --git a/core/core-security/src/main/java/com/mm/coresecurity/jwt/JwtAuthenticationFilter.java b/core/core-security/src/main/java/com/mm/coresecurity/jwt/JwtAuthenticationFilter.java index baf8ca5..e9d90ed 100644 --- a/core/core-security/src/main/java/com/mm/coresecurity/jwt/JwtAuthenticationFilter.java +++ b/core/core-security/src/main/java/com/mm/coresecurity/jwt/JwtAuthenticationFilter.java @@ -2,6 +2,8 @@ import java.io.IOException; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.stereotype.Component; import org.springframework.util.StringUtils; import org.springframework.web.filter.OncePerRequestFilter; @@ -23,17 +25,22 @@ public class JwtAuthenticationFilter extends OncePerRequestFilter { @Override protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException { - try { + if (SecurityContextHolder.getContext().getAuthentication() == null) { String accessToken = resolveToken(request); - jwtTokenProvider.validateAccessToken(accessToken); - } catch (ExpiredJwtException e) { - log.info(">>>>> access token expired {}", e); - throw e; - } catch (Exception e) { - log.warn(">>>>> Authentication Failed {}", e); - throw e; + if (accessToken != null) { + try { + jwtTokenProvider.validateAccessToken(accessToken); + Authentication authentication = jwtTokenProvider.getAuthentication(accessToken); + SecurityContextHolder.getContext().setAuthentication(authentication); + } catch (ExpiredJwtException e) { + log.info(">>>>> access token expired {}", e); + throw e; + } catch (Exception e) { + log.warn(">>>>> Authentication Failed {}", e); + throw e; + } + } } - filterChain.doFilter(request, response); } diff --git a/core/core-security/src/main/java/com/mm/coresecurity/jwt/JwtTokenProvider.java b/core/core-security/src/main/java/com/mm/coresecurity/jwt/JwtTokenProvider.java index 6db6678..51b78b2 100644 --- a/core/core-security/src/main/java/com/mm/coresecurity/jwt/JwtTokenProvider.java +++ b/core/core-security/src/main/java/com/mm/coresecurity/jwt/JwtTokenProvider.java @@ -1,17 +1,25 @@ package com.mm.coresecurity.jwt; import java.time.Instant; +import java.util.Arrays; +import java.util.Collection; import java.util.Date; import java.util.stream.Collectors; import javax.crypto.SecretKey; import org.springframework.beans.factory.annotation.Value; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.Authentication; import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.stereotype.Component; import com.mm.coresecurity.oauth.OAuth2UserDetails; +import com.mm.coresecurity.oauth.OAuthProvider; +import io.jsonwebtoken.Claims; +import io.jsonwebtoken.ExpiredJwtException; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.io.Decoders; import io.jsonwebtoken.security.Keys; @@ -57,11 +65,40 @@ public String generateRefreshToken() { .compact(); } - private SecretKey getKey() { - return Keys.hmacShaKeyFor(Decoders.BASE64.decode(secretKey)); + public Authentication getAuthentication(String accessToken) { + Claims claims = parseClaims(accessToken); + + Collection authorities = null; + if (claims.get("") != null) { + authorities = Arrays.stream(claims.get("authorities").toString().split(",")) + .map(SimpleGrantedAuthority::new) + .toList(); + } + + // TODO provider 애플 추가 + OAuth2UserDetails principal = new OAuth2UserDetails(claims.get("id", Long.class), claims.getSubject(), + authorities, + OAuthProvider.KAKAO); + return new UsernamePasswordAuthenticationToken(principal, "", authorities); } public void validateAccessToken(String token) { Jwts.parser().verifyWith(getKey()).build().parse(token); } + + private Claims parseClaims(String accessToken) { + try { + return Jwts.parser() + .verifyWith(getKey()) + .build() + .parseSignedClaims(accessToken) + .getPayload(); + } catch (ExpiredJwtException e) { + return e.getClaims(); + } + } + + private SecretKey getKey() { + return Keys.hmacShaKeyFor(Decoders.BASE64.decode(secretKey)); + } } diff --git a/core/core-security/src/main/java/com/mm/coresecurity/oauth/OAuth2AuthSuccessHandler.java b/core/core-security/src/main/java/com/mm/coresecurity/oauth/OAuth2AuthSuccessHandler.java index bb27e54..0ebf398 100644 --- a/core/core-security/src/main/java/com/mm/coresecurity/oauth/OAuth2AuthSuccessHandler.java +++ b/core/core-security/src/main/java/com/mm/coresecurity/oauth/OAuth2AuthSuccessHandler.java @@ -12,7 +12,9 @@ import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import com.mm.coredomain.domain.Groups; import com.mm.coredomain.domain.Member; +import com.mm.coredomain.repository.GroupRepository; import com.mm.coredomain.repository.MemberRepository; import com.mm.coresecurity.jwt.JwtTokenProvider; import com.mm.coresecurity.util.HttpResponseUtil; @@ -30,17 +32,18 @@ public class OAuth2AuthSuccessHandler implements AuthenticationSuccessHandler { private final JwtTokenProvider jwtTokenProvider; private final MemberRepository memberRepository; - + private final GroupRepository groupRepository; + @Override public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication) throws IOException, ServletException { DefaultOAuth2User principal = (DefaultOAuth2User)authentication.getPrincipal(); - Map properties = principal.getAttribute("properties"); + Map properties = principal.getAttribute("kakao_account"); String email = properties.get("email"); Member member = getMemberElseCreateMember(email); - List authorities = member.getGroup() + List authorities = member.getGroups() .getGroupPermissions() .stream() .map(groupPermission -> new SimpleGrantedAuthority(groupPermission.getPermission().getName())) @@ -61,13 +64,16 @@ public void onAuthenticationSuccess(HttpServletRequest request, HttpServletRespo tokenMap.put("accessToken", accessToken); tokenMap.put("refreshToken", refreshToken); + response.addHeader("Authorization", "Bearer " + accessToken); HttpResponseUtil.writeSuccessResponse(response, tokenMap); } private Member getMemberElseCreateMember(String email) { return memberRepository.findByEmail(email).orElseGet(() -> { + Groups userGroup = groupRepository.findByName("USER_GROUP").orElseThrow(RuntimeException::new); Member member = Member.builder() .email(email) + .groups(userGroup) .build(); return memberRepository.save(member); }); diff --git a/core/core-security/src/main/java/com/mm/coresecurity/oauth/OAuth2UserDetails.java b/core/core-security/src/main/java/com/mm/coresecurity/oauth/OAuth2UserDetails.java index 9cdc227..f822f2a 100644 --- a/core/core-security/src/main/java/com/mm/coresecurity/oauth/OAuth2UserDetails.java +++ b/core/core-security/src/main/java/com/mm/coresecurity/oauth/OAuth2UserDetails.java @@ -19,7 +19,7 @@ public class OAuth2UserDetails implements UserDetails { private OAuthProvider provider; @Builder - public OAuth2UserDetails(Long id, String email, String password, + public OAuth2UserDetails(Long id, String email, Collection authorities, OAuthProvider provider) { this.id = id; this.email = email; diff --git a/core/core-security/src/main/resources/data.sql b/core/core-security/src/main/resources/data.sql new file mode 100644 index 0000000..2aed5d5 --- /dev/null +++ b/core/core-security/src/main/resources/data.sql @@ -0,0 +1,8 @@ +insert into permission(id, name) values(1, 'ROLE_ADMIN'); +insert into permission(id, name) values(2, 'ROLE_USER'); + +insert into groups(id, name) values(1, 'ADMIN_GROUP'); +insert into groups(id, name) values(2, 'USER_GROUP'); + +insert into group_permission(id, groups_id, permission_id) values(1, 1, 1); +insert into group_permission(id, groups_id, permission_id) values(2, 2, 2); diff --git a/settings.gradle b/settings.gradle index 5444b90..eb162b9 100644 --- a/settings.gradle +++ b/settings.gradle @@ -2,5 +2,6 @@ rootProject.name = 'daldal' include 'api' include 'core:core-domain' -include 'core:core-infra:core-infra-qdsl' +include 'core:core-infra-qdsl' +include 'core:core-infra-rdb' include 'core:core-security' From af14970ea78649e568268fb6eb3152d163ac7f46 Mon Sep 17 00:00:00 2001 From: KarmaPol Date: Tue, 23 Jan 2024 20:29:04 +0900 Subject: [PATCH 06/18] =?UTF-8?q?feat:=20#4=20=EA=B8=B0=EB=B3=B8=EC=A0=81?= =?UTF-8?q?=EC=9D=B8=20Auth=20Controller,=20Service=20=EB=B0=8F=20Member?= =?UTF-8?q?=20Controller,=20Service=20=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/build.gradle | 4 ++ api/http/test.http | 7 +++ .../auth/controller/AuthController.java | 30 ++++++++++ .../auth/dto/request/RefreshTokenRequest.java | 4 ++ .../auth/dto/response/TokenResponse.java | 4 ++ .../api/domain/auth/service/AuthService.java | 57 ++++++++++++++++++ .../item/controller/ItemController.java | 60 +++++++++++++++++++ .../item/dto/request/ItemCreateRequest.java | 29 +++++++++ .../item/dto/request/ItemUpdateRequest.java | 14 +++++ .../item/dto/response/ItemDetailResponse.java | 32 ++++++++++ .../item/dto/response/ItemResponse.java | 26 ++++++++ .../item/service/ItemService.java | 10 ++-- .../member/controller/MemberController.java | 45 ++++++++++++++ .../request/UpdateMemberAccountRequest.java | 4 ++ .../dto/response/MemberInfoResponse.java | 31 ++++++++++ .../domain/member/service/MemberService.java | 40 +++++++++++++ .../java/com/mm/api/exception/ErrorCode.java | 25 ++++---- .../api/item/controller/ItemController.java | 51 ---------------- .../item/dto/request/ItemCreateRequest.java | 29 --------- .../item/dto/request/ItemUpdateRequest.java | 14 ----- .../item/dto/response/ItemDetailResponse.java | 32 ---------- .../api/item/dto/response/ItemResponse.java | 26 -------- api/src/main/resources/application.yml | 2 +- .../mm/coredomain/domain}/OAuthProvider.java | 0 .../src/main/resources/application.properties | 1 - .../CoreSecurityApplicationTests.java | 13 ---- 26 files changed, 407 insertions(+), 183 deletions(-) create mode 100644 api/http/test.http create mode 100644 api/src/main/java/com/mm/api/domain/auth/controller/AuthController.java create mode 100644 api/src/main/java/com/mm/api/domain/auth/dto/request/RefreshTokenRequest.java create mode 100644 api/src/main/java/com/mm/api/domain/auth/dto/response/TokenResponse.java create mode 100644 api/src/main/java/com/mm/api/domain/auth/service/AuthService.java create mode 100644 api/src/main/java/com/mm/api/domain/item/controller/ItemController.java create mode 100644 api/src/main/java/com/mm/api/domain/item/dto/request/ItemCreateRequest.java create mode 100644 api/src/main/java/com/mm/api/domain/item/dto/request/ItemUpdateRequest.java create mode 100644 api/src/main/java/com/mm/api/domain/item/dto/response/ItemDetailResponse.java create mode 100644 api/src/main/java/com/mm/api/domain/item/dto/response/ItemResponse.java rename api/src/main/java/com/mm/api/{ => domain}/item/service/ItemService.java (91%) create mode 100644 api/src/main/java/com/mm/api/domain/member/controller/MemberController.java create mode 100644 api/src/main/java/com/mm/api/domain/member/dto/request/UpdateMemberAccountRequest.java create mode 100644 api/src/main/java/com/mm/api/domain/member/dto/response/MemberInfoResponse.java create mode 100644 api/src/main/java/com/mm/api/domain/member/service/MemberService.java delete mode 100644 api/src/main/java/com/mm/api/item/controller/ItemController.java delete mode 100644 api/src/main/java/com/mm/api/item/dto/request/ItemCreateRequest.java delete mode 100644 api/src/main/java/com/mm/api/item/dto/request/ItemUpdateRequest.java delete mode 100644 api/src/main/java/com/mm/api/item/dto/response/ItemDetailResponse.java delete mode 100644 api/src/main/java/com/mm/api/item/dto/response/ItemResponse.java rename core/{core-security/src/main/java/com/mm/coresecurity/oauth => core-domain/src/main/java/com/mm/coredomain/domain}/OAuthProvider.java (100%) delete mode 100644 core/core-infra-qdsl/src/main/resources/application.properties delete mode 100644 core/core-security/src/test/java/com/mm/coresecurity/CoreSecurityApplicationTests.java diff --git a/api/build.gradle b/api/build.gradle index c1b73eb..a7fe41c 100644 --- a/api/build.gradle +++ b/api/build.gradle @@ -9,6 +9,7 @@ dependencies { implementation project(':core:core-domain'); implementation project(':core:core-infra-rdb'); implementation project(':core:core-infra-qdsl'); + implementation project(':core:core-infra-redis'); implementation project(':core:core-security'); // validation @@ -25,4 +26,7 @@ dependencies { // security implementation 'org.springframework.boot:spring-boot-starter-security' + + // redis + implementation 'org.springframework.boot:spring-boot-starter-data-redis' } diff --git a/api/http/test.http b/api/http/test.http new file mode 100644 index 0000000..d2aa124 --- /dev/null +++ b/api/http/test.http @@ -0,0 +1,7 @@ +### 토큰 재발급 요청 +POST http://localhost:8080/api/v1/auth/refresh-access-token +Content-Type: application/json + +{ + "refreshToken": "eyJhbGciOiJIUzUxMiJ9.eyJpYXQiOjE3MDYwMDc0MzYsImV4cCI6MTcwNjI2NjYzNn0.7Cnv74WOMVBEKR6K33-EtTyB84DNMuA_FpD1OnduO399LA_tVhCK34V80z1f2dOS9U-CM9D3OqPGLYOmUWKjFQ" +} diff --git a/api/src/main/java/com/mm/api/domain/auth/controller/AuthController.java b/api/src/main/java/com/mm/api/domain/auth/controller/AuthController.java new file mode 100644 index 0000000..490cef4 --- /dev/null +++ b/api/src/main/java/com/mm/api/domain/auth/controller/AuthController.java @@ -0,0 +1,30 @@ +package com.mm.api.domain.auth.controller; + +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +import com.mm.api.domain.auth.dto.request.RefreshTokenRequest; +import com.mm.api.domain.auth.dto.response.TokenResponse; +import com.mm.api.domain.auth.service.AuthService; + +import lombok.RequiredArgsConstructor; + +@RestController +@RequiredArgsConstructor +public class AuthController { + private final AuthService authService; + + @GetMapping("/oauth2/authorization/{oauth2-provider}") + public void login() { + // oauth2 로그인 + } + + @PostMapping("/api/v1/auth/refresh-access-token") + public ResponseEntity refreshAccessToken(@RequestBody RefreshTokenRequest request) { + TokenResponse tokenResponse = authService.refreshAccessToken(request); + return ResponseEntity.ok(tokenResponse); + } +} diff --git a/api/src/main/java/com/mm/api/domain/auth/dto/request/RefreshTokenRequest.java b/api/src/main/java/com/mm/api/domain/auth/dto/request/RefreshTokenRequest.java new file mode 100644 index 0000000..ff2de47 --- /dev/null +++ b/api/src/main/java/com/mm/api/domain/auth/dto/request/RefreshTokenRequest.java @@ -0,0 +1,4 @@ +package com.mm.api.domain.auth.dto.request; + +public record RefreshTokenRequest(String refreshToken) { +} diff --git a/api/src/main/java/com/mm/api/domain/auth/dto/response/TokenResponse.java b/api/src/main/java/com/mm/api/domain/auth/dto/response/TokenResponse.java new file mode 100644 index 0000000..fa0f254 --- /dev/null +++ b/api/src/main/java/com/mm/api/domain/auth/dto/response/TokenResponse.java @@ -0,0 +1,4 @@ +package com.mm.api.domain.auth.dto.response; + +public record TokenResponse(String accessToken, String refreshToken) { +} diff --git a/api/src/main/java/com/mm/api/domain/auth/service/AuthService.java b/api/src/main/java/com/mm/api/domain/auth/service/AuthService.java new file mode 100644 index 0000000..2e9c8d0 --- /dev/null +++ b/api/src/main/java/com/mm/api/domain/auth/service/AuthService.java @@ -0,0 +1,57 @@ +package com.mm.api.domain.auth.service; + +import java.util.List; + +import org.springframework.security.core.authority.SimpleGrantedAuthority; +import org.springframework.stereotype.Service; + +import com.mm.api.domain.auth.dto.request.RefreshTokenRequest; +import com.mm.api.domain.auth.dto.response.TokenResponse; +import com.mm.api.exception.CustomException; +import com.mm.api.exception.ErrorCode; +import com.mm.coredomain.domain.Member; +import com.mm.coredomain.repository.MemberRepository; +import com.mm.coreinfraredis.repository.RedisRefreshTokenRepository; +import com.mm.coresecurity.jwt.JwtTokenProvider; +import com.mm.coresecurity.oauth.OAuth2UserDetails; + +import lombok.RequiredArgsConstructor; + +@Service +@RequiredArgsConstructor +public class AuthService { + private final RedisRefreshTokenRepository redisRefreshTokenRepository; + private final JwtTokenProvider jwtTokenProvider; + private final MemberRepository memberRepository; + + public TokenResponse refreshAccessToken(RefreshTokenRequest request) { + Long memberId = redisRefreshTokenRepository.findByRefreshToken(request.refreshToken()) + .orElseThrow(() -> new CustomException(ErrorCode.REFRESH_TOKEN_EXPIRED)); + + Member member = memberRepository.findById(memberId) + .orElseThrow(() -> new CustomException(ErrorCode.MEMBER_NOT_FOUND)); + + OAuth2UserDetails oauth2UserDetails = createOauth2UserDetails(member); + + String accessToken = jwtTokenProvider.generateAccessToken(oauth2UserDetails); + String refreshToken = jwtTokenProvider.generateRefreshToken(); + + redisRefreshTokenRepository.save(refreshToken, memberId); + + return new TokenResponse(accessToken, refreshToken); + } + + private OAuth2UserDetails createOauth2UserDetails(Member member) { + List authorities = member.getGroups() + .getGroupPermissions() + .stream() + .map(groupPermission -> new SimpleGrantedAuthority(groupPermission.getPermission().getName())) + .toList(); + + return OAuth2UserDetails.builder() + .id(member.getId()) + .provider(member.getProvider()) + .authorities(authorities) + .build(); + } +} diff --git a/api/src/main/java/com/mm/api/domain/item/controller/ItemController.java b/api/src/main/java/com/mm/api/domain/item/controller/ItemController.java new file mode 100644 index 0000000..daee3f2 --- /dev/null +++ b/api/src/main/java/com/mm/api/domain/item/controller/ItemController.java @@ -0,0 +1,60 @@ +package com.mm.api.domain.item.controller; + +import java.util.List; + +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import com.mm.api.domain.item.dto.request.ItemCreateRequest; +import com.mm.api.domain.item.dto.request.ItemUpdateRequest; +import com.mm.api.domain.item.dto.response.ItemDetailResponse; +import com.mm.api.domain.item.dto.response.ItemResponse; +import com.mm.api.domain.item.service.ItemService; + +import lombok.RequiredArgsConstructor; + +@RestController +@RequestMapping("/api/v1") +@RequiredArgsConstructor +public class ItemController { + private final ItemService itemService; + + @PostMapping("/items") + public ResponseEntity createItem(@RequestBody ItemCreateRequest request) { + ItemResponse response = itemService.createItem(request); + return ResponseEntity.ok(response); + } + + @PutMapping("/items/{id}") + public ResponseEntity updateItem(@RequestParam Long id, @RequestBody ItemUpdateRequest request) { + ItemResponse response = itemService.updateItem(id, request); + return ResponseEntity.ok(response); + } + + @DeleteMapping("/items/{id}") + public ResponseEntity updateItem(@RequestParam Long id) { + itemService.deleteItem(id); + return ResponseEntity.noContent().build(); + } + + // 관리자 권한 + + @GetMapping("/items") + public ResponseEntity getItems(@RequestParam(required = false, defaultValue = "1") Integer page) { + List responses = itemService.getItems(page); + return ResponseEntity.ok(responses); + } + + @GetMapping("/items/{id}") + public ResponseEntity getItemDetail(@RequestParam Long id) { + ItemDetailResponse response = itemService.getItemDetail(id); + return ResponseEntity.ok(response); + } +} diff --git a/api/src/main/java/com/mm/api/domain/item/dto/request/ItemCreateRequest.java b/api/src/main/java/com/mm/api/domain/item/dto/request/ItemCreateRequest.java new file mode 100644 index 0000000..52d1f6a --- /dev/null +++ b/api/src/main/java/com/mm/api/domain/item/dto/request/ItemCreateRequest.java @@ -0,0 +1,29 @@ +package com.mm.api.domain.item.dto.request; + +import java.util.List; + +import com.mm.coredomain.domain.Item; +import com.mm.coredomain.domain.ItemCategoryType; + +public record ItemCreateRequest(String detail, + String redirectUrl, + String categoryType, + Integer price, + Integer refund, + Double rating, + String thumbnailUrl, + List imageUrls, + List videoUrls +) { + public Item toEntity() { + return Item.builder() + .detail(detail) + .redirectUrl(redirectUrl) + .categoryType(ItemCategoryType.of(categoryType)) + .price(price) + .refund(refund) + .rating(rating) + .thumbnailUrl(thumbnailUrl) + .build(); + } +} diff --git a/api/src/main/java/com/mm/api/domain/item/dto/request/ItemUpdateRequest.java b/api/src/main/java/com/mm/api/domain/item/dto/request/ItemUpdateRequest.java new file mode 100644 index 0000000..069ca06 --- /dev/null +++ b/api/src/main/java/com/mm/api/domain/item/dto/request/ItemUpdateRequest.java @@ -0,0 +1,14 @@ +package com.mm.api.domain.item.dto.request; + +import java.util.List; + +public record ItemUpdateRequest(String detail, + String redirectUrl, + String categoryType, + Integer price, + Integer refund, + Double rating, + String thumbnailUrl, + List imageUrls, + List videoUrls) { +} diff --git a/api/src/main/java/com/mm/api/domain/item/dto/response/ItemDetailResponse.java b/api/src/main/java/com/mm/api/domain/item/dto/response/ItemDetailResponse.java new file mode 100644 index 0000000..a2ec44e --- /dev/null +++ b/api/src/main/java/com/mm/api/domain/item/dto/response/ItemDetailResponse.java @@ -0,0 +1,32 @@ +package com.mm.api.domain.item.dto.response; + +import java.util.List; + +import com.mm.coredomain.domain.Item; +import com.mm.coredomain.domain.ItemCategoryType; + +public record ItemDetailResponse(Long id, + String detail, + String redirectUrl, + ItemCategoryType categoryType, + Integer price, + Integer refund, + Double rating, + String thumbnailUrl, + List imageUrls, + List videoUrls) { + public static ItemDetailResponse of(Item item, List imageUrls, List videoUrls) { + return new ItemDetailResponse( + item.getId(), + item.getDetail(), + item.getRedirectUrl(), + item.getCategoryType(), + item.getPrice(), + item.getRefund(), + item.getRating(), + item.getThumbnailUrl(), + imageUrls, + videoUrls + ); + } +} diff --git a/api/src/main/java/com/mm/api/domain/item/dto/response/ItemResponse.java b/api/src/main/java/com/mm/api/domain/item/dto/response/ItemResponse.java new file mode 100644 index 0000000..6714fdc --- /dev/null +++ b/api/src/main/java/com/mm/api/domain/item/dto/response/ItemResponse.java @@ -0,0 +1,26 @@ +package com.mm.api.domain.item.dto.response; + +import com.mm.coredomain.domain.Item; +import com.mm.coredomain.domain.ItemCategoryType; + +public record ItemResponse(Long id, + String detail, + String redirectUrl, + ItemCategoryType categoryType, + Integer price, + Integer refund, + Double rating, + String thumbnailUrl) { + public static ItemResponse of(Item item) { + return new ItemResponse( + item.getId(), + item.getDetail(), + item.getRedirectUrl(), + item.getCategoryType(), + item.getPrice(), + item.getRefund(), + item.getRating(), + item.getThumbnailUrl() + ); + } +} diff --git a/api/src/main/java/com/mm/api/item/service/ItemService.java b/api/src/main/java/com/mm/api/domain/item/service/ItemService.java similarity index 91% rename from api/src/main/java/com/mm/api/item/service/ItemService.java rename to api/src/main/java/com/mm/api/domain/item/service/ItemService.java index c01628c..cc2f22a 100644 --- a/api/src/main/java/com/mm/api/item/service/ItemService.java +++ b/api/src/main/java/com/mm/api/domain/item/service/ItemService.java @@ -1,4 +1,4 @@ -package com.mm.api.item.service; +package com.mm.api.domain.item.service; import static com.mm.api.exception.ErrorCode.*; @@ -7,11 +7,11 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import com.mm.api.domain.item.dto.request.ItemCreateRequest; +import com.mm.api.domain.item.dto.request.ItemUpdateRequest; +import com.mm.api.domain.item.dto.response.ItemDetailResponse; +import com.mm.api.domain.item.dto.response.ItemResponse; import com.mm.api.exception.CustomException; -import com.mm.api.item.dto.request.ItemCreateRequest; -import com.mm.api.item.dto.request.ItemUpdateRequest; -import com.mm.api.item.dto.response.ItemDetailResponse; -import com.mm.api.item.dto.response.ItemResponse; import com.mm.coredomain.domain.Item; import com.mm.coredomain.domain.ItemCategoryType; import com.mm.coredomain.domain.ItemImage; diff --git a/api/src/main/java/com/mm/api/domain/member/controller/MemberController.java b/api/src/main/java/com/mm/api/domain/member/controller/MemberController.java new file mode 100644 index 0000000..68236be --- /dev/null +++ b/api/src/main/java/com/mm/api/domain/member/controller/MemberController.java @@ -0,0 +1,45 @@ +package com.mm.api.domain.member.controller; + +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PatchMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import com.mm.api.domain.member.dto.request.UpdateMemberAccountRequest; +import com.mm.api.domain.member.dto.response.MemberInfoResponse; +import com.mm.api.domain.member.service.MemberService; + +import lombok.RequiredArgsConstructor; + +@RestController +@RequestMapping("/api/v1") +@RequiredArgsConstructor +public class MemberController { + private final MemberService memberService; + + // 관리자 권한 + 자신만 + + @PatchMapping("/members/{memberId}/account") + public ResponseEntity updateMemberAccount(@PathVariable Long memberId, + @RequestBody UpdateMemberAccountRequest request) { + memberService.updateMemberAccount(memberId, request); + return ResponseEntity.noContent().build(); + } + + @PatchMapping("/members/{memberId}/name") + public ResponseEntity updateMemberName(@PathVariable Long memberId, + @RequestParam(value = "name") String name) { + memberService.updateMemberName(memberId, name); + return ResponseEntity.noContent().build(); + } + + @GetMapping("/members/{memberId}") + public ResponseEntity getMemberInfo(@PathVariable Long memberId) { + MemberInfoResponse memberInfo = memberService.getMemberInfo(memberId); + return ResponseEntity.ok(memberInfo); + } +} diff --git a/api/src/main/java/com/mm/api/domain/member/dto/request/UpdateMemberAccountRequest.java b/api/src/main/java/com/mm/api/domain/member/dto/request/UpdateMemberAccountRequest.java new file mode 100644 index 0000000..b9cf047 --- /dev/null +++ b/api/src/main/java/com/mm/api/domain/member/dto/request/UpdateMemberAccountRequest.java @@ -0,0 +1,4 @@ +package com.mm.api.domain.member.dto.request; + +public record UpdateMemberAccountRequest(String account, String accountBank) { +} diff --git a/api/src/main/java/com/mm/api/domain/member/dto/response/MemberInfoResponse.java b/api/src/main/java/com/mm/api/domain/member/dto/response/MemberInfoResponse.java new file mode 100644 index 0000000..79f76ad --- /dev/null +++ b/api/src/main/java/com/mm/api/domain/member/dto/response/MemberInfoResponse.java @@ -0,0 +1,31 @@ +package com.mm.api.domain.member.dto.response; + +import com.mm.coredomain.domain.Member; +import com.mm.coredomain.domain.MemberStatus; +import com.mm.coredomain.domain.OAuthProvider; + +import lombok.Builder; + +@Builder +public record MemberInfoResponse(Long id, + String name, + String email, + Integer point, + String account, + String accountBank, + MemberStatus memberStatus, + OAuthProvider provider +) { + public static MemberInfoResponse of(Member member) { + return MemberInfoResponse.builder() + .id(member.getId()) + .name(member.getName()) + .email(member.getEmail()) + .point(member.getPoint()) + .account(member.getAccount()) + .accountBank(member.getAccountBank()) + .memberStatus(member.getMemberStatus()) + .provider(member.getProvider()) + .build(); + } +} diff --git a/api/src/main/java/com/mm/api/domain/member/service/MemberService.java b/api/src/main/java/com/mm/api/domain/member/service/MemberService.java new file mode 100644 index 0000000..b08705d --- /dev/null +++ b/api/src/main/java/com/mm/api/domain/member/service/MemberService.java @@ -0,0 +1,40 @@ +package com.mm.api.domain.member.service; + +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.mm.api.domain.member.dto.request.UpdateMemberAccountRequest; +import com.mm.api.domain.member.dto.response.MemberInfoResponse; +import com.mm.api.exception.CustomException; +import com.mm.api.exception.ErrorCode; +import com.mm.coredomain.domain.Member; +import com.mm.coredomain.repository.MemberRepository; + +import lombok.RequiredArgsConstructor; + +@Service +@Transactional +@RequiredArgsConstructor +public class MemberService { + private final MemberRepository memberRepository; + + public void updateMemberAccount(Long memberId, UpdateMemberAccountRequest request) { + Member member = getMember(memberId); + member.updateMemberAccount(request.account(), request.accountBank()); + } + + public void updateMemberName(Long memberId, String name) { + Member member = getMember(memberId); + member.updateMemberName(name); + } + + public MemberInfoResponse getMemberInfo(Long memberId) { + Member member = getMember(memberId); + return MemberInfoResponse.of(member); + } + + private Member getMember(Long memberId) { + return memberRepository.findById(memberId) + .orElseThrow(() -> new CustomException(ErrorCode.MEMBER_NOT_FOUND)); + } +} diff --git a/api/src/main/java/com/mm/api/exception/ErrorCode.java b/api/src/main/java/com/mm/api/exception/ErrorCode.java index c17c734..7f2e558 100644 --- a/api/src/main/java/com/mm/api/exception/ErrorCode.java +++ b/api/src/main/java/com/mm/api/exception/ErrorCode.java @@ -1,21 +1,24 @@ package com.mm.api.exception; -import lombok.Getter; import org.springframework.http.HttpStatus; +import lombok.Getter; + @Getter public enum ErrorCode { - VALIDATION_FAILED("400/0001", HttpStatus.BAD_REQUEST, "잘못된 요청입니다."), - ITEM_NOT_FOUND("404/0001", HttpStatus.NOT_FOUND, "존재하지 않는 상품입니다"); + VALIDATION_FAILED("400/0001", HttpStatus.BAD_REQUEST, "잘못된 요청입니다."), + ITEM_NOT_FOUND("404/0001", HttpStatus.NOT_FOUND, "존재하지 않는 상품입니다"), + MEMBER_NOT_FOUND("404/0002", HttpStatus.NOT_FOUND, "존재하지 않는 회원입니다"), + REFRESH_TOKEN_EXPIRED("401/0001", HttpStatus.UNAUTHORIZED, "토큰이 만료되었으니 다시 로그인 해주세요"); - private final String errorCode; - private final HttpStatus status; - private final String message; + private final String errorCode; + private final HttpStatus status; + private final String message; - ErrorCode(String errorCode, HttpStatus httpStatus, String message) { - this.errorCode = errorCode; - this.status = httpStatus; - this.message = message; - } + ErrorCode(String errorCode, HttpStatus httpStatus, String message) { + this.errorCode = errorCode; + this.status = httpStatus; + this.message = message; + } } diff --git a/api/src/main/java/com/mm/api/item/controller/ItemController.java b/api/src/main/java/com/mm/api/item/controller/ItemController.java deleted file mode 100644 index e358b94..0000000 --- a/api/src/main/java/com/mm/api/item/controller/ItemController.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.mm.api.item.controller; - -import com.mm.api.item.dto.request.ItemCreateRequest; -import com.mm.api.item.dto.request.ItemUpdateRequest; -import com.mm.api.item.dto.response.ItemDetailResponse; -import com.mm.api.item.dto.response.ItemResponse; -import com.mm.api.item.service.ItemService; -import lombok.RequiredArgsConstructor; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -@RestController -@RequestMapping("/api/v1") -@RequiredArgsConstructor -public class ItemController { - private final ItemService itemService; - - @PostMapping("/items") - public ResponseEntity createItem(@RequestBody ItemCreateRequest request){ - ItemResponse response = itemService.createItem(request); - return ResponseEntity.ok(response); - } - - @PutMapping("/items/{id}") - public ResponseEntity updateItem(@RequestParam Long id, @RequestBody ItemUpdateRequest request){ - ItemResponse response = itemService.updateItem(id, request); - return ResponseEntity.ok(response); - } - - @DeleteMapping("/items/{id}") - public ResponseEntity updateItem(@RequestParam Long id){ - itemService.deleteItem(id); - return ResponseEntity.noContent().build(); - } - - // 관리자 권한 - - @GetMapping("/items") - public ResponseEntity getItems(@RequestParam(required = false, defaultValue = "1") Integer page){ - List responses = itemService.getItems(page); - return ResponseEntity.ok(responses); - } - - @GetMapping("/items/{id}") - public ResponseEntity getItemDetail(@RequestParam Long id){ - ItemDetailResponse response = itemService.getItemDetail(id); - return ResponseEntity.ok(response); - } -} diff --git a/api/src/main/java/com/mm/api/item/dto/request/ItemCreateRequest.java b/api/src/main/java/com/mm/api/item/dto/request/ItemCreateRequest.java deleted file mode 100644 index b5e8f8d..0000000 --- a/api/src/main/java/com/mm/api/item/dto/request/ItemCreateRequest.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.mm.api.item.dto.request; - -import com.mm.coredomain.domain.Item; -import com.mm.coredomain.domain.ItemCategoryType; - -import java.util.List; - -public record ItemCreateRequest(String detail, - String redirectUrl, - String categoryType, - Integer price, - Integer refund, - Double rating, - String thumbnailUrl, - List imageUrls, - List videoUrls - ) { - public Item toEntity(){ - return Item.builder() - .detail(detail) - .redirectUrl(redirectUrl) - .categoryType(ItemCategoryType.of(categoryType)) - .price(price) - .refund(refund) - .rating(rating) - .thumbnailUrl(thumbnailUrl) - .build(); - } -} diff --git a/api/src/main/java/com/mm/api/item/dto/request/ItemUpdateRequest.java b/api/src/main/java/com/mm/api/item/dto/request/ItemUpdateRequest.java deleted file mode 100644 index f1eaee1..0000000 --- a/api/src/main/java/com/mm/api/item/dto/request/ItemUpdateRequest.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.mm.api.item.dto.request; - -import java.util.List; - -public record ItemUpdateRequest(String detail, - String redirectUrl, - String categoryType, - Integer price, - Integer refund, - Double rating, - String thumbnailUrl, - List imageUrls, - List videoUrls) { -} diff --git a/api/src/main/java/com/mm/api/item/dto/response/ItemDetailResponse.java b/api/src/main/java/com/mm/api/item/dto/response/ItemDetailResponse.java deleted file mode 100644 index 15cf07a..0000000 --- a/api/src/main/java/com/mm/api/item/dto/response/ItemDetailResponse.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.mm.api.item.dto.response; - -import com.mm.coredomain.domain.Item; -import com.mm.coredomain.domain.ItemCategoryType; - -import java.util.List; - -public record ItemDetailResponse(Long id, - String detail, - String redirectUrl, - ItemCategoryType categoryType, - Integer price, - Integer refund, - Double rating, - String thumbnailUrl, - List imageUrls, - List videoUrls) { - public static ItemDetailResponse of(Item item, List imageUrls, List videoUrls){ - return new ItemDetailResponse( - item.getId(), - item.getDetail(), - item.getRedirectUrl(), - item.getCategoryType(), - item.getPrice(), - item.getRefund(), - item.getRating(), - item.getThumbnailUrl(), - imageUrls, - videoUrls - ); - } -} diff --git a/api/src/main/java/com/mm/api/item/dto/response/ItemResponse.java b/api/src/main/java/com/mm/api/item/dto/response/ItemResponse.java deleted file mode 100644 index 8f40b44..0000000 --- a/api/src/main/java/com/mm/api/item/dto/response/ItemResponse.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.mm.api.item.dto.response; - -import com.mm.coredomain.domain.Item; -import com.mm.coredomain.domain.ItemCategoryType; - -public record ItemResponse(Long id, - String detail, - String redirectUrl, - ItemCategoryType categoryType, - Integer price, - Integer refund, - Double rating, - String thumbnailUrl) { - public static ItemResponse of(Item item){ - return new ItemResponse( - item.getId(), - item.getDetail(), - item.getRedirectUrl(), - item.getCategoryType(), - item.getPrice(), - item.getRefund(), - item.getRating(), - item.getThumbnailUrl() - ); - } -} diff --git a/api/src/main/resources/application.yml b/api/src/main/resources/application.yml index 8cedbdb..5581a89 100644 --- a/api/src/main/resources/application.yml +++ b/api/src/main/resources/application.yml @@ -1,6 +1,6 @@ spring: profiles: - include: infra-rdb, security + include: infra-rdb, redis, security active: dev server: diff --git a/core/core-security/src/main/java/com/mm/coresecurity/oauth/OAuthProvider.java b/core/core-domain/src/main/java/com/mm/coredomain/domain/OAuthProvider.java similarity index 100% rename from core/core-security/src/main/java/com/mm/coresecurity/oauth/OAuthProvider.java rename to core/core-domain/src/main/java/com/mm/coredomain/domain/OAuthProvider.java diff --git a/core/core-infra-qdsl/src/main/resources/application.properties b/core/core-infra-qdsl/src/main/resources/application.properties deleted file mode 100644 index 8b13789..0000000 --- a/core/core-infra-qdsl/src/main/resources/application.properties +++ /dev/null @@ -1 +0,0 @@ - diff --git a/core/core-security/src/test/java/com/mm/coresecurity/CoreSecurityApplicationTests.java b/core/core-security/src/test/java/com/mm/coresecurity/CoreSecurityApplicationTests.java deleted file mode 100644 index f9ad38f..0000000 --- a/core/core-security/src/test/java/com/mm/coresecurity/CoreSecurityApplicationTests.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.mm.coresecurity; - -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; - -@SpringBootTest -class CoreSecurityApplicationTests { - - @Test - void contextLoads() { - } - -} From 93fff559be29316a41bc669735590727756ae593 Mon Sep 17 00:00:00 2001 From: KarmaPol Date: Tue, 23 Jan 2024 20:30:02 +0900 Subject: [PATCH 07/18] =?UTF-8?q?feat:=20#4=20security=20=EB=AA=A8?= =?UTF-8?q?=EB=93=88=20redis=20=EC=97=B0=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mm/coredomain/domain/Member.java | 13 ++++++++ .../mm/coredomain/domain/OAuthProvider.java | 2 +- core/core-infra-redis/build.gradle | 11 +++++++ .../gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43462 bytes .../gradle/wrapper/gradle-wrapper.properties | 7 +++++ .../mm/coreinfraredis/config/RedisConfig.java | 29 ++++++++++++++++++ .../RedisRefreshTokenRepository.java | 29 ++++++++++++++++++ .../src/main/resources/application-redis.yml | 5 +++ core/core-security/build.gradle | 4 +++ .../config/SecurityModuleConfig.java | 11 +++++++ .../config/WebSecurityConfig.java | 4 --- .../mm/coresecurity/jwt/JwtTokenProvider.java | 2 +- .../oauth/OAuth2AuthSuccessHandler.java | 8 +++-- .../coresecurity/oauth/OAuth2UserDetails.java | 2 ++ docker-compose.yml | 23 ++++++++++++++ settings.gradle | 1 + 16 files changed, 143 insertions(+), 8 deletions(-) create mode 100644 core/core-infra-redis/build.gradle create mode 100644 core/core-infra-redis/gradle/wrapper/gradle-wrapper.jar create mode 100644 core/core-infra-redis/gradle/wrapper/gradle-wrapper.properties create mode 100644 core/core-infra-redis/src/main/java/com/mm/coreinfraredis/config/RedisConfig.java create mode 100644 core/core-infra-redis/src/main/java/com/mm/coreinfraredis/repository/RedisRefreshTokenRepository.java create mode 100644 core/core-infra-redis/src/main/resources/application-redis.yml create mode 100644 core/core-security/src/main/java/com/mm/coresecurity/config/SecurityModuleConfig.java create mode 100644 docker-compose.yml diff --git a/core/core-domain/src/main/java/com/mm/coredomain/domain/Member.java b/core/core-domain/src/main/java/com/mm/coredomain/domain/Member.java index 76d09b5..0dba19d 100644 --- a/core/core-domain/src/main/java/com/mm/coredomain/domain/Member.java +++ b/core/core-domain/src/main/java/com/mm/coredomain/domain/Member.java @@ -28,10 +28,23 @@ public class Member extends BaseEntity { private Integer point; + private String account; + private String accountBank; private MemberStatus memberStatus; + private OAuthProvider provider; + @ManyToOne(fetch = FetchType.LAZY) private Groups groups; + + public void updateMemberAccount(String account, String accountBank) { + this.account = account; + this.accountBank = accountBank; + } + + public void updateMemberName(String name) { + this.name = name; + } } diff --git a/core/core-domain/src/main/java/com/mm/coredomain/domain/OAuthProvider.java b/core/core-domain/src/main/java/com/mm/coredomain/domain/OAuthProvider.java index d8ba7f4..b41c8c1 100644 --- a/core/core-domain/src/main/java/com/mm/coredomain/domain/OAuthProvider.java +++ b/core/core-domain/src/main/java/com/mm/coredomain/domain/OAuthProvider.java @@ -1,4 +1,4 @@ -package com.mm.coresecurity.oauth; +package com.mm.coredomain.domain; public enum OAuthProvider { KAKAO, APPLE diff --git a/core/core-infra-redis/build.gradle b/core/core-infra-redis/build.gradle new file mode 100644 index 0000000..16d629c --- /dev/null +++ b/core/core-infra-redis/build.gradle @@ -0,0 +1,11 @@ +// 실행가능한 jar로 생성하는 옵션, main이 없는 라이브러리에서는 false로 비활성화함 +// 스프링 부트 2.0 이상이라면 bootRepackage.enabled를 사용해야 함 +bootJar { enabled = false } + +// 외부에서 의존하기 위한 jar로 생성하는 옵션, main이 없는 라이브러리에서는 true로 비활성화함 +jar { enabled = true } + +dependencies { + // redis + implementation 'org.springframework.boot:spring-boot-starter-data-redis' +} diff --git a/core/core-infra-redis/gradle/wrapper/gradle-wrapper.jar b/core/core-infra-redis/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..d64cd4917707c1f8861d8cb53dd15194d4248596 GIT binary patch literal 43462 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 literal 0 HcmV?d00001 diff --git a/core/core-infra-redis/gradle/wrapper/gradle-wrapper.properties b/core/core-infra-redis/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..1af9e09 --- /dev/null +++ b/core/core-infra-redis/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/core/core-infra-redis/src/main/java/com/mm/coreinfraredis/config/RedisConfig.java b/core/core-infra-redis/src/main/java/com/mm/coreinfraredis/config/RedisConfig.java new file mode 100644 index 0000000..bf37263 --- /dev/null +++ b/core/core-infra-redis/src/main/java/com/mm/coreinfraredis/config/RedisConfig.java @@ -0,0 +1,29 @@ +package com.mm.coreinfraredis.config; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.data.redis.connection.RedisConnectionFactory; +import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory; +import org.springframework.data.redis.core.RedisTemplate; + +@Configuration +public class RedisConfig { + @Value("${spring.data.redis.host}") + private String redisHost; + + @Value("${spring.data.redis.port}") + private int redisPort; + + @Bean + public RedisConnectionFactory redisConnectionFactory() { + return new LettuceConnectionFactory(redisHost, redisPort); + } + + @Bean + public RedisTemplate redisTemplate() { + RedisTemplate redisTemplate = new RedisTemplate<>(); + redisTemplate.setConnectionFactory(redisConnectionFactory()); + return redisTemplate; + } +} diff --git a/core/core-infra-redis/src/main/java/com/mm/coreinfraredis/repository/RedisRefreshTokenRepository.java b/core/core-infra-redis/src/main/java/com/mm/coreinfraredis/repository/RedisRefreshTokenRepository.java new file mode 100644 index 0000000..d9ef199 --- /dev/null +++ b/core/core-infra-redis/src/main/java/com/mm/coreinfraredis/repository/RedisRefreshTokenRepository.java @@ -0,0 +1,29 @@ +package com.mm.coreinfraredis.repository; + +import java.util.Optional; +import java.util.concurrent.TimeUnit; + +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.data.redis.core.ValueOperations; +import org.springframework.stereotype.Repository; + +import lombok.RequiredArgsConstructor; + +@Repository +@RequiredArgsConstructor +public class RedisRefreshTokenRepository { + private final RedisTemplate redisTemplate; + private final static long REFRESH_TOKEN_EXPIRE_LONG = 259200L; + + public void save(String refreshToken, Long memberId) { + ValueOperations valueOperations = redisTemplate.opsForValue(); + valueOperations.set(refreshToken, memberId); + redisTemplate.expire(refreshToken, 60L, TimeUnit.SECONDS); + } + + public Optional findByRefreshToken(String refreshToken) { + ValueOperations valueOperations = redisTemplate.opsForValue(); + Long memberId = valueOperations.get(refreshToken); + return Optional.ofNullable(memberId); + } +} diff --git a/core/core-infra-redis/src/main/resources/application-redis.yml b/core/core-infra-redis/src/main/resources/application-redis.yml new file mode 100644 index 0000000..471d2e5 --- /dev/null +++ b/core/core-infra-redis/src/main/resources/application-redis.yml @@ -0,0 +1,5 @@ +spring: + data: + redis: + port: 6379 + host: localhost diff --git a/core/core-security/build.gradle b/core/core-security/build.gradle index 5db4ab1..ad99744 100644 --- a/core/core-security/build.gradle +++ b/core/core-security/build.gradle @@ -7,6 +7,7 @@ jar { enabled = true } dependencies { implementation project(':core:core-domain'); + implementation project(':core:core-infra-redis') // security implementation 'org.springframework.boot:spring-boot-starter-security' @@ -14,4 +15,7 @@ dependencies { implementation 'io.jsonwebtoken:jjwt-api:0.12.3' implementation 'io.jsonwebtoken:jjwt-impl:0.12.3' implementation 'io.jsonwebtoken:jjwt-jackson:0.12.3' + + // redis + implementation 'org.springframework.boot:spring-boot-starter-data-redis' } diff --git a/core/core-security/src/main/java/com/mm/coresecurity/config/SecurityModuleConfig.java b/core/core-security/src/main/java/com/mm/coresecurity/config/SecurityModuleConfig.java new file mode 100644 index 0000000..26e00c9 --- /dev/null +++ b/core/core-security/src/main/java/com/mm/coresecurity/config/SecurityModuleConfig.java @@ -0,0 +1,11 @@ +package com.mm.coresecurity.config; + +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Configuration; +import org.springframework.data.redis.repository.configuration.EnableRedisRepositories; + +@Configuration +@EnableRedisRepositories(basePackages = "com.mm") +@ComponentScan(basePackages = "com.mm") +public class SecurityModuleConfig { +} diff --git a/core/core-security/src/main/java/com/mm/coresecurity/config/WebSecurityConfig.java b/core/core-security/src/main/java/com/mm/coresecurity/config/WebSecurityConfig.java index ade4928..3675c69 100644 --- a/core/core-security/src/main/java/com/mm/coresecurity/config/WebSecurityConfig.java +++ b/core/core-security/src/main/java/com/mm/coresecurity/config/WebSecurityConfig.java @@ -1,13 +1,11 @@ package com.mm.coresecurity.config; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.http.SessionCreationPolicy; import org.springframework.security.web.SecurityFilterChain; -import org.springframework.security.web.authentication.AuthenticationSuccessHandler; import org.springframework.security.web.authentication.logout.LogoutFilter; import com.mm.coresecurity.jwt.JwtAccessDeniedHandler; @@ -20,7 +18,6 @@ @Configuration @EnableWebSecurity -@ComponentScan(basePackages = "com.mm.coresecurity") @RequiredArgsConstructor public class WebSecurityConfig { private final JwtAuthenticationFilter jwtAuthenticationFilter; @@ -28,7 +25,6 @@ public class WebSecurityConfig { private final JwtAccessDeniedHandler jwtAccessDeniedHandler; private final OAuth2UserService oAuth2UserService; private final OAuth2AuthSuccessHandler oAuth2AuthSuccessHandler; - private final AuthenticationSuccessHandler authenticationSuccessHandler; @Bean public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { diff --git a/core/core-security/src/main/java/com/mm/coresecurity/jwt/JwtTokenProvider.java b/core/core-security/src/main/java/com/mm/coresecurity/jwt/JwtTokenProvider.java index 51b78b2..4032b39 100644 --- a/core/core-security/src/main/java/com/mm/coresecurity/jwt/JwtTokenProvider.java +++ b/core/core-security/src/main/java/com/mm/coresecurity/jwt/JwtTokenProvider.java @@ -15,8 +15,8 @@ import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.stereotype.Component; +import com.mm.coredomain.domain.OAuthProvider; import com.mm.coresecurity.oauth.OAuth2UserDetails; -import com.mm.coresecurity.oauth.OAuthProvider; import io.jsonwebtoken.Claims; import io.jsonwebtoken.ExpiredJwtException; diff --git a/core/core-security/src/main/java/com/mm/coresecurity/oauth/OAuth2AuthSuccessHandler.java b/core/core-security/src/main/java/com/mm/coresecurity/oauth/OAuth2AuthSuccessHandler.java index 0ebf398..0c282a0 100644 --- a/core/core-security/src/main/java/com/mm/coresecurity/oauth/OAuth2AuthSuccessHandler.java +++ b/core/core-security/src/main/java/com/mm/coresecurity/oauth/OAuth2AuthSuccessHandler.java @@ -14,8 +14,10 @@ import com.mm.coredomain.domain.Groups; import com.mm.coredomain.domain.Member; +import com.mm.coredomain.domain.OAuthProvider; import com.mm.coredomain.repository.GroupRepository; import com.mm.coredomain.repository.MemberRepository; +import com.mm.coreinfraredis.repository.RedisRefreshTokenRepository; import com.mm.coresecurity.jwt.JwtTokenProvider; import com.mm.coresecurity.util.HttpResponseUtil; @@ -33,7 +35,8 @@ public class OAuth2AuthSuccessHandler implements AuthenticationSuccessHandler { private final JwtTokenProvider jwtTokenProvider; private final MemberRepository memberRepository; private final GroupRepository groupRepository; - + private final RedisRefreshTokenRepository redisRefreshTokenRepository; + @Override public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication) throws IOException, ServletException { @@ -58,7 +61,8 @@ public void onAuthenticationSuccess(HttpServletRequest request, HttpServletRespo String accessToken = jwtTokenProvider.generateAccessToken(userDetails); String refreshToken = jwtTokenProvider.generateRefreshToken(); - // TODO refreshToken 저장 추가 (레디스) + + redisRefreshTokenRepository.save(refreshToken, member.getId()); Map tokenMap = new HashMap<>(); tokenMap.put("accessToken", accessToken); diff --git a/core/core-security/src/main/java/com/mm/coresecurity/oauth/OAuth2UserDetails.java b/core/core-security/src/main/java/com/mm/coresecurity/oauth/OAuth2UserDetails.java index f822f2a..8008d8f 100644 --- a/core/core-security/src/main/java/com/mm/coresecurity/oauth/OAuth2UserDetails.java +++ b/core/core-security/src/main/java/com/mm/coresecurity/oauth/OAuth2UserDetails.java @@ -7,6 +7,8 @@ import net.minidev.json.annotate.JsonIgnore; +import com.mm.coredomain.domain.OAuthProvider; + import lombok.Builder; import lombok.Getter; diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..87182ea --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,23 @@ +version: '3' + +services: + # mysql: + # image: mysql:latest + # container_name: bingterpark + # restart: always + # environment: + # MYSQL_ROOT_PASSWORD: root1234! + # MYSQL_DATABASE: bingterpark + # MYSQL_CHARSET: utf8mb4 + # MYSQL_COLLATION: utf8mb4_unicode_ci + # ports: + # - "3307:3306" + # volumes: + # - ./data/:/var/lib/mysql + # - ./db/conf.d:/etc/mysql/conf.d + # - ./db/initdb.d:/docker-entrypoint-initdb.d + + redis: + image: redis:latest + ports: + - "6379:6379" diff --git a/settings.gradle b/settings.gradle index eb162b9..fef7545 100644 --- a/settings.gradle +++ b/settings.gradle @@ -4,4 +4,5 @@ include 'api' include 'core:core-domain' include 'core:core-infra-qdsl' include 'core:core-infra-rdb' +include 'core:core-infra-redis' include 'core:core-security' From 65bcb6ad78e8f5bcad68fdf359bec2a57c7a69e1 Mon Sep 17 00:00:00 2001 From: KarmaPol Date: Wed, 24 Jan 2024 17:25:12 +0900 Subject: [PATCH 08/18] =?UTF-8?q?fix:=20jwt=20=ED=97=A4=EB=8D=94=20?= =?UTF-8?q?=EB=B6=80=EC=97=AC=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mm/coresecurity/oauth/OAuth2AuthSuccessHandler.java | 1 - 1 file changed, 1 deletion(-) diff --git a/core/core-security/src/main/java/com/mm/coresecurity/oauth/OAuth2AuthSuccessHandler.java b/core/core-security/src/main/java/com/mm/coresecurity/oauth/OAuth2AuthSuccessHandler.java index 0c282a0..78f5195 100644 --- a/core/core-security/src/main/java/com/mm/coresecurity/oauth/OAuth2AuthSuccessHandler.java +++ b/core/core-security/src/main/java/com/mm/coresecurity/oauth/OAuth2AuthSuccessHandler.java @@ -68,7 +68,6 @@ public void onAuthenticationSuccess(HttpServletRequest request, HttpServletRespo tokenMap.put("accessToken", accessToken); tokenMap.put("refreshToken", refreshToken); - response.addHeader("Authorization", "Bearer " + accessToken); HttpResponseUtil.writeSuccessResponse(response, tokenMap); } From e8eb7a6d9377982f49117c899dcc2ee5c39d70fd Mon Sep 17 00:00:00 2001 From: KarmaPol Date: Wed, 24 Jan 2024 17:25:43 +0900 Subject: [PATCH 09/18] =?UTF-8?q?feat:=20buy=20repository=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mm/coredomain/repository/BuyRepository.java | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 core/core-domain/src/main/java/com/mm/coredomain/repository/BuyRepository.java diff --git a/core/core-domain/src/main/java/com/mm/coredomain/repository/BuyRepository.java b/core/core-domain/src/main/java/com/mm/coredomain/repository/BuyRepository.java new file mode 100644 index 0000000..b4e32c6 --- /dev/null +++ b/core/core-domain/src/main/java/com/mm/coredomain/repository/BuyRepository.java @@ -0,0 +1,8 @@ +package com.mm.coredomain.repository; + +import org.springframework.data.jpa.repository.JpaRepository; + +import com.mm.coredomain.domain.Buy; + +public interface BuyRepository extends JpaRepository { +} From a5f3bab4b4ee59d911d02e36853f7cfd688fe721 Mon Sep 17 00:00:00 2001 From: KarmaPol Date: Wed, 24 Jan 2024 17:26:08 +0900 Subject: [PATCH 10/18] =?UTF-8?q?feat:=20buy=20entity=20=EC=88=98=EC=A0=95?= =?UTF-8?q?=20=EB=B0=8F=20item=20add=20buy=20controller,=20service?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/buy/controller/BuyController.java | 38 +++++++++++++ .../mm/api/domain/buy/service/BuyService.java | 55 +++++++++++++++++++ .../item/controller/ItemController.java | 4 +- .../api/domain/item/service/ItemService.java | 11 ++-- .../domain/member/service/MemberService.java | 1 + .../java/com/mm/coredomain/domain/Buy.java | 44 ++++++++++----- .../mm/coredomain/domain/RefundStatus.java | 4 ++ 7 files changed, 137 insertions(+), 20 deletions(-) create mode 100644 api/src/main/java/com/mm/api/domain/buy/controller/BuyController.java create mode 100644 api/src/main/java/com/mm/api/domain/buy/service/BuyService.java diff --git a/api/src/main/java/com/mm/api/domain/buy/controller/BuyController.java b/api/src/main/java/com/mm/api/domain/buy/controller/BuyController.java new file mode 100644 index 0000000..76feb87 --- /dev/null +++ b/api/src/main/java/com/mm/api/domain/buy/controller/BuyController.java @@ -0,0 +1,38 @@ +package com.mm.api.domain.buy.controller; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PatchMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import com.mm.api.domain.buy.service.BuyService; + +import lombok.RequiredArgsConstructor; + +@RestController +@RequestMapping("/api/v1") +@RequiredArgsConstructor +public class BuyController { + private final BuyService buyService; + + // 관리자만 + @GetMapping("/buys") + public void getBuys(@RequestParam(required = false, defaultValue = "1") Integer page) { + + } + + @PatchMapping("/buys/{buyId}/refund-status") + public void updateBuyRefundStatus(@RequestParam String refundStatus) { + + } + + // 회원만 + @PostMapping("/buys/{memberId}/{itemId}") + public void postBuy(@PathVariable Long memberId, @PathVariable Long itemId) { + buyService.postBuy(memberId, itemId); + + } +} diff --git a/api/src/main/java/com/mm/api/domain/buy/service/BuyService.java b/api/src/main/java/com/mm/api/domain/buy/service/BuyService.java new file mode 100644 index 0000000..de8b053 --- /dev/null +++ b/api/src/main/java/com/mm/api/domain/buy/service/BuyService.java @@ -0,0 +1,55 @@ +package com.mm.api.domain.buy.service; + +import static com.mm.api.exception.ErrorCode.*; + +import java.time.LocalDateTime; + +import org.springframework.stereotype.Service; + +import com.mm.api.exception.CustomException; +import com.mm.api.exception.ErrorCode; +import com.mm.coredomain.domain.Buy; +import com.mm.coredomain.domain.Item; +import com.mm.coredomain.domain.Member; +import com.mm.coredomain.domain.RefundStatus; +import com.mm.coredomain.repository.BuyRepository; +import com.mm.coredomain.repository.ItemRepository; +import com.mm.coredomain.repository.MemberRepository; + +import lombok.RequiredArgsConstructor; + +@Service +@RequiredArgsConstructor +public class BuyService { + private final BuyRepository buyRepository; + private final MemberRepository memberRepository; + private final ItemRepository itemRepository; + + public void postBuy(Long memberId, Long itemId) { + Member member = getMember(memberId); + Item item = getItem(itemId); + + // TODO 인증샷 업로드 + + Buy buy = Buy.builder() + .member(member) + .item(item) + .redirectUrl(item.getRedirectUrl()) + .refund(item.getRefund()) + .refundStatus(RefundStatus.IN_PROGRESS) + .uploadTime(LocalDateTime.now()) + .build(); + + buyRepository.save(buy); + } + + private Item getItem(Long id) { + return itemRepository.findById(id) + .orElseThrow(() -> new CustomException(ITEM_NOT_FOUND)); + } + + private Member getMember(Long memberId) { + return memberRepository.findById(memberId) + .orElseThrow(() -> new CustomException(ErrorCode.MEMBER_NOT_FOUND)); + } +} diff --git a/api/src/main/java/com/mm/api/domain/item/controller/ItemController.java b/api/src/main/java/com/mm/api/domain/item/controller/ItemController.java index daee3f2..0fc0a2a 100644 --- a/api/src/main/java/com/mm/api/domain/item/controller/ItemController.java +++ b/api/src/main/java/com/mm/api/domain/item/controller/ItemController.java @@ -26,6 +26,7 @@ public class ItemController { private final ItemService itemService; + // 관리자 권한 @PostMapping("/items") public ResponseEntity createItem(@RequestBody ItemCreateRequest request) { ItemResponse response = itemService.createItem(request); @@ -44,8 +45,7 @@ public ResponseEntity updateItem(@RequestParam Long id) { return ResponseEntity.noContent().build(); } - // 관리자 권한 - + // 권한 X @GetMapping("/items") public ResponseEntity getItems(@RequestParam(required = false, defaultValue = "1") Integer page) { List responses = itemService.getItems(page); diff --git a/api/src/main/java/com/mm/api/domain/item/service/ItemService.java b/api/src/main/java/com/mm/api/domain/item/service/ItemService.java index cc2f22a..4b414de 100644 --- a/api/src/main/java/com/mm/api/domain/item/service/ItemService.java +++ b/api/src/main/java/com/mm/api/domain/item/service/ItemService.java @@ -53,8 +53,7 @@ public List getItems(Integer page) { @Transactional(readOnly = true) public ItemDetailResponse getItemDetail(Long id) { - Item item = itemRepository.findById(id) - .orElseThrow(() -> new CustomException(ITEM_NOT_FOUND)); + Item item = getItem(id); List images = item.getItemImages().stream() .map(ItemImage::getUrl) @@ -67,8 +66,7 @@ public ItemDetailResponse getItemDetail(Long id) { } public ItemResponse updateItem(Long id, ItemUpdateRequest request) { - Item item = itemRepository.findById(id) - .orElseThrow(() -> new CustomException(ITEM_NOT_FOUND)); + Item item = getItem(id); ItemUpdate itemUpdate = getItemUpdate(request); item.updateItem(itemUpdate); @@ -86,6 +84,11 @@ public void deleteItem(Long id) { itemRepository.deleteById(id); } + private Item getItem(Long id) { + return itemRepository.findById(id) + .orElseThrow(() -> new CustomException(ITEM_NOT_FOUND)); + } + private ItemUpdate getItemUpdate(ItemUpdateRequest request) { return ItemUpdate.builder() .detail(request.detail()) diff --git a/api/src/main/java/com/mm/api/domain/member/service/MemberService.java b/api/src/main/java/com/mm/api/domain/member/service/MemberService.java index b08705d..2d70742 100644 --- a/api/src/main/java/com/mm/api/domain/member/service/MemberService.java +++ b/api/src/main/java/com/mm/api/domain/member/service/MemberService.java @@ -18,6 +18,7 @@ public class MemberService { private final MemberRepository memberRepository; + // 관리자 + 회원 권한(자신만) public void updateMemberAccount(Long memberId, UpdateMemberAccountRequest request) { Member member = getMember(memberId); member.updateMemberAccount(request.account(), request.accountBank()); diff --git a/core/core-domain/src/main/java/com/mm/coredomain/domain/Buy.java b/core/core-domain/src/main/java/com/mm/coredomain/domain/Buy.java index b177393..1eeab35 100644 --- a/core/core-domain/src/main/java/com/mm/coredomain/domain/Buy.java +++ b/core/core-domain/src/main/java/com/mm/coredomain/domain/Buy.java @@ -1,27 +1,43 @@ package com.mm.coredomain.domain; -import jakarta.persistence.*; - import java.time.LocalDateTime; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; +import jakarta.persistence.ManyToOne; +import lombok.AccessLevel; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.NoArgsConstructor; + @Entity +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +@Builder public class Buy extends BaseEntity { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long id; + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Lob + private String redirectUrl; - @Lob - private String redirectUrl; + private LocalDateTime uploadTime; - private LocalDateTime orderTime; + private Integer refund; - private Integer refund; + private RefundStatus refundStatus; - private RefundStatus refundStatus; + @Lob + private String certImageUrl; - @ManyToOne(fetch = FetchType.LAZY) - private Member member; + @ManyToOne(fetch = FetchType.LAZY) + private Member member; - @ManyToOne(fetch = FetchType.LAZY) - private Item item; + @ManyToOne(fetch = FetchType.LAZY) + private Item item; } diff --git a/core/core-domain/src/main/java/com/mm/coredomain/domain/RefundStatus.java b/core/core-domain/src/main/java/com/mm/coredomain/domain/RefundStatus.java index fa3e333..54f154f 100644 --- a/core/core-domain/src/main/java/com/mm/coredomain/domain/RefundStatus.java +++ b/core/core-domain/src/main/java/com/mm/coredomain/domain/RefundStatus.java @@ -1,4 +1,8 @@ package com.mm.coredomain.domain; public enum RefundStatus { + UNDER_EXAMINATION, + IN_PROGRESS, + COMPLETED, + REFUSED } From a2eca7cdec4ee64d6cd77d65a42400ce58c4d1e9 Mon Sep 17 00:00:00 2001 From: KarmaPol Date: Wed, 24 Jan 2024 18:32:19 +0900 Subject: [PATCH 11/18] =?UTF-8?q?chore:=20#5=20s3=20=EB=AA=A8=EB=93=88=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + .../repository/RedisRefreshTokenRepository.java | 2 +- core/core-infra-s3/build.gradle | 13 +++++++++++++ .../gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43462 bytes .../gradle/wrapper/gradle-wrapper.properties | 7 +++++++ .../mm/coreinfras3/CoreInfraS3Application.java | 13 +++++++++++++ .../CoreInfraS3ApplicationTests.java | 13 +++++++++++++ settings.gradle | 1 + 8 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 core/core-infra-s3/build.gradle create mode 100644 core/core-infra-s3/gradle/wrapper/gradle-wrapper.jar create mode 100644 core/core-infra-s3/gradle/wrapper/gradle-wrapper.properties create mode 100644 core/core-infra-s3/src/main/java/com/mm/coreinfras3/CoreInfraS3Application.java create mode 100644 core/core-infra-s3/src/test/java/com/mm/coreinfras3/CoreInfraS3ApplicationTests.java diff --git a/.gitignore b/.gitignore index 289c027..c7c8f3a 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ build/ ### yml **/application-infra-rdb.yml **/application-security.yml +**/application-s3.yml ### STS ### .apt_generated diff --git a/core/core-infra-redis/src/main/java/com/mm/coreinfraredis/repository/RedisRefreshTokenRepository.java b/core/core-infra-redis/src/main/java/com/mm/coreinfraredis/repository/RedisRefreshTokenRepository.java index d9ef199..3e21b62 100644 --- a/core/core-infra-redis/src/main/java/com/mm/coreinfraredis/repository/RedisRefreshTokenRepository.java +++ b/core/core-infra-redis/src/main/java/com/mm/coreinfraredis/repository/RedisRefreshTokenRepository.java @@ -13,7 +13,7 @@ @RequiredArgsConstructor public class RedisRefreshTokenRepository { private final RedisTemplate redisTemplate; - private final static long REFRESH_TOKEN_EXPIRE_LONG = 259200L; + private static final long REFRESH_TOKEN_EXPIRE_LONG = 259200L; public void save(String refreshToken, Long memberId) { ValueOperations valueOperations = redisTemplate.opsForValue(); diff --git a/core/core-infra-s3/build.gradle b/core/core-infra-s3/build.gradle new file mode 100644 index 0000000..0eb74cc --- /dev/null +++ b/core/core-infra-s3/build.gradle @@ -0,0 +1,13 @@ +// 실행가능한 jar로 생성하는 옵션, main이 없는 라이브러리에서는 false로 비활성화함 +// 스프링 부트 2.0 이상이라면 bootRepackage.enabled를 사용해야 함 +bootJar { enabled = false } + +// 외부에서 의존하기 위한 jar로 생성하는 옵션, main이 없는 라이브러리에서는 true로 비활성화함 +jar { enabled = true } + +dependencies { + implementation project(':core:core-domain'); + + // s3 + implementation 'org.springframework.cloud:spring-cloud-starter-aws' +} diff --git a/core/core-infra-s3/gradle/wrapper/gradle-wrapper.jar b/core/core-infra-s3/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..d64cd4917707c1f8861d8cb53dd15194d4248596 GIT binary patch literal 43462 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 literal 0 HcmV?d00001 diff --git a/core/core-infra-s3/gradle/wrapper/gradle-wrapper.properties b/core/core-infra-s3/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..1af9e09 --- /dev/null +++ b/core/core-infra-s3/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/core/core-infra-s3/src/main/java/com/mm/coreinfras3/CoreInfraS3Application.java b/core/core-infra-s3/src/main/java/com/mm/coreinfras3/CoreInfraS3Application.java new file mode 100644 index 0000000..285803d --- /dev/null +++ b/core/core-infra-s3/src/main/java/com/mm/coreinfras3/CoreInfraS3Application.java @@ -0,0 +1,13 @@ +package com.mm.coreinfras3; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class CoreInfraS3Application { + + public static void main(String[] args) { + SpringApplication.run(CoreInfraS3Application.class, args); + } + +} diff --git a/core/core-infra-s3/src/test/java/com/mm/coreinfras3/CoreInfraS3ApplicationTests.java b/core/core-infra-s3/src/test/java/com/mm/coreinfras3/CoreInfraS3ApplicationTests.java new file mode 100644 index 0000000..ca66544 --- /dev/null +++ b/core/core-infra-s3/src/test/java/com/mm/coreinfras3/CoreInfraS3ApplicationTests.java @@ -0,0 +1,13 @@ +package com.mm.coreinfras3; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class CoreInfraS3ApplicationTests { + + @Test + void contextLoads() { + } + +} diff --git a/settings.gradle b/settings.gradle index fef7545..dd260fa 100644 --- a/settings.gradle +++ b/settings.gradle @@ -5,4 +5,5 @@ include 'core:core-domain' include 'core:core-infra-qdsl' include 'core:core-infra-rdb' include 'core:core-infra-redis' +include 'core:core-infra-s3' include 'core:core-security' From 25071ae38a0dc21264118cd5d65ba2ae23d2c92d Mon Sep 17 00:00:00 2001 From: KarmaPol Date: Wed, 24 Jan 2024 18:51:10 +0900 Subject: [PATCH 12/18] feat: #5 add s3 config --- core/core-infra-s3/build.gradle | 2 +- .../coreinfras3/CoreInfraS3Application.java | 13 -------- .../com/mm/coreinfras3/config/S3Config.java | 31 +++++++++++++++++++ .../CoreInfraS3ApplicationTests.java | 13 -------- 4 files changed, 32 insertions(+), 27 deletions(-) delete mode 100644 core/core-infra-s3/src/main/java/com/mm/coreinfras3/CoreInfraS3Application.java create mode 100644 core/core-infra-s3/src/main/java/com/mm/coreinfras3/config/S3Config.java delete mode 100644 core/core-infra-s3/src/test/java/com/mm/coreinfras3/CoreInfraS3ApplicationTests.java diff --git a/core/core-infra-s3/build.gradle b/core/core-infra-s3/build.gradle index 0eb74cc..fbc64ef 100644 --- a/core/core-infra-s3/build.gradle +++ b/core/core-infra-s3/build.gradle @@ -9,5 +9,5 @@ dependencies { implementation project(':core:core-domain'); // s3 - implementation 'org.springframework.cloud:spring-cloud-starter-aws' + implementation 'org.springframework.cloud:spring-cloud-starter-aws:2.2.1.RELEASE' } diff --git a/core/core-infra-s3/src/main/java/com/mm/coreinfras3/CoreInfraS3Application.java b/core/core-infra-s3/src/main/java/com/mm/coreinfras3/CoreInfraS3Application.java deleted file mode 100644 index 285803d..0000000 --- a/core/core-infra-s3/src/main/java/com/mm/coreinfras3/CoreInfraS3Application.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.mm.coreinfras3; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -@SpringBootApplication -public class CoreInfraS3Application { - - public static void main(String[] args) { - SpringApplication.run(CoreInfraS3Application.class, args); - } - -} diff --git a/core/core-infra-s3/src/main/java/com/mm/coreinfras3/config/S3Config.java b/core/core-infra-s3/src/main/java/com/mm/coreinfras3/config/S3Config.java new file mode 100644 index 0000000..0f81dc2 --- /dev/null +++ b/core/core-infra-s3/src/main/java/com/mm/coreinfras3/config/S3Config.java @@ -0,0 +1,31 @@ +package com.mm.coreinfras3.config; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import com.amazonaws.auth.AWSStaticCredentialsProvider; +import com.amazonaws.auth.BasicAWSCredentials; +import com.amazonaws.services.s3.AmazonS3Client; +import com.amazonaws.services.s3.AmazonS3ClientBuilder; + +@Configuration +public class S3Config { + @Value("${cloud.aws.s3.region.static}") + private String region; + + @Value("${cloud.aws.credentials.access-key}") + private String accessKey; + + @Value("${cloud.aws.credentials.secret-key}") + private String secretKey; + + @Bean + public AmazonS3Client amazonS3Client() { + BasicAWSCredentials awsCredentials = new BasicAWSCredentials(accessKey, secretKey); + return (AmazonS3Client)AmazonS3ClientBuilder.standard() + .withRegion(region).enablePathStyleAccess() + .withCredentials(new AWSStaticCredentialsProvider(awsCredentials)) + .build(); + } +} diff --git a/core/core-infra-s3/src/test/java/com/mm/coreinfras3/CoreInfraS3ApplicationTests.java b/core/core-infra-s3/src/test/java/com/mm/coreinfras3/CoreInfraS3ApplicationTests.java deleted file mode 100644 index ca66544..0000000 --- a/core/core-infra-s3/src/test/java/com/mm/coreinfras3/CoreInfraS3ApplicationTests.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.mm.coreinfras3; - -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; - -@SpringBootTest -class CoreInfraS3ApplicationTests { - - @Test - void contextLoads() { - } - -} From e1ab0508dd80b58af2c3ce6f68f9fcc7ef077d41 Mon Sep 17 00:00:00 2001 From: KarmaPol Date: Wed, 24 Jan 2024 19:05:22 +0900 Subject: [PATCH 13/18] =?UTF-8?q?feat:=20#5=20s3=20service=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mm/coreinfras3/util/S3Service.java | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 core/core-infra-s3/src/main/java/com/mm/coreinfras3/util/S3Service.java diff --git a/core/core-infra-s3/src/main/java/com/mm/coreinfras3/util/S3Service.java b/core/core-infra-s3/src/main/java/com/mm/coreinfras3/util/S3Service.java new file mode 100644 index 0000000..1102609 --- /dev/null +++ b/core/core-infra-s3/src/main/java/com/mm/coreinfras3/util/S3Service.java @@ -0,0 +1,39 @@ +package com.mm.coreinfras3.util; + +import java.io.IOException; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; + +import com.amazonaws.services.s3.AmazonS3Client; +import com.amazonaws.services.s3.model.DeleteObjectRequest; +import com.amazonaws.services.s3.model.ObjectMetadata; + +import lombok.RequiredArgsConstructor; + +@Service +@RequiredArgsConstructor +public class S3Service { + private final AmazonS3Client amazonS3Client; + + @Value("${cloud.aws.s3.bucket}") + private String bucket; + + public String uploadFileToS3(MultipartFile file, String filename) { + try { + ObjectMetadata metadata = new ObjectMetadata(); + metadata.setContentType(file.getContentType()); + metadata.setContentLength(file.getSize()); + amazonS3Client.putObject(bucket, filename, file.getInputStream(), metadata); + return String.valueOf(amazonS3Client.getUrl(bucket, filename)); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + public void delete(String fileName) { + DeleteObjectRequest deleteObjectRequest = new DeleteObjectRequest(bucket, fileName); + amazonS3Client.deleteObject(deleteObjectRequest); + } +} From 48c3959c25c37a7edb930fcf6c837c281851b621 Mon Sep 17 00:00:00 2001 From: KarmaPol Date: Wed, 24 Jan 2024 19:21:32 +0900 Subject: [PATCH 14/18] =?UTF-8?q?feat:=20#5=20=EA=B5=AC=EB=A7=A4=20?= =?UTF-8?q?=EC=9D=B8=EC=A6=9D=20=EC=8B=9C=20=EC=9D=B8=EC=A6=9D=20=EC=9D=B4?= =?UTF-8?q?=EB=AF=B8=EC=A7=80=20=EC=97=85=EB=A1=9C=EB=93=9C=20=EA=B8=B0?= =?UTF-8?q?=EB=8A=A5=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/build.gradle | 3 ++- .../mm/api/domain/buy/controller/BuyController.java | 7 +++++-- .../com/mm/api/domain/buy/service/BuyService.java | 8 ++++++-- .../main/java/com/mm/coreinfras3/util/S3Service.java | 11 ++++++++++- 4 files changed, 23 insertions(+), 6 deletions(-) diff --git a/api/build.gradle b/api/build.gradle index a7fe41c..99166d5 100644 --- a/api/build.gradle +++ b/api/build.gradle @@ -10,6 +10,7 @@ dependencies { implementation project(':core:core-infra-rdb'); implementation project(':core:core-infra-qdsl'); implementation project(':core:core-infra-redis'); + implementation project(':core:core-infra-s3'); implementation project(':core:core-security'); // validation @@ -26,7 +27,7 @@ dependencies { // security implementation 'org.springframework.boot:spring-boot-starter-security' - + // redis implementation 'org.springframework.boot:spring-boot-starter-data-redis' } diff --git a/api/src/main/java/com/mm/api/domain/buy/controller/BuyController.java b/api/src/main/java/com/mm/api/domain/buy/controller/BuyController.java index 76feb87..1856743 100644 --- a/api/src/main/java/com/mm/api/domain/buy/controller/BuyController.java +++ b/api/src/main/java/com/mm/api/domain/buy/controller/BuyController.java @@ -6,7 +6,9 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RequestPart; import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.multipart.MultipartFile; import com.mm.api.domain.buy.service.BuyService; @@ -31,8 +33,9 @@ public void updateBuyRefundStatus(@RequestParam String refundStatus) { // 회원만 @PostMapping("/buys/{memberId}/{itemId}") - public void postBuy(@PathVariable Long memberId, @PathVariable Long itemId) { - buyService.postBuy(memberId, itemId); + public void postBuy(@PathVariable Long memberId, @PathVariable Long itemId, + @RequestPart(value = "file", required = true) MultipartFile file) { + buyService.postBuy(memberId, itemId, file); } } diff --git a/api/src/main/java/com/mm/api/domain/buy/service/BuyService.java b/api/src/main/java/com/mm/api/domain/buy/service/BuyService.java index de8b053..526469a 100644 --- a/api/src/main/java/com/mm/api/domain/buy/service/BuyService.java +++ b/api/src/main/java/com/mm/api/domain/buy/service/BuyService.java @@ -5,6 +5,7 @@ import java.time.LocalDateTime; import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; import com.mm.api.exception.CustomException; import com.mm.api.exception.ErrorCode; @@ -15,6 +16,7 @@ import com.mm.coredomain.repository.BuyRepository; import com.mm.coredomain.repository.ItemRepository; import com.mm.coredomain.repository.MemberRepository; +import com.mm.coreinfras3.util.S3Service; import lombok.RequiredArgsConstructor; @@ -24,12 +26,13 @@ public class BuyService { private final BuyRepository buyRepository; private final MemberRepository memberRepository; private final ItemRepository itemRepository; + private final S3Service s3Service; - public void postBuy(Long memberId, Long itemId) { + public void postBuy(Long memberId, Long itemId, MultipartFile file) { Member member = getMember(memberId); Item item = getItem(itemId); - // TODO 인증샷 업로드 + String url = s3Service.uploadFileToS3(file, memberId, itemId); Buy buy = Buy.builder() .member(member) @@ -38,6 +41,7 @@ public void postBuy(Long memberId, Long itemId) { .refund(item.getRefund()) .refundStatus(RefundStatus.IN_PROGRESS) .uploadTime(LocalDateTime.now()) + .certImageUrl(url) .build(); buyRepository.save(buy); diff --git a/core/core-infra-s3/src/main/java/com/mm/coreinfras3/util/S3Service.java b/core/core-infra-s3/src/main/java/com/mm/coreinfras3/util/S3Service.java index 1102609..f3ba074 100644 --- a/core/core-infra-s3/src/main/java/com/mm/coreinfras3/util/S3Service.java +++ b/core/core-infra-s3/src/main/java/com/mm/coreinfras3/util/S3Service.java @@ -1,6 +1,7 @@ package com.mm.coreinfras3.util; import java.io.IOException; +import java.text.SimpleDateFormat; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -20,11 +21,12 @@ public class S3Service { @Value("${cloud.aws.s3.bucket}") private String bucket; - public String uploadFileToS3(MultipartFile file, String filename) { + public String uploadFileToS3(MultipartFile file, Long memberId, Long itemId) { try { ObjectMetadata metadata = new ObjectMetadata(); metadata.setContentType(file.getContentType()); metadata.setContentLength(file.getSize()); + String filename = getUploadFileName(memberId, itemId); amazonS3Client.putObject(bucket, filename, file.getInputStream(), metadata); return String.valueOf(amazonS3Client.getUrl(bucket, filename)); } catch (IOException e) { @@ -36,4 +38,11 @@ public void delete(String fileName) { DeleteObjectRequest deleteObjectRequest = new DeleteObjectRequest(bucket, fileName); amazonS3Client.deleteObject(deleteObjectRequest); } + + private String getUploadFileName(Long memberId, Long itemId) { + StringBuffer stringBuffer = new StringBuffer(); + String currentTime = new SimpleDateFormat("yyyy-MM-dd-HH-mm-ss-SSS").format(System.currentTimeMillis()); + stringBuffer.append(currentTime).append("-").append(memberId).append("-").append(itemId); + return stringBuffer.toString(); + } } From 8edb6c05fb8e642b88827f39d8a6c964b9fe8a13 Mon Sep 17 00:00:00 2001 From: KarmaPol Date: Wed, 24 Jan 2024 19:32:56 +0900 Subject: [PATCH 15/18] =?UTF-8?q?feat:=20#5=20=EA=B5=AC=EB=A7=A4=20?= =?UTF-8?q?=EC=9D=B8=EC=A6=9D=20=EA=B8=B0=EB=8A=A5=20=EA=B5=AC=ED=98=84=20?= =?UTF-8?q?=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/buy/controller/BuyController.java | 8 +++--- .../domain/buy/dto/response/BuyResponse.java | 27 +++++++++++++++++++ .../mm/api/domain/buy/service/BuyService.java | 7 +++-- .../java/com/mm/coredomain/domain/Buy.java | 2 ++ 4 files changed, 39 insertions(+), 5 deletions(-) create mode 100644 api/src/main/java/com/mm/api/domain/buy/dto/response/BuyResponse.java diff --git a/api/src/main/java/com/mm/api/domain/buy/controller/BuyController.java b/api/src/main/java/com/mm/api/domain/buy/controller/BuyController.java index 1856743..e3d77ec 100644 --- a/api/src/main/java/com/mm/api/domain/buy/controller/BuyController.java +++ b/api/src/main/java/com/mm/api/domain/buy/controller/BuyController.java @@ -1,5 +1,6 @@ package com.mm.api.domain.buy.controller; +import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PatchMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -10,6 +11,7 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; +import com.mm.api.domain.buy.dto.response.BuyResponse; import com.mm.api.domain.buy.service.BuyService; import lombok.RequiredArgsConstructor; @@ -33,9 +35,9 @@ public void updateBuyRefundStatus(@RequestParam String refundStatus) { // 회원만 @PostMapping("/buys/{memberId}/{itemId}") - public void postBuy(@PathVariable Long memberId, @PathVariable Long itemId, + public ResponseEntity postBuy(@PathVariable Long memberId, @PathVariable Long itemId, @RequestPart(value = "file", required = true) MultipartFile file) { - buyService.postBuy(memberId, itemId, file); - + BuyResponse buyResponse = buyService.postBuy(memberId, itemId, file); + return ResponseEntity.ok(buyResponse); } } diff --git a/api/src/main/java/com/mm/api/domain/buy/dto/response/BuyResponse.java b/api/src/main/java/com/mm/api/domain/buy/dto/response/BuyResponse.java new file mode 100644 index 0000000..b6e0473 --- /dev/null +++ b/api/src/main/java/com/mm/api/domain/buy/dto/response/BuyResponse.java @@ -0,0 +1,27 @@ +package com.mm.api.domain.buy.dto.response; + +import java.time.LocalDateTime; + +import com.mm.coredomain.domain.Buy; +import com.mm.coredomain.domain.RefundStatus; + +import lombok.Builder; + +@Builder +public record BuyResponse(Long id, + String redirectUrl, + LocalDateTime uploadTime, + Integer refund, + RefundStatus refundStatus, + String certImageUrl) { + public static BuyResponse of(Buy buy) { + return BuyResponse.builder() + .id(buy.getId()) + .redirectUrl(buy.getRedirectUrl()) + .uploadTime(buy.getUploadTime()) + .refund(buy.getRefund()) + .refundStatus(buy.getRefundStatus()) + .certImageUrl(buy.getCertImageUrl()) + .build(); + } +} diff --git a/api/src/main/java/com/mm/api/domain/buy/service/BuyService.java b/api/src/main/java/com/mm/api/domain/buy/service/BuyService.java index 526469a..aeb97f1 100644 --- a/api/src/main/java/com/mm/api/domain/buy/service/BuyService.java +++ b/api/src/main/java/com/mm/api/domain/buy/service/BuyService.java @@ -5,8 +5,10 @@ import java.time.LocalDateTime; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; +import com.mm.api.domain.buy.dto.response.BuyResponse; import com.mm.api.exception.CustomException; import com.mm.api.exception.ErrorCode; import com.mm.coredomain.domain.Buy; @@ -21,6 +23,7 @@ import lombok.RequiredArgsConstructor; @Service +@Transactional @RequiredArgsConstructor public class BuyService { private final BuyRepository buyRepository; @@ -28,7 +31,7 @@ public class BuyService { private final ItemRepository itemRepository; private final S3Service s3Service; - public void postBuy(Long memberId, Long itemId, MultipartFile file) { + public BuyResponse postBuy(Long memberId, Long itemId, MultipartFile file) { Member member = getMember(memberId); Item item = getItem(itemId); @@ -44,7 +47,7 @@ public void postBuy(Long memberId, Long itemId, MultipartFile file) { .certImageUrl(url) .build(); - buyRepository.save(buy); + return BuyResponse.of(buyRepository.save(buy)); } private Item getItem(Long id) { diff --git a/core/core-domain/src/main/java/com/mm/coredomain/domain/Buy.java b/core/core-domain/src/main/java/com/mm/coredomain/domain/Buy.java index 1eeab35..dcd7608 100644 --- a/core/core-domain/src/main/java/com/mm/coredomain/domain/Buy.java +++ b/core/core-domain/src/main/java/com/mm/coredomain/domain/Buy.java @@ -12,8 +12,10 @@ import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Builder; +import lombok.Getter; import lombok.NoArgsConstructor; +@Getter @Entity @NoArgsConstructor(access = AccessLevel.PROTECTED) @AllArgsConstructor From 6dc608fa5fe96244233cfa821837e5055ced9786 Mon Sep 17 00:00:00 2001 From: KarmaPol Date: Wed, 24 Jan 2024 21:05:03 +0900 Subject: [PATCH 16/18] =?UTF-8?q?feat:=20#5=20=EA=B5=AC=EB=A7=A4=20?= =?UTF-8?q?=EC=9D=B8=EC=A6=9D=20=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C,=20=EA=B5=AC=EB=A7=A4=20=EC=9D=B8=EC=A6=9D=20?= =?UTF-8?q?=EC=83=81=ED=83=9C=20=EB=B3=80=EA=B2=BD,=20=EA=B5=AC=EB=A7=A4?= =?UTF-8?q?=20=EC=9D=B8=EC=A6=9D=20=EC=82=AD=EC=A0=9C=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/buy/controller/BuyController.java | 19 +++++++++-- .../mm/api/domain/buy/service/BuyService.java | 29 +++++++++++++++++ .../java/com/mm/api/exception/ErrorCode.java | 1 + .../java/com/mm/coredomain/domain/Buy.java | 4 +++ .../mm/coredomain/domain/RefundStatus.java | 10 +++++- .../repository/BuyCustomRepository.java | 9 ++++++ .../repository/BuyCustomRepositoryImpl.java | 28 ++++++++++++++++ .../repository/ItemCustomRepositoryImpl.java | 32 +++++++++---------- 8 files changed, 112 insertions(+), 20 deletions(-) create mode 100644 core/core-infra-qdsl/src/main/java/com/mm/coreinfraqdsl/repository/BuyCustomRepository.java create mode 100644 core/core-infra-qdsl/src/main/java/com/mm/coreinfraqdsl/repository/BuyCustomRepositoryImpl.java diff --git a/api/src/main/java/com/mm/api/domain/buy/controller/BuyController.java b/api/src/main/java/com/mm/api/domain/buy/controller/BuyController.java index e3d77ec..02c35d5 100644 --- a/api/src/main/java/com/mm/api/domain/buy/controller/BuyController.java +++ b/api/src/main/java/com/mm/api/domain/buy/controller/BuyController.java @@ -1,6 +1,9 @@ package com.mm.api.domain.buy.controller; +import java.util.List; + import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PatchMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -24,13 +27,23 @@ public class BuyController { // 관리자만 @GetMapping("/buys") - public void getBuys(@RequestParam(required = false, defaultValue = "1") Integer page) { - + public ResponseEntity getBuys(@RequestParam(required = false, defaultValue = "1") Integer page) { + List responses = buyService.getBuys(page); + return ResponseEntity.ok(responses); } @PatchMapping("/buys/{buyId}/refund-status") - public void updateBuyRefundStatus(@RequestParam String refundStatus) { + public ResponseEntity updateBuyRefundStatus(@PathVariable Long buyId, + @RequestParam String refundStatus) { + BuyResponse response = buyService.updateBuyRefundStatus(buyId, refundStatus); + return ResponseEntity.ok(response); + } + // 관리자 + 회원(자신만) + @DeleteMapping("/buys/{buyId}") + public ResponseEntity deleteBuy(@PathVariable Long buyId) { + buyService.deleteBuy(buyId); + return ResponseEntity.noContent().build(); } // 회원만 diff --git a/api/src/main/java/com/mm/api/domain/buy/service/BuyService.java b/api/src/main/java/com/mm/api/domain/buy/service/BuyService.java index aeb97f1..014c056 100644 --- a/api/src/main/java/com/mm/api/domain/buy/service/BuyService.java +++ b/api/src/main/java/com/mm/api/domain/buy/service/BuyService.java @@ -3,6 +3,7 @@ import static com.mm.api.exception.ErrorCode.*; import java.time.LocalDateTime; +import java.util.List; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -18,6 +19,7 @@ import com.mm.coredomain.repository.BuyRepository; import com.mm.coredomain.repository.ItemRepository; import com.mm.coredomain.repository.MemberRepository; +import com.mm.coreinfraqdsl.repository.BuyCustomRepository; import com.mm.coreinfras3.util.S3Service; import lombok.RequiredArgsConstructor; @@ -30,6 +32,7 @@ public class BuyService { private final MemberRepository memberRepository; private final ItemRepository itemRepository; private final S3Service s3Service; + private final BuyCustomRepository buyCustomRepository; public BuyResponse postBuy(Long memberId, Long itemId, MultipartFile file) { Member member = getMember(memberId); @@ -50,6 +53,32 @@ public BuyResponse postBuy(Long memberId, Long itemId, MultipartFile file) { return BuyResponse.of(buyRepository.save(buy)); } + public BuyResponse updateBuyRefundStatus(Long buyId, String refundStatus) { + RefundStatus convertedRefundStatus = RefundStatus.of(refundStatus); + Buy buy = getBuy(buyId); + buy.updateRefundStatus(convertedRefundStatus); + + return BuyResponse.of(buy); + } + + public void deleteBuy(Long buyId) { + Buy buy = getBuy(buyId); + buyRepository.delete(buy); + } + + @Transactional(readOnly = true) + public List getBuys(Integer page) { + List buys = buyCustomRepository.getBuysByPage(page); + return buys.stream() + .map(BuyResponse::of) + .toList(); + } + + private Buy getBuy(Long buyId) { + return buyRepository.findById(buyId) + .orElseThrow(() -> new CustomException(BUY_NOT_FOUND)); + } + private Item getItem(Long id) { return itemRepository.findById(id) .orElseThrow(() -> new CustomException(ITEM_NOT_FOUND)); diff --git a/api/src/main/java/com/mm/api/exception/ErrorCode.java b/api/src/main/java/com/mm/api/exception/ErrorCode.java index 7f2e558..486f773 100644 --- a/api/src/main/java/com/mm/api/exception/ErrorCode.java +++ b/api/src/main/java/com/mm/api/exception/ErrorCode.java @@ -10,6 +10,7 @@ public enum ErrorCode { VALIDATION_FAILED("400/0001", HttpStatus.BAD_REQUEST, "잘못된 요청입니다."), ITEM_NOT_FOUND("404/0001", HttpStatus.NOT_FOUND, "존재하지 않는 상품입니다"), MEMBER_NOT_FOUND("404/0002", HttpStatus.NOT_FOUND, "존재하지 않는 회원입니다"), + BUY_NOT_FOUND("404/0003", HttpStatus.NOT_FOUND, "존재하지 않는 구매인증입니다"), REFRESH_TOKEN_EXPIRED("401/0001", HttpStatus.UNAUTHORIZED, "토큰이 만료되었으니 다시 로그인 해주세요"); private final String errorCode; diff --git a/core/core-domain/src/main/java/com/mm/coredomain/domain/Buy.java b/core/core-domain/src/main/java/com/mm/coredomain/domain/Buy.java index dcd7608..9c7266b 100644 --- a/core/core-domain/src/main/java/com/mm/coredomain/domain/Buy.java +++ b/core/core-domain/src/main/java/com/mm/coredomain/domain/Buy.java @@ -42,4 +42,8 @@ public class Buy extends BaseEntity { @ManyToOne(fetch = FetchType.LAZY) private Item item; + + public void updateRefundStatus(RefundStatus refundStatus) { + this.refundStatus = refundStatus; + } } diff --git a/core/core-domain/src/main/java/com/mm/coredomain/domain/RefundStatus.java b/core/core-domain/src/main/java/com/mm/coredomain/domain/RefundStatus.java index 54f154f..eb1f6b8 100644 --- a/core/core-domain/src/main/java/com/mm/coredomain/domain/RefundStatus.java +++ b/core/core-domain/src/main/java/com/mm/coredomain/domain/RefundStatus.java @@ -4,5 +4,13 @@ public enum RefundStatus { UNDER_EXAMINATION, IN_PROGRESS, COMPLETED, - REFUSED + REFUSED; + + public static RefundStatus of(String input) { + try { + return RefundStatus.valueOf(input.toUpperCase()); + } catch (Exception e) { + throw new IllegalArgumentException("존재하지 않는 환급 상태입니다. : " + input); + } + } } diff --git a/core/core-infra-qdsl/src/main/java/com/mm/coreinfraqdsl/repository/BuyCustomRepository.java b/core/core-infra-qdsl/src/main/java/com/mm/coreinfraqdsl/repository/BuyCustomRepository.java new file mode 100644 index 0000000..685d116 --- /dev/null +++ b/core/core-infra-qdsl/src/main/java/com/mm/coreinfraqdsl/repository/BuyCustomRepository.java @@ -0,0 +1,9 @@ +package com.mm.coreinfraqdsl.repository; + +import java.util.List; + +import com.mm.coredomain.domain.Buy; + +public interface BuyCustomRepository { + List getBuysByPage(Integer page); +} diff --git a/core/core-infra-qdsl/src/main/java/com/mm/coreinfraqdsl/repository/BuyCustomRepositoryImpl.java b/core/core-infra-qdsl/src/main/java/com/mm/coreinfraqdsl/repository/BuyCustomRepositoryImpl.java new file mode 100644 index 0000000..9ee4520 --- /dev/null +++ b/core/core-infra-qdsl/src/main/java/com/mm/coreinfraqdsl/repository/BuyCustomRepositoryImpl.java @@ -0,0 +1,28 @@ +package com.mm.coreinfraqdsl.repository; + +import static com.mm.coredomain.domain.QBuy.*; + +import java.util.List; + +import org.springframework.stereotype.Repository; + +import com.mm.coredomain.domain.Buy; +import com.querydsl.jpa.impl.JPAQueryFactory; + +import lombok.RequiredArgsConstructor; + +@Repository +@RequiredArgsConstructor +public class BuyCustomRepositoryImpl implements BuyCustomRepository { + private final JPAQueryFactory jpaQueryFactory; + + private static final Long PAGE_OFFSET = 10L; + + @Override + public List getBuysByPage(Integer page) { + return jpaQueryFactory.selectFrom(buy) + .offset((page - 1) * PAGE_OFFSET) + .limit(PAGE_OFFSET) + .fetch(); + } +} diff --git a/core/core-infra-qdsl/src/main/java/com/mm/coreinfraqdsl/repository/ItemCustomRepositoryImpl.java b/core/core-infra-qdsl/src/main/java/com/mm/coreinfraqdsl/repository/ItemCustomRepositoryImpl.java index bd7aadc..8107303 100644 --- a/core/core-infra-qdsl/src/main/java/com/mm/coreinfraqdsl/repository/ItemCustomRepositoryImpl.java +++ b/core/core-infra-qdsl/src/main/java/com/mm/coreinfraqdsl/repository/ItemCustomRepositoryImpl.java @@ -1,28 +1,28 @@ package com.mm.coreinfraqdsl.repository; -import com.mm.coredomain.domain.Item; -import com.mm.coredomain.domain.QItem; -import com.querydsl.jpa.impl.JPAQueryFactory; -import jakarta.persistence.criteria.CriteriaBuilder; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Repository; +import static com.mm.coredomain.domain.QItem.*; import java.util.List; -import static com.mm.coredomain.domain.QItem.item; +import org.springframework.stereotype.Repository; + +import com.mm.coredomain.domain.Item; +import com.querydsl.jpa.impl.JPAQueryFactory; + +import lombok.RequiredArgsConstructor; @Repository @RequiredArgsConstructor public class ItemCustomRepositoryImpl implements ItemCustomRepository { - private final JPAQueryFactory jpaQueryFactory; + private final JPAQueryFactory jpaQueryFactory; - private final static Long PAGE_OFFSET = 10L; + private static final Long PAGE_OFFSET = 10L; - @Override - public List getItemsByPage(Integer page) { - return jpaQueryFactory.selectFrom(item) - .offset((page-1)*PAGE_OFFSET) - .limit(PAGE_OFFSET) - .fetch(); - } + @Override + public List getItemsByPage(Integer page) { + return jpaQueryFactory.selectFrom(item) + .offset((page - 1) * PAGE_OFFSET) + .limit(PAGE_OFFSET) + .fetch(); + } } From a6f9156c76e8da11bd8932dc547ad0081ff2c273 Mon Sep 17 00:00:00 2001 From: KarmaPol Date: Thu, 25 Jan 2024 00:43:46 +0900 Subject: [PATCH 17/18] =?UTF-8?q?chore:=20redis=20yml=20prod=20=ED=99=98?= =?UTF-8?q?=EA=B2=BD=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/build.gradle | 3 +++ .../api/domain/auth/controller/AuthController.java | 5 +++++ .../api/domain/buy/controller/BuyController.java | 7 +++++++ .../api/domain/item/controller/ItemController.java | 10 +++++++++- .../domain/member/controller/MemberController.java | 4 +++- api/src/main/resources/application.yml | 2 +- .../src/main/resources/application-redis.yml | 14 ++++++++++++++ .../java/com/mm/coreinfras3/config/S3Config.java | 2 +- 8 files changed, 43 insertions(+), 4 deletions(-) diff --git a/api/build.gradle b/api/build.gradle index 99166d5..601d6f4 100644 --- a/api/build.gradle +++ b/api/build.gradle @@ -30,4 +30,7 @@ dependencies { // redis implementation 'org.springframework.boot:spring-boot-starter-data-redis' + + // swagger + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' } diff --git a/api/src/main/java/com/mm/api/domain/auth/controller/AuthController.java b/api/src/main/java/com/mm/api/domain/auth/controller/AuthController.java index 490cef4..029ad3d 100644 --- a/api/src/main/java/com/mm/api/domain/auth/controller/AuthController.java +++ b/api/src/main/java/com/mm/api/domain/auth/controller/AuthController.java @@ -10,18 +10,23 @@ import com.mm.api.domain.auth.dto.response.TokenResponse; import com.mm.api.domain.auth.service.AuthService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; +@Tag(name = "회원 인증", description = "회원 인증 관련 API 입니다.") @RestController @RequiredArgsConstructor public class AuthController { private final AuthService authService; + @Operation(summary = "oAuth 로그인을 합니다. 현재 provider는 kakao만 제공됩니다.") @GetMapping("/oauth2/authorization/{oauth2-provider}") public void login() { // oauth2 로그인 } + @Operation(summary = "access token을 갱신합니다.") @PostMapping("/api/v1/auth/refresh-access-token") public ResponseEntity refreshAccessToken(@RequestBody RefreshTokenRequest request) { TokenResponse tokenResponse = authService.refreshAccessToken(request); diff --git a/api/src/main/java/com/mm/api/domain/buy/controller/BuyController.java b/api/src/main/java/com/mm/api/domain/buy/controller/BuyController.java index 02c35d5..26d885d 100644 --- a/api/src/main/java/com/mm/api/domain/buy/controller/BuyController.java +++ b/api/src/main/java/com/mm/api/domain/buy/controller/BuyController.java @@ -17,8 +17,11 @@ import com.mm.api.domain.buy.dto.response.BuyResponse; import com.mm.api.domain.buy.service.BuyService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; +@Tag(name = "구매 인증", description = "구매 인증 관련 API 입니다.") @RestController @RequestMapping("/api/v1") @RequiredArgsConstructor @@ -26,12 +29,14 @@ public class BuyController { private final BuyService buyService; // 관리자만 + @Operation(summary = "구매 인증을 페이지 단위로 가져옵니다.") @GetMapping("/buys") public ResponseEntity getBuys(@RequestParam(required = false, defaultValue = "1") Integer page) { List responses = buyService.getBuys(page); return ResponseEntity.ok(responses); } + @Operation(summary = "구매 인증 상태를 변경합니다.") @PatchMapping("/buys/{buyId}/refund-status") public ResponseEntity updateBuyRefundStatus(@PathVariable Long buyId, @RequestParam String refundStatus) { @@ -40,6 +45,7 @@ public ResponseEntity updateBuyRefundStatus(@PathVariable Long buyId, } // 관리자 + 회원(자신만) + @Operation(summary = "구매 인증을 삭제합니다.") @DeleteMapping("/buys/{buyId}") public ResponseEntity deleteBuy(@PathVariable Long buyId) { buyService.deleteBuy(buyId); @@ -47,6 +53,7 @@ public ResponseEntity deleteBuy(@PathVariable Long buyId) { } // 회원만 + @Operation(summary = "구매 인증을 작성합니다.") @PostMapping("/buys/{memberId}/{itemId}") public ResponseEntity postBuy(@PathVariable Long memberId, @PathVariable Long itemId, @RequestPart(value = "file", required = true) MultipartFile file) { diff --git a/api/src/main/java/com/mm/api/domain/item/controller/ItemController.java b/api/src/main/java/com/mm/api/domain/item/controller/ItemController.java index 0fc0a2a..30b3bc8 100644 --- a/api/src/main/java/com/mm/api/domain/item/controller/ItemController.java +++ b/api/src/main/java/com/mm/api/domain/item/controller/ItemController.java @@ -18,8 +18,11 @@ import com.mm.api.domain.item.dto.response.ItemResponse; import com.mm.api.domain.item.service.ItemService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; +@Tag(name = "상품", description = "상품 관련 API 입니다.") @RestController @RequestMapping("/api/v1") @RequiredArgsConstructor @@ -27,31 +30,36 @@ public class ItemController { private final ItemService itemService; // 관리자 권한 + @Operation(summary = "상품 글을 작성합니다.") @PostMapping("/items") public ResponseEntity createItem(@RequestBody ItemCreateRequest request) { ItemResponse response = itemService.createItem(request); return ResponseEntity.ok(response); } + @Operation(summary = "상품 글을 업데이트합니다.") @PutMapping("/items/{id}") public ResponseEntity updateItem(@RequestParam Long id, @RequestBody ItemUpdateRequest request) { ItemResponse response = itemService.updateItem(id, request); return ResponseEntity.ok(response); } + @Operation(summary = "상품 글을 삭제합니다.") @DeleteMapping("/items/{id}") - public ResponseEntity updateItem(@RequestParam Long id) { + public ResponseEntity deleteItem(@RequestParam Long id) { itemService.deleteItem(id); return ResponseEntity.noContent().build(); } // 권한 X + @Operation(summary = "상품 글을 페이지 단위로 읽어옵니다.") @GetMapping("/items") public ResponseEntity getItems(@RequestParam(required = false, defaultValue = "1") Integer page) { List responses = itemService.getItems(page); return ResponseEntity.ok(responses); } + @Operation(summary = "상품 글의 상세 내용을 읽어옵니다.") @GetMapping("/items/{id}") public ResponseEntity getItemDetail(@RequestParam Long id) { ItemDetailResponse response = itemService.getItemDetail(id); diff --git a/api/src/main/java/com/mm/api/domain/member/controller/MemberController.java b/api/src/main/java/com/mm/api/domain/member/controller/MemberController.java index 68236be..7ce8c96 100644 --- a/api/src/main/java/com/mm/api/domain/member/controller/MemberController.java +++ b/api/src/main/java/com/mm/api/domain/member/controller/MemberController.java @@ -13,8 +13,10 @@ import com.mm.api.domain.member.dto.response.MemberInfoResponse; import com.mm.api.domain.member.service.MemberService; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; +@Tag(name = "회원", description = "회원 관련 API 입니다.") @RestController @RequestMapping("/api/v1") @RequiredArgsConstructor @@ -22,7 +24,7 @@ public class MemberController { private final MemberService memberService; // 관리자 권한 + 자신만 - + @PatchMapping("/members/{memberId}/account") public ResponseEntity updateMemberAccount(@PathVariable Long memberId, @RequestBody UpdateMemberAccountRequest request) { diff --git a/api/src/main/resources/application.yml b/api/src/main/resources/application.yml index 5581a89..07aba15 100644 --- a/api/src/main/resources/application.yml +++ b/api/src/main/resources/application.yml @@ -1,6 +1,6 @@ spring: profiles: - include: infra-rdb, redis, security + include: infra-rdb, redis, s3, security active: dev server: diff --git a/core/core-infra-redis/src/main/resources/application-redis.yml b/core/core-infra-redis/src/main/resources/application-redis.yml index 471d2e5..d531800 100644 --- a/core/core-infra-redis/src/main/resources/application-redis.yml +++ b/core/core-infra-redis/src/main/resources/application-redis.yml @@ -1,5 +1,19 @@ spring: + config: + activate: + on-profile: dev data: redis: port: 6379 host: localhost + +--- + +spring: + config: + activate: + on-profile: prod + data: + redis: + port: 6379 + host: redis diff --git a/core/core-infra-s3/src/main/java/com/mm/coreinfras3/config/S3Config.java b/core/core-infra-s3/src/main/java/com/mm/coreinfras3/config/S3Config.java index 0f81dc2..8e2def1 100644 --- a/core/core-infra-s3/src/main/java/com/mm/coreinfras3/config/S3Config.java +++ b/core/core-infra-s3/src/main/java/com/mm/coreinfras3/config/S3Config.java @@ -11,7 +11,7 @@ @Configuration public class S3Config { - @Value("${cloud.aws.s3.region.static}") + @Value("${cloud.aws.region.static}") private String region; @Value("${cloud.aws.credentials.access-key}") From efcc70decfe9f17a3e5551ab7d4352d3c87e5a01 Mon Sep 17 00:00:00 2001 From: KarmaPol Date: Thu, 25 Jan 2024 00:51:31 +0900 Subject: [PATCH 18/18] =?UTF-8?q?chore:=20profile=20=EA=B8=B0=EB=B3=B8?= =?UTF-8?q?=EA=B0=92=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/src/main/resources/application.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/src/main/resources/application.yml b/api/src/main/resources/application.yml index 07aba15..ccb7049 100644 --- a/api/src/main/resources/application.yml +++ b/api/src/main/resources/application.yml @@ -1,7 +1,7 @@ spring: profiles: include: infra-rdb, redis, s3, security - active: dev + active: prod server: port: 8080