update

daemawiki-api/src/main/java/org/daemawiki/domain/document/api/DocumentController.java

@@ -11,9 +11,9 @@
 import org.daemawiki.domain.document.usecase.DeleteDocumentUsecase;
 import org.daemawiki.domain.document.usecase.GetDocumentUsecase;
 import org.daemawiki.domain.document.usecase.UpdateDocumentUsecase;
-import org.daemawiki.domain.info.dto.UpdateInfoRequest;
-import org.daemawiki.domain.info.usecase.UpdateDocumentInfoUsecase;
-import org.daemawiki.domain.info.usecase.UploadDocumentImageUsecase;
+import org.daemawiki.domain.document_info.dto.UpdateInfoRequest;
+import org.daemawiki.domain.document_info.usecase.UpdateDocumentInfoUsecase;
+import org.daemawiki.domain.document_info.usecase.UploadDocumentImageUsecase;
 import org.daemawiki.utils.PagingInfo;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
@@ -76,7 +76,7 @@ public Flux<DocumentSearchResult> searchDocumentTitle(
             @RequestParam(defaultValue = "0") Integer page,
             @RequestParam(defaultValue = "10") Integer size
     ) {
-        return getDocumentUsecase.searchDocumentTitle(text, PagingInfo.of(sortBy, sortDirection, page, size));
+        return getDocumentUsecase.searchDocumentsByTitle(text, PagingInfo.of(sortBy, sortDirection, page, size));
     }
 
     @GetMapping("/search/content")
@@ -87,7 +87,7 @@ public Flux<DocumentSearchResult> searchDocumentContent(
             @RequestParam(defaultValue = "0") Integer page,
             @RequestParam(defaultValue = "10") Integer size
     ) {
-        return getDocumentUsecase.searchDocumentContent(text, PagingInfo.of(sortBy, sortDirection, page, size));
+        return getDocumentUsecase.searchDocumentsByContent(text, PagingInfo.of(sortBy, sortDirection, page, size));
     }
 
     @GetMapping("/most-revision")
@@ -97,7 +97,7 @@ public Flux<SimpleDocumentResponse> getDocumentsOrderByVersion(
             @RequestParam(defaultValue = "0") Integer page,
             @RequestParam(defaultValue = "10") Integer size
     ) {
-        return getDocumentUsecase.getDocumentsMostRevision(PagingInfo.of(sortBy, sortDirection, page, size));
+        return getDocumentUsecase.getDocumentsSortByMostRevision(PagingInfo.of(sortBy, sortDirection, page, size));
     }
 
     @GetMapping("/most-view")
@@ -107,7 +107,7 @@ public Flux<GetMostViewDocumentResponse> getDocumentsOrderByView(
             @RequestParam(defaultValue = "0") Integer page,
             @RequestParam(defaultValue = "10") Integer size
     ) {
-        return getDocumentUsecase.getDocumentOrderByView(PagingInfo.of(sortBy, sortDirection, page, size));
+        return getDocumentUsecase.getDocumentsSortByView(PagingInfo.of(sortBy, sortDirection, page, size));
     }
 
     @DeleteMapping("/{documentId}")

daemawiki-api/src/main/java/org/daemawiki/domain/content/api/DocumentContentController.java → daemawiki-api/src/main/java/org/daemawiki/domain/document_content/api/DocumentContentController.java

