10주차 Develop 반영

README.md

@@ -1,2 +1,65 @@
 # Team14_BE
+
 14조 백엔드
+
+## 프로젝트 소개
+- **프로젝트 명**: 요기먹때
+- **프로젝트 기간**: 24.09 ~ 24.11
+- **프로젝트 목표**: 높아진 배달 요구 금액에 대한 부담을 모르는 사람과 함께 주문하여 해결한다.
+
+> 모르는 사람과 함께 배달을 시켜보세요!
+
+![image](https://github.com/user-attachments/assets/0d40077d-5791-4a3d-981d-8c2726c2083f)
+
+- 🙋🏻‍♀️배달 가격이 부담스러운 사람을 대상으로
+- 👩‍👦함께 배달 음식을 주문할 수 있는 사람을 매칭해
+- 💵배달 최소 주문 금액 부담을 덜고 추가적인 배달음식비 또는 배달팁을 줄여보세요!
+
+## 배포 링크
+
+✅FE: https://team14-fe.vercel.app/  
+✅BE: https://order-together.duckdns.org/api/v1
+
+## 주요 기능
+### 1️⃣ 카카오 소설 로그인 기능
+| <img src="https://github.com/user-attachments/assets/b0cd3118-7f61-4fcd-b179-02b9e92a7b24" width=300> | - 카카오 로그인을 통한 회원등록 절차 간소화 |
+|-------------------------------------------------------------------------------------------------------|-----------------------|
+
+### 2️⃣ 주문 결제(토스 페이먼츠 API)
+| <img src="https://github.com/user-attachments/assets/307c2341-0379-4ba6-acc4-6235477f1912" width=300> | - 토스페이먼츠 API 를 사용한 포인트 충전 시스템<br/>-요기먹때에서 사용되는 재화를 충전할 수 있습니다. |
+|-------------------------------------------------------------------------------------------------------|------------------------------------------------------------|
+
+### 3️⃣ SMS 보내기 기능
+| <img src="https://github.com/user-attachments/assets/44da63a7-4a6a-4e82-9004-3a367d038590" width=300> | - 문자로 참여할 배민 함께주문 링크를 받을 수 있습니다. |
+|------------------------------------------------------------------------------------------------------|----------------------------------|
+
+### 4️⃣ 카카오 지도 API 
+| <img src="https://github.com/user-attachments/assets/ad48f508-3df6-4145-8e9c-a3c9c361396c" width=300> | - 카카오 지도를 통해 참여할 스팟을 확인할 수 있습니다. |
+|------------------------------------------------------------------------------------------------------|----------------------------------|
+
+
+## ERD 이미지
+
+![image](https://github.com/user-attachments/assets/59b8b750-ceb3-4484-a538-acd53d7fc370)
+
+## 개발 인원 : 7명
+
+| 이름   | 담당 역할 및 기능                                                      |
+| ------ | ---------------------------------------------------------------------- |
+| 강호정 | <img src="https://img.shields.io/badge/-FE-blue"> 마이페이지           |
+| 서민지 | <img src="https://img.shields.io/badge/-FE-blue"> 스팟(메인)페이지     |
+| 임지환 | <img src="https://img.shields.io/badge/-FE-blue"> 로그인 및 결제페이지 |
+| 나제법 | <img src="https://img.shields.io/badge/-BE-red"> 결제 API              |
+| 서영우 | <img src="https://img.shields.io/badge/-BE-red"> 로그인 API, 회원 API  |
+| 안재영 | <img src="https://img.shields.io/badge/-BE-red"> SMS API, 결제내역 API |
+| 유보민 | <img src="https://img.shields.io/badge/-BE-red"> 지도(스팟) API        |
+
+## ⚒️ BE 기술 스택
+| **Category**   | **Technology**                     |
+|----------------|------------------------------------|
+| **Language**   | Java 21                            |
+| **Framework**  | Spring Boot 3.3.3, Spring Data JPA |
+| **Database**   | MySQL 8.0                          |
+| **Infra**      | Amazon Web Service                 |
+| **Testing**    | JUnit5, Mockito                    |
+

build.gradle

@@ -41,9 +41,11 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation "io.jsonwebtoken:jjwt-api:${jjwt_version}"
     implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:${swagger_version}"
-    implementation 'org.mapstruct:mapstruct:1.6.2'
-
-    annotationProcessor 'org.mapstruct:mapstruct-processor:1.6.2'
+    implementation 'org.mapstruct:mapstruct:1.5.5.Final'
+    implementation 'ch.hsr:geohash:1.4.0'
+    implementation 'net.nurigo:sdk:4.3.0'
+    annotationProcessor 'org.mapstruct:mapstruct-processor:1.5.5.Final'
+    annotationProcessor 'org.projectlombok:lombok-mapstruct-binding:0.2.0'
 
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
 //    testImplementation 'org.springframework.security:spring-security-test'

src/main/java/com/ordertogether/team14_be/auth/application/dto/KakaoProperties.java

@@ -1,14 +1,20 @@
 package com.ordertogether.team14_be.auth.application.dto;
 
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.util.LinkedMultiValueMap;
 
 @ConfigurationProperties(prefix = "kakao")
+@Slf4j
 public record KakaoProperties(
 		String clientId, String redirectUrl, String authTokenUrl, String userApiUrl) {
 	public LinkedMultiValueMap<String, String> createBody(String code) {
 		LinkedMultiValueMap<String, String> body = new LinkedMultiValueMap<>();
 
+		log.info("clientId: {}", clientId());
+		log.info("redirectUrl: {}", redirectUrl());
+		log.info("code: {}", code);
+
 		body.add("grant_type", "authorization_code");
 		body.add("client_id", clientId());
 		body.add("redirect_uri", redirectUrl());

src/main/java/com/ordertogether/team14_be/auth/application/dto/TokenDto.java

@@ -0,0 +1,3 @@
+package com.ordertogether.team14_be.auth.application.dto;
+
+public record TokenDto(String token) {}

src/main/java/com/ordertogether/team14_be/auth/application/service/AuthService.java

@@ -1,56 +1,30 @@
 package com.ordertogether.team14_be.auth.application.service;
 
-import com.ordertogether.team14_be.auth.JwtUtil;
-import com.ordertogether.team14_be.auth.application.dto.KakaoUserInfo;
-import com.ordertogether.team14_be.auth.presentation.KakaoClient;
-import com.ordertogether.team14_be.common.web.response.ApiResponse;
+import com.ordertogether.team14_be.auth.persistence.JwtUtil;
+import com.ordertogether.team14_be.auth.persistence.exception.AlreadyExistMember;
 import com.ordertogether.team14_be.member.application.service.MemberService;
 import com.ordertogether.team14_be.member.persistence.entity.Member;
-import java.net.URI;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
 import java.util.Optional;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 
-@RequiredArgsConstructor
 @Service
 public class AuthService {
-
-	private final KakaoClient kakaoClient;
 	private final MemberService memberService;
 	private final JwtUtil jwtUtil;
 
-	@Value(("${FRONT_PAGE_SIGNUP}"))
-	String redirectPage;
-
-	public ResponseEntity<ApiResponse<String>> kakaoLogin(String authorizationCode) {
-		String kakaoToken = kakaoClient.getAccessToken(authorizationCode); // 인가코드로부터 카카오토큰 발급
-		KakaoUserInfo kakaoUserInfo = kakaoClient.getUserInfo((kakaoToken));
-		String userKakaoEmail = kakaoUserInfo.kakaoAccount().email(); // 와 사용자 카카오 이메일이야
+	public AuthService(MemberService memberService, JwtUtil jwtUtil) {
+		this.memberService = memberService;
+		this.jwtUtil = jwtUtil;
+	}
 
-		Optional<Member> existMember = memberService.findMemberByEmail(userKakaoEmail);
-		if (existMember.isPresent()) {
-			String serviceToken =
-					jwtUtil.generateToken(memberService.getMemberId(userKakaoEmail)); // 서비스 토큰 줘야징
-			return ResponseEntity.ok((ApiResponse.with(HttpStatus.OK, "로그인 성공", serviceToken)));
-		} else {
-			return ResponseEntity.status(HttpStatus.FOUND)
-					.location(
-							URI.create(redirectPage + URLEncoder.encode(userKakaoEmail, StandardCharsets.UTF_8)))
-					.build();
-		}
+	public String getServiceToken(String email) {
+		return jwtUtil.generateToken(memberService.getMemberId(email));
 	}
 
-	public ResponseEntity<ApiResponse<String>> register(
-			String email, String deliveryName, String phoneNumber) {
-		Member member = new Member(email, deliveryName, phoneNumber);
-		memberService.registerMember(member);
-		Long memberId = memberService.getMemberId(email);
-		String serviceToken = jwtUtil.generateToken(memberId);
-		return ResponseEntity.ok((ApiResponse.with(HttpStatus.OK, "회원가입 및 로그인 성공", serviceToken)));
+	public void validMember(String email, String platform) {
+		Optional<Member> isAlreadyMember = memberService.findMemberByEmail(email);
+		if (isAlreadyMember.isPresent() && isAlreadyMember.get().getPlatform().equals(platform)) {
+			throw new AlreadyExistMember();
+		}
 	}
 }

src/main/java/com/ordertogether/team14_be/auth/application/service/KakaoAuthService.java

@@ -0,0 +1,41 @@
+package com.ordertogether.team14_be.auth.application.service;
+
+import com.ordertogether.team14_be.auth.application.dto.KakaoUserInfo;
+import com.ordertogether.team14_be.auth.persistence.JwtUtil;
+import com.ordertogether.team14_be.auth.presentation.KakaoClient;
+import com.ordertogether.team14_be.member.application.service.MemberService;
+import com.ordertogether.team14_be.member.persistence.entity.Member;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestClientException;
+
+@RequiredArgsConstructor
+@Service
+public class KakaoAuthService {
+	private final KakaoClient kakaoClient;
+	private final MemberService memberService;
+	private final JwtUtil jwtUtil;
+	private static final String LOGIN_PLATFORM = "KAKAO";
+	private final AuthService authService;
+
+	public String getKakaoUserEmail(String authorizationCode) {
+		try {
+			String kakaoToken = kakaoClient.getAccessToken(authorizationCode);
+			KakaoUserInfo kakaoUserInfo = kakaoClient.getUserInfo((kakaoToken));
+			String userKakaoEmail = kakaoUserInfo.kakaoAccount().email();
+			return userKakaoEmail;
+		} catch (RestClientException e) {
+			System.err.println(e.getMessage());
+			return null;
+		}
+	}
+
+	public String register(String email, String deliveryName, String phoneNumber) {
+		Member member = new Member(email, 0, phoneNumber, deliveryName, LOGIN_PLATFORM);
+		authService.validMember(email, LOGIN_PLATFORM);
+		memberService.registerMember(member);
+		Long memberId = memberService.getMemberId(email);
+		String serviceToken = jwtUtil.generateToken(memberId);
+		return serviceToken;
+	}
+}

src/main/java/com/ordertogether/team14_be/auth/persistence/JwtInterceptor.java

@@ -0,0 +1,67 @@
+package com.ordertogether.team14_be.auth.persistence;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.ordertogether.team14_be.auth.token.TokenContext;
+import com.ordertogether.team14_be.member.application.exception.NotFoundMember;
+import com.ordertogether.team14_be.member.persistence.entity.Member;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.stereotype.Component;
+import org.springframework.web.servlet.HandlerInterceptor;
+
+@RequiredArgsConstructor
+@Slf4j
+@Component
+public class JwtInterceptor implements HandlerInterceptor {
+	private final JwtUtil jwtUtil;
+
+	@Override
+	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler)
+			throws Exception {
+		log.info("JwtInterceptor 실행");
+		if (HttpMethod.OPTIONS.matches(request.getMethod())) {
+			log.info("OPTIONS 요청");
+			return true;
+		}
+
+		logRequestDetails(request);
+
+		String authorization = request.getHeader(HttpHeaders.AUTHORIZATION);
+		String token = authorization.replaceAll("Bearer ", "");
+
+		if (token != null && token.length() > 10) {
+			log.debug("토큰 상태:: " + token);
+
+			if (jwtUtil.vaildToken(token)) {
+				ObjectMapper objectMapper = new ObjectMapper();
+
+				String member = objectMapper.writeValueAsString(jwtUtil.decodeJwt(token).get("member"));
+				log.info("member = " + member);
+				Member accessMember = objectMapper.readValue(member, Member.class);
+				log.info("accessMember = " + accessMember);
+
+				request.setAttribute("member", accessMember);
+				Long memberId = Long.valueOf(jwtUtil.getSubject(token));
+				log.info("memberId = " + memberId);
+				TokenContext.addCurrentMemberId(memberId);
+				return true;
+			}
+		} else {
+			throw new NotFoundMember();
+		}
+		return false;
+	}
+
+	private static void logRequestDetails(HttpServletRequest request) {
+		String clientIp = request.getHeader("X-Forwarded-For");
+		if (clientIp == null || clientIp.isEmpty()) {
+			clientIp = request.getRemoteAddr();
+		}
+		log.info("Request URI = " + request.getRequestURI());
+		log.info("Client IP = " + clientIp);
+	}
+}

src/main/java/com/ordertogether/team14_be/auth/JwtUtil.java → src/main/java/com/ordertogether/team14_be/auth/persistence/JwtUtil.java

@@ -1,7 +1,9 @@
-package com.ordertogether.team14_be.auth;
+package com.ordertogether.team14_be.auth.persistence;
 
+import com.ordertogether.team14_be.auth.persistence.exception.InvalidToken;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jwts;
+import io.jsonwebtoken.MalformedJwtException;
 import io.jsonwebtoken.SignatureAlgorithm;
 import io.jsonwebtoken.security.Keys;
 import java.nio.charset.StandardCharsets;
@@ -11,6 +13,7 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
+@Component
 public class JwtUtil {
 	private final SecretKey key;
 	private final int expireTime;
@@ -37,4 +40,21 @@ public String generateToken(Long data) {
 	public Claims decodeJwt(String token) {
 		return Jwts.parserBuilder().setSigningKey(key).build().parseClaimsJws(token).getBody();
 	}
+
+	public String getSubject(String token) {
+		return decodeJwt(token).getSubject();
+	}
+
+	public boolean vaildToken(String token) throws InvalidToken {
+		try {
+			Claims claims =
+					Jwts.parser()
+							.setSigningKey(key)
+							.parseClaimsJws(token) // 토큰 파싱
+							.getBody();
+			return true; // 유효하다면 true 반환
+		} catch (MalformedJwtException e) {
+			throw new InvalidToken();
+		}
+	}
 }

src/main/java/com/ordertogether/team14_be/auth/persistence/exception/AlreadyExistMember.java

@@ -0,0 +1,7 @@
+package com.ordertogether.team14_be.auth.persistence.exception;
+
+public class AlreadyExistMember extends RuntimeException {
+	public AlreadyExistMember() {
+		super("이미 회원이 존재합니다.");
+	}
+}

src/main/java/com/ordertogether/team14_be/auth/persistence/exception/InvalidToken.java

@@ -0,0 +1,7 @@
+package com.ordertogether.team14_be.auth.persistence.exception;
+
+public class InvalidToken extends IllegalAccessException {
+	public InvalidToken() {
+		super("토큰이 유효하지 않습니다.");
+	}
+}