DC/dc-project
1
1
Fork 0
Code Issues 25 Pull Requests 2 Actions Packages Projects Releases Wiki Activity

#68 Clean follow Entity

Browse Source
This commit is contained in:
Fabrice Lecomte
2021-03-01 22:44:17 +01:00
parent 66dcff8f46
commit 8d93fc8b3c
11 changed files with 78 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/kotlin/fr/dcproject/component/notification/NotificationConsumer.kt
View File

@@ -7,10 +7,9 @@ import com.rabbitmq.client.Consumer
import com.rabbitmq.client.DefaultConsumer
import com.rabbitmq.client.Envelope
import fr.dcproject.common.entity.TargetRef
import fr.dcproject.component.citizen.CitizenRef
import fr.dcproject.component.follow.FollowArticleRepository
import fr.dcproject.component.follow.FollowConstitutionRepository
import fr.dcproject.component.follow.FollowSimple
import fr.dcproject.component.follow.FollowForView
import io.ktor.utils.io.errors.IOException
import io.lettuce.core.RedisClient
import io.lettuce.core.api.async.RedisAsyncCommands
@@ -108,6 +107,6 @@ class NotificationConsumer(
private class DecodedMessage(
val event: EntityNotification,
val rawMessage: String,
val follow: FollowSimple<out TargetRef, CitizenRef>
val follow: FollowForView<out TargetRef>
)
}

5
src/main/kotlin/fr/dcproject/component/notification/NotificationEmailSender.kt
View File

@@ -9,9 +9,8 @@ import fr.dcproject.common.entity.TargetRef
import fr.dcproject.component.article.ArticleRepository
import fr.dcproject.component.article.ArticleWithTitleI
import fr.dcproject.component.citizen.CitizenBasicI
import fr.dcproject.component.citizen.CitizenRef
import fr.dcproject.component.citizen.CitizenRepository
import fr.dcproject.component.follow.FollowSimple
import fr.dcproject.component.follow.FollowForView
import java.util.UUID
class NotificationEmailSender(
@@ -20,7 +19,7 @@ class NotificationEmailSender(
private val citizenRepo: CitizenRepository,
private val articleRepo: ArticleRepository
) {
fun sendEmail(follow: FollowSimple<out TargetRef, CitizenRef>) {
fun sendEmail(follow: FollowForView<out TargetRef>) {
val citizen = citizenRepo.findById(follow.createdBy.id) ?: noCitizen(follow.createdBy.id)
val target = when (follow.target.reference) {
"article" ->