update main

README.md

@@ -1 +1,34 @@
-# spring-gift-point
+# spring-gift-point
+
+https://www.notion.so/6-api-3d91cc23fb1e435eaf34ff1a8e51eaf1?pvs=4
+
+
+
+**팀 API 명세서**
+![img_5.png](img_5.png)
+![img_6.png](img_6.png)
+![img_3.png](img_3.png)
+![img_4.png](img_4.png)
+![img_7.png](img_7.png)
+![img_8.png](img_8.png)
+![img_9.png](img_9.png)
+![img_10.png](img_10.png)
+![img_11.png](img_11.png)
+
+### 기능 요구사항 작성
+- [X] 팀원과 의논한 팀 API 명세서를 바탕으로 코드 리팩토링 
+
+# 🚀포인트 구현
+
+### 기능 요구 사항
+
+---
+
+상품 구매에 사용할 수 있는 포인트 기능을 구현한다.
+
+- [X]  포인트는 사용자별로 보유
+    - [X]  Member : Point = 1 : 1
+    - [X]  관리자 화면에서 포인트를 충전하여 사용하는 방식이다.
+- [X]  포인트 차감
+    - [X]  상품을 주문하면 포인트에서 차감된다.
+- [X]  관리자 화면에서 포인트 충전 가능

build.gradle

@@ -21,8 +21,15 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-jdbc'
     implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
     implementation 'org.springframework.boot:spring-boot-starter-web'
+    implementation 'org.springframework.boot:spring-boot-starter-validation'
+    implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
+    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
+    compileOnly 'io.jsonwebtoken:jjwt-api:0.12.6'
+    runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.12.6'
+    runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.12.6'
     runtimeOnly 'com.h2database:h2'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
+    testImplementation 'org.mockito:mockito-core'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 }
 

src/main/java/gift/auth/JwtHelper.java

@@ -0,0 +1,50 @@
+package gift.auth;
+
+import io.jsonwebtoken.Claims;
+import io.jsonwebtoken.Jwts;
+import io.jsonwebtoken.security.Keys;
+import org.springframework.stereotype.Component;
+
+import javax.crypto.SecretKey;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+@Component
+public class JwtHelper {
+
+    private final static String SECRET_KEY = "mysecretmysecretmysecretmysecretmysecretmysecret";
+    private final static SecretKey KEY = Keys.hmacShaKeyFor(SECRET_KEY.getBytes());
+    private final static long TOKEN_TIME = 60 * 60 *1000L; //60분
+
+    public String generateToken(Long userId, String email) {
+        Map<String, Object> claims = new HashMap<>();
+        claims.put("userId", userId); // 사용자 ID를 클레임에 추가한다.
+        claims.put("email", email); // 사용자 이메일을 클레임에 추가한다.
+
+        return Jwts.builder()
+                .setClaims(claims)
+                .setIssuedAt(new Date(new Date().getTime()))
+                .setExpiration(new Date(new Date().getTime() + TOKEN_TIME))
+                .signWith(KEY)
+                .compact();
+    }
+
+    /**
+     * Token에서 Claim 추출
+     * @param token JWT 토큰
+     * @return Claims
+     */
+    public Claims getClaims(Token token) {
+        return Jwts.parser()
+                .verifyWith(KEY)
+                .build()
+                .parseSignedClaims(token.token())
+                .getPayload();
+    }
+
+    public boolean isJwtToken(Token token) {
+        return token.token().split("\\.").length == 3;
+    }
+
+}

src/main/java/gift/auth/JwtUtil.java

