diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..85e7c1d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/.idea/
diff --git a/.idea/Backend.iml b/.idea/Backend.iml
deleted file mode 100644
index d6ebd48..0000000
--- a/.idea/Backend.iml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
deleted file mode 100644
index 3f04895..0000000
--- a/.idea/gradle.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index e3a6f1d..0000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index f43d862..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 35eb1dd..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
deleted file mode 100644
index e4623b0..0000000
--- a/.idea/workspace.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1704176766234
-
-
- 1704176766234
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/README.md b/README.md
index aee2944..a782736 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,14 @@
# Backend
TEAM2 백엔드 레포지토리입니다.
+
+## 사용기술
+- SpringBoot
+- Spring Data JPA
+- Spring Security
+- MySQL
+- JWT + OAuth2.0
+- NCP Server
+- NCP Object Storage
+
+## 아키텍처
+
diff --git a/ping/.gitignore b/ping/.gitignore
index ba9d2be..b3fd7d3 100644
--- a/ping/.gitignore
+++ b/ping/.gitignore
@@ -16,7 +16,6 @@ build/
bin/
!**/src/main/**/bin/
!**/src/test/**/bin/
-
### IntelliJ IDEA ###
.idea
*.iws
@@ -26,6 +25,9 @@ out/
!**/src/main/**/out/
!**/src/test/**/out/
application.yml
+JwtProperties.java
+OAuthProperties.java
+NcpObjectStorageConfig.java
### NetBeans ###
/nbproject/private/
@@ -33,6 +35,6 @@ application.yml
/dist/
/nbdist/
/.nb-gradle/
-
+frontend/
### VS Code ###
.vscode/
diff --git a/ping/build.gradle b/ping/build.gradle
index 31c81af..82c7868 100644
--- a/ping/build.gradle
+++ b/ping/build.gradle
@@ -26,13 +26,24 @@ dependencies {
implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
implementation 'org.springframework.boot:spring-boot-starter-security'
implementation 'org.springframework.boot:spring-boot-starter-web'
+ implementation group: 'com.auth0', name: 'java-jwt', version: '4.3.0'
+ implementation 'org.springframework.boot:spring-boot-devtools'
+ implementation 'org.springframework.boot:spring-boot-starter-validation'
+ implementation 'com.github.gavlyukovskiy:p6spy-spring-boot-starter:1.5.6'
+ implementation 'org.apache.httpcomponents:httpclient:4.5.13'
compileOnly 'org.projectlombok:lombok'
runtimeOnly 'com.mysql:mysql-connector-j'
annotationProcessor 'org.projectlombok:lombok'
testImplementation 'org.springframework.boot:spring-boot-starter-test'
testImplementation 'org.springframework.security:spring-security-test'
+ implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310'
+ implementation 'com.fasterxml.jackson.core:jackson-databind'
}
tasks.named('test') {
useJUnitPlatform()
}
+
+bootJar {
+ duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+}
\ No newline at end of file
diff --git a/ping/src/main/java/com/b6122/ping/ImgPathProperties.java b/ping/src/main/java/com/b6122/ping/ImgPathProperties.java
new file mode 100644
index 0000000..d587404
--- /dev/null
+++ b/ping/src/main/java/com/b6122/ping/ImgPathProperties.java
@@ -0,0 +1,6 @@
+package com.b6122.ping;
+
+public interface ImgPathProperties {
+
+ String postImgPath = "C:\\ping\\post\\image";
+}
diff --git a/ping/src/main/java/com/b6122/ping/PingApplication.java b/ping/src/main/java/com/b6122/ping/PingApplication.java
index 1cc78e3..e7b4b62 100644
--- a/ping/src/main/java/com/b6122/ping/PingApplication.java
+++ b/ping/src/main/java/com/b6122/ping/PingApplication.java
@@ -2,10 +2,19 @@
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Bean;
+import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
@SpringBootApplication
+@EnableJpaAuditing
public class PingApplication {
+ @Bean
+ public BCryptPasswordEncoder passwordEncoder() {
+ return new BCryptPasswordEncoder();
+ }
+
public static void main(String[] args) {
SpringApplication.run(PingApplication.class, args);
}
diff --git a/ping/src/main/java/com/b6122/ping/auth/PrincipalDetails.java b/ping/src/main/java/com/b6122/ping/auth/PrincipalDetails.java
new file mode 100644
index 0000000..04cda93
--- /dev/null
+++ b/ping/src/main/java/com/b6122/ping/auth/PrincipalDetails.java
@@ -0,0 +1,57 @@
+package com.b6122.ping.auth;
+
+import com.b6122.ping.domain.User;
+import lombok.Data;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
+import org.springframework.security.core.userdetails.UserDetails;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+@Data
+public class PrincipalDetails implements UserDetails {
+
+ private User user;
+
+ @Override
+ public Collection getAuthorities() {
+ Collection authorities = new ArrayList<>();
+ authorities.add(new SimpleGrantedAuthority(user.getRole().toString())); // Enum을 문자열로 변환하여 SimpleGrantedAuthority 생성
+ return authorities;
+ }
+
+ @Override
+ public String getPassword() {
+ return null;
+ }
+
+ @Override
+ public String getUsername() {
+ return null;
+ }
+
+ @Override
+ public boolean isAccountNonExpired() {
+ return true;
+ }
+
+ @Override
+ public boolean isAccountNonLocked() {
+ return true;
+ }
+
+ @Override
+ public boolean isCredentialsNonExpired() {
+ return true;
+ }
+
+ @Override
+ public boolean isEnabled() {
+ return true;
+ }
+
+ public PrincipalDetails(User user) {
+ this.user = user;
+ }
+}
diff --git a/ping/src/main/java/com/b6122/ping/auth/PrincipalDetailsService.java b/ping/src/main/java/com/b6122/ping/auth/PrincipalDetailsService.java
new file mode 100644
index 0000000..7fd4d19
--- /dev/null
+++ b/ping/src/main/java/com/b6122/ping/auth/PrincipalDetailsService.java
@@ -0,0 +1,26 @@
+package com.b6122.ping.auth;
+
+import com.b6122.ping.domain.User;
+import com.b6122.ping.repository.datajpa.UserDataRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.core.userdetails.UserDetailsService;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
+import org.springframework.stereotype.Service;
+
+// http://localhost:8080/login을 통해 로그인을 안함(disable 해놔서) 따라서 아래 서비스가 동작하기 위한
+// 필터를 하나 만들어야 된다(JwtAuthenticationFilter)
+// 근데 우리 서비스는 ~/login을 통해 요청할 일이 없기 때문에, JwtAuthenticationFilter도 사실상 필요가 없다
+// jwt 토큰 발급 후 JwtAuthorizationFilter에서 시큐리티 세션에 Authentication 객체를 저장하여 권한 관리를 하고 있다.
+@Service
+@RequiredArgsConstructor
+public class PrincipalDetailsService implements UserDetailsService {
+
+ private final UserDataRepository userDataRepository;
+
+ @Override
+ public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
+ User userEntity = userDataRepository.findByUsername(username).orElseThrow();
+ return new PrincipalDetails(userEntity);
+ }
+}
diff --git a/ping/src/main/java/com/b6122/ping/config/CorsConfig.java b/ping/src/main/java/com/b6122/ping/config/CorsConfig.java
new file mode 100644
index 0000000..c6f9c38
--- /dev/null
+++ b/ping/src/main/java/com/b6122/ping/config/CorsConfig.java
@@ -0,0 +1,25 @@
+package com.b6122.ping.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.cors.CorsConfiguration;
+import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
+import org.springframework.web.filter.CorsFilter;
+
+@Configuration
+public class CorsConfig {
+
+ @Bean
+ public CorsFilter corsFilter() {
+ UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
+ CorsConfiguration config = new CorsConfiguration();
+ config.setAllowCredentials(true); // 내 서버가 응답을 할 때 json을 자바스크립트에서 처리할 수 있게 할지를 설정
+// config.addAllowedOriginPattern("http://61.97.185.12");
+ config.addAllowedOriginPattern("http://localhost:3000");
+ config.addAllowedHeader("*"); // 모든 header에 응답을 허용
+ config.addAllowedMethod("*"); // 모든 http method를 허용
+ source.registerCorsConfiguration("/**", config);
+ return new CorsFilter(source);
+
+ }
+}
diff --git a/ping/src/main/java/com/b6122/ping/config/SecurityConfig.java b/ping/src/main/java/com/b6122/ping/config/SecurityConfig.java
new file mode 100644
index 0000000..b99ea0b
--- /dev/null
+++ b/ping/src/main/java/com/b6122/ping/config/SecurityConfig.java
@@ -0,0 +1,54 @@
+package com.b6122.ping.config;
+
+import com.b6122.ping.config.jwt.JwtAuthorizationFilter;
+import com.b6122.ping.repository.datajpa.UserDataRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
+import org.springframework.security.config.http.SessionCreationPolicy;
+import org.springframework.security.core.userdetails.UserDetailsService;
+import org.springframework.security.web.SecurityFilterChain;
+
+
+@Configuration
+@EnableWebSecurity
+@RequiredArgsConstructor
+public class SecurityConfig {
+
+ private final CorsConfig corsConfig;
+ private final UserDetailsService userDetailsService;
+ private final UserDataRepository userDataRepository;
+
+ @Bean
+ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
+
+ //AuthenticaionManager 생성
+ AuthenticationManagerBuilder sharedObject = http.getSharedObject(AuthenticationManagerBuilder.class);
+ sharedObject.userDetailsService(this.userDetailsService); //이 userDetailsService와 PrincipalDetailsService에서 상속받는 인터페이스는 서로 같음.
+ AuthenticationManager authenticationManager = sharedObject.build();
+ http.authenticationManager(authenticationManager);
+ //세션 만들지 않기.
+ http
+ .addFilter(corsConfig.corsFilter())
+ .csrf(AbstractHttpConfigurer::disable)
+ .sessionManagement((sessionManagement) -> sessionManagement.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
+ .formLogin((formLogin) -> formLogin.disable())
+// .addFilter(new JwtAuthenticationFilter((authenticationManager)))
+ .addFilter((new JwtAuthorizationFilter(authenticationManager, userDataRepository)))
+ .httpBasic((httpBasic) -> httpBasic.disable()) //Bearer 방식을 사용하기 위해 basic 인증 비활성화
+ .authorizeHttpRequests((authorize) ->
+ authorize
+ .requestMatchers("/api/oauth/jwt/**").permitAll()
+ .requestMatchers("/admin/**").hasAnyRole("ADMIN")
+ .requestMatchers("/**").hasAnyRole("ADMIN", "USER")
+ .anyRequest().authenticated());
+
+
+ return http.build();
+ }
+}
diff --git a/ping/src/main/java/com/b6122/ping/config/jwt/JwtAuthenticationFilter.java b/ping/src/main/java/com/b6122/ping/config/jwt/JwtAuthenticationFilter.java
new file mode 100644
index 0000000..76fb3d9
--- /dev/null
+++ b/ping/src/main/java/com/b6122/ping/config/jwt/JwtAuthenticationFilter.java
@@ -0,0 +1,67 @@
+//package com.b6122.ping.config.jwt;
+//
+//import com.auth0.jwt.JWT;
+//import com.auth0.jwt.algorithms.Algorithm;
+//import com.b6122.ping.auth.PrincipalDetails;
+//import com.b6122.ping.domain.User;
+//import com.fasterxml.jackson.databind.ObjectMapper;
+//import jakarta.servlet.FilterChain;
+//import jakarta.servlet.ServletException;
+//import jakarta.servlet.http.HttpServletRequest;
+//import jakarta.servlet.http.HttpServletResponse;
+//import lombok.RequiredArgsConstructor;
+//import org.springframework.security.authentication.AuthenticationManager;
+//import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+//import org.springframework.security.core.Authentication;
+//import org.springframework.security.core.AuthenticationException;
+//import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
+//
+//import java.io.IOException;
+//import java.util.Date;
+//
+//@RequiredArgsConstructor
+//public class JwtAuthenticationFilter extends UsernamePasswordAuthenticationFilter {
+//
+// private final AuthenticationManager authenticationManager;
+//
+// //로그인 요청을 하면, 로그인 시도를 위해 실행되는 메소드
+// @Override
+// public Authentication attemptAuthentication(HttpServletRequest request, HttpServletResponse response) throws AuthenticationException {
+// System.out.println("로그인 시도중");
+//
+// //넘어온 username과 pw를 받아서
+// ObjectMapper objectMapper = new ObjectMapper();
+// try {
+// //json 데이터를 가정
+// User user = objectMapper.readValue(request.getInputStream(), User.class);
+// //authenticationManager에 넘겨주기 위해 토큰 생성
+// UsernamePasswordAuthenticationToken authenticationToken =
+// new UsernamePasswordAuthenticationToken(user.getUsername(), "1234");
+// //토큰을 authenticate()에 넘겨주면, PrincipalDetailsService의 loadByUsername() 실행
+// //service에서 인증이 완료되면 로그인 완료(DB의 데이터와 들어온 데이터가 일치)
+// Authentication authentication = authenticationManager.authenticate(authenticationToken);
+//
+// return authentication; //세션에 저장
+// //세션에 저장하는 이유는, security가 권한 관리를 해주기 때문에
+// //자세한 이유 --> https://www.inflearn.com/questions/714149/jwt-token-%EA%B5%AC%ED%98%84%EC%97%90%EC%84%9C-session-%EC%9D%84-%EC%82%AC%EC%9A%A9%ED%95%9C%EB%8B%A4
+// } catch (IOException e) {
+// throw new RuntimeException(e);
+// }
+// }
+//
+// // attemptAuthentication이 성공적으로 실행 이후 successfulAuthentication 메소드 실행.
+// // 아래 메소드에서 JWT 토큰 생성 후 사용자에게 response 해준다.
+// @Override
+// protected void successfulAuthentication(HttpServletRequest request, HttpServletResponse response, FilterChain chain, Authentication authResult) throws IOException, ServletException {
+// PrincipalDetails principalDetails = (PrincipalDetails) authResult.getPrincipal();
+//
+// //HMAC512 방식 암호화
+// String jwtToken = JWT.create()
+// .withSubject("jwt토큰")
+// .withExpiresAt(new Date(System.currentTimeMillis() + (60000 * 10))) //10분
+// .withClaim("id", principalDetails.getUser().getId())
+// .withClaim("username",principalDetails.getUser().getUsername())
+// .sign(Algorithm.HMAC512("secretKeyByServer"));
+// response.addHeader("Authorization", "Bearer " + jwtToken);
+// }
+//}
diff --git a/ping/src/main/java/com/b6122/ping/config/jwt/JwtAuthorizationFilter.java b/ping/src/main/java/com/b6122/ping/config/jwt/JwtAuthorizationFilter.java
new file mode 100644
index 0000000..e42356f
--- /dev/null
+++ b/ping/src/main/java/com/b6122/ping/config/jwt/JwtAuthorizationFilter.java
@@ -0,0 +1,97 @@
+package com.b6122.ping.config.jwt;
+
+import com.auth0.jwt.JWT;
+import com.auth0.jwt.algorithms.Algorithm;
+import com.auth0.jwt.exceptions.JWTVerificationException;
+import com.b6122.ping.auth.PrincipalDetails;
+import com.b6122.ping.domain.User;
+import com.b6122.ping.dto.UserDto;
+import com.b6122.ping.repository.datajpa.UserDataRepository;
+import com.b6122.ping.service.JwtService;
+import jakarta.persistence.EntityNotFoundException;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.web.authentication.www.BasicAuthenticationFilter;
+
+import java.io.IOException;
+import java.util.Map;
+
+public class JwtAuthorizationFilter extends BasicAuthenticationFilter {
+
+ private UserDataRepository userDataRepository;
+ private JwtService jwtService;
+
+ public JwtAuthorizationFilter(AuthenticationManager authenticationManager, UserDataRepository userDataRepository) {
+ super(authenticationManager);
+ this.userDataRepository = userDataRepository;
+ }
+
+ @Override
+ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain)
+ throws IOException, ServletException {
+
+ String header = request.getHeader(JwtProperties.HEADER_STRING);
+
+ if (header == null || !header.startsWith(JwtProperties.TOKEN_PREFIX)) {
+ chain.doFilter(request, response);
+ return;
+ }
+
+ //토큰 검증(동일한 토큰인지, 만료시간은 안지났는지 com.auth0.jwt 라이브러리가 확인해줌)
+ //access token과 refresh token을 검증
+ String username = null;
+ String token = request.getHeader(JwtProperties.HEADER_STRING).replace(JwtProperties.TOKEN_PREFIX, "");
+ String tokenType = JWT.decode(token).getClaim("token_type").asString();
+
+ if (tokenType.equals("access")) {
+ try {
+ username = JWT.require(Algorithm.HMAC512(JwtProperties.SECRET)).build().verify(token).getClaim("username").asString();
+ } catch(JWTVerificationException e) {
+ response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
+ response.getWriter().write("Access token is not valid. Please send refersh token.");
+ return;
+ }
+ } else if (tokenType.equals("refresh")) {
+
+ try {
+ username = JWT.require(Algorithm.HMAC512(JwtProperties.SECRET)).build().verify(token).getClaim("username").asString();
+ User user = userDataRepository.findByUsername(username).orElseThrow(EntityNotFoundException::new);
+ UserDto userDto = new UserDto(user.getId(), user.getUsername());
+ Map jwtAccessToken = jwtService.createJwtAccessToken(userDto);
+
+ //refersh token이 유효하면 access token 새로 발급
+ response.setStatus(HttpServletResponse.SC_OK);
+ response.getWriter().write("{\"access-token\": \"" + jwtAccessToken.get("access-token") + "\"}");
+ return;
+
+ } catch (JWTVerificationException e) {
+ response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
+ response.getWriter().write("Refresh token is not valid. Please login again.");
+ return;
+ }
+ }
+
+ if (username != null) {
+ User user = userDataRepository.findByUsername(username).orElseThrow(EntityNotFoundException::new);
+
+ // 인증은 토큰 검증시 끝. 인증을 하기 위해서가 아닌 스프링 시큐리티가 수행해주는 권한 처리를 위해
+ // 아래와 같이 토큰을 만들어서 Authentication 객체를 강제로 만들고 그걸 세션에 저장
+ PrincipalDetails principalDetails = new PrincipalDetails(user);
+ Authentication authentication = new UsernamePasswordAuthenticationToken(principalDetails,
+ null,
+ principalDetails.getAuthorities());
+ // 강제로 시큐리티의 세션에 접근하여 값 저장
+ // -> 컨트롤러에서 Authentication 객체를 받아서(DI) 권한 처리를 할 수 있음.
+ SecurityContextHolder.getContext().setAuthentication(authentication);
+ }
+
+ chain.doFilter(request, response);
+ }
+
+}
diff --git a/ping/src/main/java/com/b6122/ping/controller/PostController.java b/ping/src/main/java/com/b6122/ping/controller/PostController.java
new file mode 100644
index 0000000..a835420
--- /dev/null
+++ b/ping/src/main/java/com/b6122/ping/controller/PostController.java
@@ -0,0 +1,186 @@
+package com.b6122.ping.controller;
+
+import com.b6122.ping.auth.PrincipalDetails;
+import com.b6122.ping.domain.PostScope;
+import com.b6122.ping.dto.PostDto;
+import com.b6122.ping.service.PostService;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+
+import org.apache.catalina.filters.AddDefaultCharsetFilter;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.Authentication;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+@Getter@Setter
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/api")
+public class PostController {
+ private final PostService postService;
+
+ //글 작성 후 디비 저장
+ @PostMapping("/posts/home/store")
+ public ResponseEntity getPost(@RequestParam("title") String title,
+ @RequestParam("content") String content,
+ @RequestParam("latitude") float latitude,
+ @RequestParam("longitude") float longitude,
+ @RequestParam("scope") String scope,
+ @RequestParam(value = "img", required = false) List img,
+ Authentication authentication){
+ PrincipalDetails principalDetails = (PrincipalDetails) authentication.getPrincipal();
+
+ PostDto postDto = new PostDto();
+ postDto.setTitle(title);
+ postDto.setContent(content);
+ postDto.setLatitude(latitude);
+ postDto.setLongitude(longitude);
+ postDto.setImgs(img);
+ postDto.setUid(principalDetails.getUser().getId());
+ if("private".equals(scope)){
+ postDto.setScope(PostScope.PRIVATE);
+ } else if("public".equals(scope)) {
+ postDto.setScope(PostScope.PUBLIC);
+ } else {
+ postDto.setScope(PostScope.FRIENDS);
+ }
+ Long pid = postService.createPost(postDto);
+ return ResponseEntity.status(HttpStatus.CREATED).body(pid);
+ }
+
+ //글 수정 후 디비 저장
+ @PutMapping("/posts/home/edit/{postId}")
+ public ResponseEntity modifyPost(@RequestParam("title") String title,
+ @RequestParam("content") String content,
+ @RequestParam("latitude") float latitude,
+ @RequestParam("longitude") float longitude,
+ @RequestParam("scope") String scope,
+ @RequestParam(value = "img", required = false) List img,
+ @PathVariable("postId") Long postId,
+ Authentication authentication){
+
+ PrincipalDetails principalDetails = (PrincipalDetails) authentication.getPrincipal();
+
+ PostDto postDto = new PostDto();
+ postDto.setTitle(title);
+ postDto.setContent(content);
+ postDto.setLatitude(latitude);
+ postDto.setLongitude(longitude);
+ postDto.setImgs(img);
+ postDto.setUid(principalDetails.getUser().getId());
+ postDto.setId(postId);
+ if("private".equals(scope)){
+ postDto.setScope(PostScope.PRIVATE);
+ } else if("public".equals(scope)) {
+ postDto.setScope(PostScope.PUBLIC);
+ } else {
+ postDto.setScope(PostScope.FRIENDS);
+ }
+ Long pid = postService.modifyPost(postDto);
+ return ResponseEntity.status(HttpStatus.CREATED).body(pid);
+ }
+
+ //글 삭제
+ @PostMapping("/post/delete")
+ public ResponseEntity deletepost(@RequestParam("pid") Long pid){
+ postService.deletePost(pid);
+ return ResponseEntity.ok(pid);
+ }
+
+ //글 정보 반환, 조회수 ++
+ @GetMapping("/postInfo")
+ public ResponseEntity postInfo(@RequestParam("pid") Long pid,Authentication authentication ) {
+ PrincipalDetails principalDetails = (PrincipalDetails) authentication.getPrincipal();
+ Long uid = principalDetails.getUser().getId();
+ PostDto pd = postService.getPostInfo(pid, uid);
+ System.out.println("PostDto = " + pd);
+ return ResponseEntity.ok(pd);
+ }
+
+ //좋아요 update
+ @PostMapping("/likeToggle")
+
+ public ResponseEntity toggleLike(@RequestParam List pids, @RequestParam List myLikes,Authentication authentication ) {
+ PrincipalDetails principalDetails = (PrincipalDetails) authentication.getPrincipal();
+ Long uid = principalDetails.getUser().getId();
+ postService.toggleLike(pids, myLikes, uid);
+
+ return ResponseEntity.ok("Like toggled successfully");
+ }
+
+
+ //pin클릭 시 글 목록 반환, pid 리스트를 받아 반환, home friends public 동일
+ @GetMapping("/posts/clickPin")//map -> clickPin 변경
+ public ResponseEntity> postsPreviewPin(@RequestParam List pids){
+ List posts = postService.getPostsPreviewPin(pids);
+ return ResponseEntity.ok(posts);
+ }
+
+ //Home
+
+ //Home-Map, 내 모든 글의 pin 반환
+ @GetMapping("/posts/home/pins")
+ public ResponseEntity> showPinsHome(Authentication authentication) {
+ PrincipalDetails principalDetails = (PrincipalDetails) authentication.getPrincipal();
+ Long uid = principalDetails.getUser().getId();
+ List posts = postService.getPinsHomeMap(uid);
+ return ResponseEntity.ok(posts);
+ }
+
+ //Home-List 토글, postList 반환
+ @GetMapping("/posts/home/list")
+ public ResponseEntity> showPostsHomeList(Authentication authentication) {
+ PrincipalDetails principalDetails = (PrincipalDetails) authentication.getPrincipal();
+ Long uid = principalDetails.getUser().getId();
+ List posts = postService.getPostsHomeList(uid);
+ return ResponseEntity.ok().body(posts);
+ }
+
+
+
+
+ //Friend
+
+ //pins 반환, 친구 id 를 리스트로 받아 공개범위가 private이 아닌 것만 pid, 위도 경도 반환
+ @GetMapping("/posts/friends/pins")
+ public ResponseEntity> showPinsFriends(@RequestParam("uids") List uids) {
+ List posts = postService.getPinsFriendsMap(uids);
+ return ResponseEntity.ok(posts);
+ }
+
+
+ //친구 글 목록 preview 반환, 친구 id를 리스트로 받아 scope가 friend, public 인 것만 최신순으로 반환
+ @GetMapping("/posts/friends/list")
+ public ResponseEntity> showPostsFriendsList(@RequestParam("uids") List uids) {
+ List posts = postService.getPostsFriendsList(uids);
+ return ResponseEntity.ok().body(posts);
+ }
+
+
+
+
+ //public
+
+ //public pin반환, 반경 2km 내에 있는 글 반환
+ @GetMapping("/posts/public/pins")
+ public ResponseEntity> showPinsPubic(@RequestParam("longitude") float longitude, @RequestParam("latitude") float latitude) {
+ List posts = postService.getPinsPublicMap(longitude,latitude);
+ return ResponseEntity.ok(posts);
+ }
+
+
+ //public list 반환,반경 2km 내에 있는 글 반환
+
+ @GetMapping("/posts/public/list")
+ public ResponseEntity> showPostsPubicList(@RequestParam("longitude") float longitude, @RequestParam("latitude") float latitude) {
+ List posts = postService.getPostsPublicList(longitude,latitude);
+ return ResponseEntity.ok(posts);
+ }
+}
+
diff --git a/ping/src/main/java/com/b6122/ping/controller/RestApiController.java b/ping/src/main/java/com/b6122/ping/controller/RestApiController.java
new file mode 100644
index 0000000..9d92438
--- /dev/null
+++ b/ping/src/main/java/com/b6122/ping/controller/RestApiController.java
@@ -0,0 +1,177 @@
+package com.b6122.ping.controller;
+
+import com.b6122.ping.auth.PrincipalDetails;
+import com.b6122.ping.dto.*;
+import com.b6122.ping.service.*;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.Authentication;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.IOException;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+import java.util.Map;
+
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/api")
+public class RestApiController {
+
+ private final JwtService jwtService;
+ private final UserService userService;
+ private final FriendshipService friendshipService;
+ private final OauthService oauthService;
+
+ //프론트엔드로부터 authorization code 받고 -> 그 code로 카카오에 accesstoken 요청
+ // 받아 온 access token으로 카카오 리소스 서버로부터 카카오 유저 정보 가져오기
+ // 가져온 정보를 기반으로 회원가입
+ // jwt accessToken을 리액트 서버에 return
+// @PostMapping("/oauth/jwt")
+// public ResponseEntity> oauthLogin(String server, String code) throws IOException {
+// UserDto joinedUser = oauthService.join(server, code);
+// return ResponseEntity.ok().body(jwtService.createJwtAccessAndRefreshToken(joinedUser));
+// }
+//
+// @GetMapping("/auth/{serverName}/callback")
+// public void getCode(@PathVariable("serverName") String server,
+// @RequestParam("code") String code) throws IOException {
+// oauthLogin(server, code);
+// }
+
+ @GetMapping("/jwt/access")
+ public void jwt() {
+
+ }
+
+ @PostMapping("/oauth/jwt/{serverName}")
+ public ResponseEntity> oauthLogin(@PathVariable("serverName") String server,
+ @RequestBody Map request) throws IOException {
+
+ UserDto joinedUser = oauthService.join(server, request.get("code").toString());
+ return ResponseEntity.ok().body(jwtService.createJwtAccessAndRefreshToken(joinedUser));
+ }
+
+ @PostMapping("/profile")
+ public void setInitialProfile(@RequestParam(value = "profileImg", required = false) MultipartFile profileImg,
+ @RequestParam("nickname") String nickname,
+ Authentication authentication) {
+ PrincipalDetails principalDetails = (PrincipalDetails) authentication.getPrincipal();
+ Long userId = principalDetails.getUser().getId();
+ UserProfileReqDto reqDto = new UserProfileReqDto(nickname, profileImg, userId);
+ userService.updateProfile(reqDto);
+ }
+
+ //회원 탈퇴
+ @DeleteMapping("/account")
+ public void deleteAccount(Authentication authentication) {
+ PrincipalDetails principalDetails = (PrincipalDetails) authentication.getPrincipal();
+ userService.deleteAccount(principalDetails.getUser().getId());
+ }
+
+ //사용자 정보(닉네임, 사진) 가져오기
+ @GetMapping("/account")
+ public ResponseEntity account(Authentication authentication) {
+ PrincipalDetails principalDetails = (PrincipalDetails) authentication.getPrincipal();
+ UserProfileResDto resDto = userService.getUserProfile(principalDetails.getUser().getId());
+ return ResponseEntity.ok().body(resDto);
+ }
+
+ //회원정보 변경(일단 사진만, 닉네임까지 확장 가능)
+ @PostMapping("/account")
+ public void updateProfile(@RequestParam(value = "profileImg", required = false) MultipartFile profileImg,
+ @RequestParam("nickname") String nickname,
+ Authentication authentication) {
+ PrincipalDetails principalDetails = (PrincipalDetails) authentication.getPrincipal();
+ Long userId = principalDetails.getUser().getId();
+ UserProfileReqDto reqDto = new UserProfileReqDto(nickname, profileImg, userId);
+ userService.updateProfile(reqDto);
+ }
+
+
+ /**
+ * 친구 목록 불러오기 (자기 친구)
+ */
+ @GetMapping("/friends")
+ public ResponseEntity> getFriendsList(Authentication authentication) {
+ PrincipalDetails principalDetails = (PrincipalDetails) authentication.getPrincipal();
+ List result = friendshipService.getFriendsProfile(principalDetails.getUser().getId());
+ return ResponseEntity.ok().body(result);
+ }
+
+ /**
+ * 친구삭제
+ * @param request {"nickname" : "xxx"}
+ */
+ @DeleteMapping("/friends")
+ public void deleteFriend(@RequestBody Map request, Authentication authentication) {
+ String friendNickname = request.get("nickname").toString();
+ Long friendId = userService.findUserByNickname(friendNickname);
+
+ PrincipalDetails principalDetails = (PrincipalDetails) authentication.getPrincipal();
+ Long userId = principalDetails.getUser().getId();
+
+ friendshipService.deleteFriend(userId, friendId);
+
+ }
+
+ /**
+ * 사용자의 nickname을 검색하여 찾기
+ * @param nickname
+ * @return 사용자 정보(UserProfileResDto -> nickname, profileImg, id), 친구 여부
+ */
+ @GetMapping("/friends/search")
+ public ResponseEntity searchUser(@RequestParam("nickname") String nickname,
+ Authentication authentication) {
+ PrincipalDetails principalDetails = (PrincipalDetails) authentication.getPrincipal();
+ Long friendId = userService.findUserByNickname(nickname);
+ SearchUserResDto searchUserResDto = friendshipService
+ .searchUser(friendId, principalDetails.getUser().getId());
+ return ResponseEntity.ok().body(searchUserResDto);
+ }
+
+ /**
+ * 친구 신청하기
+ */
+ @PostMapping("/friends/search")
+ public void sendFriendRequest(Authentication authentication,
+ @RequestBody SendFriendReqDto reqDto) {
+ PrincipalDetails principalDetails = (PrincipalDetails) authentication.getPrincipal();
+ Long fromUserId = principalDetails.getUser().getId();
+ Long toUserId = userService.findUserByNickname(reqDto.getNickname());
+ //fromUserId -> 친구 신청한 사람 id, toUserId -> 친구 신청 상대방 id
+ friendshipService.sendRequest(fromUserId, toUserId);
+ }
+
+ /**
+ * 나에게 온 친구 요청(대기중 PENDING) 리스트
+ * @return
+ */
+ @GetMapping("/friends/pending")
+ public ResponseEntity> friendsRequestList(Authentication authentication) {
+ PrincipalDetails principalDetails = (PrincipalDetails) authentication.getPrincipal();
+ List result = friendshipService.findPendingFriendsToMe(principalDetails.getUser().getId());
+
+ return ResponseEntity.ok().body(result);
+ }
+
+ /**
+ * 친구 요청 수락 또는 거절
+ * nickname , status(accept, reject)
+ */
+ @PostMapping("/friends/pending")
+ public void addFriend(Authentication authentication,
+ @RequestBody AddFriendReqDto reqDto) {
+ //toUserId -> 친구 요청을 받은 유저
+ //fromUserId -> 친구 요청을 보낸 유저
+ PrincipalDetails principalDetails = (PrincipalDetails) authentication.getPrincipal();
+ Long userId = principalDetails.getUser().getId();
+ reqDto.setToUserId(userId);
+ friendshipService.addFriend(reqDto);
+ }
+}
diff --git a/ping/src/main/java/com/b6122/ping/domain/Friendship.java b/ping/src/main/java/com/b6122/ping/domain/Friendship.java
new file mode 100644
index 0000000..03936dc
--- /dev/null
+++ b/ping/src/main/java/com/b6122/ping/domain/Friendship.java
@@ -0,0 +1,72 @@
+package com.b6122.ping.domain;
+
+import com.b6122.ping.dto.AddFriendReqDto;
+import com.b6122.ping.dto.UserProfileResDto;
+import jakarta.persistence.*;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Entity
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+public class Friendship {
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+ private Long id;
+
+ @ManyToOne(fetch = FetchType.LAZY)
+ @JoinColumn(name = "from_user_id")
+ private User fromUser; //친구 요청을 보낸 User
+
+ @ManyToOne(fetch = FetchType.LAZY)
+ @JoinColumn(name = "to_user_id")
+ private User toUser; //친구 요청을 받은 User
+
+ @Enumerated(EnumType.STRING)
+ private FriendshipRequestStatus requestStatus; // PENDING, ACCEPTED, REJECTED
+
+ private boolean isFriend = false;
+
+ //친구 요청 시 메소드
+ public static Friendship createFriendship(User fromUser, User toUser) {
+ Friendship friendship = new Friendship();
+ friendship.fromUser = fromUser;
+ friendship.toUser = toUser;
+ friendship.requestStatus = FriendshipRequestStatus.PENDING;
+ return friendship;
+ }
+
+ //친구 상대방 유저 정보
+ public UserProfileResDto getUserProfileOfFriendship(Long userId) {
+ User fromUser = this.getFromUser();
+ User toUser = this.getToUser();
+ UserProfileResDto resDto;
+
+ //사용자가 친구 요청을 했을 경우 친구 상대방은 toUser
+ if (fromUser.getId().equals(userId)) {
+ resDto = toUser.getProfileInfo();
+
+ //사용자가 친구 요청을 받았을 경우 친구 상대방은 fromUser
+ } else {
+ resDto = fromUser.getProfileInfo();
+ }
+ return resDto;
+ }
+
+ /**
+ * 친구 거절 또는 수락 시
+ * @param reqDto String nickname, String status, Long toUserId;
+ */
+ public void updateFriendship(AddFriendReqDto reqDto) {
+ if ("accept".equals(reqDto.getStatus())) {
+ this.requestStatus = FriendshipRequestStatus.ACCEPTED;
+ this.isFriend = true;
+ } else {
+ this.requestStatus = FriendshipRequestStatus.REJECTED;
+ }
+
+ }
+}
+
diff --git a/ping/src/main/java/com/b6122/ping/domain/FriendshipRequestStatus.java b/ping/src/main/java/com/b6122/ping/domain/FriendshipRequestStatus.java
new file mode 100644
index 0000000..2c511f0
--- /dev/null
+++ b/ping/src/main/java/com/b6122/ping/domain/FriendshipRequestStatus.java
@@ -0,0 +1,7 @@
+package com.b6122.ping.domain;
+
+public enum FriendshipRequestStatus {
+ PENDING, // 대기 중
+ ACCEPTED, // 수락됨
+ REJECTED // 거절됨
+}
diff --git a/ping/src/main/java/com/b6122/ping/domain/Image.java b/ping/src/main/java/com/b6122/ping/domain/Image.java
new file mode 100644
index 0000000..60568e2
--- /dev/null
+++ b/ping/src/main/java/com/b6122/ping/domain/Image.java
@@ -0,0 +1,10 @@
+//package com.b6122.ping.domain;
+//
+//import jakarta.persistence.JoinColumn;
+//import jakarta.persistence.ManyToOne;
+//
+//public class Image {
+// @ManyToOne
+// @JoinColumn("Post")
+//
+//}
diff --git a/ping/src/main/java/com/b6122/ping/domain/Like.java b/ping/src/main/java/com/b6122/ping/domain/Like.java
index b97fadd..0cf7c5f 100644
--- a/ping/src/main/java/com/b6122/ping/domain/Like.java
+++ b/ping/src/main/java/com/b6122/ping/domain/Like.java
@@ -1,4 +1,24 @@
package com.b6122.ping.domain;
+import jakarta.persistence.*;
+import lombok.*;
+
+@Getter@Setter
+@RequiredArgsConstructor
+@Entity
+@Table(name = "likes")
public class Like {
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+ @Column(name = "like_id")
+ private Long id;
+
+ @ManyToOne(fetch = FetchType.LAZY)
+ @JoinColumn(name = "user_id")
+ private User user;
+
+ @ManyToOne(fetch = FetchType.LAZY)
+ @JoinColumn(name = "post_id")
+ private Post post;
}
diff --git a/ping/src/main/java/com/b6122/ping/domain/Post.java b/ping/src/main/java/com/b6122/ping/domain/Post.java
index 02eebe8..6234e2f 100644
--- a/ping/src/main/java/com/b6122/ping/domain/Post.java
+++ b/ping/src/main/java/com/b6122/ping/domain/Post.java
@@ -1,4 +1,170 @@
package com.b6122.ping.domain;
-public class Post {
+import com.b6122.ping.ImgPathProperties;
+import jakarta.persistence.*;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+import org.hibernate.annotations.ColumnDefault;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.UrlResource;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+
+//이미지 파일 가져오기
+//friend 글 목록 페이지: 이미지 , 제몯, 냉ㅇ 15자, 공개범위, 날짜, 좋앙, 요청 id가 좋앙 눌러는지, 최신순
+//탈퇴 시 글 삭제
+//friend map: 받은 위치정보에 해당하는 글을 찾아 같은 주소로 이미지, 냉ㅇ,공개 범위, 날짜, 제목
+//public : 공개범위가 public인 글만
+
+@Entity
+@Getter @Setter
+@Table(name = "post")
+@NoArgsConstructor
+public class Post extends TimeEntity{
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+ @Column(name = "post_id")
+ private Long id ; //post id
+
+ @ManyToOne(fetch = FetchType.LAZY)
+ @JoinColumn(name = "user_id")
+ private User user; //사용자
+
+ @Column
+ private String location; //위치
+
+ @Column
+ private float latitude; //위도
+
+ @Column
+ private float longitude; //경도
+
+ @Column(name = "title")
+ private String title; // 제목
+ @Column(name = "content", nullable = false, length = 1000)
+ private String content;
+ @Enumerated(EnumType.STRING)
+ private PostScope scope; //공개 범위 [private, friends, public]
+ @ColumnDefault("0")
+ @Column(name = "viewCount")
+ private int viewCount; // 조회수
+ @ColumnDefault("0")
+ @Column(name = "likeCount")
+ private int likeCount; // 좋아요 수
+ @OneToMany(mappedBy = "post")
+ private List likes = new ArrayList<>();
+
+ @Column(length = 1000)
+ private List imgPaths = new ArrayList<>();
+
+ public void addImgPath(String path) {
+ this.imgPaths.add(path);
+ }
+
+ //연관관계 매서드//
+ public void setUser(User user) {
+ this.user = user;
+ user.addPost(this); //user의 posts list에 post(this) 추가
+ }
+
+
+ //이미지 파일 저장
+ public List saveImagesInStorage(List images) {
+ List savedImageNames = new ArrayList<>();
+
+ for (MultipartFile image : images) {
+ // Generate a random file name to prevent duplicate file names
+ String randomFileName = UUID.randomUUID().toString();
+
+ // Get the original file extension
+ String originalFilename = image.getOriginalFilename();
+
+ // Generate the full file path with the random file name and original file extension
+ String imagePath = ImgPathProperties.postImgPath;
+ File file = new File(imagePath);
+
+ String imageName = randomFileName + originalFilename;
+ //지정한 디렉토리가 없으면 생성
+ if (!file.exists()) {
+ file.mkdirs();
+ }
+ // Save the file
+ try {
+ image.transferTo(new File(imagePath, imageName));
+ String path = imagePath + "\\" + imageName;
+ savedImageNames.add(path);
+ } catch (IOException e) {
+ // Handle file saving error
+ e.printStackTrace();
+ }
+ }
+
+ return savedImageNames; //local storage path list return
+ }
+
+ //대표 이미지 반환
+ public byte[] getByteArrayOfFirstImgByPath() {
+// byte[] fileByteArray = Files.readAllBytes("파일의 절대경로");
+ if (!this.getImgPaths().isEmpty()) {
+ try {
+ Resource resource = new UrlResource(Path.of(this.getImgPaths().get(0)).toUri());
+ if (resource.exists() && resource.isReadable()) {
+ // InputStream을 사용하여 byte 배열로 변환
+ try (InputStream inputStream = resource.getInputStream()) {
+ byte[] data = new byte[inputStream.available()];
+ inputStream.read(data);
+ return data;
+ }
+ } else {
+ // 이미지를 찾을 수 없는 경우 예외 또는 다른 처리 방법을 선택
+ throw new RuntimeException("Image not found");
+ }
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ return new byte[0];
+ }
+
+ //모든 이미지 반환
+ public List getByteArraysOfImgsByPaths() {
+
+ List imagePaths = this.getImgPaths();
+ List byteArrays = new ArrayList<>();
+
+ for (String imagePath : imagePaths) {
+ try {
+ Resource resource = new UrlResource(Path.of(imagePath).toUri());
+ if (resource.exists() && resource.isReadable()) {
+ // InputStream을 사용하여 byte 배열로 변환
+ try (InputStream inputStream = resource.getInputStream()) {
+ byte[] data = inputStream.readAllBytes();
+ byteArrays.add(data);
+ }
+ } else {
+ // 이미지를 찾을 수 없는 경우 예외 또는 다른 처리 방법을 선택
+ throw new RuntimeException("Image not found: " + imagePath);
+ }
+ } catch (IOException e) {
+ throw new RuntimeException("Error reading image: " + imagePath, e);
+ }
+ }
+
+ return byteArrays;
+ }
+
+
+
+
}
diff --git a/ping/src/main/java/com/b6122/ping/domain/PostScope.java b/ping/src/main/java/com/b6122/ping/domain/PostScope.java
new file mode 100644
index 0000000..57ca65d
--- /dev/null
+++ b/ping/src/main/java/com/b6122/ping/domain/PostScope.java
@@ -0,0 +1,8 @@
+package com.b6122.ping.domain;
+
+
+public enum PostScope { //post 공개 범위
+ PRIVATE,
+ FRIENDS,
+ PUBLIC
+}
diff --git a/ping/src/main/java/com/b6122/ping/domain/TimeEntity.java b/ping/src/main/java/com/b6122/ping/domain/TimeEntity.java
new file mode 100644
index 0000000..d984761
--- /dev/null
+++ b/ping/src/main/java/com/b6122/ping/domain/TimeEntity.java
@@ -0,0 +1,37 @@
+package com.b6122.ping.domain;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.annotation.LastModifiedDate;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.MappedSuperclass;
+import java.time.LocalDateTime;
+
+//JPA Entity 클래스가 TimeEntity를 상속할 경우 이 클래스의 변수를 Column으로 인식
+@Getter
+@Setter
+@MappedSuperclass
+@EntityListeners(AuditingEntityListener.class) //시간 값을 자동으로 할당
+public class TimeEntity {
+
+ @JsonSerialize(using = LocalDateTimeSerializer.class)
+ @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm")
+ @CreatedDate
+ private LocalDateTime createdDate;
+
+ @JsonSerialize(using = LocalDateTimeSerializer.class)
+ @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm")
+ @LastModifiedDate
+ private LocalDateTime modifiedDate;
+}
diff --git a/ping/src/main/java/com/b6122/ping/domain/User.java b/ping/src/main/java/com/b6122/ping/domain/User.java
index 6909ebd..25862bd 100644
--- a/ping/src/main/java/com/b6122/ping/domain/User.java
+++ b/ping/src/main/java/com/b6122/ping/domain/User.java
@@ -1,5 +1,364 @@
package com.b6122.ping.domain;
+import com.b6122.ping.ImgPathProperties;
+import com.b6122.ping.NcpObjectStorageConfig;
+import com.b6122.ping.dto.UpdateUserProfileDto;
+import com.b6122.ping.dto.UserProfileReqDto;
+import com.b6122.ping.dto.UserProfileResDto;
+import jakarta.persistence.*;
+import lombok.*;
+import org.apache.commons.codec.binary.Hex;
+import org.apache.http.Header;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPut;
+import org.apache.http.client.methods.HttpUriRequest;
+import org.apache.http.entity.FileEntity;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.UrlResource;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.crypto.Mac;
+import javax.crypto.spec.SecretKeySpec;
+import java.io.*;
+import java.net.URLEncoder;
+import java.nio.file.Path;
+import java.security.InvalidKeyException;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+@Entity
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@Builder
+@AllArgsConstructor
public class User {
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+ @Column(name = "user_id")
+ private Long id;
+
+ @Column(unique = true)
+ private String nickname; // 사용자가 직접 입력하는 고유닉네임
+
+ /** oauth2 연동 유저정보(username, providerId, provider) **/
+ private String provider; //"google", "kakao", etc.
+ private String providerId; //google, kakao 등 사용자의 고유Id
+ private String username; // provider + _ + providerId
+
+ //NCP Object Storage에 저장되는 파일 이름
+ private String profileImgObjectName;
+
+ @Enumerated(EnumType.STRING)
+ private UserRole role; // ROLE_USER or ROLE_ADMIN
+
+ @OneToMany(mappedBy = "user")
+ private List posts = new ArrayList<>();
+
+
+ @Transient
+ private final String REGION_NAME = "kr-standard";
+
+ @Transient
+ private final String ENDPOINT = NcpObjectStorageConfig.endPoint;
+
+ @Transient
+ private final String ACCESS_KEY = NcpObjectStorageConfig.accessKey;
+
+ @Transient
+ private final String SECRET_KEY = NcpObjectStorageConfig.secretKey;
+
+ @Transient
+ private final String CHARSET_NAME = "UTF-8";
+
+ @Transient
+ private final String HMAC_ALGORITHM = "HmacSHA256";
+
+ @Transient
+ private final String HASH_ALGORITHM = "SHA-256";
+
+ @Transient
+ private final String AWS_ALGORITHM = "AWS4-HMAC-SHA256";
+
+ @Transient
+ private final String SERVICE_NAME = "s3";
+
+ @Transient
+ private final String REQUEST_TYPE = "aws4_request";
+
+ @Transient
+ private final String UNSIGNED_PAYLOAD = "UNSIGNED-PAYLOAD";
+
+ @Transient
+ private final SimpleDateFormat DATE_FORMATTER = new SimpleDateFormat("yyyyMMdd");
+
+ @Transient
+ private final SimpleDateFormat TIME_FORMATTER = new SimpleDateFormat("yyyyMMdd\'T\'HHmmss\'Z\'");
+
+ public void addPost(Post p) {//외부에서 post 생성시 posts list에 추가
+ this.posts.add(p);
+ }
+
+ public void updateProfile(UserProfileReqDto reqDto) {
+
+ String objectName = null;
+ if (reqDto.getProfileImg() != null) {
+ objectName = UUID.randomUUID() + "_" + reqDto.getProfileImg().getOriginalFilename();
+ String bucketName = NcpObjectStorageConfig.ProfileImgBucketName;
+ try {
+ putObject(bucketName, objectName, reqDto.getProfileImg());
+ } catch(IOException e) {
+ e.printStackTrace();
+ }
+ }
+ this.nickname = reqDto.getNickname();
+ this.profileImgObjectName = objectName;
+ }
+
+ //회원 정보(nickname, profileImg, id)
+ public UserProfileResDto getProfileInfo() {
+ return new UserProfileResDto(nickname, this.getProfileObjectImgBytes(), id);
+ }
+
+
+ public byte[] getProfileObjectImgBytes() {
+
+ String objectName = this.getProfileImgObjectName();
+ String bucketName = NcpObjectStorageConfig.ProfileImgBucketName;
+ byte[] imgBytes = new byte[0];
+ try {
+ return imgBytes = getObject(bucketName, objectName);
+
+ } catch (Exception e) {
+
+ }
+ return imgBytes;
+ }
+
+
+ //NCP Object Storage에서 이미지 Object를 가져온 후, byte배열로 변환 후 return 한다
+ private byte[] getObject(String bucketName, String objectName) throws Exception {
+ HttpClient httpClient = HttpClientBuilder.create().build();
+ HttpGet request = new HttpGet(ENDPOINT + "/" + bucketName + "/" + objectName);
+ request.addHeader("Host", request.getURI().getHost());
+
+ authorization(request, REGION_NAME, ACCESS_KEY, SECRET_KEY);
+
+ HttpResponse response = httpClient.execute(request);
+ System.out.println("Response : " + response.getStatusLine());
+
+ InputStream is = response.getEntity().getContent();
+ //임시 폴더에 저장
+// File targetFile = new File(System.getProperty("java.io.tmpdir")+"/"+objectName);
+// OutputStream os = new FileOutputStream(targetFile);
+
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ byte[] buffer = new byte[8 * 1024];
+ int bytesRead;
+ while ((bytesRead = is.read(buffer)) != -1) {
+ baos.write(buffer, 0, bytesRead);
+ }
+ byte[] result = baos.toByteArray();
+ baos.close();
+ is.close();
+ return result;
+ }
+
+ private void putObject(String bucketName, String objectName,
+ MultipartFile imgFile) throws IOException {
+ HttpClient httpClient = HttpClientBuilder.create().build();
+
+ //MultipartFile을 전송하기 위해 File로 변환 (MultipartFile -> File)
+ //운영체제의 임시 폴더에 저장
+ File file = new File(System.getProperty("java.io.tmpdir")+"/"+objectName);
+ file.createNewFile();
+ FileOutputStream fileOutputStream = new FileOutputStream(file);
+ fileOutputStream.write(imgFile.getBytes());
+ fileOutputStream.close();
+
+ //ACL 권한을 public-read로 설정.
+ HttpPut request = new HttpPut(ENDPOINT + "/" + bucketName + "/" + objectName);
+ request.addHeader("Host", request.getURI().getHost());
+ request.setEntity(new FileEntity(file));
+
+ try {
+ authorization(request, REGION_NAME, ACCESS_KEY, SECRET_KEY);
+ } catch (Exception e) {
+
+ }
+ HttpResponse response = httpClient.execute(request);
+
+ //로컬 임시폴더에 저장된 file 삭제
+ file.delete();
+ System.out.println("Response : " + response.getStatusLine());
+ }
+
+ private void authorization(HttpUriRequest request, String regionName, String accessKey, String secretKey) throws Exception {
+ Date now = new Date();
+ DATE_FORMATTER.setTimeZone(TimeZone.getTimeZone("UTC"));
+ TIME_FORMATTER.setTimeZone(TimeZone.getTimeZone("UTC"));
+ String datestamp = DATE_FORMATTER.format(now);
+ String timestamp = TIME_FORMATTER.format(now);
+
+ request.addHeader("X-Amz-Date", timestamp);
+
+ request.addHeader("X-Amz-Content-Sha256", UNSIGNED_PAYLOAD);
+
+ String standardizedQueryParameters = getStandardizedQueryParameters(request.getURI().getQuery());
+
+ TreeMap sortedHeaders = getSortedHeaders(request.getAllHeaders());
+ String signedHeaders = getSignedHeaders(sortedHeaders);
+ String standardizedHeaders = getStandardizedHeaders(sortedHeaders);
+
+ String canonicalRequest = getCanonicalRequest(request, standardizedQueryParameters, standardizedHeaders, signedHeaders);
+ System.out.println("> canonicalRequest :");
+ System.out.println(canonicalRequest);
+
+ String scope = getScope(datestamp, regionName);
+
+ String stringToSign = getStringToSign(timestamp, scope, canonicalRequest);
+ System.out.println("> stringToSign :");
+ System.out.println(stringToSign);
+
+ String signature = getSignature(secretKey, datestamp, regionName, stringToSign);
+
+ String authorization = getAuthorization(accessKey, scope, signedHeaders, signature);
+ request.addHeader("Authorization", authorization);
+ }
+
+ private String getAuthorization(String accessKey, String scope, String signedHeaders, String signature) {
+ String signingCredentials = accessKey + "/" + scope;
+ String credential = "Credential=" + signingCredentials;
+ String signerHeaders = "SignedHeaders=" + signedHeaders;
+ String signatureHeader = "Signature=" + signature;
+
+ StringBuilder authHeaderBuilder = new StringBuilder().append(AWS_ALGORITHM).append(" ")
+ .append(credential).append(", ")
+ .append(signerHeaders).append(", ")
+ .append(signatureHeader);
+
+ return authHeaderBuilder.toString();
+ }
+
+ private byte[] sign(String stringData, byte[] key) throws NoSuchAlgorithmException, UnsupportedEncodingException, InvalidKeyException {
+ byte[] data = stringData.getBytes(CHARSET_NAME);
+ Mac e = Mac.getInstance(HMAC_ALGORITHM);
+ e.init(new SecretKeySpec(key, HMAC_ALGORITHM));
+ return e.doFinal(data);
+ }
+
+ private String hash(String text) throws NoSuchAlgorithmException, UnsupportedEncodingException {
+ MessageDigest e = MessageDigest.getInstance(HASH_ALGORITHM);
+ e.update(text.getBytes(CHARSET_NAME));
+ return Hex.encodeHexString(e.digest());
+ }
+
+ private String getStandardizedQueryParameters(String queryString) throws UnsupportedEncodingException {
+ TreeMap sortedQueryParameters = new TreeMap<>();
+ // sort by key name
+ if (queryString != null && !queryString.isEmpty()) {
+ String[] queryStringTokens = queryString.split("&");
+ for (String field : queryStringTokens) {
+ String[] fieldTokens = field.split("=");
+ if (fieldTokens.length > 0) {
+ if (fieldTokens.length > 1) {
+ sortedQueryParameters.put(fieldTokens[0], fieldTokens[1]);
+ } else {
+ sortedQueryParameters.put(fieldTokens[0], "");
+ }
+ }
+ }
+ }
+
+ StringBuilder standardizedQueryParametersBuilder = new StringBuilder();
+ int count = 0;
+ for (String key : sortedQueryParameters.keySet()) {
+ if (count > 0) {
+ standardizedQueryParametersBuilder.append("&");
+ }
+ standardizedQueryParametersBuilder.append(key).append("=");
+
+ if (sortedQueryParameters.get(key) != null && !sortedQueryParameters.get(key).isEmpty()) {
+ standardizedQueryParametersBuilder.append(URLEncoder.encode(sortedQueryParameters.get(key), CHARSET_NAME));
+ }
+
+ count++;
+ }
+ return standardizedQueryParametersBuilder.toString();
+ }
+
+ private TreeMap getSortedHeaders(Header[] headers) {
+ TreeMap sortedHeaders = new TreeMap<>();
+ // sort by header name
+ for (Header header : headers) {
+ sortedHeaders.put(header.getName(), header.getValue());
+ }
+
+ return sortedHeaders;
+ }
+
+ private String getSignedHeaders(TreeMap sortedHeaders) {
+ StringBuilder signedHeadersBuilder = new StringBuilder();
+ for (String headerName : sortedHeaders.keySet()) {
+ signedHeadersBuilder.append(headerName.toLowerCase()).append(";");
+ }
+ String s = signedHeadersBuilder.toString();
+ if (s.endsWith(";")) {
+ s = s.substring(0, s.length() - 1);
+ }
+ return s;
+ }
+
+ private String getStandardizedHeaders(TreeMap sortedHeaders) {
+ StringBuilder standardizedHeadersBuilder = new StringBuilder();
+ for (String headerName : sortedHeaders.keySet()) {
+ standardizedHeadersBuilder.append(headerName.toLowerCase()).append(":").append(sortedHeaders.get(headerName)).append("\n");
+ }
+
+ return standardizedHeadersBuilder.toString();
+ }
+
+ private String getCanonicalRequest(HttpUriRequest request, String standardizedQueryParameters, String standardizedHeaders, String signedHeaders) {
+ StringBuilder canonicalRequestBuilder = new StringBuilder().append(request.getMethod()).append("\n")
+ .append(request.getURI().getPath()).append("\n")
+ .append(standardizedQueryParameters).append("\n")
+ .append(standardizedHeaders).append("\n")
+ .append(signedHeaders).append("\n")
+ .append(UNSIGNED_PAYLOAD);
+
+ return canonicalRequestBuilder.toString();
+ }
+
+ private String getScope(String datestamp, String regionName) {
+ StringBuilder scopeBuilder = new StringBuilder().append(datestamp).append("/")
+ .append(regionName).append("/")
+ .append(SERVICE_NAME).append("/")
+ .append(REQUEST_TYPE);
+ return scopeBuilder.toString();
+ }
+
+ private String getStringToSign(String timestamp, String scope, String canonicalRequest) throws NoSuchAlgorithmException, UnsupportedEncodingException {
+ StringBuilder stringToSignBuilder = new StringBuilder(AWS_ALGORITHM)
+ .append("\n")
+ .append(timestamp).append("\n")
+ .append(scope).append("\n")
+ .append(hash(canonicalRequest));
+
+ return stringToSignBuilder.toString();
+ }
+
+ private String getSignature(String secretKey, String datestamp, String regionName, String stringToSign) throws NoSuchAlgorithmException, UnsupportedEncodingException, InvalidKeyException {
+ byte[] kSecret = ("AWS4" + secretKey).getBytes(CHARSET_NAME);
+ byte[] kDate = sign(datestamp, kSecret);
+ byte[] kRegion = sign(regionName, kDate);
+ byte[] kService = sign(SERVICE_NAME, kRegion);
+ byte[] signingKey = sign(REQUEST_TYPE, kService);
+
+ return Hex.encodeHexString(sign(stringToSign, signingKey));
+ }
}
diff --git a/ping/src/main/java/com/b6122/ping/domain/UserRole.java b/ping/src/main/java/com/b6122/ping/domain/UserRole.java
new file mode 100644
index 0000000..acbcf60
--- /dev/null
+++ b/ping/src/main/java/com/b6122/ping/domain/UserRole.java
@@ -0,0 +1,6 @@
+package com.b6122.ping.domain;
+
+public enum UserRole {
+ ROLE_USER,
+ ROLE_ADMIN
+}
diff --git a/ping/src/main/java/com/b6122/ping/dto/AddFriendReqDto.java b/ping/src/main/java/com/b6122/ping/dto/AddFriendReqDto.java
new file mode 100644
index 0000000..acba41e
--- /dev/null
+++ b/ping/src/main/java/com/b6122/ping/dto/AddFriendReqDto.java
@@ -0,0 +1,15 @@
+package com.b6122.ping.dto;
+
+import jakarta.persistence.Column;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class AddFriendReqDto {
+ private String nickname;
+ private String status;
+ private Long toUserId;
+}
diff --git a/ping/src/main/java/com/b6122/ping/dto/PostDto.java b/ping/src/main/java/com/b6122/ping/dto/PostDto.java
new file mode 100644
index 0000000..2509774
--- /dev/null
+++ b/ping/src/main/java/com/b6122/ping/dto/PostDto.java
@@ -0,0 +1,141 @@
+package com.b6122.ping.dto;
+
+import com.b6122.ping.domain.Like;
+import com.b6122.ping.domain.Post;
+import com.b6122.ping.domain.PostScope;
+import com.b6122.ping.repository.LikeRepository;
+import jakarta.annotation.Nullable;
+import jakarta.persistence.*;
+
+import lombok.Getter;
+
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+
+import org.springframework.web.multipart.MultipartFile;
+
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+
+import java.util.List;
+
+//dto 분리,메모리 효율을 위해
+@Getter @Setter
+@RequiredArgsConstructor
+public class PostDto {
+ private Long id; //post id
+
+ private Long uid; //사용자
+
+ private String location; //위치
+
+ private float latitude; //위도
+
+ private float longitude; //경도
+
+ private String title; // 제목
+
+ private String content;
+
+ private PostScope scope; //공개 범위 [private, friends, public]
+
+ private int viewCount; // 조회수
+
+ private int likeCount; // 좋아요 수
+
+ private boolean myLike; //본인이 글에 좋아요 눌렀는지
+
+ private LocalDateTime createdDate; //생성 날짜
+
+ private LocalDateTime modifiedDate; //수정 날짜
+
+ private String contentPreview; //미리보기 15자
+
+ //프론트에서 이미지 파일 받을때
+
+ private List imgs;
+ private MultipartFile firstImg;
+
+ private byte[] userImg;
+ private String userNickname;
+
+
+ //프론트로 이미지 파일 전달
+ private byte[] imgByte;
+ private List imgsByte;
+
+ @OneToMany(mappedBy = "post")
+ private List likes = new ArrayList<>();
+
+
+
+
+ //pin- 위도, 경도,postId
+ //Map위에 pin 보여주기
+ public static PostDto pinMap(Post post) {
+ PostDto postDto = new PostDto();
+ postDto.setId(post.getId());
+ postDto.setLongitude(post.getLongitude());
+ postDto.setLatitude(post.getLatitude());
+ return postDto;
+ }
+
+ //Home-Map 토글, pin클릭시 postPreview보여주기
+ public static PostDto postPreviewMap(Post post) {
+ PostDto postDto = new PostDto();
+ postDto.setId(post.getId());
+ postDto.setTitle(post.getTitle());
+ postDto.setScope(post.getScope());
+ postDto.setCreatedDate(post.getCreatedDate());
+ postDto.setContentPreview(truncateContent(post.getContent(), 15)); // Adjust for content preview
+ postDto.setImgByte(post.getByteArrayOfFirstImgByPath()); //대표 이미지 가져오기
+ postDto.setUserImg(post.getUser().getProfileObjectImgBytes());
+ postDto.setUserNickname(post.getUser().getNickname());
+ return postDto;
+ }
+
+
+ //Home-List 토글
+ public static PostDto postPreviewList(Post post, LikeRepository likeRepository) {
+ PostDto postDto = new PostDto();
+ postDto.setId(post.getId());
+ postDto.setTitle(post.getTitle());
+ postDto.setScope(post.getScope());
+ postDto.setLikeCount(post.getLikeCount());
+ postDto.setMyLike(likeRepository.checkMyLike(post.getId(), post.getUser().getId()));//사용자가 post에 좋아요 눌렀다면 myLike == True
+ postDto.setCreatedDate(post.getCreatedDate());
+ postDto.setContentPreview(truncateContent(post.getContent(), 15)); // Adjust for content preview
+ postDto.setImgByte(post.getByteArrayOfFirstImgByPath()); //대표 이미지 가져오기
+ postDto.setUserImg(post.getUser().getProfileObjectImgBytes());
+ postDto.setUserNickname(post.getUser().getNickname());
+ return postDto;
+ }
+
+
+ //글 보기
+ public static PostDto postInfo(Post post, LikeRepository likeRepository) {
+ PostDto postDto = new PostDto();
+ postDto.setId(post.getId());
+ postDto.setUid(post.getUser().getId());
+ postDto.setTitle(post.getTitle());
+ postDto.setScope(post.getScope());
+ postDto.setLikeCount(post.getLikeCount());
+ postDto.setMyLike(likeRepository.checkMyLike(post.getId(), post.getUser().getId()));//사용자가 post에 좋아요 눌렀다면 myLike == True
+ postDto.setCreatedDate(post.getCreatedDate());
+ postDto.setCreatedDate(post.getModifiedDate());
+ postDto.setContent(post.getContent());
+ postDto.setImgsByte(post.getByteArraysOfImgsByPaths()); //모든 이미지 반환
+ postDto.setUserImg(post.getUser().getProfileObjectImgBytes());
+ postDto.setUserNickname(post.getUser().getNickname());
+ return postDto;
+ }
+
+
+ private static String truncateContent(String content, int maxLength) {
+ if (content.length() <= maxLength) {
+ return content;
+ } else {
+ return content.substring(0, maxLength) + "...";
+ }
+ }
+}
\ No newline at end of file
diff --git a/ping/src/main/java/com/b6122/ping/dto/SearchUserResDto.java b/ping/src/main/java/com/b6122/ping/dto/SearchUserResDto.java
new file mode 100644
index 0000000..8a46bf6
--- /dev/null
+++ b/ping/src/main/java/com/b6122/ping/dto/SearchUserResDto.java
@@ -0,0 +1,13 @@
+package com.b6122.ping.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+public class SearchUserResDto {
+
+ private String nickname;
+ private byte[] profileImg;
+ private boolean isFriend;
+}
diff --git a/ping/src/main/java/com/b6122/ping/dto/SendFriendReqDto.java b/ping/src/main/java/com/b6122/ping/dto/SendFriendReqDto.java
new file mode 100644
index 0000000..fc0cf12
--- /dev/null
+++ b/ping/src/main/java/com/b6122/ping/dto/SendFriendReqDto.java
@@ -0,0 +1,12 @@
+package com.b6122.ping.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class SendFriendReqDto {
+ private String nickname;
+}
diff --git a/ping/src/main/java/com/b6122/ping/dto/UpdateUserProfileDto.java b/ping/src/main/java/com/b6122/ping/dto/UpdateUserProfileDto.java
new file mode 100644
index 0000000..6258f09
--- /dev/null
+++ b/ping/src/main/java/com/b6122/ping/dto/UpdateUserProfileDto.java
@@ -0,0 +1,15 @@
+package com.b6122.ping.dto;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+public class UpdateUserProfileDto {
+
+ private Long id;
+ private String nickname;
+ private String profileImgObjectName;
+}
diff --git a/ping/src/main/java/com/b6122/ping/dto/UserDto.java b/ping/src/main/java/com/b6122/ping/dto/UserDto.java
new file mode 100644
index 0000000..cc722b8
--- /dev/null
+++ b/ping/src/main/java/com/b6122/ping/dto/UserDto.java
@@ -0,0 +1,14 @@
+package com.b6122.ping.dto;
+
+import com.b6122.ping.domain.UserRole;
+import lombok.Data;
+
+@Data
+public class UserDto {
+ private Long id;
+ private String username;
+ public UserDto(Long id,String username) {
+ this.id = id;
+ this.username = username;
+ }
+}
diff --git a/ping/src/main/java/com/b6122/ping/dto/UserProfileReqDto.java b/ping/src/main/java/com/b6122/ping/dto/UserProfileReqDto.java
new file mode 100644
index 0000000..2fa8a41
--- /dev/null
+++ b/ping/src/main/java/com/b6122/ping/dto/UserProfileReqDto.java
@@ -0,0 +1,14 @@
+package com.b6122.ping.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import org.springframework.web.multipart.MultipartFile;
+
+@Data
+@AllArgsConstructor
+public class UserProfileReqDto {
+
+ private String nickname;
+ private MultipartFile profileImg;
+ private Long id;
+}
diff --git a/ping/src/main/java/com/b6122/ping/dto/UserProfileResDto.java b/ping/src/main/java/com/b6122/ping/dto/UserProfileResDto.java
new file mode 100644
index 0000000..16b7fdb
--- /dev/null
+++ b/ping/src/main/java/com/b6122/ping/dto/UserProfileResDto.java
@@ -0,0 +1,13 @@
+package com.b6122.ping.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+public class UserProfileResDto {
+
+ private String nickname;
+ private byte[] profileImg;
+ private Long id;
+}
diff --git a/ping/src/main/java/com/b6122/ping/oauth/provider/GoogleUser.java b/ping/src/main/java/com/b6122/ping/oauth/provider/GoogleUser.java
new file mode 100644
index 0000000..68b7f17
--- /dev/null
+++ b/ping/src/main/java/com/b6122/ping/oauth/provider/GoogleUser.java
@@ -0,0 +1,28 @@
+package com.b6122.ping.oauth.provider;
+
+import java.util.Map;
+
+public class GoogleUser implements OAuthUser {
+
+ private Map attribute;
+
+ public GoogleUser(Map attribute) {
+ this.attribute = attribute;
+ }
+
+ @Override
+ public String getProviderId() {
+ return (String)attribute.get("providerId");
+ }
+
+ @Override
+ public String getProvider() {
+ return (String)attribute.get("provider");
+ }
+
+ @Override
+ public String getName() {
+ return (String)attribute.get("username");
+ }
+
+}
diff --git a/ping/src/main/java/com/b6122/ping/oauth/provider/KakaoUser.java b/ping/src/main/java/com/b6122/ping/oauth/provider/KakaoUser.java
new file mode 100644
index 0000000..c6e5175
--- /dev/null
+++ b/ping/src/main/java/com/b6122/ping/oauth/provider/KakaoUser.java
@@ -0,0 +1,28 @@
+package com.b6122.ping.oauth.provider;
+
+import java.util.Map;
+
+public class KakaoUser implements OAuthUser {
+
+ private Map attribute;
+
+ public KakaoUser(Map attribute) {
+ this.attribute = attribute;
+ }
+
+ @Override
+ public String getProviderId() {
+ return (String)attribute.get("providerId");
+ }
+
+ @Override
+ public String getProvider() {
+ return (String)attribute.get("provider");
+ }
+
+ @Override
+ public String getName() {
+ return (String)attribute.get("username");
+ }
+
+}
diff --git a/ping/src/main/java/com/b6122/ping/oauth/provider/OAuthUser.java b/ping/src/main/java/com/b6122/ping/oauth/provider/OAuthUser.java
new file mode 100644
index 0000000..9829540
--- /dev/null
+++ b/ping/src/main/java/com/b6122/ping/oauth/provider/OAuthUser.java
@@ -0,0 +1,9 @@
+package com.b6122.ping.oauth.provider;
+
+public interface OAuthUser {
+ String getProviderId();
+ String getProvider();
+ String getName();
+}
+
+//환준님 코드 업데이트 확인
\ No newline at end of file
diff --git a/ping/src/main/java/com/b6122/ping/repository/LikeRepository.java b/ping/src/main/java/com/b6122/ping/repository/LikeRepository.java
new file mode 100644
index 0000000..3b79e7b
--- /dev/null
+++ b/ping/src/main/java/com/b6122/ping/repository/LikeRepository.java
@@ -0,0 +1,57 @@
+package com.b6122.ping.repository;
+
+import com.b6122.ping.domain.Like;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.TypedQuery;
+import lombok.RequiredArgsConstructor;
+import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Repository;
+import java.util.List;
+import java.util.Optional;
+
+
+@Repository
+@RequiredArgsConstructor
+public class LikeRepository {
+
+ private final EntityManager em;
+
+
+ //특정post에 좋아요를 눌렀는지 확인
+ public boolean checkMyLike(Long pid, Long uid) {
+ TypedQuery query = em.createQuery("SELECT l FROM Like l WHERE l.post.id = :pid AND l.user.id = :uid", Like.class);
+ query.setParameter("pid", pid);
+ query.setParameter("uid", uid);
+
+ List result = query.getResultList();
+
+ return !result.isEmpty(); // If the result list is not empty, return true; otherwise, return false
+ }
+
+ /*
+ public Optional findByPostIdAndUserId(@Param("pid") long pid, @Param("uid") long uid) {
+ TypedQuery query = em.createQuery("SELECT l FROM Like l WHERE l.pid = :pid AND l.uid = :uid", Like.class);
+ query.setParameter("pid", pid);
+ query.setParameter("uid", uid);
+ Optional like = Optional.ofNullable(query.getSingleResult());
+ return like ;
+ }
+*/
+
+ public void save(@Param("pids") List pids, @Param("uid") Long uid ) {
+ for(Long pid : pids){
+ TypedQuery query = em.createQuery("Insert INTO Like l(pid, uid) VALUES (:pid, :uid)", Like.class);
+ query.setParameter("pid", pid);
+ query.setParameter("uid", uid);
+ }
+
+ }
+
+ public void delete(@Param("pids") List pids, @Param("uid") Long uid ){
+ TypedQuery query = em.createQuery("delete FROM Like l WHERE l.pid in :pids And l.uid = :uid", Like.class);
+ query.setParameter("pids", pids);
+ query.setParameter("uid", uid);
+ }
+
+
+}
diff --git a/ping/src/main/java/com/b6122/ping/repository/PostRepository.java b/ping/src/main/java/com/b6122/ping/repository/PostRepository.java
new file mode 100644
index 0000000..1b5c65f
--- /dev/null
+++ b/ping/src/main/java/com/b6122/ping/repository/PostRepository.java
@@ -0,0 +1,104 @@
+package com.b6122.ping.repository;
+
+import com.b6122.ping.domain.Post;
+
+import jakarta.persistence.EntityManager;
+import lombok.RequiredArgsConstructor;
+
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import org.springframework.stereotype.Repository;
+
+import java.lang.management.RuntimeMXBean;
+import java.util.List;
+
+@Repository
+@RequiredArgsConstructor
+public class PostRepository {
+
+ private final EntityManager em;
+
+ @Query("SELECT p FROM Post p WHERE p.latitude = :latitude AND p.longitude = :longitude ORDER BY p.createdDate DESC")
+ public List findByLocation(@Param("latitude") float latitude, @Param("longitude") float longitude) {
+ return null;
+ }
+ @Query("SELECT p FROM Post p WHERE p.latitude = :latitude AND p.longitude = :longitude AND p.user.id = :uid ORDER BY p.createdDate DESC")
+ public List findByLocationUser(@Param("latitude") float latitude, @Param("longitude") float longitude, @Param("uid") long uid) {
+ return null;
+ }
+
+ @Query("Delete FROM Post p WHERE p.pid = :pid")
+ public List deletePost(@Param("pid") Long pid) {
+ return null;
+ }
+
+ @Modifying// 조회수 중복 방지 추가 구현
+ @Query("update Post p set p.viewCount = :viewCount where p.id =:id")
+ public int updateViewCount(@Param("viewCount") int viewCount, @Param("id") Long id){
+ return 0;
+ }
+
+
+ @Modifying
+ @Query("update Post p set p.likeCount = p.likeCount + 1 where p.id =:pid")
+ public int upLikeCount(@Param("id") Long pid){
+ return 0;
+ }
+
+ @Modifying
+ @Query("update Post p set p.likeCount = p.likeCount - 1 where p.id =:pid")
+ public int downLikeCount(@Param("id") Long pid){
+ return 0;
+ }
+
+
+ public Post findById(Long id){
+ return em.createQuery("select p from Post p where p.id = :id", Post.class)
+ .setParameter("id", id)
+ .getSingleResult();
+ }
+
+// @Query("SELECT p FROM Post p WHERE p.user.id= :uid ORDER BY p.createdDate DESC")
+ public List findByUid(Long uid){
+ return em.createQuery("select p from Post p" +
+ " where p.user.id = :uid" +
+ " order by p.createdDate", Post.class) //최신순으로 반환
+ .setParameter("uid", uid)
+ .getResultList();
+ }
+
+ public Long save(Post p) {
+ em.persist(p);
+ return p.getId();
+ }
+
+ public long updatePost(Post p) {
+ return em.createQuery("update Post p set location =:location, latitude =:latitude, longitude =:longitude, title =:title, content =:content, scope =:scope, imgPaths =:imgPaths", Long.class)
+ .setParameter("location", p.getLocation())
+ .setParameter("latitude", p.getLatitude())
+ .setParameter("longitude", p.getLongitude())
+ .setParameter("title", p.getTitle())
+ .setParameter("content", p.getContent())
+ .setParameter("scope", p.getScope())
+ .setParameter("imgPaths", p.getImgPaths())
+ .executeUpdate();
+ }
+
+ public List findNonePrivateByUid(Long uid) {
+ return em.createQuery("select p from Post p" +
+
+ " where p.user.id = :uid and p.scope != \"private\" " +
+ "order by p.createdDate", Post.class) //최신순
+ .setParameter("uid", uid)
+ .getResultList();
+ }
+
+ public List findPublicPosts(float longitude, float latitude) {
+ return em.createQuery("select p from Post p"+
+ " where p.scope = \"public\" and ST_Distance_Sphere(POINT(p.longitude, p.latitude), POINT(longitude, latitude)) <= 2000"+
+ "order by p.createdDate", Post.class)
+ .getResultList();
+ }
+}
diff --git a/ping/src/main/java/com/b6122/ping/repository/datajpa/FriendshipDataRepository.java b/ping/src/main/java/com/b6122/ping/repository/datajpa/FriendshipDataRepository.java
new file mode 100644
index 0000000..2afc159
--- /dev/null
+++ b/ping/src/main/java/com/b6122/ping/repository/datajpa/FriendshipDataRepository.java
@@ -0,0 +1,54 @@
+package com.b6122.ping.repository.datajpa;
+
+import com.b6122.ping.domain.Friendship;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+import java.util.Optional;
+
+public interface FriendshipDataRepository extends JpaRepository {
+
+ //친구 목록 조회
+ @Query("select f from Friendship f" +
+ " join fetch f.fromUser fu" +
+ " join fetch f.toUser tu" +
+ " where (fu.id = :userId or tu.id = :userId) and f.isFriend = true")
+ List findFriendshipsById(@Param("userId") Long userId);
+
+ //친구 단건 조회
+ @Query("select f from Friendship f" +
+ " where f.isFriend = true" +
+ " and ((f.toUser.id =:friendId and f.fromUser.id = :userId)" +
+ " or (f.toUser.id = :userId and f.fromUser.id = :friendId))")
+ Optional findFriendshipByIds(@Param("friendId") Long friendId,
+ @Param("userId") Long userId);
+
+ /**
+ * 아직 대기 중인(PENDING) 친구 요청
+ * @param toUserId 친구 요청 받은 사람 id
+ * @param fromUserId 친구 요청 보낸 사람 id
+ * @return
+ */
+ @Query("select f from Friendship f" +
+ " where f.isFriend = false" +
+ " and f.requestStatus = com.b6122.ping.domain.FriendshipRequestStatus.PENDING" +
+ " and f.toUser.id = :toUserId" +
+ " and f.fromUser.id = :fromUserId")
+ Optional findPendingFriendShip(@Param("toUserId") Long toUserId,
+ @Param("fromUserId") Long fromUserId);
+
+ /**
+ * 나에게 온 대기 상태의 친구 요청 찾기 (toUserId가 내 id)
+ * @param toUserId
+ * @return
+ */
+ @Query("select f from Friendship f" +
+ " join fetch f.fromUser" +
+ " where f.isFriend = false" +
+ " and f.requestStatus = com.b6122.ping.domain.FriendshipRequestStatus.PENDING" +
+ " and f.toUser.id = :toUserId")
+ List findPendingFriendShipsToMe(@Param("toUserId") Long toUserId);
+}
+
diff --git a/ping/src/main/java/com/b6122/ping/repository/datajpa/PostDataRepository.java b/ping/src/main/java/com/b6122/ping/repository/datajpa/PostDataRepository.java
new file mode 100644
index 0000000..e1d8c2f
--- /dev/null
+++ b/ping/src/main/java/com/b6122/ping/repository/datajpa/PostDataRepository.java
@@ -0,0 +1,16 @@
+package com.b6122.ping.repository.datajpa;
+import com.b6122.ping.domain.Post;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+
+//CRUD작성
+public interface PostDataRepository extends JpaRepository {
+ @Modifying
+ @Query("update Post p set p.viewCount = :viewCount where p.id =:id")
+ int updateViewCount(@Param("viewCount") int viewCount, @Param("id") Long id);
+//likeCount update
+}
\ No newline at end of file
diff --git a/ping/src/main/java/com/b6122/ping/repository/datajpa/UserDataRepository.java b/ping/src/main/java/com/b6122/ping/repository/datajpa/UserDataRepository.java
new file mode 100644
index 0000000..95baebd
--- /dev/null
+++ b/ping/src/main/java/com/b6122/ping/repository/datajpa/UserDataRepository.java
@@ -0,0 +1,11 @@
+package com.b6122.ping.repository.datajpa;
+
+import com.b6122.ping.domain.User;
+import org.springframework.data.jpa.repository.JpaRepository;
+import java.util.Optional;
+
+public interface UserDataRepository extends JpaRepository {
+ Optional findByUsername(String username);
+
+ Optional findByNickname(String nickname);
+}
diff --git a/ping/src/main/java/com/b6122/ping/service/FriendshipService.java b/ping/src/main/java/com/b6122/ping/service/FriendshipService.java
new file mode 100644
index 0000000..a264e1f
--- /dev/null
+++ b/ping/src/main/java/com/b6122/ping/service/FriendshipService.java
@@ -0,0 +1,140 @@
+package com.b6122.ping.service;
+
+import com.b6122.ping.domain.Friendship;
+import com.b6122.ping.domain.User;
+import com.b6122.ping.dto.AddFriendReqDto;
+import com.b6122.ping.dto.SearchUserResDto;
+import com.b6122.ping.dto.UserProfileResDto;
+import com.b6122.ping.repository.datajpa.FriendshipDataRepository;
+import com.b6122.ping.repository.datajpa.UserDataRepository;
+import jakarta.persistence.EntityNotFoundException;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+
+@Service
+@RequiredArgsConstructor
+public class FriendshipService {
+
+ private final FriendshipDataRepository friendshipDataRepository;
+ private final UserDataRepository userDataRepository;
+
+ /**
+ * 사용자의 친구 목록에서 삭제
+ */
+ @Transactional
+ public void deleteFriend(Long userId, Long friendId) {
+ Optional findFriendship = findFriendByIds(userId, friendId);
+ if (findFriendship.isPresent()) {
+ friendshipDataRepository.delete(findFriendship.get());
+ }
+ }
+
+ /**
+ * 사용자의 id로 친구 목록 반환
+ *
+ * @param userId 요청한 사용자의 id
+ * @return 친구 목록 (FriendDto 정보: nickname, profileImg, id)
+ */
+ public List getFriendsProfile(Long userId) {
+
+ //fromUser, toUser 페치 조인
+ List friendshipList = friendshipDataRepository.findFriendshipsById(userId);
+ if (friendshipList.isEmpty()) {
+ return Collections.emptyList();
+ }
+
+ List userProfiles = new ArrayList<>();
+ for (Friendship friendship : friendshipList) {
+ UserProfileResDto userProfile = friendship.getUserProfileOfFriendship(userId);
+ userProfiles.add(userProfile);
+ }
+ return userProfiles;
+ }
+
+
+ /**
+ * 친구 단건 조회(FriendShip 엔티티 가져오기, isFriend가 true인 경우만)
+ */
+ public Optional findFriendByIds(Long userId, Long friendId) {
+ return friendshipDataRepository.findFriendshipByIds(userId, friendId);
+ }
+
+ /**
+ * 친구 요청 보내기
+ *
+ * @param fromUserId ->친구 요청 보낸 사람 (사용자)
+ * @param toUserId -> 친구 요청 받은 사람
+ */
+ @Transactional
+ public void sendRequest(Long fromUserId, Long toUserId) {
+
+ //중복 방지
+ Optional findFriendShip = findFriendByIds(fromUserId, toUserId);
+ if (findFriendShip.isEmpty()) {
+ Optional findPendingFriendship = friendshipDataRepository.findPendingFriendShip(toUserId, fromUserId);
+ if (findPendingFriendship.isEmpty()) {
+ User fromUser = userDataRepository.findById(fromUserId).orElseThrow(EntityNotFoundException::new);
+ User toUser = userDataRepository.findById(toUserId).orElseThrow(EntityNotFoundException::new);
+ Friendship friendship = Friendship.createFriendship(fromUser, toUser);
+ friendshipDataRepository.save(friendship);
+ }
+ }
+ }
+
+ public void deleteCounterPartPendingFriendship(Long toUserIdArg, Long fromUserIdArg) throws RuntimeException {
+ Long toUserId = fromUserIdArg;
+ Long fromUserId = toUserIdArg;
+ Optional pendingFriendShip = friendshipDataRepository.findPendingFriendShip(toUserId, fromUserId);
+ pendingFriendShip.ifPresent(friendshipDataRepository::delete);
+ }
+
+ @Transactional
+ public void addFriend(AddFriendReqDto reqDto) {
+ Long fromUserId = userDataRepository.findByNickname(reqDto.getNickname())
+ .orElseThrow(RuntimeException::new).getId();
+
+ //동시에 두명이 서로 신청 했을 경우 한 쪽이 수락하면 반대쪽 대기 리스트 삭제
+ if ("accept".equals(reqDto.getStatus())) {
+ deleteCounterPartPendingFriendship(reqDto.getToUserId(), fromUserId);
+ }
+
+ Friendship pendingFriendship = friendshipDataRepository.findPendingFriendShip(reqDto.getToUserId(), fromUserId)
+ .orElseThrow(RuntimeException::new);
+ pendingFriendship.updateFriendship(reqDto);
+ }
+
+ /**
+ * 나에게 친구 요청 상태인 유저정보 리스트 반환
+ * @param toUserId (내 id)
+ * @return
+ */
+ public List findPendingFriendsToMe (Long toUserId){
+ List friendshipList = friendshipDataRepository.findPendingFriendShipsToMe(toUserId);
+
+ if (friendshipList.isEmpty()) {
+ return Collections.emptyList();
+ }
+
+ List userProfiles = new ArrayList<>();
+ for (Friendship friendship : friendshipList) {
+ UserProfileResDto userProfile = friendship.getUserProfileOfFriendship(toUserId);
+ userProfiles.add(userProfile);
+ }
+ return userProfiles;
+ }
+
+ public SearchUserResDto searchUser (Long friendId, Long userId){
+ User friendEntity = userDataRepository.findById(friendId).orElseThrow(RuntimeException::new);
+ String nickname = friendEntity.getNickname();
+ Optional findFriendship = findFriendByIds(userId, friendId);
+ boolean isFriend = findFriendship.isPresent();
+
+ return new SearchUserResDto(nickname, friendEntity.getProfileObjectImgBytes(), isFriend);
+ }
+}
diff --git a/ping/src/main/java/com/b6122/ping/service/JwtService.java b/ping/src/main/java/com/b6122/ping/service/JwtService.java
new file mode 100644
index 0000000..f840796
--- /dev/null
+++ b/ping/src/main/java/com/b6122/ping/service/JwtService.java
@@ -0,0 +1,69 @@
+package com.b6122.ping.service;
+
+import com.auth0.jwt.JWT;
+import com.auth0.jwt.algorithms.Algorithm;
+import com.b6122.ping.config.jwt.JwtProperties;
+import com.b6122.ping.dto.UserDto;
+import com.b6122.ping.repository.datajpa.UserDataRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+@Service
+@RequiredArgsConstructor
+public class JwtService {
+
+ private final UserDataRepository userDataRepository;
+
+ /**
+ * 사용자 정보를 바탕으로 Jwt AccessToken 발급
+ * @param userDto UserDto 정보: id, username
+ * @return
+ */
+ public Map createJwtAccessAndRefreshToken(UserDto userDto) {
+
+ //accessToken 생성
+ String accessToken = JWT.create()
+ .withExpiresAt(new Date(System.currentTimeMillis() + JwtProperties.ACCESS_TOKEN_EXPIRATION_TIME))
+ .withClaim("id", userDto.getId())
+ .withClaim("username", userDto.getUsername())
+ .withClaim("token_type", "access")
+ .withClaim("expires-at", JwtProperties.ACCESS_TOKEN_EXPIRATION_TIME)
+ .sign(Algorithm.HMAC512(JwtProperties.SECRET));
+
+ //refreshToken 생성
+ String refreshToken = JWT.create()
+ .withExpiresAt(new Date(System.currentTimeMillis() + JwtProperties.REFRESH_TOKEN_EXPIRATION_TIME))
+ .withClaim("id", userDto.getId())
+ .withClaim("username", userDto.getUsername())
+ .withClaim("token_type", "refresh")
+ .withClaim("expires-at", JwtProperties.REFRESH_TOKEN_EXPIRATION_TIME)
+ .sign(Algorithm.HMAC512(JwtProperties.SECRET));
+
+ //responseBody에 값 저장해서 return
+ Map responseBody = new HashMap<>();
+ responseBody.put("access-token", accessToken);
+ responseBody.put("refresh-token", refreshToken);
+
+ return responseBody;
+ }
+
+ public Map createJwtAccessToken(UserDto userDto) {
+
+ //accessToken 생성
+ String accessToken = JWT.create()
+ .withExpiresAt(new Date(System.currentTimeMillis() + JwtProperties.ACCESS_TOKEN_EXPIRATION_TIME))
+ .withClaim("id", userDto.getId())
+ .withClaim("username", userDto.getUsername())
+ .withClaim("token_type", "access")
+ .sign(Algorithm.HMAC512(JwtProperties.SECRET));
+
+ //responseBody에 값 저장해서 return
+ Map responseBody = new HashMap<>();
+ responseBody.put("access-token", accessToken);
+
+ return responseBody;
+ }
+}
diff --git a/ping/src/main/java/com/b6122/ping/service/OauthService.java b/ping/src/main/java/com/b6122/ping/service/OauthService.java
new file mode 100644
index 0000000..65293de
--- /dev/null
+++ b/ping/src/main/java/com/b6122/ping/service/OauthService.java
@@ -0,0 +1,275 @@
+package com.b6122.ping.service;
+
+import com.b6122.ping.domain.User;
+import com.b6122.ping.domain.UserRole;
+import com.b6122.ping.dto.UserDto;
+import com.b6122.ping.oauth.provider.GoogleUser;
+import com.b6122.ping.oauth.provider.KakaoUser;
+import com.b6122.ping.oauth.provider.OAuthProperties;
+import com.b6122.ping.oauth.provider.OAuthUser;
+import com.b6122.ping.repository.datajpa.UserDataRepository;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.io.*;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+
+@Service
+@RequiredArgsConstructor
+public class OauthService {
+
+ private final UserDataRepository userDataRepository;
+
+ //회원 가입 후 jwt 토큰 발급
+ public UserDto join(String server, String code) throws IOException {
+
+ Map userInfo = new HashMap<>();
+ if ("kakao".equals(server)) {
+ String accessToken = getKakaoAccessToken(code);
+ userInfo = getKakaoUserInfo(accessToken);
+ } else if ("google".equals(server)) {
+ String accessToken = getGoogleAccessToken(code);
+ userInfo = getGoogleUserInfo(accessToken);
+ }
+ return joinOAuthUser(userInfo);
+ }
+ //프론트에서 전달 받은 인가코드로 카카오 서버로 요청해서 access token 받는 메소드
+ //요청 데이터 타입 (Content-type: application/x-www-form-urlencoded;charset=utf-8)
+
+ //네트워크 통신 방법
+ //1. HttpURLConnection -> 아래 메소드에서 사용
+ //2. RestTemplate(추후 deprecated 예정?)
+ //3. HttpClient
+ //4. WebClient(Spring WebFlux)
+ //5. RestTemplate 기반의 Spring 6.1 RestClient
+ public String getKakaoAccessToken(String authorizationCode) throws IOException {
+ String tokenEndpoint = "https://kauth.kakao.com/oauth/token";
+
+ // HTTP 연결 설정
+ URL url = new URL(tokenEndpoint);
+ HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+ connection.setRequestMethod("POST"); // post만 가능
+ connection.setRequestProperty("Content-Type", "application/x-www-form-urlencoded;charset=utf-8"); //필수
+ connection.setDoOutput(true); //데이터의 전송을 허용, 기본 값 false
+
+ // 데이터 작성, 요청 시 필요한 필수 요소만 포함
+ String requestBody = "grant_type=authorization_code" +
+ "&client_id=" + OAuthProperties.KAKAO_CLIENT_ID +
+ "&redirect_uri" + OAuthProperties.KAKAO_REDIRECT_URI +
+ "&code=" + authorizationCode;
+
+ // 데이터 전송
+ try (OutputStream os = connection.getOutputStream();
+ BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(os))) {
+ writer.write(requestBody);
+ writer.flush();
+ }
+
+ // 응답 처리
+ int responseCode = connection.getResponseCode();
+ if (responseCode == HttpURLConnection.HTTP_OK) {
+ // 성공적으로 access token을 받은 경우
+ try (BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream(), "UTF-8"))) {
+ StringBuilder response = new StringBuilder();
+ String line;
+ while ((line = reader.readLine()) != null) {
+ response.append(line);
+ }
+
+ ObjectMapper objectMapper = new ObjectMapper();
+ JsonNode jsonNode = objectMapper.readTree(response.toString());
+ // access token 추출 후 컨트롤러로 전달
+ return jsonNode.get("access_token").asText();
+ }
+ } else {
+ // 오류가 발생한 경우
+ try (BufferedReader errorReader = new BufferedReader(new InputStreamReader(connection.getErrorStream(), "UTF-8"))) {
+ StringBuilder errorResponse = new StringBuilder();
+ String line;
+ while ((line = errorReader.readLine()) != null) {
+ errorResponse.append(line);
+ }
+ return errorResponse.toString(); //예외처리 필요..
+ }
+ }
+ }
+
+ public Map getKakaoUserInfo(String accessToken) throws IOException{
+ String requestEndpoint = "https://kapi.kakao.com/v2/user/me";
+
+ URL url = new URL(requestEndpoint);
+ HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+ connection.setRequestMethod("POST"); //get post 둘다 가능
+ connection.setRequestProperty("Content-Type", "application/x-www-form-urlencoded;charset=utf-8"); //필수
+ connection.setRequestProperty("Authorization", "Bearer " + accessToken); //필수
+ connection.setDoOutput(true);
+
+ int responseCode = connection.getResponseCode();
+ if (responseCode == HttpURLConnection.HTTP_OK) {
+ // 성공적으로 값을 전송받았다면
+ try (BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream(), "UTF-8"))) {
+ StringBuilder response = new StringBuilder();
+ String line;
+ while ((line = reader.readLine()) != null) {
+ response.append(line);
+ }
+ ObjectMapper objectMapper = new ObjectMapper();
+ Map userInfoMap = objectMapper.readValue(response.toString(), Map.class);
+ userInfoMap.put("provider", "kakao");
+ return userInfoMap;
+ }
+ } else {
+ try (BufferedReader errorReader = new BufferedReader(new InputStreamReader(connection.getErrorStream(), "UTF-8"))) {
+ StringBuilder errorResponse = new StringBuilder();
+ String line;
+ while ((line = errorReader.readLine()) != null) {
+ errorResponse.append(line);
+ }
+ ObjectMapper objectMapper = new ObjectMapper();
+ return objectMapper.readValue(errorResponse.toString(), Map.class); //예외처리 필요..
+ }
+ }
+ }
+
+ public String getGoogleAccessToken(String authorizationCode) throws IOException {
+ String tokenEndpoint = "https://www.googleapis.com/oauth2/v4/token";
+
+ // HTTP connection setup
+ URL url = new URL(tokenEndpoint);
+ HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+ connection.setRequestMethod("POST");
+ connection.setRequestProperty("Content-Type", "application/x-www-form-urlencoded;charset=utf-8");
+ connection.setDoOutput(true);
+
+ // Data preparation for the request
+ String requestBody = "code=" + authorizationCode +
+ "&client_id=" + OAuthProperties.GOOGLE_CLIENT_ID +
+ "&client_secret=" + OAuthProperties.GOOGLE_CLIENT_SECRET +
+ "&redirect_uri=" + OAuthProperties.GOOGLE_REDIRECT_URI +
+ "&grant_type=authorization_code";
+
+ // Data transmission
+ try (OutputStream os = connection.getOutputStream();
+ BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(os))) {
+ writer.write(requestBody);
+ writer.flush();
+ }
+
+ // Response handling
+ int responseCode = connection.getResponseCode();
+ if (responseCode == HttpURLConnection.HTTP_OK) {
+ try (BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream(), "UTF-8"))) {
+ StringBuilder response = new StringBuilder();
+ String line;
+ while ((line = reader.readLine()) != null) {
+ response.append(line);
+ }
+
+ ObjectMapper objectMapper = new ObjectMapper();
+ JsonNode jsonNode = objectMapper.readTree(response.toString());
+ return jsonNode.get("access_token").asText();
+ }
+ } else {
+ try (BufferedReader errorReader = new BufferedReader(new InputStreamReader(connection.getErrorStream(), "UTF-8"))) {
+ StringBuilder errorResponse = new StringBuilder();
+ String line;
+ while ((line = errorReader.readLine()) != null) {
+ errorResponse.append(line);
+ }
+ return errorResponse.toString(); // Exception handling required...
+ }
+ }
+ }
+
+ public Map getGoogleUserInfo(String accessToken) throws IOException {
+ String requestEndpoint = "https://www.googleapis.com/oauth2/v1/userinfo";
+ URL url = new URL(requestEndpoint);
+ HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+ connection.setRequestMethod("GET");
+ connection.setRequestProperty("Authorization", "Bearer " + accessToken);
+
+ int responseCode = connection.getResponseCode();
+ if (responseCode == HttpURLConnection.HTTP_OK) {
+ try (BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream(), "UTF-8"))) {
+ StringBuilder response = new StringBuilder();
+ String line;
+ while ((line = reader.readLine()) != null) {
+ response.append(line);
+ }
+ ObjectMapper objectMapper = new ObjectMapper();
+ Map userInfoMap = objectMapper.readValue(response.toString(), Map.class);
+ userInfoMap.put("provider", "google");
+ return userInfoMap;
+ }
+ } else {
+ try (BufferedReader errorReader = new BufferedReader(new InputStreamReader(connection.getErrorStream(), "UTF-8"))) {
+ StringBuilder errorResponse = new StringBuilder();
+ String line;
+ while ((line = errorReader.readLine()) != null) {
+ errorResponse.append(line);
+ }
+ ObjectMapper objectMapper = new ObjectMapper();
+ return objectMapper.readValue(errorResponse.toString(), Map.class); // Exception handling required...
+ }
+ }
+ }
+
+ /**
+ * 리소스 서버(kakao, google)로 부터 사용자 정보를 받은 후 그것을 바탕으로 회원가입
+ * @param userInfoMap 사용자 정보 Map
+ * @return UserDto (id, username)
+ * @throws IOException
+ */
+ @Transactional
+ public UserDto joinOAuthUser(Map userInfoMap) throws IOException {
+
+ //OAuthUser 생성을 위한 매핑
+ String provider = userInfoMap.get("provider").toString();
+ String providerId = userInfoMap.get("id").toString();
+ String username = provider + "_" + providerId;
+
+ Map userInfo = new HashMap<>();
+
+ userInfo.put("username", username);
+ userInfo.put("provider", provider);
+ userInfo.put("providerId", providerId);
+
+ //OAuthUser 생성 -> 나중에 프로바이더마다 다른 회원가입 정책을 할 수도 있기 때문에 추상화
+ OAuthUser oAuthUser = createOAuthUser(provider, userInfo);
+
+ //db에 회원 등록이 되어있는지 확인후, 안되어 있다면 회원가입 시도
+ User findUser = userDataRepository
+ .findByUsername(oAuthUser.getName())
+ .orElseGet(() -> {
+ User user = User.builder()
+ .provider(oAuthUser.getProvider())
+ .providerId(oAuthUser.getProviderId())
+ .username(oAuthUser.getName())
+ .role(UserRole.ROLE_USER)
+ .build();
+
+ // 회원가입
+ return userDataRepository.save(user);
+ });
+ return new UserDto(findUser.getId(), findUser.getUsername());
+
+ }
+
+ //OAuthUser 생성 메소드. 리소스 서버에 따라 분기.
+ protected OAuthUser createOAuthUser(String provider, Map userInfo) {
+ switch (provider) {
+ case "google":
+ return new GoogleUser(userInfo);
+ case "kakao":
+ return new KakaoUser(userInfo);
+ default:
+ return null;
+ }
+ }
+}
diff --git a/ping/src/main/java/com/b6122/ping/service/PostService.java b/ping/src/main/java/com/b6122/ping/service/PostService.java
new file mode 100644
index 0000000..dad2823
--- /dev/null
+++ b/ping/src/main/java/com/b6122/ping/service/PostService.java
@@ -0,0 +1,182 @@
+package com.b6122.ping.service;
+
+import com.b6122.ping.domain.Like;
+import com.b6122.ping.domain.Post;
+import com.b6122.ping.domain.PostScope;
+import com.b6122.ping.domain.User;
+import com.b6122.ping.dto.PostDto;
+import com.b6122.ping.repository.LikeRepository;
+import com.b6122.ping.repository.PostRepository;
+import com.b6122.ping.repository.datajpa.UserDataRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+
+@Service
+@RequiredArgsConstructor
+public class PostService {
+ @Autowired
+ private final PostRepository postRepository;
+
+ @Autowired
+ private final LikeRepository likeRepository;
+
+ private final UserDataRepository userDataRepository;
+
+ @Transactional
+ public Long createPost(PostDto postDto) {
+ Post post;
+ post = new Post();
+ User user = userDataRepository.findById(postDto.getUid()).orElseThrow(RuntimeException::new);
+ post.setUser(user);
+ post.setLocation(postDto.getLocation());
+ post.setLatitude(postDto.getLatitude());
+ post.setLongitude(postDto.getLongitude());
+ post.setTitle(postDto.getTitle());
+ post.setContent(postDto.getContent());
+ post.setScope(postDto.getScope());
+ post.setViewCount(postDto.getViewCount());
+ post.setLikeCount(postDto.getLikeCount());
+ post.setLikes(postDto.getLikes());
+ if(postDto.getImgs() != null) {
+ //이미지 저장 MultiPartfile->path
+
+ List paths = post.saveImagesInStorage(postDto.getImgs());
+ for (String path : paths) {
+ post.addImgPath(path);
+ }
+ }
+ return postRepository.save(post);
+ }
+
+ //post 수정
+ @Transactional
+ public Long modifyPost(PostDto postDto) {
+
+ Post post = postRepository.findById(postDto.getId());
+ post.setId(postDto.getId());
+ post.setLocation(postDto.getLocation());
+ post.setLatitude(postDto.getLatitude());
+ post.setLongitude(postDto.getLongitude());
+ post.setTitle(postDto.getTitle());
+ post.setContent(postDto.getContent());
+ post.setScope(postDto.getScope());
+ if(postDto.getImgs() != null) {
+ //이미지 저장 MultiPartfile->path
+ List paths = post.saveImagesInStorage(postDto.getImgs());
+ for (String path : paths) {
+ post.addImgPath(path);
+ }
+ }
+ return post.getId();
+ }
+
+
+ //글 삭제
+ public void deletePost(Long pid) {
+ postRepository.deletePost(pid);
+ }
+
+
+ //글 전체보기 요청
+ public PostDto getPostInfo(Long pid, Long uid) {
+ Post post = postRepository.findById(pid);
+
+ if (post.getUser().getId().equals(uid)) {//사용자와 글 작성자와 다른 경우만 viewCount++
+ postRepository.updateViewCount(post.getViewCount() + 1, post.getId());
+ }
+
+ return PostDto.postInfo(post, likeRepository);
+ }
+
+ //for문 마다 확인하기엔 통신이 너무 오래 걸림, db에서 한번에 검사하는게 효율적
+ //postid, MyLike 받아서 체크
+ public void toggleLike(List pids, List myLikes, Long uid) {
+ List delLikePids = new ArrayList<>();
+ List insertLikePids = new ArrayList<>();
+ for (int i = 0; i < pids.size(); i++) {
+ if (!myLikes.get(i)) {
+ delLikePids.add(pids.get(i));
+ } else {
+ insertLikePids.add(pids.get(i));
+ }
+ }
+ likeRepository.delete(delLikePids, uid);
+ likeRepository.save(insertLikePids, uid);
+ }
+
+ //pin 클릭시 해당 위치의 postList 반환,home friend public 동일한 함수 사용
+ public List getPostsPreviewPin(List pids) {
+ List posts = new ArrayList<>();
+ for (Long pid : pids) {
+ posts.add(postRepository.findById(pid));
+ }
+ return posts.stream().map(PostDto::postPreviewMap).collect(Collectors.toList());
+ }
+
+
+ //Home
+ //Home-Map 클릭 전, 내가 작성한 모든 글의 pin띄우기
+ public List getPinsHomeMap ( long uid){
+ List posts = postRepository.findByUid(uid);
+ return posts.stream().map(PostDto::pinMap).collect(Collectors.toList());
+ }
+
+ //Home-List 토글, postList 반환
+ public List getPostsHomeList (Long uid){
+ List posts = postRepository.findByUid(uid);
+
+ return posts.stream()
+ .map(post -> PostDto.postPreviewList(post, likeRepository))
+ .collect(Collectors.toList());
+ }
+
+
+
+
+ //Friends
+ //친구가 작성한 글의 pin 반환
+ public List getPinsFriendsMap(List uids) {
+ List posts = new ArrayList<>();
+ for(Long uid : uids){
+ posts.addAll(postRepository.findNonePrivateByUid(uid));
+ }
+
+ return posts.stream().map(PostDto::pinMap).collect(Collectors.toList());
+ }
+
+
+ //친구 post list preview
+ public List getPostsFriendsList (List < Long > uids) {
+ List posts = new ArrayList<>();
+ for (Long uid : uids) {
+ posts.addAll(postRepository.findNonePrivateByUid(uid));
+ }
+
+ return posts.stream()
+ .map(post -> PostDto.postPreviewList(post, likeRepository))
+ .collect(Collectors.toList());
+ }
+
+
+ //Public
+ public List getPinsPublicMap ( float longitude, float latitude){
+ List posts = postRepository.findPublicPosts(longitude, latitude);
+ return posts.stream().map(PostDto::pinMap).collect(Collectors.toList());
+ }
+
+ public List getPostsPublicList ( float longitude, float latitude){
+ List posts = postRepository.findPublicPosts(longitude, latitude);
+
+ return posts.stream()
+ .map(post -> PostDto.postPreviewList(post, likeRepository))
+ .collect(Collectors.toList());
+ }
+ }
diff --git a/ping/src/main/java/com/b6122/ping/service/UserService.java b/ping/src/main/java/com/b6122/ping/service/UserService.java
new file mode 100644
index 0000000..ecd25f0
--- /dev/null
+++ b/ping/src/main/java/com/b6122/ping/service/UserService.java
@@ -0,0 +1,50 @@
+package com.b6122.ping.service;
+
+import com.b6122.ping.domain.User;
+import com.b6122.ping.dto.UpdateUserProfileDto;
+import com.b6122.ping.dto.UserProfileReqDto;
+import com.b6122.ping.dto.UserProfileResDto;
+import com.b6122.ping.repository.datajpa.UserDataRepository;
+import jakarta.persistence.EntityNotFoundException;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@RequiredArgsConstructor
+public class UserService {
+
+ private final UserDataRepository userDataRepository;
+
+ @Transactional
+ public void updateProfile(UserProfileReqDto reqDto) {
+ User user = userDataRepository.findById(reqDto.getId()).orElseThrow(RuntimeException::new);
+ user.updateProfile(reqDto);
+ }
+
+ //계정 삭제
+ @Transactional
+ public void deleteAccount(Long id) {
+ userDataRepository.deleteById(id);
+ }
+
+ /**
+ * 사용자 정보(이미지, 닉네임) 가져오기
+ * @param id 사용자의 id
+ * @return 사용자 정보(UserProfileResDto 정보: nickname, profileImg, id)
+ */
+ public UserProfileResDto getUserProfile(Long id) {
+ User user = userDataRepository.findById(id).orElseThrow(RuntimeException::new);
+ return user.getProfileInfo();
+ }
+
+ /**
+ * nickname으로 유저 검색
+ * @param nickname
+ * @return Long id of find user
+ */
+ public Long findUserByNickname(String nickname) {
+ User findUser = userDataRepository.findByNickname(nickname).orElseThrow(EntityNotFoundException::new);
+ return findUser.getId();
+ }
+}
diff --git a/ping/src/main/resources/META-INF/MANIFEST.MF b/ping/src/main/resources/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..0c4bc54
--- /dev/null
+++ b/ping/src/main/resources/META-INF/MANIFEST.MF
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Main-Class: com.b6122.ping.PingApplication
+
diff --git a/ping/src/test/java/com/b6122/ping/PingApplicationTests.java b/ping/src/test/java/com/b6122/ping/PingApplicationTests.java
deleted file mode 100644
index 5ad0c3a..0000000
--- a/ping/src/test/java/com/b6122/ping/PingApplicationTests.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.b6122.ping;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-
-@SpringBootTest
-class PingApplicationTests {
-
- @Test
- void contextLoads() {
- }
-
-}