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

#68 Clean Entities

Browse Source
This commit is contained in:
Fabrice Lecomte
2021-02-25 18:32:17 +01:00
parent c1af949204
commit c25cf64f4b
39 changed files with 265 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/kotlin/fr/dcproject/component/notification/Notification.kt
View File

@@ -7,8 +7,8 @@ import com.fasterxml.jackson.databind.module.SimpleModule
import com.fasterxml.jackson.datatype.joda.JodaModule
import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
import com.fasterxml.jackson.module.kotlin.readValue
import fr.dcproject.common.entity.Entity
import fr.dcproject.component.article.ArticleForView
import fr.postgresjson.entity.UuidEntity
import org.joda.time.DateTime
import java.util.concurrent.atomic.AtomicInteger
@@ -47,7 +47,7 @@ open class Notification(
}
open class EntityNotification(
val target: UuidEntity,
val target: Entity,
type: String,
val action: String
) : Notification(type)

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

@@ -4,6 +4,7 @@ import com.sendgrid.helpers.mail.Mail
import com.sendgrid.helpers.mail.objects.Content
import com.sendgrid.helpers.mail.objects.Email
import fr.dcproject.common.email.Mailer
import fr.dcproject.common.entity.EntityI
import fr.dcproject.common.entity.TargetRef
import fr.dcproject.component.article.ArticleRepository
import fr.dcproject.component.article.ArticleWithTitleI
@@ -11,7 +12,6 @@ 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.postgresjson.entity.UuidEntityI
import java.util.UUID
class NotificationEmailSender(
@@ -43,7 +43,7 @@ class NotificationEmailSender(
}
}
private fun generateHtmlContent(citizen: CitizenBasicI, target: UuidEntityI): String? {
private fun generateHtmlContent(citizen: CitizenBasicI, target: EntityI): String? {
return when (target) {
is ArticleWithTitleI -> """
Hello ${citizen.name.getFullName()},<br/>
@@ -53,7 +53,7 @@ class NotificationEmailSender(
}
}
private fun generateContent(citizen: CitizenBasicI, target: UuidEntityI): String {
private fun generateContent(citizen: CitizenBasicI, target: EntityI): String {
return when (target) {
is ArticleWithTitleI -> """
Hello ${citizen.name.getFullName()},