@@ -0,0 +1,66 @@
+package gift.auth;
+
+import gift.service.KakaoApiService;
+import gift.service.MemberService;
+import gift.vo.Member;
+import io.jsonwebtoken.security.Keys;
+import org.springframework.stereotype.Component;
+
+import javax.crypto.SecretKey;
+
+@Component
+public class JwtUtil {
+
+    private final KakaoApiService kakaoApiService;
+    private final MemberService memberService;
+
+    // Token 만료 시간
+    private final static long TOKEN_TIME = 60 * 60 *1000L; //60분
+    private final static String SECRET_KEY = "mysecretmysecretmysecretmysecretmysecretmysecret";
+    private final static SecretKey KEY = Keys.hmacShaKeyFor(SECRET_KEY.getBytes());
+    private final JwtHelper jwtHelper;
+
+    public JwtUtil(KakaoApiService kakaoApiService, MemberService memberService, JwtHelper jwtHelper) {
+        this.kakaoApiService = kakaoApiService;
+        this.memberService = memberService;
+        this.jwtHelper = jwtHelper;
+    }
+
+    private Long getMemberIdFromToken(Token token) {
+        return jwtHelper.getClaims(token).get("userId", Long.class);
+    }
+
+    /**
+     *
+     * @param authorizationHeader Authorization 헤더
+     * @return Bearer 토큰 추출
+     */
+    public Token getBearerTokenFromAuthorizationHeader(String authorizationHeader) {
+        String bearerToken = authorizationHeader.replace("Bearer ", "");
+        return new Token(bearerToken);
+    }
+
+    private Long getMemberIdFromKakao(Token token) {
+        String memberEmail = kakaoApiService.getMemberEmailFromKakao(token);
+        return memberService.getMemberByEmail(memberEmail).getId();
+    }
+
+    public Member getMemberFromAuthorizationHeader(String authorizationHeader) {
+        Token fetchedToken = getBearerTokenFromAuthorizationHeader(authorizationHeader);
+
+        Long foundedMemberId;
+
+        if (jwtHelper.isJwtToken(fetchedToken)) {
+            foundedMemberId = getMemberIdFromToken(fetchedToken);
+        } else {
+            foundedMemberId = getMemberIdFromKakao(fetchedToken);
+        }
+
+        return memberService.getMemberById(foundedMemberId);
+    }
+
+    public boolean isNotJwtToken(Token token) {
+        return token.token().split("\\.").length != 3;
+    }
+
+}

src/main/java/gift/auth/OAuthToken.java

@@ -0,0 +1,11 @@
+package gift.auth;
+
+public record OAuthToken (
+        String access_token,
+        String token_type,
+        String refresh_token,
+        int expires_in,
+        String scope,
+        int refresh_token_expires_in
+) {
+}

src/main/java/gift/auth/Token.java

@@ -0,0 +1,11 @@
+package gift.auth;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+@Schema(description = "Token")
+public record Token(
+
+        @Schema(description = "Access Token")
+        String token
+) {
+}

src/main/java/gift/component/LoginMemberArgumentResolver.java

@@ -0,0 +1,38 @@
+package gift.component;
+
+import gift.auth.JwtUtil;
+import gift.service.MemberService;
+import gift.vo.LoginMember;
+import jakarta.servlet.http.HttpServletRequest;
+import org.springframework.core.MethodParameter;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.support.WebDataBinderFactory;
+import org.springframework.web.context.request.NativeWebRequest;
+import org.springframework.web.method.support.HandlerMethodArgumentResolver;
+import org.springframework.web.method.support.ModelAndViewContainer;
+
+@Component
+public class LoginMemberArgumentResolver implements HandlerMethodArgumentResolver {
+
+    private final MemberService memberService;
+    private final JwtUtil jwtUtil;
+
+    public LoginMemberArgumentResolver(MemberService memberService, JwtUtil jwtUtil) {
+        this.memberService = memberService;
+        this.jwtUtil = jwtUtil;
+    }
+
+    @Override
+    public boolean supportsParameter(MethodParameter parameter) {
+        return parameter.hasParameterAnnotation(LoginMember.class);
+    }
+
+    @Override
+    public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer, NativeWebRequest webRequest, WebDataBinderFactory binderFactory) throws Exception {
+        HttpServletRequest request = (HttpServletRequest) webRequest.getNativeRequest();
+        String authorizationHeader = request.getHeader("Authorization");
+
+        return jwtUtil.getMemberFromAuthorizationHeader(authorizationHeader);
+    }
+
+}

src/main/java/gift/component/kakao/KakaoApiProvider.java