@@ -1,17 +1,17 @@
-package org.daemawiki.domain.content.api;
-
-import org.daemawiki.domain.content.dto.AddContentRequest;
-import org.daemawiki.domain.content.dto.DeleteContentRequest;
-import org.daemawiki.domain.content.dto.EditContentTableTitleRequest;
-import org.daemawiki.domain.content.dto.WriteContentRequest;
-import org.daemawiki.domain.content.usecase.AddContentTableUsecase;
-import org.daemawiki.domain.content.usecase.RemoveContentTableUsecase;
-import org.daemawiki.domain.content.usecase.UpdateContentTableTitleUsecase;
-import org.daemawiki.domain.content.usecase.WriteContentUsecase;
-import org.daemawiki.domain.content.service.AddContentTableService;
-import org.daemawiki.domain.content.service.RemoveContentTableService;
-import org.daemawiki.domain.content.service.UpdateContentTableTitleService;
-import org.daemawiki.domain.content.service.WriteContentService;
+package org.daemawiki.domain.document_content.api;
+
+import org.daemawiki.domain.document_content.dto.AddContentRequest;
+import org.daemawiki.domain.document_content.dto.DeleteContentRequest;
+import org.daemawiki.domain.document_content.dto.EditContentTableTitleRequest;
+import org.daemawiki.domain.document_content.dto.WriteContentRequest;
+import org.daemawiki.domain.document_content.usecase.AddContentTableUsecase;
+import org.daemawiki.domain.document_content.usecase.RemoveContentTableUsecase;
+import org.daemawiki.domain.document_content.usecase.UpdateContentTableTitleUsecase;
+import org.daemawiki.domain.document_content.usecase.WriteContentUsecase;
+import org.daemawiki.domain.document_content.service.AddContentTableService;
+import org.daemawiki.domain.document_content.service.RemoveContentTableService;
+import org.daemawiki.domain.document_content.service.UpdateContentTableTitleService;
+import org.daemawiki.domain.document_content.service.WriteContentService;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotBlank;
 import org.springframework.http.HttpStatus;

daemawiki-api/src/main/java/org/daemawiki/domain/editor/api/DocumentEditorController.java → daemawiki-api/src/main/java/org/daemawiki/domain/document_editor/api/DocumentEditorController.java

@@ -1,11 +1,11 @@
-package org.daemawiki.domain.editor.api;
+package org.daemawiki.domain.document_editor.api;
 
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotBlank;
-import org.daemawiki.domain.editor.dto.AddEditorRequest;
-import org.daemawiki.domain.editor.dto.DeleteEditorRequest;
-import org.daemawiki.domain.editor.usecase.AddDocumentEditorUsecase;
-import org.daemawiki.domain.editor.usecase.RemoveDocumentEditorUsecase;
+import org.daemawiki.domain.document_editor.dto.AddEditorRequest;
+import org.daemawiki.domain.document_editor.dto.DeleteEditorRequest;
+import org.daemawiki.domain.document_editor.usecase.AddDocumentEditorUsecase;
+import org.daemawiki.domain.document_editor.usecase.RemoveDocumentEditorUsecase;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
 import reactor.core.publisher.Mono;

daemawiki-api/src/main/java/org/daemawiki/domain/revision/api/RevisionHistoryController.java → daemawiki-api/src/main/java/org/daemawiki/domain/document_revision/api/RevisionHistoryController.java

@@ -1,9 +1,9 @@
-package org.daemawiki.domain.revision.api;
+package org.daemawiki.domain.document_revision.api;
 
 import org.daemawiki.domain.document.dto.response.SimpleDocumentResponse;
-import org.daemawiki.domain.revision.dto.response.GetRevisionByUserResponse;
-import org.daemawiki.domain.revision.model.RevisionHistory;
-import org.daemawiki.domain.revision.usecase.GetRevisionUsecase;
+import org.daemawiki.domain.document_revision.dto.response.GetRevisionByUserResponse;
+import org.daemawiki.domain.document_revision.model.RevisionHistory;
+import org.daemawiki.domain.document_revision.usecase.GetRevisionUsecase;
 import org.daemawiki.utils.PagingInfo;
 import org.springframework.web.bind.annotation.*;
 import reactor.core.publisher.Flux;

daemawiki-api/src/main/java/org/daemawiki/domain/auth/api/AuthController.java → daemawiki-api/src/main/java/org/daemawiki/domain/user_auth/api/AuthController.java

@@ -1,12 +1,12 @@
-package org.daemawiki.domain.auth.api;
+package org.daemawiki.domain.user_auth.api;
 
 import jakarta.validation.Valid;
-import org.daemawiki.domain.auth.dto.request.LoginRequest;
-import org.daemawiki.domain.auth.dto.request.SignupRequest;
-import org.daemawiki.domain.auth.dto.response.TokenResponse;
-import org.daemawiki.domain.auth.usecase.ReissueUsecase;
-import org.daemawiki.domain.auth.usecase.SigninUsecase;
-import org.daemawiki.domain.auth.usecase.SignupUsecase;
+import org.daemawiki.domain.user_auth.dto.request.LoginRequest;
+import org.daemawiki.domain.user_auth.dto.request.SignupRequest;
+import org.daemawiki.domain.user_auth.dto.response.TokenResponse;
+import org.daemawiki.domain.user_auth.usecase.ReissueUsecase;
+import org.daemawiki.domain.user_auth.usecase.SigninUsecase;
+import org.daemawiki.domain.user_auth.usecase.SignupUsecase;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
 import reactor.core.publisher.Mono;

