[BE] server/test -> dev 병합

server/build.gradle

@@ -78,3 +78,7 @@ bootJar { // Spring Rest Docs
         into 'static/docs'
     }
 }
+
+test {
+    exclude '**/*'
+}

server/src/main/java/com/codestates/Pre038Application.java

@@ -4,7 +4,6 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 
-@EnableJpaAuditing
 @SpringBootApplication
 public class Pre038Application {
 

server/src/main/java/com/codestates/answer/controller/AnswerController.java

@@ -18,8 +18,10 @@
 import javax.validation.constraints.Positive;
 import java.util.List;
 
-@CrossOrigin(origins = {"http://pre-project-038-client.s3-website.ap-northeast-2.amazonaws.com",
-        "http://ec2-13-125-208-244.ap-northeast-2.compute.amazonaws.com:8080"})
+@CrossOrigin(origins = {"http://localhost:3000",
+                "http://pre-project-038-client.s3-website.ap-northeast-2.amazonaws.com",
+                "http://seb40-pre-038.vercel.app",
+        "http://ec2-13-125-208-244.ap-northeast-2.compute.amazonaws.com:8080"}, allowCredentials = "true")
 @RestController
 @Validated
 @RequestMapping("/api")
@@ -69,18 +71,6 @@ public ResponseEntity voteAnswer(@PathVariable("answer-id") @Positive long answe
                 HttpStatus.OK);
     }
 
