[TRELLO-2658] Fix reports not updated when crating a website (#1757)

betagouv · Oct 16, 2024 · 38ad5c7 · 38ad5c7
1 parent 899617e
commit 38ad5c7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/app/controllers/WebsiteController.scala b/app/controllers/WebsiteController.scala
@@ -44,7 +44,7 @@ class WebsiteController(
         errors => Future.successful(BadRequest(JsError.toJson(errors))),
         websiteCreation =>
           websitesOrchestrator
-            .create(URL(websiteCreation.host), websiteCreation.company.toCompany())
+            .create(URL(websiteCreation.host), websiteCreation.company.toCompany(), request.identity)
             .map(website => Ok(Json.toJson(website)))
       )
   }

diff --git a/app/orchestrators/ReportOrchestrator.scala b/app/orchestrators/ReportOrchestrator.scala
@@ -607,9 +607,10 @@ class ReportOrchestrator(
       reportCompany: ReportCompany,
       adminUserId: UUID
   ) =
-    if (isReportTooOld(existingReport))
+    if (isReportTooOld(existingReport)) {
+      logger.debug(s"Report ${existingReport.id} is too old to be updated")
       Future.unit
-    else
+    } else
       updateReportCompany(existingReport, reportCompany, adminUserId).map(_ => ())
 
   private def updateReportCompany(

diff --git a/app/orchestrators/WebsitesOrchestrator.scala b/app/orchestrators/WebsitesOrchestrator.scala
@@ -44,7 +44,7 @@ class WebsitesOrchestrator(
 
   val logger: Logger = Logger(this.getClass)
 
-  def create(url: URL, company: Company): Future[Website] =
+  def create(url: URL, company: Company, user: User): Future[Website] =
     for {
       host                   <- url.getHost.liftTo[Future](MalformedHost(url.value))
       createdCompany         <- companyRepository.getOrCreate(company.siret, company)
@@ -62,6 +62,7 @@ class WebsitesOrchestrator(
         identificationStatus = IdentificationStatus.Identified
       )
       createdWebsite <- repository.create(website)
+      _              <- updatePreviousReportsAssociatedToWebsite(website.host, createdCompany, user.id)
     } yield createdWebsite
 
   def searchByHost(host: String): Future[Seq[Country]] =
@@ -272,6 +273,7 @@ class WebsitesOrchestrator(
     )
     for {
       reports <- reportRepository.getForWebsiteWithoutCompany(websiteHost)
+      _ = logger.debug(s"updatePreviousReportsAssociatedToWebsite: Found ${reports.length} reports to update")
       _ <- reports.traverse(reportId =>
         reportOrchestrator.updateReportCompanyForWebsite(reportId, reportCompany, userId)
       )