[RELEASE] develop 변경사항 운영 반영

.github/pull_request_template.md

@@ -0,0 +1,18 @@
+## 관련 이슈
+<!-- 이 PR이 병합될 때 종료할 이슈 번호를 입력해주세요. -->
+Closes #
+
+## 변경 배경
+<!-- 이 변경이 필요한 문제와 이유를 설명해주세요. -->
+
+## 변경 내용
+<!-- 주요 변경사항을 항목별로 작성해주세요. -->
+
+## 검증
+<!-- 실행한 테스트와 수동 검증 결과를 작성해주세요. -->
+
+- [ ] 테스트 통과
+- [ ] 변경 동작 확인
+
+## 영향 및 참고사항
+<!-- API, DB, 배포 설정, 호환성, 롤백 등 리뷰어가 알아야 할 내용이 없다면 "없음"으로 작성해주세요. -->

.github/workflows/dev-cd.yml

@@ -2,13 +2,14 @@ name: dev-cd.yml
 
 on:
   push:
-    branches: ["develop"]
+    branches: [ "develop" ]
     paths:
       - "**"
+  workflow_dispatch:
 
 jobs:
   build-and-push:
-    runs-on: [self-hosted, crew-wiki-dev]
+    runs-on: [ self-hosted, crew-wiki-dev ]
     env:
       IMAGE_NAME: ${{ secrets.DOCKERHUB_USERNAME }}/crew-wiki
     steps:
@@ -50,7 +51,7 @@ jobs:
 
   deploy:
     needs: build-and-push
-    runs-on: [self-hosted, crew-wiki-dev]
+    runs-on: [ self-hosted, crew-wiki-dev ]
     env:
       IMAGE_NAME: ${{ secrets.DOCKERHUB_USERNAME }}/crew-wiki:dev-latest
     steps:

.github/workflows/prod-cd.yml

@@ -112,7 +112,7 @@ jobs:
           PROD_DB_URL=${{ secrets.PROD_DB_URL }}
           PROD_DB_USERNAME=${{ secrets.PROD_DB_USERNAME }}
           PROD_DB_PASSWORD=${{ secrets.PROD_DB_PASSWORD }}
-          CORS_ALLOWED_ORIGINS=${{ secrets.PROD_CORS_ALLOWED_ORIGINS || 'https://crew-wiki.site,https://api.crew-wiki.site' }}
+          CORS_ALLOWED_ORIGINS=${{ secrets.PROD_CORS_ALLOWED_ORIGINS || 'https://crew-wiki.site,https://www.crew-wiki.site,https://api.crew-wiki.site' }}
           SWAGGER_SERVER_URL=${{ secrets.PROD_SWAGGER_SERVER_URL || 'https://api.crew-wiki.site' }}
           AWS_CREDENTIALS_ACCESS_KEY=${{ secrets.AWS_CREDENTIALS_ACCESS_KEY }}
           AWS_CREDENTIALS_SECRET_KEY=${{ secrets.AWS_CREDENTIALS_SECRET_KEY }}

.gitignore

@@ -42,3 +42,7 @@ application-*.yml
 !src/main/resources/application-prod.yml
 .env
 .env.*
+
+### AI ###
+.omc
+.omx

src/main/java/com/wooteco/wiki/admin/domain/Admin.java

