Skip to content
This repository was archived by the owner on Aug 13, 2022. It is now read-only.

Feature/hjchang/document history #70

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package kr.flab.wiki.core.domain.document

import kr.flab.wiki.core.common.annotation.DomainModel
import kr.flab.wiki.core.domain.document.persistence.DocumentHistoryEntity
import kr.flab.wiki.core.domain.user.User
import java.time.LocalDateTime

Expand All @@ -26,4 +27,14 @@ interface DocumentHistory {
val creator: User

val createdAt: LocalDateTime
companion object {
fun newInstance(
title: String,
body: String,
creator: User,
createdAt: LocalDateTime
): DocumentHistory {
return DocumentHistoryEntity(title, body, creator, createdAt)
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package kr.flab.wiki.core.domain.document.impl

import kr.flab.wiki.core.domain.document.Document
import kr.flab.wiki.core.domain.document.service.DocumentContributorService
import kr.flab.wiki.core.domain.document.repository.DocumentRepository
import kr.flab.wiki.core.domain.user.User

class DocumentContributorServiceImpl(
private val documentRepository: DocumentRepository
) : DocumentContributorService {
override fun findDocumentContributor(title: String): List<User> {
val documents = documentRepository.findAllHistoryByTitle(title)

return documents.map { it.creator }
}
override fun findContributedDocument(user: User): List<Document> {
return documentRepository.findDocumentsByUser(user)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import kr.flab.wiki.core.domain.document.repository.DocumentRepository
class DocumentHistoryServiceImpl(
private val documentRepository: DocumentRepository
) : DocumentHistoryService {
override fun findDocumentHistory(title: String): MutableList<DocumentHistory> {
override fun findDocumentHistory(title: String): List<DocumentHistory> {
return documentRepository.findAllHistoryByTitle(title)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package kr.flab.wiki.core.domain.document.repository
import kr.flab.wiki.core.common.exception.document.DocumentNotFoundException
import kr.flab.wiki.core.domain.document.Document
import kr.flab.wiki.core.domain.document.DocumentHistory
import kr.flab.wiki.core.domain.user.User

interface DocumentRepository {
/**
Expand All @@ -21,5 +22,7 @@ interface DocumentRepository {

fun findAllByTitle(title: String): MutableList<Document>

fun findAllHistoryByTitle(title: String): MutableList<DocumentHistory>
fun findAllHistoryByTitle(title: String): List<DocumentHistory>

fun findDocumentsByUser(user: User): List<Document>
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package kr.flab.wiki.core.domain.document.service

import kr.flab.wiki.core.common.annotation.DomainService
import kr.flab.wiki.core.domain.document.Document
import kr.flab.wiki.core.domain.document.impl.DocumentContributorServiceImpl
import kr.flab.wiki.core.domain.document.repository.DocumentRepository
import kr.flab.wiki.core.domain.user.User

@DomainService
interface DocumentContributorService {
fun findDocumentContributor(title: String): List<User>
fun findContributedDocument(user: User): List<Document>
companion object {
fun newInstance(
documentRepository: DocumentRepository,
): DocumentContributorService {
return DocumentContributorServiceImpl(documentRepository)
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import kr.flab.wiki.core.domain.document.repository.DocumentRepository

@DomainService
interface DocumentHistoryService {
fun findDocumentHistory(title: String): MutableList<DocumentHistory>
fun findDocumentHistory(title: String): List<DocumentHistory>

companion object {
fun newInstance(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import kr.flab.wiki.core.common.exception.document.DocumentConflictException
import kr.flab.wiki.core.domain.document.Document
import kr.flab.wiki.core.domain.document.DocumentHistory
import kr.flab.wiki.core.domain.document.repository.DocumentRepository
import kr.flab.wiki.core.domain.user.User
import org.springframework.jdbc.core.JdbcTemplate
import org.springframework.jdbc.core.RowMapper
import org.springframework.stereotype.Repository
Expand All @@ -20,6 +21,8 @@ class MySqlDocumentRepository(
val body = Document::body::name.get()
val updatedAt = Document::updatedAt::name.get()
val version = Document::version::name.get()
// user id fkey 필요
val userId = User::emailAddress::name.get()
}

val mapper = RowMapper { rs: ResultSet, _: Int ->
Expand Down Expand Up @@ -71,7 +74,16 @@ class MySqlDocumentRepository(
return jdbcTemplate.query("SELECT * FROM ${Document.name} WHERE $title = ?", mapper, title)
}

override fun findAllHistoryByTitle(title: String): MutableList<DocumentHistory> {
TODO("Not yet implemented")
override fun findAllHistoryByTitle(title: String): List<DocumentHistory> {
return jdbcTemplate
.query("SELECT * FROM ${Document.name} WHERE $title = ?", mapper, title)
.map {
DocumentHistory.newInstance(it.title, it.body, it.lastContributor, it.updatedAt)
}
}

override fun findDocumentsByUser(user: User): List<Document> {
return jdbcTemplate
.query("SELECT * FROM ${Document.name} WHERE $userId = ?", mapper, user.emailAddress)
}
}