@@ -0,0 +1,86 @@
+package gift.component.kakao;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import gift.auth.OAuthToken;
+import gift.dto.KakaoMessageRequestDto;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.stereotype.Component;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+
+@Component
+public class KakaoApiProvider {
+
+    private final KakaoProperties kakaoProperties;
+    private final ObjectMapper objectMapper;
+
+    private static final String GRANT_TYPE = "authorization_code";
+    public static final String KAKAO_TOKEN_REQUEST_URI = "https://kauth.kakao.com/oauth/token";
+    public static final String KAKAO_USER_PROFILE_URI = "https://kapi.kakao.com/v2/user/me";
+    public static final String KAKAO_MESSAGE_API_URI = "https://kapi.kakao.com/v2/api/talk/memo/default/send";
+    public static final String KAKAO_EMAIL = "kakao@kakao_";
+    public static final String KAKAO_PASSWORD = "KAKAO";
+    private static final String WEB_URL = "http://www.daum.net";
+    private static final String BUTTON_TITLE = "바로가기";
+
+    public KakaoApiProvider(KakaoProperties kakaoProperties, ObjectMapper objectMapper) {
+        this.kakaoProperties = kakaoProperties;
+        this.objectMapper = objectMapper;
+    }
+
+    public OAuthToken parseOAuthToken(String json) throws JsonProcessingException {
+        return objectMapper.readValue(json, OAuthToken.class);
+    }
+
+    public HttpHeaders makeHeaders() {
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
+        return headers;
+    }
+
+    public MultiValueMap<String, String> makeGetAccessTokenBody(String code) {
+        MultiValueMap<String, String> body = new LinkedMultiValueMap<>();
+        body.add("grant_type", GRANT_TYPE);
+        body.add("client_id", kakaoProperties.kakaoClientId());
+        body.add("redirect_uri", kakaoProperties.kakaoRedirectUrl());
+        body.add("code", code);
+        return body;
+    }
+
+    public MultiValueMap<String, String> makeTemplateObject(KakaoMessageRequestDto kakaoMessageRequestDto) {
+        String text = generateOrderText(kakaoMessageRequestDto);
+
+        ObjectNode templateJson = objectMapper.createObjectNode();
+        templateJson.put("object_type", "text");
+        templateJson.put("text", text);
+        templateJson.set("link", createLinkNode());
+        templateJson.put("button_title", BUTTON_TITLE);
+
+        String templateObject = templateJson.toString();
+        MultiValueMap<String, String> body = new LinkedMultiValueMap<>();
+        body.add("template_object", templateObject);
+
+        return body;
+    }
+
+    private String generateOrderText(KakaoMessageRequestDto kakaoMessageRequestDto) {
+        String productName = kakaoMessageRequestDto.productName();
+        String optionName = kakaoMessageRequestDto.optionName();
+        int num = kakaoMessageRequestDto.quantity();
+
+        String message = kakaoMessageRequestDto.message();
+
+        return productName + "[" + optionName + "]" + " 상품이 " + num + "개 주문되었습니다." + "\n메시지: " + message;
+    }
+
+    private ObjectNode createLinkNode() {
+        ObjectNode link = objectMapper.createObjectNode();
+        link.put("web_url", WEB_URL);
+
+        return link;
+    }
+
+}

src/main/java/gift/component/kakao/KakaoProperties.java

@@ -0,0 +1,13 @@
+package gift.component.kakao;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+@Component
+public record KakaoProperties(
+
+    @Value("${kakao.clientId}")  String kakaoClientId,
+
+    @Value("${kakao.redirectUrl}")  String kakaoRedirectUrl
+) {
+}

src/main/java/gift/config/RestClientConfig.java

@@ -0,0 +1,23 @@
+package gift.config;
+
+import gift.exception.CustomResponseErrorHandler;
+import org.springframework.boot.web.client.RestTemplateBuilder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.stereotype.Component;
+import org.springframework.web.client.RestTemplate;
+
+import java.time.Duration;
+
+@Component
+public class RestClientConfig {
+
+    @Bean
+    public RestTemplate restTemplate(RestTemplateBuilder builder, CustomResponseErrorHandler customResponseErrorHandler) {
+        return builder
+                .setConnectTimeout(Duration.ofSeconds(5))
+                .setReadTimeout(Duration.ofSeconds(5))
+                .errorHandler(customResponseErrorHandler)
+                .build();
+    };
+
+}

src/main/java/gift/config/SwaggerConfig.java

@@ -0,0 +1,36 @@
+package gift.config;
+
+import io.swagger.v3.oas.models.Components;
+import io.swagger.v3.oas.models.OpenAPI;
+import io.swagger.v3.oas.models.info.Info;
+import io.swagger.v3.oas.models.security.SecurityRequirement;
+import io.swagger.v3.oas.models.security.SecurityScheme;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class SwaggerConfig {
+    @Bean
+    public OpenAPI openAPI() {
+        String jwt = "JWT";
+        SecurityRequirement securityRequirement = new SecurityRequirement().addList(jwt);
+        Components components = new Components().addSecuritySchemes(jwt, new SecurityScheme()
+                .name(jwt)
+                .type(SecurityScheme.Type.HTTP)
+                .scheme("bearer")
+                .bearerFormat("JWT")
+        );
+
+        return new OpenAPI()
+                .components(components)
+                .info(apiInfo())
+                .addSecurityItem(securityRequirement);
+    }
+
+    private Info apiInfo() {
+        return new Info()
+                .title("선물하기 Project Spring Boot API Test")
+                .description("Swagger UI")
+                .version("1.0.0");
+    }
+}