Merge pull request #179 from Nawabali-project/feature/167/updateAll

게시글 일괄 조회 및 일괄수정 API 추가

build.gradle

@@ -30,8 +30,8 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-cache'
 
 	// elastic search
-//	implementation 'org.springframework.boot:spring-boot-starter-data-elasticsearch'
-	implementation 'org.springframework.data:spring-data-elasticsearch:4.2.2'
+	implementation 'org.springframework.boot:spring-boot-starter-data-elasticsearch'
+//	implementation 'org.springframework.data:spring-data-elasticsearch:4.2.2'
 
 	// Querydsl 추가
 	implementation 'com.querydsl:querydsl-jpa:5.0.0:jakarta'

src/main/java/com/nawabali/nawabali/config/ElasticSearchConfig.java

@@ -1,42 +1,42 @@
-package com.nawabali.nawabali.config;
-
-import org.elasticsearch.client.RestHighLevelClient;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.data.elasticsearch.client.ClientConfiguration;
-import org.springframework.data.elasticsearch.client.RestClients;
-import org.springframework.data.elasticsearch.config.AbstractElasticsearchConfiguration;
-import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
-import org.springframework.data.elasticsearch.core.ElasticsearchRestTemplate;
-import org.springframework.data.elasticsearch.repository.config.EnableElasticsearchRepositories;
-
-@Configuration
-@EnableElasticsearchRepositories
-public class ElasticSearchConfig extends AbstractElasticsearchConfiguration {
-
-    @Value("${spring.elasticsearch.username}")
-    private String username;
-
-    @Value("${spring.elasticsearch.password}")
-    private String password;
-
-    @Value("${spring.elasticsearch.rest.uris}")
-    private String[] esHost;
-
-    @Override
-    @Bean
-    public RestHighLevelClient elasticsearchClient() {
-        final ClientConfiguration clientConfiguration = ClientConfiguration.builder()
-                .connectedTo(esHost[0])
-                .withBasicAuth(username,password)
-                .build();
-        return RestClients.create(clientConfiguration).rest();
-    }
-
-    @Bean
-    public ElasticsearchOperations elasticsearchOperations(){
-        return new ElasticsearchRestTemplate(elasticsearchClient());
-    }
-}
-
+//package com.nawabali.nawabali.config;
+//
+//import org.elasticsearch.client.RestHighLevelClient;
+//import org.springframework.beans.factory.annotation.Value;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.data.elasticsearch.client.ClientConfiguration;
+//import org.springframework.data.elasticsearch.client.RestClients;
+//import org.springframework.data.elasticsearch.config.AbstractElasticsearchConfiguration;
+//import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
+//import org.springframework.data.elasticsearch.core.ElasticsearchRestTemplate;
+//import org.springframework.data.elasticsearch.repository.config.EnableElasticsearchRepositories;
+//
+//@Configuration
+//@EnableElasticsearchRepositories
+//public class ElasticSearchConfig extends AbstractElasticsearchConfiguration {
+//
+//    @Value("${spring.elasticsearch.username}")
+//    private String username;
+//
+//    @Value("${spring.elasticsearch.password}")
+//    private String password;
+//
+//    @Value("${spring.elasticsearch.rest.uris}")
+//    private String[] esHost;
+//
+//    @Override
+//    @Bean
+//    public RestHighLevelClient elasticsearchClient() {
+//        final ClientConfiguration clientConfiguration = ClientConfiguration.builder()
+//                .connectedTo(esHost[0])
+//                .withBasicAuth(username,password)
+//                .build();
+//        return RestClients.create(clientConfiguration).rest();
+//    }
+//
+//    @Bean
+//    public ElasticsearchOperations elasticsearchOperations(){
+//        return new ElasticsearchRestTemplate(elasticsearchClient());
+//    }
+//}
+//

src/main/java/com/nawabali/nawabali/config/WebSecurityConfig.java

@@ -105,7 +105,7 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
                                 .requestMatchers(
                                         "/users/logout","/users/signup","/users/check-nickname", "users/info").permitAll()
                                 .requestMatchers(HttpMethod.POST, "/users/login").permitAll()
-                                .requestMatchers("/posts","/posts/district/*").permitAll()
+                                .requestMatchers("/posts","/posts/district/*", "posts/searchAll", "posts/updateAll").permitAll()
                                 .requestMatchers(HttpMethod.GET, "/posts/**").permitAll() // 게시글 상세 조회 허가
                                 .requestMatchers("/comments/check/posts/**").permitAll()
                                 .requestMatchers("/swagger/**","/swagger-ui/**","/v3/api-docs/**").permitAll()

src/main/java/com/nawabali/nawabali/controller/PostController.java

