diff --git a/app/controllers/AdminController.scala b/app/controllers/AdminController.scala
index f8bb11d4..0b5ea1b5 100644
--- a/app/controllers/AdminController.scala
+++ b/app/controllers/AdminController.scala
@@ -13,7 +13,6 @@ import models.event.Event
import models.report._
import models.report.sampledata.SampleDataService
import orchestrators.EmailNotificationOrchestrator
-import orchestrators.ReportFileOrchestrator
import play.api.Logger
import play.api.i18n.Lang
import play.api.i18n.Messages
@@ -30,6 +29,8 @@ import repositories.event.EventRepositoryInterface
import repositories.ipblacklist.BlackListedIp
import repositories.ipblacklist.IpBlackListRepositoryInterface
import repositories.report.ReportRepositoryInterface
+import repositories.subcategorylabel.SubcategoryLabel
+import repositories.subcategorylabel.SubcategoryLabelRepositoryInterface
import services.AlbertService
import services.PDFService
import services.emails.EmailDefinitions.allEmailDefinitions
@@ -59,13 +60,13 @@ class AdminController(
pdfService: PDFService,
emailConfiguration: EmailConfiguration,
taskConfiguration: TaskConfiguration,
- reportFileOrchestrator: ReportFileOrchestrator,
companyRepository: CompanyRepositoryInterface,
emailNotificationOrchestrator: EmailNotificationOrchestrator,
ipBlackListRepository: IpBlackListRepositoryInterface,
albertClassificationRepository: AlbertClassificationRepositoryInterface,
albertService: AlbertService,
sampleDataService: SampleDataService,
+ subcategoryLabelRepository: SubcategoryLabelRepositoryInterface,
implicit val frontRoute: FrontRoute,
authenticator: Authenticator[User],
controllerComponents: ControllerComponents
@@ -213,7 +214,10 @@ class AdminController(
} yield ()
}
- private def _sendReportAckToConsumer(reportsMap: Map[Report, List[ReportFile]]) = {
+ private def _sendReportAckToConsumer(
+ reportsMap: Map[Report, List[ReportFile]],
+ subcategoryLabels: List[SubcategoryLabel]
+ ) = {
val reports = reportsMap.keys.toList
for {
events <- eventRepository.fetchEventsOfReports(reports)
@@ -223,12 +227,15 @@ class AdminController(
val maybeCompany = report.companyId.flatMap(companyId => companies.find(_.id == companyId))
val event =
events.get(report.id).flatMap(_.find(_.action == Constants.ActionEvent.EMAIL_CONSUMER_ACKNOWLEDGMENT))
+ val subcategoryLabel =
+ subcategoryLabels.find(sl => sl.category == report.category && sl.subcategories == report.subcategories)
event match {
case Some(evt) =>
Some(
ConsumerReportAcknowledgment.Email(
report,
+ subcategoryLabel,
maybeCompany,
evt,
reportAttachements,
@@ -244,6 +251,19 @@ class AdminController(
} yield ()
}
+ private def _sendReportToDgccrfIfNeeded(
+ reportsMap: Map[Report, List[ReportFile]],
+ subcategoryLabels: List[SubcategoryLabel]
+ ) = {
+ val reports = reportsMap.keys.toList
+
+ reports.traverse { report =>
+ val subcategoryLabel =
+ subcategoryLabels.find(sl => sl.category == report.category && sl.subcategories == report.subcategories)
+ emailNotificationOrchestrator.notifyDgccrfIfNeeded(report, subcategoryLabel)
+ }
+ }
+
def resend(start: OffsetDateTime, end: OffsetDateTime, emailType: ResendEmailType) =
SecuredAction.andThen(WithRole(UserRole.SuperAdmin)).async { implicit request =>
for {
@@ -251,12 +271,15 @@ class AdminController(
Some(request.identity),
ReportFilter(start = Some(start), end = Some(end))
)
+ reportsList = reports.keys.toList
+ subcategoryLabels <- reportsList
+ .traverse(report => subcategoryLabelRepository.get(report.category, report.subcategories))
+ .map(_.flatten)
_ <- emailType match {
- case ResendEmailType.NewReportAckToConsumer => _sendReportAckToConsumer(reports.toMap)
- case ResendEmailType.NewReportAckToPro => _sendNewReportToPro(reports.keys.toList)
- case ResendEmailType.NotifyDGCCRF =>
- Future.sequence(reports.keys.map(emailNotificationOrchestrator.notifyDgccrfIfNeeded))
- case ResendEmailType.ReportProResponse => _sendProAckToConsumer(reports.keys.toList)
+ case ResendEmailType.NewReportAckToConsumer => _sendReportAckToConsumer(reports.toMap, subcategoryLabels)
+ case ResendEmailType.NewReportAckToPro => _sendNewReportToPro(reportsList)
+ case ResendEmailType.NotifyDGCCRF => _sendReportToDgccrfIfNeeded(reports.toMap, subcategoryLabels)
+ case ResendEmailType.ReportProResponse => _sendProAckToConsumer(reportsList)
}
} yield NoContent
}
diff --git a/app/controllers/ReportController.scala b/app/controllers/ReportController.scala
index d7cb52b6..162ddd23 100644
--- a/app/controllers/ReportController.scala
+++ b/app/controllers/ReportController.scala
@@ -274,8 +274,7 @@ class ReportController(
SecuredAction.andThen(WithRole(UserRole.AdminsAndReadOnly)).async { implicit request =>
for {
maybeReportWithMetadata <- reportRepository.getFor(Some(request.identity), uuid)
- maybeReport = maybeReportWithMetadata.map(_.report)
- company <- maybeReport.flatMap(_.companyId).flatTraverse(r => companyRepository.get(r))
+ company <- maybeReportWithMetadata.flatMap(_.report.companyId).flatTraverse(r => companyRepository.get(r))
files <- reportFileRepository.retrieveReportFiles(uuid)
events <- eventsOrchestrator.getReportsEvents(
reportId = uuid,
@@ -283,12 +282,18 @@ class ReportController(
user = request.identity
)
proResponseEvent = events.find(_.data.action == REPORT_PRO_RESPONSE)
- source = maybeReport
- .map { report =>
- val lang = Lang(report.lang.getOrElse(Locale.FRENCH))
+ source = maybeReportWithMetadata
+ .map { reportWithMetadata =>
+ val lang = Lang(reportWithMetadata.report.lang.getOrElse(Locale.FRENCH))
implicit val messagesProvider: MessagesProvider = MessagesImpl(lang, controllerComponents.messagesApi)
val notificationHtml =
- views.html.mails.consumer.reportAcknowledgment(report, company, files, isPDF = true)(
+ views.html.mails.consumer.reportAcknowledgment(
+ reportWithMetadata.report,
+ reportWithMetadata.subcategoryLabel,
+ company,
+ files,
+ isPDF = true
+ )(
frontRoute,
messagesProvider
)
diff --git a/app/loader/SignalConsoApplicationLoader.scala b/app/loader/SignalConsoApplicationLoader.scala
index 5cd4799d..83d52e9d 100644
--- a/app/loader/SignalConsoApplicationLoader.scala
+++ b/app/loader/SignalConsoApplicationLoader.scala
@@ -467,6 +467,7 @@ class SignalConsoComponents(
companySyncService,
engagementRepository,
engagementOrchestrator,
+ subcategoryLabelRepository,
messagesApi
)
@@ -774,13 +775,13 @@ class SignalConsoComponents(
pdfService,
emailConfiguration,
taskConfiguration,
- reportFileOrchestrator,
companyRepository,
emailNotificationOrchestrator,
ipBlackListRepository,
albertClassificationRepository,
albertService,
sampleDataService,
+ subcategoryLabelRepository,
frontRoute,
cookieAuthenticator,
controllerComponents
diff --git a/app/orchestrators/EmailNotificationOrchestrator.scala b/app/orchestrators/EmailNotificationOrchestrator.scala
index 64b31fdc..4c553215 100644
--- a/app/orchestrators/EmailNotificationOrchestrator.scala
+++ b/app/orchestrators/EmailNotificationOrchestrator.scala
@@ -4,6 +4,7 @@ import cats.implicits.toTraverseOps
import models.report.Report
import models.report.ReportTag
import play.api.Logger
+import repositories.subcategorylabel.SubcategoryLabel
import repositories.subscription.SubscriptionRepositoryInterface
import services.emails.EmailDefinitionsDggcrf.DgccrfDangerousProductReportNotification
import services.emails.EmailDefinitionsDggcrf.DgccrfPriorityReportNotification
@@ -24,13 +25,17 @@ class EmailNotificationOrchestrator(mailService: MailService, subscriptionReposi
tag == ReportTag.ProduitDangereux || tag == ReportTag.BauxPrecaire || tag == ReportTag.Shrinkflation
)
- private def getNotificationEmail(report: Report): Option[Seq[EmailAddress] => BaseEmail] = {
+ private def getNotificationEmail(
+ report: Report,
+ subcategoryLabel: Option[SubcategoryLabel]
+ ): Option[Seq[EmailAddress] => BaseEmail] = {
val maybeTag = shouldNotifyDgccrf(report)
maybeTag match {
- case Some(ReportTag.ProduitDangereux) => Some(DgccrfDangerousProductReportNotification.Email(_, report))
- case Some(tag) => Some(DgccrfPriorityReportNotification.Email(_, report, tag.translate()))
- case None => None
+ case Some(ReportTag.ProduitDangereux) =>
+ Some(DgccrfDangerousProductReportNotification.Email(_, report, subcategoryLabel))
+ case Some(tag) => Some(DgccrfPriorityReportNotification.Email(_, report, subcategoryLabel, tag.translate()))
+ case None => None
}
}
@@ -67,8 +72,8 @@ class EmailNotificationOrchestrator(mailService: MailService, subscriptionReposi
}
}
- def notifyDgccrfIfNeeded(report: Report): Future[Unit] =
- getNotificationEmail(report) match {
+ def notifyDgccrfIfNeeded(report: Report, subcategoryLabel: Option[SubcategoryLabel]): Future[Unit] =
+ getNotificationEmail(report, subcategoryLabel) match {
case Some(email) =>
for {
ddEmails <- getDDEmails(report)
diff --git a/app/orchestrators/ReportOrchestrator.scala b/app/orchestrators/ReportOrchestrator.scala
index 5f28015c..a70070ba 100644
--- a/app/orchestrators/ReportOrchestrator.scala
+++ b/app/orchestrators/ReportOrchestrator.scala
@@ -43,6 +43,7 @@ import repositories.report.ReportRepositoryInterface
import repositories.reportmetadata.ReportMetadataRepositoryInterface
import repositories.socialnetwork.SocialNetworkRepositoryInterface
import repositories.subcategorylabel.SubcategoryLabel
+import repositories.subcategorylabel.SubcategoryLabelRepositoryInterface
import repositories.user.UserRepositoryInterface
import repositories.website.WebsiteRepositoryInterface
import services.emails.EmailDefinitionsConsumer.ConsumerProResponseNotification
@@ -94,6 +95,7 @@ class ReportOrchestrator(
companySyncService: CompanySyncServiceInterface,
engagementRepository: EngagementRepositoryInterface,
engagementOrchestrator: EngagementOrchestrator,
+ subcategoryLabelRepository: SubcategoryLabelRepositoryInterface,
messagesApi: MessagesApi
)(implicit val executionContext: ExecutionContext) {
val logger = Logger(this.getClass)
@@ -345,13 +347,14 @@ class ReportOrchestrator(
reportCreationDate,
expirationDate
)
- report <- reportRepository.create(reportToCreate)
+ report <- reportRepository.create(reportToCreate)
+ maybeSubcategoryLabel <- subcategoryLabelRepository.get(report.category, report.subcategories)
_ = logger.debug(s"Created report with id ${report.id}")
_ <- createReportMetadata(draftReport, report, consumerIp)
files <- reportFileOrchestrator.attachFilesToReport(draftReport.fileIds, report.id)
updatedReport <- notifyProfessionalIfNeeded(maybeCompany, report)
- _ <- emailNotificationOrchestrator.notifyDgccrfIfNeeded(updatedReport)
- _ <- notifyConsumer(updatedReport, maybeCompany, files)
+ _ <- emailNotificationOrchestrator.notifyDgccrfIfNeeded(updatedReport, maybeSubcategoryLabel)
+ _ <- notifyConsumer(updatedReport, maybeSubcategoryLabel, maybeCompany, files)
_ = logger.debug(s"Report ${updatedReport.id} created")
} yield updatedReport
@@ -383,7 +386,12 @@ class ReportOrchestrator(
baseDate.plus(delay)
}
- private def notifyConsumer(report: Report, maybeCompany: Option[Company], reportAttachements: List[ReportFile]) = {
+ private def notifyConsumer(
+ report: Report,
+ maybeSubcategoryLabel: Option[SubcategoryLabel],
+ maybeCompany: Option[Company],
+ reportAttachements: List[ReportFile]
+ ) = {
val event = Event(
UUID.randomUUID(),
Some(report.id),
@@ -395,7 +403,14 @@ class ReportOrchestrator(
)
for {
_ <- mailService.send(
- ConsumerReportAcknowledgment.Email(report, maybeCompany, event, reportAttachements, messagesApi)
+ ConsumerReportAcknowledgment.Email(
+ report,
+ maybeSubcategoryLabel,
+ maybeCompany,
+ event,
+ reportAttachements,
+ messagesApi
+ )
)
_ <- eventRepository.create(event)
} yield ()
diff --git a/app/services/emails/EmailDefinitionsConsumer.scala b/app/services/emails/EmailDefinitionsConsumer.scala
index 035fe0f4..ade83b45 100644
--- a/app/services/emails/EmailDefinitionsConsumer.scala
+++ b/app/services/emails/EmailDefinitionsConsumer.scala
@@ -10,6 +10,7 @@ import play.api.i18n.MessagesApi
import play.api.i18n.MessagesImpl
import play.api.i18n.MessagesProvider
import play.api.libs.mailer.Attachment
+import repositories.subcategorylabel.SubcategoryLabel
import services.AttachmentService
import services.emails.EmailCategory.Consumer
import services.emails.EmailsExamplesUtils._
@@ -52,6 +53,7 @@ object EmailDefinitionsConsumer {
"report_ack" -> ((recipient, messagesApi) =>
Email(
genReport.copy(email = recipient),
+ None,
Some(genCompany),
genEvent,
Nil,
@@ -62,6 +64,7 @@ object EmailDefinitionsConsumer {
((recipient, messagesApi) =>
Email(
genReport.copy(status = ReportStatus.NA, tags = List(ReportTag.ReponseConso), email = recipient),
+ None,
Some(genCompany),
genEvent,
Nil,
@@ -72,6 +75,7 @@ object EmailDefinitionsConsumer {
((recipient, messagesApi) =>
Email(
genReport.copy(tags = List(ReportTag.LitigeContractuel), email = recipient),
+ None,
Some(genCompany),
genEvent,
Nil,
@@ -86,6 +90,7 @@ object EmailDefinitionsConsumer {
tags = List(ReportTag.ProduitDangereux, ReportTag.BauxPrecaire),
email = recipient
),
+ None,
Some(genCompany),
genEvent,
Nil,
@@ -100,6 +105,7 @@ object EmailDefinitionsConsumer {
companyAddress = Address(country = Some(Country.Italie)),
email = recipient
),
+ None,
Some(genCompany),
genEvent,
Nil,
@@ -115,6 +121,7 @@ object EmailDefinitionsConsumer {
companyAddress = Address(country = Some(Country.Islande)),
email = recipient
),
+ None,
Some(genCompany),
genEvent,
Nil,
@@ -129,6 +136,7 @@ object EmailDefinitionsConsumer {
companyAddress = Address(country = Some(Country.Andorre)),
email = recipient
),
+ None,
Some(genCompany),
genEvent,
Nil,
@@ -144,6 +152,7 @@ object EmailDefinitionsConsumer {
companyAddress = Address(country = Some(Country.Andorre)),
email = recipient
),
+ None,
Some(genCompany),
genEvent,
Nil,
@@ -158,6 +167,7 @@ object EmailDefinitionsConsumer {
companyAddress = Address(country = Some(Country.Suisse)),
email = recipient
),
+ None,
Some(genCompany),
genEvent,
Nil,
@@ -172,6 +182,7 @@ object EmailDefinitionsConsumer {
companyAddress = Address(country = Some(Country.Suisse)),
email = recipient
),
+ None,
Some(genCompany),
genEvent,
Nil,
@@ -186,6 +197,7 @@ object EmailDefinitionsConsumer {
email = recipient,
tags = List(ReportTag.CompagnieAerienne)
),
+ None,
Some(genCompany),
genEvent,
Nil,
@@ -200,6 +212,7 @@ object EmailDefinitionsConsumer {
companyAddress = Address(country = Some(Country.Bahamas)),
email = recipient
),
+ None,
Some(genCompany),
genEvent,
Nil,
@@ -214,6 +227,7 @@ object EmailDefinitionsConsumer {
companyAddress = Address(country = Some(Country.Bahamas)),
email = recipient
),
+ None,
Some(genCompany),
genEvent,
Nil,
@@ -224,6 +238,7 @@ object EmailDefinitionsConsumer {
final case class Email(
report: Report,
+ subcategoryLabel: Option[SubcategoryLabel],
maybeCompany: Option[Company],
event: Event,
files: Seq[ReportFile],
@@ -237,7 +252,7 @@ object EmailDefinitionsConsumer {
override def getBody: (FrontRoute, EmailAddress) => String = (frontRoute, _) =>
views.html.mails.consumer
- .reportAcknowledgment(report, maybeCompany, files.toList)(frontRoute, messagesProvider)
+ .reportAcknowledgment(report, subcategoryLabel, maybeCompany, files.toList)(frontRoute, messagesProvider)
.toString
override def getAttachements: AttachmentService => Seq[Attachment] =
diff --git a/app/services/emails/EmailDefinitionsDggcrf.scala b/app/services/emails/EmailDefinitionsDggcrf.scala
index f2d25e9d..e040fd25 100644
--- a/app/services/emails/EmailDefinitionsDggcrf.scala
+++ b/app/services/emails/EmailDefinitionsDggcrf.scala
@@ -5,6 +5,7 @@ import models.User
import models.report.Report
import models.report.ReportFile
import models.report.ReportTag
+import repositories.subcategorylabel.SubcategoryLabel
import services.emails.EmailCategory.Dgccrf
import services.emails.EmailsExamplesUtils._
import utils.EmailAddress
@@ -77,17 +78,20 @@ object EmailDefinitionsDggcrf {
override def examples =
Seq(
- "report_dangerous_product_notification" -> ((recipient, _) => Email(Seq(recipient), genReport))
+ "report_dangerous_product_notification" -> ((recipient, _) => Email(Seq(recipient), genReport, None))
)
final case class Email(
recipients: Seq[EmailAddress],
- report: Report
+ report: Report,
+ subcategoryLabel: Option[SubcategoryLabel]
) extends BaseEmail {
override val subject: String = EmailSubjects.REPORT_NOTIF_DGCCRF(1, "[Produits dangereux] ")
override def getBody: (FrontRoute, EmailAddress) => String = (frontRoute, contact) =>
- views.html.mails.dgccrf.reportDangerousProductNotification(report)(frontRoute, contact).toString
+ views.html.mails.dgccrf
+ .reportDangerousProductNotification(report, subcategoryLabel)(frontRoute, contact)
+ .toString
}
}
@@ -98,7 +102,7 @@ object EmailDefinitionsDggcrf {
val report = genReport
Seq(
"priority_report_notification" -> ((recipient, _) =>
- Email(Seq(recipient), report, report.tags.headOption.map(_.entryName).getOrElse(""))
+ Email(Seq(recipient), report, None, report.tags.headOption.map(_.entryName).getOrElse(""))
)
)
}
@@ -106,12 +110,15 @@ object EmailDefinitionsDggcrf {
final case class Email(
recipients: Seq[EmailAddress],
report: Report,
+ subcategoryLabel: Option[SubcategoryLabel],
label: String
) extends BaseEmail {
override val subject: String = EmailSubjects.REPORT_NOTIF_DGCCRF(1, s"[$label] ")
override def getBody: (FrontRoute, EmailAddress) => String = (frontRoute, contact) =>
- views.html.mails.dgccrf.priorityReportNotification(report, label)(frontRoute, contact).toString
+ views.html.mails.dgccrf
+ .priorityReportNotification(report, subcategoryLabel, label)(frontRoute, contact)
+ .toString
}
}
diff --git a/app/views/mails/consumer/reportAcknowledgment.scala.html b/app/views/mails/consumer/reportAcknowledgment.scala.html
index 9647db2b..1b5655e2 100644
--- a/app/views/mails/consumer/reportAcknowledgment.scala.html
+++ b/app/views/mails/consumer/reportAcknowledgment.scala.html
@@ -7,7 +7,8 @@
@import models.company.Company
@import services.AttachmentService
@import java.util.Locale
-@(report: Report, maybeCompany: Option[Company], files: List[ReportFile] = Nil, isPDF: Boolean = false)(implicit frontRoute: FrontRoute, messageProvider: MessagesProvider)
+@import repositories.subcategorylabel.SubcategoryLabel
+@(report: Report, subcategoryLabel: Option[SubcategoryLabel], maybeCompany: Option[Company], files: List[ReportFile] = Nil, isPDF: Boolean = false)(implicit frontRoute: FrontRoute, messageProvider: MessagesProvider)
@contentBlock() = {
@@ -173,7 +174,7 @@
@ReportCategory.displayValue(report.category)
- @report.subcategories.map { subcategory =>
+ @SubcategoryLabel.translateSubcategories(report, subcategoryLabel).subcategories.map { subcategory =>
@subcategory
}
diff --git a/app/views/mails/dgccrf/priorityReportNotification.scala.html b/app/views/mails/dgccrf/priorityReportNotification.scala.html
index 56494399..db3d3d11 100644
--- a/app/views/mails/dgccrf/priorityReportNotification.scala.html
+++ b/app/views/mails/dgccrf/priorityReportNotification.scala.html
@@ -5,7 +5,8 @@
@import models.report.Report
@import models.report.ReportCategory
-@(report: Report, label: String)(frontRoute: FrontRoute, contactAddress: EmailAddress)
+@import repositories.subcategorylabel.SubcategoryLabel
+@(report: Report, subcategoryLabel: Option[SubcategoryLabel], label: String)(frontRoute: FrontRoute, contactAddress: EmailAddress)
@views.html.mails.layout("Nouveaux signalements") {
@@ -38,7 +39,7 @@
@ReportCategory.displayValue(report.category)
- @report.subcategories.map { subcategory =>
+ @SubcategoryLabel.translateSubcategories(report, subcategoryLabel).subcategories.map { subcategory =>
@subcategory
}
diff --git a/app/views/mails/dgccrf/reportDangerousProductNotification.scala.html b/app/views/mails/dgccrf/reportDangerousProductNotification.scala.html
index 06b37a60..da9bf345 100644
--- a/app/views/mails/dgccrf/reportDangerousProductNotification.scala.html
+++ b/app/views/mails/dgccrf/reportDangerousProductNotification.scala.html
@@ -5,7 +5,8 @@
@import models.report.Report
@import models.report.ReportCategory
-@(report: Report)(frontRoute: FrontRoute, contactAddress: EmailAddress)
+@import repositories.subcategorylabel.SubcategoryLabel
+@(report: Report, subcategoryLabel: Option[SubcategoryLabel])(frontRoute: FrontRoute, contactAddress: EmailAddress)
@views.html.mails.layout("Nouveaux signalements") {
@@ -38,7 +39,7 @@
@ReportCategory.displayValue(report.category)
- @report.subcategories.map { subcategory =>
+ @SubcategoryLabel.translateSubcategories(report, subcategoryLabel).subcategories.map { subcategory =>
@subcategory
}
diff --git a/test/controllers/report/CreateUpdateReportSpec.scala b/test/controllers/report/CreateUpdateReportSpec.scala
index 91dc3416..59257296 100644
--- a/test/controllers/report/CreateUpdateReportSpec.scala
+++ b/test/controllers/report/CreateUpdateReportSpec.scala
@@ -64,7 +64,7 @@ object CreateReportFromDomTom extends CreateUpdateReportSpec {
And send an acknowledgment mail to the consumer ${mailMustHaveBeenSent(
draftReport.email,
"Votre signalement",
- views.html.mails.consumer.reportAcknowledgment(report, Some(company), Nil).toString,
+ views.html.mails.consumer.reportAcknowledgment(report, None, Some(company), Nil).toString,
attachmentService.attachmentSeqForWorkflowStepN(2, Locale.FRENCH)
)}
"""
@@ -100,7 +100,7 @@ object CreateReportForEmployeeConsumer extends CreateUpdateReportSpec {
And send an acknowledgment mail to the consumer ${mailMustHaveBeenSent(
draftReport.email,
"Votre signalement",
- views.html.mails.consumer.reportAcknowledgment(report, Some(company), Nil).toString
+ views.html.mails.consumer.reportAcknowledgment(report, None, Some(company), Nil).toString
)}
"""
}
@@ -132,7 +132,7 @@ object CreateReportForProWithoutAccount extends CreateUpdateReportSpec {
And send an acknowledgment mail to the consumer ${mailMustHaveBeenSent(
draftReport.email,
"Votre signalement",
- views.html.mails.consumer.reportAcknowledgment(report, Some(anotherCompany), Nil).toString,
+ views.html.mails.consumer.reportAcknowledgment(report, None, Some(anotherCompany), Nil).toString,
attachmentService.attachmentSeqForWorkflowStepN(2, Locale.FRENCH)
)}
"""
@@ -163,7 +163,7 @@ object CreateReportForProWithActivatedAccount extends CreateUpdateReportSpec {
And send an acknowledgment mail to the consumer ${mailMustHaveBeenSent(
draftReport.email,
"Votre signalement",
- views.html.mails.consumer.reportAcknowledgment(report, Some(existingCompany), Nil).toString,
+ views.html.mails.consumer.reportAcknowledgment(report, None, Some(existingCompany), Nil).toString,
attachmentService.attachmentSeqForWorkflowStepN(2, Locale.FRENCH)
)}
And create an event "EMAIL_CONSUMER_ACKNOWLEDGMENT" ${eventMustHaveBeenCreatedWithAction(
@@ -205,7 +205,7 @@ object CreateReportOnDangerousProduct extends CreateUpdateReportSpec {
And send an acknowledgment mail to the consumer ${mailMustHaveBeenSent(
draftReport.email,
"Votre signalement",
- views.html.mails.consumer.reportAcknowledgment(report, Some(existingCompany), Nil).toString,
+ views.html.mails.consumer.reportAcknowledgment(report, None, Some(existingCompany), Nil).toString,
attachmentService.attachmentSeqForWorkflowStepN(2, Locale.FRENCH)
)}
"""