FFGR8-2715: fix sample data job

betagouv · Nov 16, 2024 · 4b8f75e · 4b8f75e
1 parent e521da0
commit 4b8f75e
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/app/loader/SignalConsoApplicationLoader.scala b/app/loader/SignalConsoApplicationLoader.scala
@@ -616,13 +616,12 @@ class SignalConsoComponents(
     reportRepository,
     companyAccessRepository,
     reportAdminActionOrchestrator,
-    websiteRepository
+    websiteRepository,
+    eventRepository
   )(
     actorSystem
   )
 
-  sampleDataService.genSampleData()
-
   val sampleDataGenerationTask =
     new SampleDataGenerationTask(actorSystem, sampleDataService, taskConfiguration, taskRepository)
 

diff --git a/app/models/report/sampledata/SampleDataService.scala b/app/models/report/sampledata/SampleDataService.scala
@@ -19,6 +19,7 @@ import play.api.Logging
 import repositories.accesstoken.AccessTokenRepositoryInterface
 import repositories.company.CompanyRepositoryInterface
 import repositories.companyaccess.CompanyAccessRepositoryInterface
+import repositories.event.EventRepositoryInterface
 import repositories.report.ReportRepositoryInterface
 import repositories.user.UserRepositoryInterface
 import repositories.website.WebsiteRepositoryInterface
@@ -37,7 +38,8 @@ class SampleDataService(
     reportRepository: ReportRepositoryInterface,
     companyAccessRepository: CompanyAccessRepositoryInterface,
     reportAdminActionOrchestrator: ReportAdminActionOrchestrator,
-    websiteRepository: WebsiteRepositoryInterface
+    websiteRepository: WebsiteRepositoryInterface,
+    eventRepository: EventRepositoryInterface
 )(implicit system: ActorSystem)
     extends Logging {
 
@@ -268,6 +270,7 @@ class SampleDataService(
           reportList <- companyIds.flatTraverse(c => reportRepository.getReports(c))
           _ = logger.info(s"Looking for reports link to company user ${predefinedUser.id}, found: ${reportList.size}")
           _        <- reportList.traverse(r => reportAdminActionOrchestrator.deleteReport(r.id))
+          _        <- maybeUser.traverse(user => eventRepository.deleteByUserId(user.id))
           websites <- websiteRepository.searchByCompaniesId(companies.map(_.company.id))
           _ = logger.info(s"Looking for websites link to company user ${predefinedUser.id}, found: ${reportList.size}")
           _ <- websites.map(_.id).traverse(websiteRepository.delete)

diff --git a/app/repositories/event/EventRepository.scala b/app/repositories/event/EventRepository.scala
@@ -51,6 +51,13 @@ class EventRepository(
         .delete
     )
 
+  override def deleteByUserId(userId: UUID): Future[Int] = db
+    .run(
+      table
+        .filter(_.userId === userId)
+        .delete
+    )
+
   override def deleteEngagement(uuidReport: UUID): Future[Int] = db
     .run(
       table

diff --git a/app/repositories/event/EventRepositoryInterface.scala b/app/repositories/event/EventRepositoryInterface.scala
@@ -17,6 +17,8 @@ import scala.concurrent.Future
 
 trait EventRepositoryInterface extends CRUDRepositoryInterface[Event] {
 
+  def deleteByUserId(userId: UUID): Future[Int]
+
   def deleteByReportId(uuidReport: UUID): Future[Int]
 
   def deleteEngagement(uuidReport: UUID): Future[Int]