-
Notifications
You must be signed in to change notification settings - Fork 1
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[폐업추정] 어드민용 API 구현 #396
Open
jyoo0515
wants to merge
4
commits into
jason/20240912-crawl-closed-place
Choose a base branch
from
jason/20241006-closed-place-candidate-api
base: jason/20240912-crawl-closed-place
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
[폐업추정] 어드민용 API 구현 #396
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
35 changes: 35 additions & 0 deletions
35
...n/kotlin/club/staircrusher/place/application/port/in/AcceptClosedPlaceCandidateUseCase.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
package club.staircrusher.place.application.port.`in` | ||
|
||
import club.staircrusher.place.application.port.out.persistence.ClosedPlaceCandidateRepository | ||
import club.staircrusher.place.application.port.out.persistence.PlaceRepository | ||
import club.staircrusher.place.application.result.NamedClosedPlaceCandidate | ||
import club.staircrusher.stdlib.di.annotation.Component | ||
import club.staircrusher.stdlib.persistence.TransactionManager | ||
import org.springframework.data.repository.findByIdOrNull | ||
|
||
@Component | ||
class AcceptClosedPlaceCandidateUseCase( | ||
private val transactionManager: TransactionManager, | ||
private val closedPlaceCandidateRepository: ClosedPlaceCandidateRepository, | ||
private val placeRepository: PlaceRepository, | ||
) { | ||
fun handle(candidateId: String) = transactionManager.doInTransaction { | ||
val candidate = closedPlaceCandidateRepository.findByIdOrNull(candidateId) | ||
?: throw IllegalArgumentException("closed place candidate with id($candidateId) not found") | ||
val place = placeRepository.findByIdOrNull(candidate.placeId)!! | ||
|
||
candidate.accept() | ||
closedPlaceCandidateRepository.save(candidate) | ||
place.setIsClosed(true) | ||
placeRepository.save(place) | ||
|
||
return@doInTransaction NamedClosedPlaceCandidate( | ||
candidateId = candidate.id, | ||
placeId = place.id, | ||
name = place.name, | ||
address = place.address.toString(), | ||
acceptedAt = candidate.acceptedAt, | ||
ignoredAt = candidate.ignoredAt, | ||
) | ||
} | ||
} |
29 changes: 29 additions & 0 deletions
29
...main/kotlin/club/staircrusher/place/application/port/in/GetClosedPlaceCandidateUseCase.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
package club.staircrusher.place.application.port.`in` | ||
|
||
import club.staircrusher.place.application.port.out.persistence.ClosedPlaceCandidateRepository | ||
import club.staircrusher.place.application.port.out.persistence.PlaceRepository | ||
import club.staircrusher.place.application.result.NamedClosedPlaceCandidate | ||
import club.staircrusher.stdlib.di.annotation.Component | ||
import club.staircrusher.stdlib.persistence.TransactionManager | ||
import org.springframework.data.repository.findByIdOrNull | ||
|
||
@Component | ||
class GetClosedPlaceCandidateUseCase( | ||
private val transactionManager: TransactionManager, | ||
private val closedPlaceCandidateRepository: ClosedPlaceCandidateRepository, | ||
private val placeRepository: PlaceRepository, | ||
) { | ||
fun handle(candidateId: String) = transactionManager.doInTransaction { | ||
val candidate = closedPlaceCandidateRepository.findByIdOrNull(candidateId) ?: return@doInTransaction null | ||
val place = placeRepository.findByIdOrNull(candidate.placeId) ?: return@doInTransaction null | ||
|
||
return@doInTransaction NamedClosedPlaceCandidate( | ||
candidateId = candidate.id, | ||
placeId = place.id, | ||
name = place.name, | ||
address = place.address.toString(), | ||
acceptedAt = candidate.acceptedAt, | ||
ignoredAt = candidate.ignoredAt, | ||
) | ||
} | ||
} |
33 changes: 33 additions & 0 deletions
33
...n/kotlin/club/staircrusher/place/application/port/in/IgnoreClosedPlaceCandidateUseCase.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
package club.staircrusher.place.application.port.`in` | ||
|
||
import club.staircrusher.place.application.port.out.persistence.ClosedPlaceCandidateRepository | ||
import club.staircrusher.place.application.port.out.persistence.PlaceRepository | ||
import club.staircrusher.place.application.result.NamedClosedPlaceCandidate | ||
import club.staircrusher.stdlib.di.annotation.Component | ||
import club.staircrusher.stdlib.persistence.TransactionManager | ||
import org.springframework.data.repository.findByIdOrNull | ||
|
||
@Component | ||
class IgnoreClosedPlaceCandidateUseCase( | ||
private val transactionManager: TransactionManager, | ||
private val closedPlaceCandidateRepository: ClosedPlaceCandidateRepository, | ||
private val placeRepository: PlaceRepository, | ||
) { | ||
fun handle(candidateId: String) = transactionManager.doInTransaction { | ||
val candidate = closedPlaceCandidateRepository.findByIdOrNull(candidateId) | ||
?: throw IllegalArgumentException("closed place candidate with id($candidateId) not found") | ||
|
||
candidate.ignore() | ||
closedPlaceCandidateRepository.save(candidate) | ||
|
||
val place = placeRepository.findByIdOrNull(candidate.placeId)!! | ||
return@doInTransaction NamedClosedPlaceCandidate( | ||
candidateId = candidate.id, | ||
placeId = place.id, | ||
name = place.name, | ||
address = place.address.toString(), | ||
acceptedAt = candidate.acceptedAt, | ||
ignoredAt = candidate.ignoredAt, | ||
) | ||
} | ||
} |
91 changes: 91 additions & 0 deletions
91
...in/kotlin/club/staircrusher/place/application/port/in/ListClosedPlaceCandidatesUseCase.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,91 @@ | ||
package club.staircrusher.place.application.port.`in` | ||
|
||
import club.staircrusher.place.application.port.out.persistence.ClosedPlaceCandidateRepository | ||
import club.staircrusher.place.application.port.out.persistence.PlaceRepository | ||
import club.staircrusher.place.application.result.NamedClosedPlaceCandidate | ||
import club.staircrusher.place.domain.model.ClosedPlaceCandidate | ||
import club.staircrusher.stdlib.di.annotation.Component | ||
import club.staircrusher.stdlib.persistence.TimestampCursor | ||
import club.staircrusher.stdlib.persistence.TransactionManager | ||
import org.springframework.data.domain.PageRequest | ||
import org.springframework.data.domain.Sort | ||
import java.time.Instant | ||
|
||
@Component | ||
class ListClosedPlaceCandidatesUseCase( | ||
private val transactionManager: TransactionManager, | ||
private val closedPlaceCandidateRepository: ClosedPlaceCandidateRepository, | ||
private val placeRepository: PlaceRepository, | ||
) { | ||
fun handle( | ||
limit: Int?, | ||
cursorValue: String?, | ||
) = transactionManager.doInTransaction { | ||
val cursor = cursorValue?.let { Cursor.parse(it) } ?: Cursor.initial() | ||
val normalizedLimit = limit ?: DEFAULT_LIMIT | ||
|
||
val pageRequest = PageRequest.of( | ||
0, | ||
normalizedLimit, | ||
Sort.by( | ||
listOf( | ||
Sort.Order.desc("createdAt"), | ||
Sort.Order.desc("id"), | ||
), | ||
), | ||
) | ||
val result = closedPlaceCandidateRepository.findCursored( | ||
cursorCreatedAt = cursor.timestamp, | ||
cursorId = cursor.id, | ||
pageable = pageRequest, | ||
) | ||
|
||
val nextCursor = if (result.hasNext()) { | ||
Cursor(result.content[normalizedLimit - 1]) | ||
} else { | ||
null | ||
} | ||
|
||
val placeIds = result.content.map { it.placeId } | ||
val places = placeRepository.findAllByIdIn(placeIds) | ||
return@doInTransaction ListClosedPlaceCandidatesResult( | ||
candidates = result.mapNotNull { candidate -> | ||
val place = places.find { it.id == candidate.placeId } ?: return@mapNotNull null | ||
NamedClosedPlaceCandidate( | ||
candidateId = candidate.id, | ||
placeId = place.id, | ||
name = place.name, | ||
address = place.address.toString(), | ||
acceptedAt = candidate.acceptedAt, | ||
ignoredAt = candidate.ignoredAt, | ||
) | ||
}, | ||
nextCursor = nextCursor?.value, | ||
) | ||
} | ||
|
||
data class ListClosedPlaceCandidatesResult( | ||
val candidates: List<NamedClosedPlaceCandidate>, | ||
val nextCursor: String?, | ||
) | ||
|
||
private data class Cursor( | ||
val createdAt: Instant, | ||
val candidateId: String, | ||
) : TimestampCursor(createdAt, candidateId) { | ||
constructor(candidate: ClosedPlaceCandidate) : this( | ||
createdAt = candidate.createdAt, | ||
candidateId = candidate.id, | ||
) | ||
|
||
companion object { | ||
fun parse(cursorValue: String) = TimestampCursor.parse(cursorValue) | ||
|
||
fun initial() = TimestampCursor.initial() | ||
} | ||
} | ||
|
||
companion object { | ||
private const val DEFAULT_LIMIT = 50 | ||
} | ||
} |
18 changes: 18 additions & 0 deletions
18
...lub/staircrusher/place/application/port/out/persistence/ClosedPlaceCandidateRepository.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,26 @@ | ||
package club.staircrusher.place.application.port.out.persistence | ||
|
||
import club.staircrusher.place.domain.model.ClosedPlaceCandidate | ||
import org.springframework.data.domain.Page | ||
import org.springframework.data.domain.Pageable | ||
import org.springframework.data.jpa.repository.Query | ||
import org.springframework.data.repository.CrudRepository | ||
import java.time.Instant | ||
|
||
interface ClosedPlaceCandidateRepository : CrudRepository<ClosedPlaceCandidate, String> { | ||
@Query(""" | ||
SELECT c | ||
FROM ClosedPlaceCandidate c | ||
WHERE | ||
( | ||
(c.createdAt = :cursorCreatedAt AND c.id < :cursorId) | ||
OR (c.createdAt < :cursorCreatedAt) | ||
) | ||
""") | ||
fun findCursored( | ||
cursorCreatedAt: Instant, | ||
cursorId: String, | ||
pageable: Pageable, | ||
): Page<ClosedPlaceCandidate> | ||
fun findByExternalIdIn(externalIds: List<String>): List<ClosedPlaceCandidate> | ||
} |
12 changes: 12 additions & 0 deletions
12
...n/src/main/kotlin/club/staircrusher/place/application/result/NamedClosedPlaceCandidate.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
package club.staircrusher.place.application.result | ||
|
||
import java.time.Instant | ||
|
||
data class NamedClosedPlaceCandidate( | ||
val candidateId: String, | ||
val placeId: String, | ||
val name: String, | ||
val address: String, | ||
val acceptedAt: Instant?, | ||
val ignoredAt: Instant?, | ||
) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
13 changes: 13 additions & 0 deletions
13
...ra/src/main/kotlin/club/staircrusher/place/infra/adapter/in/controller/AdminConverters.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
package club.staircrusher.place.infra.adapter.`in`.controller | ||
|
||
import club.staircrusher.admin_api.converter.toDTO | ||
import club.staircrusher.place.application.result.NamedClosedPlaceCandidate | ||
|
||
fun NamedClosedPlaceCandidate.toAdminDTO() = club.staircrusher.admin_api.spec.dto.AdminClosedPlaceCandidateDTO( | ||
id = candidateId, | ||
placeId = placeId, | ||
name = name, | ||
address = address, | ||
acceptedAt = acceptedAt?.toDTO(), | ||
ignoredAt = ignoredAt?.toDTO(), | ||
) |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ClosedPlaceCandidate
엔티티에 있는 placeId 필드를 Place 로 바꾸고 연관관계를 맺어도 되지만 아래와 같은 이유로 따로 조회하도록 했습니다