@@ -21,7 +21,10 @@ public class Admin {
     protected Admin() {
     }
 
-    public Admin(String loginId, String password) {
+    public Admin(
+            String loginId,
+            String password
+    ) {
         this.loginId = loginId;
         this.password = password;
     }

src/main/java/com/wooteco/wiki/admin/domain/dto/LoginRequest.java

@@ -1,4 +1,7 @@
 package com.wooteco.wiki.admin.domain.dto;
 
-public record LoginRequest(String loginId, String password) {
+public record LoginRequest(
+        String loginId,
+        String password
+) {
 }

src/main/java/com/wooteco/wiki/admin/repository/AdminRepository.java

@@ -6,5 +6,8 @@
 
 public interface AdminRepository extends JpaRepository<Admin, Long> {
 
-    Optional<Admin> findOneByLoginIdAndPassword(String loginId, String password);
+    Optional<Admin> findOneByLoginIdAndPassword(
+            String loginId,
+            String password
+    );
 }

src/main/java/com/wooteco/wiki/admin/service/CrewDocumentService.java

@@ -81,7 +81,10 @@ public DocumentResponse getRandom() {
     }
 
     @Transactional
-    public DocumentResponse update(UUID uuid, DocumentUpdateRequest request) {
+    public DocumentResponse update(
+            UUID uuid,
+            DocumentUpdateRequest request
+    ) {
         CrewDocument crewDocument = crewDocumentRepository.findByUuid(uuid)
                 .orElseThrow(() -> new WikiException(ErrorCode.DOCUMENT_NOT_FOUND));
 

src/main/java/com/wooteco/wiki/document/controller/CrewDocumentQueryController.java

@@ -0,0 +1,31 @@
+package com.wooteco.wiki.document.controller;
+
+import com.wooteco.wiki.document.dto.GenerationCrewResponse;
+import com.wooteco.wiki.document.service.CrewDocumentQueryService;
+import com.wooteco.wiki.global.common.ApiResponse;
+import com.wooteco.wiki.global.common.ApiResponse.SuccessBody;
+import com.wooteco.wiki.global.common.ApiResponseGenerator;
+import io.swagger.v3.oas.annotations.Operation;
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/document")
+public class CrewDocumentQueryController {
+
+    private final CrewDocumentQueryService crewDocumentQueryService;
+
+    @Operation(summary = "기수별 크루 목록 조회", description = "기수에 속한 크루의 이름, 문서 UUID, 분야를 조회합니다.")
+    @GetMapping("/crews")
+    public ApiResponse<SuccessBody<List<GenerationCrewResponse>>> findAllByGeneration(
+            @RequestParam String generation
+    ) {
+        List<GenerationCrewResponse> response = crewDocumentQueryService.findAllByGeneration(generation);
+        return ApiResponseGenerator.success(response);
+    }
+}

src/main/java/com/wooteco/wiki/document/controller/DocumentController.java

@@ -2,7 +2,13 @@
 
 import com.wooteco.wiki.admin.service.CrewDocumentService;
 import com.wooteco.wiki.document.domain.Document;
-import com.wooteco.wiki.document.domain.dto.*;
+import com.wooteco.wiki.document.domain.dto.CrewDocumentCreateRequest;
+import com.wooteco.wiki.document.domain.dto.DocumentListResponse;
+import com.wooteco.wiki.document.domain.dto.DocumentResponse;
+import com.wooteco.wiki.document.domain.dto.DocumentSearchResponse;
+import com.wooteco.wiki.document.domain.dto.DocumentTitleListResponse;
+import com.wooteco.wiki.document.domain.dto.DocumentUpdateRequest;
+import com.wooteco.wiki.document.domain.dto.ViewFlushRequest;
 import com.wooteco.wiki.document.service.DocumentSearchService;
 import com.wooteco.wiki.document.service.DocumentService;
 import com.wooteco.wiki.document.service.DocumentServiceJava;
@@ -21,11 +27,20 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
+@RequiredArgsConstructor
 @RestController
 @RequestMapping("/document")
-@RequiredArgsConstructor
 public class DocumentController {
 
     private final CrewDocumentService crewDocumentService;
@@ -56,6 +71,13 @@ public ApiResponse<SuccessBody<PagedResponse<List<DocumentListResponse>>>> findA
         return ApiResponseGenerator.success(convertToResponse(responses));
     }
 
+    @Operation(summary = "위키 글 제목 전체 조회", description = "모든 위키 글의 제목과 UUID를 조회합니다.")
+    @GetMapping("/titles")
+    public ApiResponse<SuccessBody<List<DocumentTitleListResponse>>> findAllTitles() {
+        List<DocumentTitleListResponse> response = documentService.findAllTitles();
+        return ApiResponseGenerator.success(response);
+    }
+
     @Operation(summary = "제목으로 위키 글 조회", description = "제목을 통해 위키 글을 조회합니다.")
     @GetMapping("title/{title}")
     public ApiResponse<SuccessBody<DocumentResponse>> get(@PathVariable String title) {

src/main/java/com/wooteco/wiki/document/domain/CrewDocument.java

@@ -13,8 +13,13 @@
 @Getter
 public class CrewDocument extends Document {
 
-    public CrewDocument(final String title, final String contents, final String writer,
-                        final Long documentBytes, final UUID uuid) {
+    public CrewDocument(
+            final String title,
+            final String contents,
+            final String writer,
+            final Long documentBytes,
+            final UUID uuid
+    ) {
         super(title, contents, writer, documentBytes, uuid);
     }
 

src/main/java/com/wooteco/wiki/document/domain/CrewField.java

@@ -0,0 +1,8 @@
+package com.wooteco.wiki.document.domain;
+
+public enum CrewField {
+
+    BACKEND,
+    FRONTEND,
+    ANDROID
+}

src/main/java/com/wooteco/wiki/document/domain/Document.java

@@ -3,6 +3,8 @@
 import jakarta.persistence.Column;
 import jakarta.persistence.DiscriminatorColumn;
 import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
@@ -47,8 +49,17 @@ public abstract class Document {
     @Column(name = "view_count", nullable = false, columnDefinition = "INT DEFAULT 0 NOT NULL")
     protected Integer viewCount = 0;
 
-    public Document(final String title, final String contents, final String writer,
-                    final Long documentBytes, final UUID uuid) {
+    @Enumerated(EnumType.STRING)
+    @Column(name = "dtype", insertable = false, updatable = false)
+    private DocumentType dtype;
+
+    public Document(
+            final String title,
+            final String contents,
+            final String writer,
+            final Long documentBytes,
+            final UUID uuid
+    ) {
         this.title = title;
         this.contents = contents;
         this.writer = writer;

src/main/java/com/wooteco/wiki/document/domain/dto/DocumentResponse.java

@@ -7,21 +7,21 @@
 import java.util.UUID;
 
 public record DocumentResponse(
-    Long documentId,
-    UUID documentUUID,
-    String title,
-    String contents,
-    String writer,
-    LocalDateTime generateTime,
-    Integer viewCount,
-    Long latestVersion,
-    List<OrganizationDocumentResponse> organizationDocumentResponses
+        Long documentId,
+        UUID documentUUID,
+        String title,
+        String contents,
+        String writer,
+        LocalDateTime generateTime,
+        Integer viewCount,
+        Long latestVersion,
+        List<OrganizationDocumentResponse> organizationDocumentResponses
 ) {
 
     public static DocumentResponse toDocumentResponse(
-        CrewDocument crewDocument,
-        Long latestVersion,
-        List<OrganizationDocumentResponse> organizationDocumentResponses
+            CrewDocument crewDocument,
+            Long latestVersion,
+            List<OrganizationDocumentResponse> organizationDocumentResponses
     ) {
         return new DocumentResponse(
             crewDocument.getId(),
@@ -36,4 +36,3 @@ public static DocumentResponse toDocumentResponse(
         );
     }
 }
-

src/main/java/com/wooteco/wiki/document/domain/dto/DocumentTitleListResponse.java

@@ -0,0 +1,13 @@
+package com.wooteco.wiki.document.domain.dto;
+
+import com.wooteco.wiki.document.domain.DocumentType;
+import java.time.LocalDateTime;
+import java.util.UUID;
+
+public record DocumentTitleListResponse(
+        String title,
+        UUID uuid,
+        DocumentType documentType,
+        LocalDateTime generateTime
+) {
+}

src/main/java/com/wooteco/wiki/document/dto/GenerationCrewResponse.java

@@ -0,0 +1,19 @@
+package com.wooteco.wiki.document.dto;
+
+import com.wooteco.wiki.document.domain.CrewField;
+import java.util.UUID;
+
+public record GenerationCrewResponse(
+        String name,
+        UUID documentUuid,
+        CrewField field
+) {
+
+    public static GenerationCrewResponse of(
+            String name,
+            UUID documentUuid,
+            CrewField field
+    ) {
+        return new GenerationCrewResponse(name, documentUuid, field);
+    }
+}

src/main/java/com/wooteco/wiki/document/repository/DocumentRepository.java

@@ -1,6 +1,7 @@
 package com.wooteco.wiki.document.repository;
 
 import com.wooteco.wiki.document.domain.Document;
+import com.wooteco.wiki.document.domain.dto.DocumentTitleListResponse;
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
@@ -17,6 +18,18 @@ public interface DocumentRepository extends JpaRepository<Document, Long> {
 
     List<Document> findAllByTitleStartingWithOrderByTitle(String keyWord);
 
+    @Query("""
+        SELECT new com.wooteco.wiki.document.domain.dto.DocumentTitleListResponse(
+            d.title,
+            d.uuid,
+            d.dtype,
+            d.generateTime
+        )
+        FROM Document d
+        ORDER BY d.title ASC
+        """)
+    List<DocumentTitleListResponse> findAllTitles();
+
     Optional<Document> findByUuid(UUID uuid);
 
     @Query("SELECT d.uuid FROM Document d WHERE d.title = :title")

src/main/java/com/wooteco/wiki/document/repository/GenerationCrewOrganizationReadModel.java

@@ -0,0 +1,10 @@
+package com.wooteco.wiki.document.repository;
+
+import java.util.UUID;
+
+public record GenerationCrewOrganizationReadModel(
+        String crewTitle,
+        UUID documentUuid,
+        String organizationTitle
+) {
+}

src/main/java/com/wooteco/wiki/document/repository/GenerationCrewQueryRepository.java

@@ -0,0 +1,8 @@
+package com.wooteco.wiki.document.repository;
+
+import java.util.List;
+
+public interface GenerationCrewQueryRepository {
+
+    List<GenerationCrewOrganizationReadModel> findAllByGenerationTitle(String generationTitle);
+}