daemawiki-api/src/main/resources/application.yml

@@ -3,6 +3,7 @@ spring:
     mongodb:
       uri: ${MONGO_URI}
       database: ${MONGO_DB}
+      auto-index-creation: true
 
     redis:
       host: ${REDIS_HOST}
@@ -35,7 +36,7 @@ daemawiki:
     secret: ${SEC_SECRET}
     issuer: ${SEC_ISSUER}
     expiration: ${SEC_EXPIRATION}
-    
+
 profile:
   image:
     url: ${DEFAULT_PROFILE_IMAGE}

daemawiki-auth/src/main/java/org/daemawiki/security/TokenizerImpl.java

@@ -2,7 +2,7 @@
 
 import io.jsonwebtoken.*;
 import org.daemawiki.config.SecurityProperties;
-import org.daemawiki.domain.user.application.FindUserPort;
+import org.daemawiki.domain.user.port.FindUserPort;
 import org.daemawiki.exception.h400.InvalidTokenException;
 import org.daemawiki.exception.h404.UserNotFoundException;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;

daemawiki-domain/src/main/java/org/daemawiki/domain/article/model/Article.java

@@ -1,5 +1,6 @@
 package org.daemawiki.domain.article.model;
 
+import lombok.Builder;
 import lombok.Getter;
 import org.daemawiki.domain.user.model.Writer;
 import org.springframework.data.annotation.CreatedDate;
