Fe/#98 chatGPT 퍼블리싱 및 반응형

.github/workflows/CI.yml

@@ -29,6 +29,13 @@ jobs:
       - name: Grant Execute Permission For Gradlew
         run: chmod +x backend/gradlew
 
+      - name: Make properties
+        run: |
+          cd backend/src/main/resources
+          touch ./application-local.yml
+          echo "${{ secrets.TEST_PROPERTIES }}" > ./application-local.yml
+        shell: bash
+
       - name: Test with Gradle
         run: |
           cd backend

.gitignore

@@ -1,7 +1,5 @@
 .DS_Store
 .env
-backend/src/test/resources/application-test.yml
-backend/src/main/resources/application-local.yml
 backend/src/main/resources/application-docker.yml
 backend/src/main/resources/application-dbconfig.yml
 backend/gradle.properties
@@ -14,3 +12,6 @@ logs/
 *.log
 
 logs/
+
+backend/src/main/resources/application-local.yml
+

backend/build.gradle

@@ -60,6 +60,7 @@ dependencies {
 
     // test
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
+    testImplementation 'com.h2database:h2'
 
     //rest-docs
     testImplementation 'org.springframework.restdocs:spring-restdocs-mockmvc'
@@ -133,11 +134,12 @@ jacocoTestReport {
         classDirectories.setFrom(files(classDirectories.files.collect {
             fileTree(dir: it, exclude: [
                     "**/Q*",
-                    "**/*Dto*",
+                    '**/dto/**',
                     "**/*Application*",
                     "**/mapper/**",
-                    "**/util/**",
                     "**/global/**",
+                    "**/com/graphy/backend/domain/job/domain/**",
+                    "**/com/graphy/backend/domain/job/service/**"
             ])
         }))
     }

backend/src/main/java/com/graphy/backend/domain/job/domain/Job.java

@@ -25,6 +25,7 @@ public class Job {
     @Column(nullable = false)
     private LocalDateTime expirationDate;
 
+    @Builder
     public Job(Long id,
                String companyName,
                String title,

backend/src/main/java/com/graphy/backend/domain/job/dto/JobDto.java

@@ -3,6 +3,7 @@
 import com.graphy.backend.domain.job.domain.Job;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 
 import java.time.LocalDateTime;
 
@@ -20,12 +21,14 @@ public static class CreateJobInfoRequest {
 
         private LocalDateTime expirationDate;
 
-        public static Job toJob(Long id,
-                                String companyName,
-                                String title,
-                                String url,
-                                LocalDateTime expirationDate) {
-            return new Job(id, companyName, title, url, expirationDate);
+        public Job toEntity() {
+            return Job.builder()
+                    .id(id)
+                    .companyName(companyName)
+                    .title(title)
+                    .url(url)
+                    .expirationDate(expirationDate)
+                    .build();
         }
     }
 }

backend/src/main/java/com/graphy/backend/domain/job/service/JobService.java

@@ -1,6 +1,7 @@
 package com.graphy.backend.domain.job.service;
 
 import com.graphy.backend.domain.job.domain.Job;
+import com.graphy.backend.domain.job.dto.JobDto;
 import com.graphy.backend.domain.job.repository.JobRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
@@ -18,7 +19,6 @@
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 
-import static com.graphy.backend.domain.job.dto.JobDto.CreateJobInfoRequest.*;
 
 @Service
 @Transactional
@@ -59,6 +59,7 @@ public void save() {
         }
 
         saveJobInfo(response.toString());
+        System.out.println(response);
     }
 
     private void saveJobInfo(String response) {
@@ -72,7 +73,6 @@ private void saveJobInfo(String response) {
 
             // 공고 ID
             Long jobId = jobObject.getLong("id");
-//            if (jobRepository.findById(jobId) != null) break;
 
             // 회사 이름
             String companyName = jobObject.getJSONObject("company")
@@ -94,8 +94,8 @@ private void saveJobInfo(String response) {
                     Instant.ofEpochSecond(expirationTimestampLong),
                     ZoneId.systemDefault());
 
-            Job job = toJob(jobId, companyName, jobTitle, companyInfoURL, expirationTimestamp);
-            jobRepository.save(job);
+            JobDto.CreateJobInfoRequest dto = new JobDto.CreateJobInfoRequest(jobId, companyName, jobTitle, companyInfoURL, expirationTimestamp);
+            jobRepository.save(dto.toEntity());
         }
     }
 

backend/src/main/java/com/graphy/backend/domain/project/service/ProjectService.java

@@ -50,20 +50,20 @@ public class ProjectService {
 
     private final GPTChatRestService gptChatRestService;
 
-    @PostConstruct
-    public void initTag() throws IOException {
-        if (tagRepository.existsById(1L))
-            return;
-        ClassPathResource resource = new ClassPathResource("tag.txt");
-        BufferedReader br = new BufferedReader(new InputStreamReader(resource.getInputStream()));
-        String s;
-
-        while ((s = br.readLine()) != null) {
-            Tag tag = Tag.builder().tech(s).build();
-            tagRepository.save(tag);
-        }
-        br.close();
-    }
+//    @PostConstruct
+//    public void initTag() throws IOException {
+//        if (tagRepository.existsById(1L))
+//            return;
+//        ClassPathResource resource = new ClassPathResource("tag.txt");
+//        BufferedReader br = new BufferedReader(new InputStreamReader(resource.getInputStream()));
+//        String s;
+//
+//        while ((s = br.readLine()) != null) {
+//            Tag tag = Tag.builder().tech(s).build();
+//            tagRepository.save(tag);
+//        }
+//        br.close();
+//    }
 
     public CreateProjectResponse createProject(CreateProjectRequest dto) {
         Project entity = mapper.toEntity(dto);
@@ -96,12 +96,6 @@ public UpdateProjectResponse updateProject(Long projectId, UpdateProjectRequest
         return mapper.toUpdateProjectDto(project);
     }
 
-    public List<GetProjectResponse> getProjects(Pageable pageable) {
-
-        Page<Project> projects = projectRepository.findAll(pageable);
-        return mapper.toDtoList(projects).getContent();
-    }
-
     public GetProjectDetailResponse getProjectById(Long projectId) {
         Project project = projectRepository.findById(projectId)
                 .orElseThrow(() -> new EmptyResultException(ErrorCode.PROJECT_DELETED_OR_NOT_EXIST));
@@ -112,7 +106,7 @@ public GetProjectDetailResponse getProjectById(Long projectId) {
     }
 
     public Tags getTagsWithName(List<String> techStacks) {
-        List<Tag> foundTags = techStacks.stream().map(tagRepository::findTagByTech)
+            List<Tag> foundTags = techStacks.stream().map(tagRepository::findTagByTech)
                 .collect(Collectors.toList());
         return new Tags(foundTags);
     }
@@ -124,7 +118,7 @@ public List<GetProjectResponse> getProjects(GetProjectsRequest dto, Pageable pag
 
     @Async
     public CompletableFuture<String> getProjectPlanAsync(String prompt) {
-        GptCompletionRequest dto = new GptCompletionDto.GptCompletionRequest();
+        GptCompletionRequest dto = new GptCompletionRequest();
         CompletableFuture<String> response = new CompletableFuture<>();
 
         dto.setPrompt(prompt);

backend/src/main/resources/application.yml

@@ -7,8 +7,8 @@ spring:
       matching-strategy: ant_path_matcher
     async:
       request-timeout: 60000
- profiles:
-   active: local
+  profiles:
+    active: local
 
   jpa:
     database: mysql

backend/src/test/java/com/graphy/backend/domain/job/service/JobServiceTest.java

@@ -11,7 +11,9 @@
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 
+import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
+import java.io.InputStream;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.time.LocalDateTime;
@@ -36,5 +38,4 @@ public void saveTest() throws Exception {
 
         verify(jobRepository, times(1)).deleteAllExpiredSince(any(LocalDateTime.class));
     }
-
 }

backend/src/test/java/com/graphy/backend/domain/project/controller/ProjectControllerTest.java

@@ -2,7 +2,6 @@
 
 import com.graphy.backend.domain.comment.dto.CommentWithMaskingDto;
 import com.graphy.backend.domain.comment.service.CommentService;
-import com.graphy.backend.domain.project.dto.ProjectDto;
 import com.graphy.backend.domain.project.service.ProjectService;
 import com.graphy.backend.global.common.PageRequest;
 import com.graphy.backend.test.MockApiTest;
@@ -23,14 +22,21 @@
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 
+import static com.graphy.backend.domain.project.dto.ProjectDto.*;
 import static com.graphy.backend.domain.project.dto.ProjectDto.GetProjectDetailResponse;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.BDDMockito.given;
-import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.get;
-import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.post;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.when;
+import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.document;
+import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.*;
+import static org.springframework.restdocs.operation.preprocess.Preprocessors.preprocessResponse;
+import static org.springframework.restdocs.operation.preprocess.Preprocessors.prettyPrint;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 @WebMvcTest(ProjectController.class)
@@ -94,22 +100,63 @@ public LocalDateTime getCreatedAt() {
         result.andExpect(status().isOk());
     }
 
+    @Test
+    @DisplayName("프로젝트 생성 테스트")
+    public void createProject() throws Exception {
+        //given
+        CreateProjectRequest request = CreateProjectRequest.builder()
+                .projectName("projectName")
+                .description("description")
+                .content("content")
+                .build();
+
+        CreateProjectResponse response = CreateProjectResponse.builder().projectId(1L).build();
+
+        //when
+        when(projectService.createProject(request)).thenReturn(response);
+
+        //then
+        mvc.perform(post(baseUrl)
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .content(objectMapper.writeValueAsString(request)))
+                .andExpect(status().isOk())
+                .andDo(document("project-create",
+                        preprocessResponse(prettyPrint()))
+                );
+    }
+
+    @Test
+    @DisplayName("프로젝트 삭제 테스트")
+    public void deleteProject() throws Exception {
+        //given
+        Long projectId = 1L;
+
+        doNothing().when(projectService).deleteProject(anyLong());
+
+        mvc.perform(delete(baseUrl + "/{projectId}", 1L)
+                        .contentType(MediaType.APPLICATION_JSON))
+                .andExpect(status().isOk())
+                .andDo(document("project-delete",
+                        preprocessResponse(prettyPrint()))
+                );
+    }
+
     @Test
     @DisplayName("프로젝트 이름/내용/전체 검색한다")
     void searchProjectsWithName() throws Exception {
 
         // given
         String projectName = "검색이름";
 
-        ProjectDto.GetProjectsRequest request = ProjectDto.GetProjectsRequest.builder()
+        GetProjectsRequest request = GetProjectsRequest.builder()
                 .projectName(projectName).build();
 
-        com.graphy.backend.global.common.PageRequest pageRequest = new PageRequest();
-        List<ProjectDto.GetProjectResponse> result = new ArrayList<ProjectDto.GetProjectResponse>();
+        PageRequest pageRequest = new PageRequest();
+        List<GetProjectResponse> result = new ArrayList<GetProjectResponse>();
 
         for (int i = 0; i < 5; i++) {
-            ProjectDto.GetProjectResponse response =
-                    ProjectDto.GetProjectResponse.builder().id((long) i).projectName("검색이름" + i)
+            GetProjectResponse response =
+                    GetProjectResponse.builder().id((long) i).projectName("검색이름" + i)
                             .description("프로젝트 설명" + i).createdAt(LocalDateTime.now()).build();
             result.add(response);
         }
@@ -135,7 +182,7 @@ void getProjectPlan() throws Exception {
         List<String> plans = new ArrayList<>(Arrays.asList("Spring Security", "Docker"));
         String topic = "간단한 게시판";
 
-        ProjectDto.GetPlanRequest request = new ProjectDto.GetPlanRequest(topic, features, techStacks, plans);
+        GetPlanRequest request = new GetPlanRequest(topic, features, techStacks, plans);
 
         String apiResult = "API 결과";
         CompletableFuture<String> result = CompletableFuture.completedFuture(apiResult);
@@ -149,4 +196,26 @@ void getProjectPlan() throws Exception {
         // then
         resultActions.andExpect((status().isOk()));
     }
+
+    @Test
+    @DisplayName("프로젝트 조회 시 프로젝트가 존재하지 않으면 예외가 발생한다")
+    public void EmptyResultTest() throws Exception {
+
+        // given
+        GetProjectsRequest request = GetProjectsRequest.builder().build();
+        PageRequest pageRequest = new PageRequest();
+        Pageable pageable = pageRequest.of();
+
+        // when
+        when(projectService.getProjects(any(GetProjectsRequest.class), any(Pageable.class)))
+                .thenReturn(Collections.emptyList());
+
+        // then
+        mvc.perform(get(baseUrl + "/search")  // "/project/search" should be replaced with the actual URL
+                        .param("page", String.valueOf(pageable.getPageNumber()))
+                        .param("size", String.valueOf(pageable.getPageSize()))
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .content(objectMapper.writeValueAsString(request)))
+                .andExpect(status().is4xxClientError());  // adjust based on the actual error code you're using
+    }
 }