MEP

app/controllers/AdminController.scala

@@ -328,7 +328,7 @@ class AdminController(
       (recipient =>
         ConsumerReportAcknowledgment(
           genReport.copy(
-            status = ReportStatus.NA,
+            status = ReportStatus.TraitementEnCours,
             tags = List(ReportTag.ProduitDangereux),
             email = recipient
           ),

app/models/report/socialnetwork/CertifiedInfluencer.scala

@@ -4,9 +4,10 @@ import models.report.SocialNetworkSlug
 import play.api.libs.json.Json
 import play.api.libs.json.OFormat
 
+import java.time.OffsetDateTime
 import java.util.UUID
 
-case class CertifiedInfluencer(id: UUID, socialNetwork: SocialNetworkSlug, name: String)
+case class CertifiedInfluencer(id: UUID, socialNetwork: SocialNetworkSlug, name: String, creationDate: OffsetDateTime)
 
 object CertifiedInfluencer {
   implicit val format: OFormat[CertifiedInfluencer] = Json.format[CertifiedInfluencer]

app/orchestrators/socialmedia/InfluencerOrchestrator.scala

@@ -4,6 +4,7 @@ import models.report.SocialNetworkSlug
 import models.report.socialnetwork.CertifiedInfluencer
 import repositories.influencer.InfluencerRepositoryInterface
 
+import java.time.OffsetDateTime
 import java.util.UUID
 import scala.concurrent.ExecutionContext
 import scala.concurrent.Future
@@ -23,7 +24,9 @@ class InfluencerOrchestrator(
       } else {
         socialBladeClient.checkSocialNetworkUsername(socialNetwork, curated).flatMap { existsOnSocialBlade =>
           if (existsOnSocialBlade) {
-            influencerRepository.create(CertifiedInfluencer(UUID.randomUUID(), socialNetwork, curated)).map(_ => true)
+            influencerRepository
+              .create(CertifiedInfluencer(UUID.randomUUID(), socialNetwork, curated, OffsetDateTime.now()))
+              .map(_ => true)
           } else {
             Future.successful(false)
           }

app/repositories/company/CompanyRepository.scala

@@ -23,6 +23,7 @@ import repositories.CRUDRepository
 import slick.basic.DatabaseConfig
 import utils.Constants.ActionEvent.POST_FOLLOW_UP_DOC
 import utils.Constants.ActionEvent.REPORT_CLOSED_BY_NO_READING
+import utils.Constants.Departments.toPostalCode
 
 import java.sql.Timestamp
 import java.time.OffsetDateTime
@@ -53,8 +54,17 @@ class CompanyRepository(override val dbConfig: DatabaseConfig[JdbcProfile])(impl
     val query = table
       .joinLeft(ReportTable.table(Some(userRole)))
       .on(_.id === _.companyId)
-      .filterIf(search.departments.nonEmpty) { case (company, _) =>
-        company.department.map(a => a.inSet(search.departments)).getOrElse(false)
+//      .filterIf(search.departments.nonEmpty) { case (company, _) =>
+//        company.department.map(a => a.inSet(search.departments)).getOrElse(false)
+//      }
+      .filterIf(search.departments.nonEmpty) { case (company, report) =>
+        val departmentsFilter: Rep[Boolean] = search.departments
+          .flatMap(toPostalCode)
+          .map(dep => company.department.asColumnOf[String] like s"${dep}%")
+          .reduceLeft(_ || _)
+        // Avoid searching departments in foreign countries
+        departmentsFilter && report.map(_.companyCountry).isEmpty
+
       }
       .filterIf(search.activityCodes.nonEmpty) { case (company, _) =>
         company.activityCode.map(a => a.inSet(search.activityCodes)).getOrElse(false)

app/repositories/influencer/InfluencerTable.scala

@@ -6,13 +6,17 @@ import repositories.DatabaseTable
 import repositories.PostgresProfile.api._
 import slick.ast.TypedType
 
+import java.time.OffsetDateTime
+
 class InfluencerTable(tag: Tag)(implicit tt: TypedType[SocialNetworkSlug])
     extends DatabaseTable[CertifiedInfluencer](tag, "influencers") {
   def socialNetwork = column[SocialNetworkSlug]("social_network")
 
-  def name = column[String]("name")
+  def name         = column[String]("name")
+  def creationDate = column[OffsetDateTime]("creation_date")
 
-  override def * = (id, socialNetwork, name) <> ((CertifiedInfluencer.apply _).tupled, CertifiedInfluencer.unapply)
+  override def * =
+    (id, socialNetwork, name, creationDate) <> ((CertifiedInfluencer.apply _).tupled, CertifiedInfluencer.unapply)
 }
 
 object InfluencerTable {

app/views/mails/consumer/reportAcknowledgment.scala.html

@@ -214,6 +214,13 @@
             @Messages("ReportAckEmail.vendorName", report.vendor.get)
             <br/>
         }
+        @if(report.influencer.isDefined) {
+            @Messages("ReportAckEmail.influencerName", report.influencer.map(_.name).getOrElse(""))
+            <br/>
+            @Messages("ReportAckEmail.socialNetwork", report.influencer.flatMap(_.socialNetwork.map(_.entryName))
+            .orElse(report.influencer.flatMap(_.otherSocialNetwork)).getOrElse(""))
+            <br/>
+        }
 
         <br />
         <b>@Messages("ReportAckEmail.consumer")</b>
@@ -225,7 +232,11 @@
         @Messages("ReportAckEmail.email", report.email)
         <br/>
         @if(report.visibleToPro) {
-            @Messages("ReportAckEmail.contactAgreement", if(report.contactAgreement) {Messages("ReportAckEmail.yes")} else {Messages("ReportAckEmail.no")})
+            @Messages("ReportAckEmail.contactAgreement", if(report.contactAgreement) {
+                Messages("ReportAckEmail.yes")
+            } else {
+                Messages("ReportAckEmail.no")
+            })
             <br/>
         }
     </div>

conf/db/migration/default/V21__influencer_creationdate.sql

@@ -0,0 +1,2 @@
+ALTER TABLE influencers
+    ADD creation_date timestamp with time zone default now() not null;

conf/messages.en

@@ -139,6 +139,8 @@ ReportAckEmail.yes=yes
 ReportAckEmail.no=no
 ReportAckEmail.understandSignalConso=Understanding SignalConso
 ReportAckEmail.yourReport=Your report
+ReportAckEmail.influencerName=Influencer: {0}
+ReportAckEmail.socialNetwork=Social network: {0}
 
 reportPDF.page.title=Report Details {0}
 reportPDF.references.uniqueId=Unique Identifier: {0}

conf/messages.fr

@@ -142,6 +142,8 @@ ReportAckEmail.yes=oui
 ReportAckEmail.no=non
 ReportAckEmail.understandSignalConso=Comprendre SignalConso
 ReportAckEmail.yourReport=Votre signalement
+ReportAckEmail.influencerName=Influenceur: {0}
+ReportAckEmail.socialNetwork=Plateforme: {0}
 
 reportPDF.page.title=Détail du signalement {0}
 reportPDF.references.uniqueId=Identifiant unique : {0}

project/Dependencies.scala

@@ -25,7 +25,7 @@ object Dependencies {
     lazy val playJsonExtensionsVersion = "0.42.0"
     lazy val awsJavaSdkS3Version       = "1.12.603"
     lazy val jacksonModuleScalaVersion = "2.16.0"
-    lazy val postgresqlVersion         = "42.5.4"
+    lazy val postgresqlVersion         = "42.5.5"
     lazy val refinedVersion            = "0.11.0"
     lazy val spoiwoVersion             = "2.2.1"
     lazy val itext7CoreVersion         = "8.0.2"