@@ -14,32 +15,39 @@ public class Article {
 
     @Id
     private String id;
+
     private String title;
+
     private String content;
+
     private Writer writer;
+
     @CreatedDate
     private LocalDateTime createdAt;
-    private Long recommend = 0L;
-    private Long view = 0L;
 
-    public void increaseView() {
-        view++;
-    }
+    private Long recommend = 0L;
 
-    public void increaseRecommend() {
-        recommend++;
-    }
+    private Long view = 0L;
 
     protected Article() {}
 
-    protected Article(String title, String content, Writer writer) {
+    @Builder
+    public Article(String title, String content, Writer writer) {
         this.title = title;
         this.content = content;
         this.writer = writer;
     }
 
-    public static Article create(String title, String content, Writer writer) {
+    public static Article of(String title, String content, Writer writer) {
         return new Article(title, content, writer);
     }
 
+    public void increaseView() {
+        view++;
+    }
+
+    public void increaseRecommend() {
+        recommend++;
+    }
+
 }

daemawiki-domain/src/main/java/org/daemawiki/domain/article_comment/model/ArticleComment.java

@@ -0,0 +1,23 @@
+package org.daemawiki.domain.article_comment.model;
+
+import org.daemawiki.domain.user.model.Writer;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.mongodb.core.mapping.Document;
+
+import java.time.LocalDateTime;
+
+@Document
+public class ArticleComment {
+
+    @Id
+    private String id;
+
+    private String content;
+
+    private Writer writer;
+
+    @CreatedDate
+    private LocalDateTime createdAt;
+
+}

daemawiki-domain/src/main/java/org/daemawiki/domain/document/adapter/DocumentAdapter.java

@@ -0,0 +1,101 @@
+package org.daemawiki.domain.document.adapter;
+
+import org.daemawiki.domain.document.model.DefaultDocument;
+import org.daemawiki.domain.document.model.DocumentSearchResult;
+import org.daemawiki.domain.document.port.DeleteDocumentPort;
+import org.daemawiki.domain.document.port.FindDocumentPort;
+import org.daemawiki.domain.document.port.SaveDocumentPort;
+import org.daemawiki.domain.document.repository.DocumentRepository;
+import org.daemawiki.utils.PagingInfo;
+import org.springframework.stereotype.Component;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+@Component
+public class DocumentAdapter implements SaveDocumentPort, FindDocumentPort, DeleteDocumentPort {
+    private final DocumentRepository documentRepository;
+
+    public DocumentAdapter(DocumentRepository documentRepository) {
+        this.documentRepository = documentRepository;
+    }
+
+    @Override
+    public Mono<DefaultDocument> findById(String id) {
+        return documentRepository.findById(id);
+    }
+
+    @Override
+    public Mono<DefaultDocument> findRandom() {
+        return documentRepository.findRandomDocument();
+    }
+
+    @Override
+    public Flux<DocumentSearchResult> search(String text, PagingInfo pagingInfo) {
+        return documentRepository.findByTextContaining(
+                text,
+                pagingInfo.sortBy(),
+                pagingInfo.sortDirection(),
+                pagingInfo.page() * pagingInfo.size(),
+                pagingInfo.size()
+        );
+    }
+
+    @Override
+    public Flux<DefaultDocument> searchByTitle(String text, PagingInfo pagingInfo) {
+        return documentRepository.findByTitleContaining(
+                text,
+                pagingInfo.sortBy(),
+                pagingInfo.sortDirection(),
+                pagingInfo.page() * pagingInfo.size(),
+                pagingInfo.size());
+    }
+
+    @Override
+    public Flux<DocumentSearchResult> searchByContent(String text, PagingInfo pagingInfo) {
+        return documentRepository.findByContentTextContaining(
+                text,
+                pagingInfo.sortBy(),
+                pagingInfo.sortDirection(),
+                pagingInfo.page() * pagingInfo.size(),
+                pagingInfo.size()
+        );
+    }
+
+    public Flux<DefaultDocument> findAllSortByMostRevision(PagingInfo pagingInfo) {
+        return documentRepository.findAllByOrderByVersion(
+                pagingInfo.sortDirection(),
+                pagingInfo.page() * pagingInfo.size(),
+                pagingInfo.size()
+        );
+    }
+
+    @Override
+    public Flux<DefaultDocument> findAllSortByView(PagingInfo pagingInfo) {
+        return documentRepository.findAllByOrderByView(
+                pagingInfo.sortDirection(),
+                pagingInfo.page() * pagingInfo.size(),
+                pagingInfo.size()
+        );
+    }
+
+    @Override
+    public Mono<DefaultDocument> save(DefaultDocument document) {
+        return documentRepository.save(document);
+    }
+
+    @Override
+    public Mono<DefaultDocument> increaseView(DefaultDocument document) {
+        return documentRepository.increaseView(document);
+    }
+
+    @Override
+    public Mono<Void> deleteById(String id) {
+        return documentRepository.deleteById(id);
+    }
+
+    @Override
+    public Mono<Void> delete(DefaultDocument document) {
+        return documentRepository.delete(document);
+    }
+
+}

daemawiki-domain/src/main/java/org/daemawiki/domain/document/dto/request/SaveDocumentRequest.java

@@ -1,10 +1,11 @@
 package org.daemawiki.domain.document.dto.request;
 
-import org.daemawiki.domain.content.model.Content;
 import jakarta.annotation.Nullable;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import lombok.Builder;
+import org.daemawiki.domain.document_content.model.Content;
+import org.daemawiki.domain.document_revision.model.RevisionDetail;
 
 import java.util.List;
 
@@ -19,7 +20,9 @@ public record SaveDocumentRequest(
         @NotNull(message = "문서의 분류가 비어있습니다.")
         List<List<String>> groups,
         @Nullable
-        Long version
+        Long version,
+        @Nullable // TODO: 5/7/24 수정 내역 필드
+        List<RevisionDetail> data
 ) {
 
         public static SaveDocumentRequest create(String title, String type, List<List<String>> groups) {

daemawiki-domain/src/main/java/org/daemawiki/domain/document/dto/response/GetDocumentResponse.java

@@ -1,11 +1,11 @@
 package org.daemawiki.domain.document.dto.response;
 
 import org.daemawiki.datetime.model.EditDateTime;
-import org.daemawiki.domain.content.model.Content;
+import org.daemawiki.domain.document_content.model.Content;
 import org.daemawiki.domain.document.model.DefaultDocument;
 import org.daemawiki.domain.document.model.type.DocumentType;
-import org.daemawiki.domain.editor.model.DocumentEditor;
-import org.daemawiki.domain.info.model.Info;
+import org.daemawiki.domain.document_editor.model.DocumentEditor;
+import org.daemawiki.domain.document_info.model.Info;
 import lombok.Builder;
 
 import java.util.List;