-    /*@PatchMapping("/{answer-id}/best") // QuestionController에서 동작
-    public ResponseEntity patchStatus(@PathVariable("answer-id") @Positive long answerId,
-                                     @Valid @RequestBody AnswerBestDto answerBestDto) {
-        answerBestDto.setAnswerId(answerId);
-
-        Answer answer = answerService.updateStatus(mapper.answerBestDtoToAnswer(answerBestDto));
-
-        return new ResponseEntity<>(
-                new SingleResponseDto<>(mapper.answerToAnswerResponseDto(answer)),
-                HttpStatus.OK);
-    }*/
-
     @GetMapping("/questions/{question-id}/answers")
     public ResponseEntity getAnswers(@PathVariable("question-id") @Positive long questionId) {
         List<Answer> answers = answerService.findAnswers(questionId);

server/src/main/java/com/codestates/answer/dto/AnswerPostDto.java

@@ -5,7 +5,6 @@
 import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.Positive;
 import javax.validation.constraints.Size;
 
 
@@ -16,7 +15,4 @@ public class AnswerPostDto {
     @NotEmpty(message = "내용을 입력하셔야 합니다.")
     @Size(min = 20, message = "20자 이상 입력하셔야 합니다.")
     private String body;
-
-    /*@Positive
-    private long userId;*/
 }

server/src/main/java/com/codestates/answer/dto/AnswerResponseDto.java

@@ -2,7 +2,6 @@
 
 import com.codestates.answer.entity.Answer;
 import com.codestates.comment.CommentDto;
-import com.codestates.comment.entity.Comment;
 import com.codestates.user.dto.UserDto;
 import lombok.*;
 

server/src/main/java/com/codestates/answer/dto/AnswerVoteDto.java

@@ -2,15 +2,10 @@
 
 import lombok.Getter;
 
-import javax.validation.constraints.Positive;
-
 @Getter
 public class AnswerVoteDto {
     private long answerId;
 
-/*    @Positive
-    private long userId;*/
-
     private int vote;
 
     public void setAnswerId(long answerId) {

server/src/main/java/com/codestates/answer/entity/Answer.java

@@ -1,6 +1,5 @@
 package com.codestates.answer.entity;
 
-import com.codestates.audit.Auditable;
 import com.codestates.user.entity.User;
 import com.codestates.question.Question;
 import com.codestates.comment.entity.Comment;
@@ -10,8 +9,6 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
-import org.springframework.data.annotation.CreatedDate;
-import org.springframework.data.annotation.LastModifiedDate;
 
 import javax.persistence.*;
 import java.time.LocalDateTime;

server/src/main/java/com/codestates/answer/mapper/AnswerMapper.java

@@ -7,7 +7,6 @@
 import com.codestates.user.dto.UserDto;
 import com.codestates.user.entity.User;
 import com.codestates.question.Question;
-import com.codestates.user.service.UserService;
 import org.mapstruct.Mapper;
 
 import java.util.List;

server/src/main/java/com/codestates/answer/repository/AnswerRepository.java

@@ -1,7 +1,6 @@
 package com.codestates.answer.repository;
 
 import com.codestates.answer.entity.Answer;
-import org.springframework.data.domain.Sort;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 

server/src/main/java/com/codestates/answer/service/AnswerService.java

@@ -7,9 +7,6 @@
 import com.codestates.question.Question;
 import com.codestates.user.entity.User;
 import com.codestates.user.service.UserService;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 

server/src/main/java/com/codestates/auth/filter/JwtAuthenticationFilter.java

@@ -9,6 +9,7 @@
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
+import org.springframework.web.bind.annotation.CrossOrigin;
 
 import javax.servlet.FilterChain;
 import javax.servlet.ServletException;
@@ -28,6 +29,7 @@ public JwtAuthenticationFilter(AuthenticationManager authenticationManager, JwtT
         this.jwtTokenizer = jwtTokenizer;
     }
 
+    @CrossOrigin(exposedHeaders = "Authorization")
     @SneakyThrows
     @Override
     public Authentication attemptAuthentication(HttpServletRequest request, HttpServletResponse response) {

server/src/main/java/com/codestates/comment/CommentController.java

@@ -16,8 +16,10 @@
 import javax.validation.constraints.Positive;
 import java.util.List;
 
-@CrossOrigin(origins = {"http://pre-project-038-client.s3-website.ap-northeast-2.amazonaws.com",
-        "http://ec2-13-125-208-244.ap-northeast-2.compute.amazonaws.com:8080"})
+@CrossOrigin(origins = {"http://localhost:3000",
+                "http://pre-project-038-client.s3-website.ap-northeast-2.amazonaws.com",
+                "http://seb40-pre-038.vercel.app",
+        "http://ec2-13-125-208-244.ap-northeast-2.compute.amazonaws.com:8080"}, allowCredentials = "true")
 @Validated
 @RestController
 @RequestMapping("/api")

server/src/main/java/com/codestates/comment/entity/Comment.java

@@ -1,7 +1,6 @@
 package com.codestates.comment.entity;
 
 import com.codestates.answer.entity.Answer;
-import com.codestates.audit.Auditable;
 import com.codestates.user.entity.User;
 import com.codestates.question.Question;
 import com.fasterxml.jackson.annotation.JsonBackReference;
@@ -20,7 +19,7 @@
 @NoArgsConstructor
 @AllArgsConstructor
 @Entity
-public class Comment extends Auditable {
+public class Comment {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)

server/src/main/java/com/codestates/configuration/SecurityConfiguration.java

@@ -74,19 +74,22 @@ public PasswordEncoder passwordEncoder() {
         return PasswordEncoderFactories.createDelegatingPasswordEncoder();
     }
 
-//    @Bean
-//    CorsConfigurationSource corsConfigurationSource() {
-//        CorsConfiguration configuration = new CorsConfiguration();
-//        configuration.addAllowedOrigin("*");
-//        configuration.addAllowedMethod("*");
-//        configuration.addAllowedHeader("*");
-//        configuration.setAllowCredentials(true);
-////        configuration.setAllowedOrigins(Arrays.asList("*"));
-////        configuration.setAllowedMethods(Arrays.asList("GET","POST", "PATCH", "DELETE"));
-//        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
-//        source.registerCorsConfiguration("/**", configuration);
-//        return source;
-//    }
+    @Bean
+    CorsConfigurationSource corsConfigurationSource() {
+        CorsConfiguration configuration = new CorsConfiguration();
+        configuration.setAllowedOrigins(Arrays.asList("http://localhost:3000",
+                "http://pre-project-038-client.s3-website.ap-northeast-2.amazonaws.com",
+                "http://seb40-pre-038.vercel.app"));
+        configuration.addAllowedMethod("*");
+        configuration.addAllowedHeader("*");
+        configuration.setExposedHeaders(Arrays.asList("Authorization"));
+        configuration.setAllowCredentials(true);
+//        configuration.setAllowedOrigins(Arrays.asList("*"));
+//        configuration.setAllowedMethods(Arrays.asList("GET","POST", "PATCH", "DELETE"));
+        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
+        source.registerCorsConfiguration("/**", configuration);
+        return source;
+    }
 
     public class CustomFilterConfigurer extends AbstractHttpConfigurer<CustomFilterConfigurer, HttpSecurity> {
         @Override

server/src/main/java/com/codestates/question/Question.java

@@ -1,15 +1,12 @@
 package com.codestates.question;
 
 import com.codestates.answer.entity.Answer;
-import com.codestates.audit.Auditable;
 import com.codestates.user.entity.User;
 import com.codestates.comment.entity.Comment;
 import com.codestates.vote.QuestionVote.QuestionVote;
 import com.fasterxml.jackson.annotation.JsonBackReference;
 import com.fasterxml.jackson.annotation.JsonManagedReference;
 import lombok.*;
-import org.springframework.data.annotation.CreatedDate;
-import org.springframework.data.annotation.LastModifiedDate;
 
 import javax.persistence.*;
 import java.time.LocalDateTime;
@@ -77,11 +74,9 @@ public void addComment(Comment comment) {
         comments.add(comment);
     }
 
-    //@CreatedDate
     @Column(nullable = false, updatable = false, name = "CREATED_AT")
     private LocalDateTime createdAt = LocalDateTime.now();
 
-    //@LastModifiedDate
     @Column(nullable = false, name = "LAST_MODIFIED_AT")
     private LocalDateTime modifiedAt = LocalDateTime.now();
 

server/src/main/java/com/codestates/question/QuestionController.java

@@ -22,8 +22,10 @@
 import java.util.Objects;
 import java.util.stream.Collectors;
 
-@CrossOrigin(origins = {"http://pre-project-038-client.s3-website.ap-northeast-2.amazonaws.com",
-        "http://ec2-13-125-208-244.ap-northeast-2.compute.amazonaws.com:8080"})
+@CrossOrigin(origins = {"http://localhost:3000",
+                "http://pre-project-038-client.s3-website.ap-northeast-2.amazonaws.com",
+                "http://seb40-pre-038.vercel.app",
+        "http://ec2-13-125-208-244.ap-northeast-2.compute.amazonaws.com:8080"}, allowCredentials = "true")
 @Validated
 @RestController
 @RequestMapping("/api/questions")

server/src/main/java/com/codestates/search/SearchController.java

@@ -9,15 +9,16 @@
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Positive;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.util.List;
 
-@CrossOrigin(origins = {"http://pre-project-038-client.s3-website.ap-northeast-2.amazonaws.com",
-        "http://ec2-13-125-208-244.ap-northeast-2.compute.amazonaws.com:8080"})
+@CrossOrigin(origins = {"http://localhost:3000",
+                "http://pre-project-038-client.s3-website.ap-northeast-2.amazonaws.com",
+                "http://seb40-pre-038.vercel.app",
+        "http://ec2-13-125-208-244.ap-northeast-2.compute.amazonaws.com:8080"}, allowCredentials = "true")
 @RestController
 @Validated
 @RequestMapping("/api/search")

server/src/main/java/com/codestates/search/SearchRepository.java

@@ -1,23 +1,9 @@
 package com.codestates.search;
 
-//import com.codestates.user.entity.user;
 import com.codestates.question.Question;
-import com.codestates.user.entity.User;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.Query;
 
 public interface SearchRepository extends JpaRepository<Question, Long>, JpaSpecificationExecutor<Question> {
 
-    /*@Query(nativeQuery = true,
-            value = "select * from Answer a where a.status > 0 and a.question_id = :questionId"
-                    + " order by status asc, vote desc, answer_id desc"
-    )*/
-    /*Page<Question> findAllByTitleContainingOrProblemContainingOrExpectContaining(String title, String problem, String expect, Pageable pageable);
-
-    Page<Question> findAllByUser(User user, Pageable pageable);
-
-    Page<Question> findAllByTagList(String tagBody, Pageable pageable);*/
 }

server/src/main/java/com/codestates/search/SearchService.java

@@ -1,6 +1,5 @@
 package com.codestates.search;
 
-import com.codestates.user.entity.User;
 import com.codestates.user.service.UserService;
 import com.codestates.question.Question;
 import org.springframework.data.domain.Page;
@@ -10,7 +9,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.lang.annotation.Target;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -28,32 +26,34 @@ public SearchService(SearchRepository searchRepository, UserService userService)
 
     public Page<Question> findContent(String all, String tab, int page, int size) {
         String tag = null;
-        long userId = 0;
+        String userNickName = null;
         List<String> contents = new ArrayList<>();
 
-        //all = all.replaceAll( "[^\uAC00-\uD7A30-9a-zA-Z\\[\\]\\s]", ""); // 특수문자 제거
+        //all = all.replaceAll( "[^\uAC00-\uD7A30-9a-zA-Z\\[\\]\\s]", ""); // 특수문자 제거 ([,] 빼고)
 
         List<String> findAll = Arrays.asList(all.split(" "));
         for(String find : findAll) {
+            System.out.println("find:"+find);
             if(find.length() >= 3 && find.charAt(0) == '[' && find.charAt(find.length() - 1) == ']') // 태그 검색일 경우
                 tag = find.substring(1, find.length() - 1);
             else if (find.length() >= 6 && find.substring(0,5).equals("user:")) // 유저 검색일 경우
-                userId = Long.parseLong(find.substring(5));
+                userNickName = find.substring(5);
             else
                 contents.add(find); // 일반 검색일 경우 keyword로 나누기
         }
+        System.out.println("TAG:"+tag + ",USER:"+userNickName);
 
-        return findTagUserContent(tag, userId, contents, tab, page, size); // 검색
+        return findTagUserContent(tag, userNickName, contents, tab, page, size); // 검색
     }
 
-    private Page<Question> findTagUserContent(String tag, long userId, List<String> contents, String tab, int page, int size) { // 질문 내용 검색
+    private Page<Question> findTagUserContent(String tag, String userNickName, List<String> contents, String tab, int page, int size) { // 질문 내용 검색
         Specification<Question> spec = null;
         if(tag != null) // tag 검색이 있을 경우
             spec = (spec == null? SearchSpecification.containsTag(tag) : spec.and(SearchSpecification.containsTag(tag)));
 
-        if(userId != 0) { // user 검색이 있을 경우
+        if(userNickName != null) { // user 검색이 있을 경우
             //User user = userService.findVerifiedUser(userId);
-            spec = (spec == null ? SearchSpecification.equalToUser(userId) : spec.and(SearchSpecification.equalToUser(userId)));
+            spec = (spec == null ? SearchSpecification.equalToUser(userNickName) : spec.and(SearchSpecification.equalToUser(userNickName)));
         }
 
         if(contents != null) { // 검색어가 있을 경우