Merge pull request #1834 from betagouv/master

MEP

app/orchestrators/AlbertOrchestrator.scala

@@ -52,7 +52,7 @@ class AlbertOrchestrator(
           Future.successful(None)
         case _ =>
           albertService
-            .findProblems(companyId, descriptions)
+            .findProblems(descriptions)
             .recover { err =>
               logger.error(s"Didn't get a result from Albert for company $companyId", err)
               None

app/orchestrators/CompanyAccessOrchestrator.scala

@@ -3,14 +3,15 @@ package orchestrators
 import controllers.error.AppError.ActivationCodeAlreadyUsed
 import controllers.error.AppError.CompanyActivationCodeExpired
 import controllers.error.AppError.CompanyActivationSiretOrCodeInvalid
-import controllers.error.AppError.ServerError
 import controllers.error.AppError.TooMuchCompanyActivationAttempts
 import models.AccessToken
 import models.User
 import models.access.ActivationLinkRequest
 
 import java.time.OffsetDateTime.now
+import cats.implicits.catsSyntaxApplicativeId
 import cats.implicits.catsSyntaxOption
+import cats.implicits.catsSyntaxOptionId
 import cats.implicits.toTraverseOps
 import models.UserRole.Admin
 import models.UserRole.DGAL
@@ -146,9 +147,8 @@ class CompanyAccessOrchestrator(
             "multiple_head_offices",
             s"Multiple head offices for siret ${company.siret} company data ids ${companies.map(_.id)} "
           )
-          Future.failed(
-            ServerError(s"Unexpected error when fetching head office for company with siret ${company.siret}")
-          )
+          // multiple_head_offices error should be investigated, but for now we are considering that last created company is the head office.
+          companies.maxBy(_.creationDate.toEpochSecond).some.pure[Future]
       }
 
   private def getHeadOfficeAccess(

app/orchestrators/ReportOrchestrator.scala

@@ -30,6 +30,7 @@ import models.report.reportmetadata.ReportWithMetadataAndBookmark
 import models.token.TokenKind.CompanyInit
 import models.website.Website
 import orchestrators.ReportOrchestrator.ReportCompanyChangeThresholdInDays
+import orchestrators.ReportOrchestrator.isGouvWebsite
 import play.api.Logger
 import play.api.i18n.MessagesApi
 import play.api.libs.json.Json
@@ -65,6 +66,7 @@ import java.time.ZoneOffset
 import java.time.temporal.TemporalAmount
 import java.util.UUID
 import java.util.concurrent.TimeUnit
+import java.util.regex.Pattern
 import scala.concurrent.ExecutionContext
 import scala.concurrent.Future
 import scala.concurrent.duration._
@@ -303,6 +305,7 @@ class ReportOrchestrator(
           Future.failed(AppError.CannotReportPublicAdministration)
         case _ => Future.unit
       }
+      _ <- isGouvWebsite(reportDraft)
       _ <- reportDraft.companySiret match {
         case Some(siret) =>
           // Try to check if siret exist in signal conso database
@@ -1112,4 +1115,20 @@ class ReportOrchestrator(
 
 object ReportOrchestrator {
   val ReportCompanyChangeThresholdInDays: Long = 90L
+
+  def isGouvWebsite(reportDraft: ReportDraft): Future[Unit] = {
+
+    def isAGouvWebsite(input: URL): Boolean = {
+      val regex   = "^(?!.*\\.gouv\\.fr(?:[\\/\\?#]|$)).*$"
+      val pattern = Pattern.compile(regex, Pattern.CASE_INSENSITIVE)
+      !pattern.matcher(input.value).matches()
+    }
+
+    reportDraft.websiteURL match {
+      case Some(websiteURL) if isAGouvWebsite(websiteURL) =>
+        Future.failed(AppError.CannotReportPublicAdministration)
+      case _ => Future.unit
+    }
+  }
+
 }

app/services/AlbertService.scala

@@ -158,7 +158,6 @@ class AlbertService(albertConfiguration: AlbertConfiguration)(implicit ec: Execu
     }
 
   def findProblems(
-      companyId: UUID,
       selectedCompanyReportsDescriptions: Seq[String]
   ): Future[Option[AlbertProblemsResult]] = {
     val prompt = AlbertPrompts.findProblems(selectedCompanyReportsDescriptions, maxPromptLength = 10000)

app/tasks/company/CompanySyncService.scala

@@ -13,13 +13,11 @@ import sttp.model.Header
 import utils.SIREN
 import utils.SIRET
 
-import java.time.OffsetDateTime
-import java.time.format.DateTimeFormatter
 import scala.concurrent.ExecutionContext
 import scala.concurrent.Future
 
 trait CompanySyncServiceInterface {
-  def syncCompanies(companies: Seq[Company], lastUpdated: OffsetDateTime): Future[List[CompanySearchResult]]
+  def syncCompanies(companies: Seq[Company]): Future[List[CompanySearchResult]]
   def companyBySiret(siret: SIRET): Future[Option[CompanySearchResult]]
   def companyBySiren(siren: SIREN, onlyHeadOffice: Boolean): Future[List[CompanySearchResult]]
   def companiesBySirets(sirets: List[SIRET]): Future[List[CompanySearchResult]]
@@ -37,16 +35,14 @@ class CompanySyncService(
   val SirenSearchEndpoint = "/api/companies/siren/search"
 
   override def syncCompanies(
-      companies: Seq[Company],
-      lastUpdated: OffsetDateTime
+      companies: Seq[Company]
   ): Future[List[CompanySearchResult]] = {
 
     val request = basicRequest
       .headers(Header("X-Api-Key", companyUpdateConfiguration.etablissementApiKey))
       .post(
         uri"${companyUpdateConfiguration.etablissementApiUrl}"
           .withWholePath(SearchEndpoint)
-          .addParam("lastUpdated", Some(lastUpdated.format(DateTimeFormatter.ISO_OFFSET_DATE_TIME)))
       )
       .body(companies.map(_.siret))
       .response(asJson[List[CompanySearchResult]])

app/tasks/company/CompanyUpdateTask.scala

@@ -44,7 +44,7 @@ class CompanyUpdateTask(
           "company_update_task_item",
           s"Syncing ${companies.size} companies"
         )
-        companySyncService.syncCompanies(companies, companySync.lastUpdated)
+        companySyncService.syncCompanies(companies)
       }
       .mapAsync(1)(updateSignalConsoCompaniesBySiret)
       .map(_.flatMap(_.lastUpdated).maxOption.getOrElse(companySync.lastUpdated))

test/orchestrators/ReportOrchestratorTest.scala

@@ -14,7 +14,7 @@ import org.specs2.mutable.Specification
 import utils.AppSpec
 import utils.Fixtures
 import utils.TestApp
-
+import utils.URL
 import java.time.LocalDate
 import java.time.OffsetDateTime
 import java.time.ZoneOffset
@@ -242,6 +242,16 @@ class ReportOrchestratorTest(implicit ee: ExecutionEnv) extends Specification wi
       res must throwA[CannotReportPublicAdministration.type].await
     }
 
+    "fail when reporting gouv website " in {
+      val draftReportOnPublicCompany = aDraftReport.copy(
+        companyActivityCode = Some("90.10"),
+        websiteURL = Some(URL("http://totot.gouv.fr?titi=tr"))
+      )
+      val res =
+        components.reportOrchestrator.validateAndCreateReport(draftReportOnPublicCompany, ConsumerIp("0.0.0.0"))
+      res must throwA[CannotReportPublicAdministration.type].await
+    }
+
     "succeed when reporting private company" in {
       val draftReportOnPrivateCompany = aDraftReport.copy(
         companyActivityCode = Some("90.10")

test/tasks/company/CompanyUpdateTaskSpec.scala

@@ -63,8 +63,7 @@ class CompanyUpdateTaskSpec(implicit ee: ExecutionEnv)
       )
 
       serviceMock.syncCompanies(
-        Seq(company),
-        companySync.lastUpdated
+        Seq(company)
       ) returns Future
         .successful(
           List(companySearchResult)
@@ -114,8 +113,7 @@ class CompanyUpdateTaskSpec(implicit ee: ExecutionEnv)
       )
 
       serviceMock.syncCompanies(
-        Seq(company),
-        CompanySync.default.lastUpdated
+        Seq(company)
       ) returns Future
         .successful(
           List(companySearchResult)
@@ -163,8 +161,7 @@ class CompanyUpdateTaskSpec(implicit ee: ExecutionEnv)
       )
 
       serviceMock.syncCompanies(
-        Seq(company),
-        companySync.lastUpdated
+        Seq(company)
       ) returns Future
         .successful(
           List(companySearchResult)
@@ -199,8 +196,7 @@ class CompanyUpdateTaskSpec(implicit ee: ExecutionEnv)
       val companySync = CompanySync(UUID.randomUUID(), now.plus(1, ChronoUnit.DAYS))
 
       serviceMock.syncCompanies(
-        org.mockito.ArgumentMatchers.eq(Seq(company)),
-        any[OffsetDateTime]
+        org.mockito.ArgumentMatchers.eq(Seq(company))
       ) returns Future
         .successful(
           List.empty

test/utils/CompanySyncServiceMock.scala

@@ -5,11 +5,10 @@ import models.company.Company
 import tasks.company.CompanySearchResult
 import tasks.company.CompanySyncServiceInterface
 
-import java.time.OffsetDateTime
 import scala.concurrent.Future
 
 class CompanySyncServiceMock extends CompanySyncServiceInterface {
-  override def syncCompanies(companies: Seq[Company], lastUpdated: OffsetDateTime): Future[List[CompanySearchResult]] =
+  override def syncCompanies(companies: Seq[Company]): Future[List[CompanySearchResult]] =
     Future.successful(List.empty[CompanySearchResult])
 
   override def companyBySiret(siret: SIRET): Future[Option[CompanySearchResult]] = Future.successful(