@@ -2,6 +2,7 @@
 
 import com.nawabali.nawabali.constant.Category;
 import com.nawabali.nawabali.constant.Period;
+import com.nawabali.nawabali.domain.elasticsearch.PostSearch;
 import com.nawabali.nawabali.dto.PostDto;
 import com.nawabali.nawabali.security.UserDetailsImpl;
 import com.nawabali.nawabali.service.PostService;
@@ -67,6 +68,19 @@ public ResponseEntity<Slice<PostDto.ResponseDto>> getPostsByLatest(
         Slice<PostDto.ResponseDto> postsSlice = postService.getPostsByLatest(pageable);
         return ResponseEntity.ok(postsSlice);
     }
+    // 전체 게시물 조회(지도용)
+    @Operation(
+            summary = "전체 게시글 조회",
+            description = "ES로 전체 조회, 등록일 기준 내림차순 정렬")
+    @GetMapping("/searchAll")
+    public List<PostSearch> searchAll(){
+        return postService.searchAllPosts();
+    }
+
+    @PatchMapping("/updateAll")
+    public void updateAll() throws IOException {
+        postService.updateAll();
+    }
 
 
     // 유저 닉네임으로 그 유저의 게시물들 조회

src/main/java/com/nawabali/nawabali/domain/Post.java

@@ -68,4 +68,7 @@ public void update(String contents) {
     }
 
 
+    public void updateImages(List<PostImage> existsImages) {
+        this.images = existsImages;
+    }
 }

src/main/java/com/nawabali/nawabali/domain/elasticsearch/PostSearch.java

@@ -62,6 +62,9 @@ public class PostSearch {
     @Field(type = FieldType.Keyword)
     private String mainImageUrl;
 
+    @Field(type=FieldType.Keyword)
+    private String resizedImageUrl;
+
     @Field(type = FieldType.Boolean)
     private boolean multiImages;
 

src/main/java/com/nawabali/nawabali/exception/GlobalExceptionAdvice.java

@@ -135,7 +135,7 @@ public class GlobalExceptionAdvice {
     @Value("${error.detailed-messages}")
     private boolean detailedMessages;
 
-    // CustomException: Error Code에 정의된 비즈니스 로직 오류
+//     CustomException: Error Code에 정의된 비즈니스 로직 오류
 //    @ExceptionHandler(CustomException.class)
 //    public ResponseEntity<ErrorResponse> handleCustomException(CustomException e) {
 //

src/main/java/com/nawabali/nawabali/global/tool/redis/RedisConfig.java

@@ -31,7 +31,7 @@ public class RedisConfig {
     public RedisConnectionFactory redisConnectionFactory() {
 
         RedisStandaloneConfiguration config = new RedisStandaloneConfiguration(host, redisProperties.getPort());
-        config.setPassword(password);
+//        config.setPassword(password);
         return new LettuceConnectionFactory(config);
 
 //        Localhost 전용

src/main/java/com/nawabali/nawabali/s3/AwsS3Service.java

@@ -1,10 +1,7 @@
 package com.nawabali.nawabali.s3;
 
 import com.amazonaws.services.s3.AmazonS3;
-import com.amazonaws.services.s3.model.CannedAccessControlList;
-import com.amazonaws.services.s3.model.DeleteObjectRequest;
-import com.amazonaws.services.s3.model.ObjectMetadata;
-import com.amazonaws.services.s3.model.PutObjectRequest;
+import com.amazonaws.services.s3.model.*;
 import com.nawabali.nawabali.exception.CustomException;
 import com.nawabali.nawabali.exception.ErrorCode;
 import lombok.RequiredArgsConstructor;
@@ -113,4 +110,19 @@ public String uploadSingleFile(MultipartFile multipartFile, String dirName){
             throw new CustomException(ErrorCode.PHOTO_UPLOAD_ERROR);
         }
     }
+
+    public S3Object getS3Object(String objectKey){
+        return amazonS3.getObject(bucket, objectKey);
+    }
+
+    public String getContentType(String objectKey){
+        S3Object s3Object = amazonS3.getObject(bucket, objectKey);
+        return s3Object.getObjectMetadata().getContentType();
+    }
+
+    public String saveAndGetUrl(String resizedFilePath, ByteArrayInputStream inputStream, ObjectMetadata resizedMetadata){
+        amazonS3.putObject(new PutObjectRequest(bucket, resizedFilePath, inputStream, resizedMetadata)
+                .withCannedAcl(CannedAccessControlList.PublicRead));
+        return amazonS3.getUrl(bucket, resizedFilePath).toString();
+    }
 }

src/main/java/com/nawabali/nawabali/security/Jwt/JwtUtil.java

@@ -16,6 +16,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.ResponseCookie;
 import org.springframework.stereotype.Component;
 import org.springframework.util.StringUtils;