Hotfix/resolve analyze job per user (#133)

gjong · web-flow · commit 753af2f3ea9e · 2025-07-15T21:02:57.000+02:00
diff --git a/domain/src/main/java/com/jongsoft/finance/domain/insight/AnalyzeJob.java b/domain/src/main/java/com/jongsoft/finance/domain/insight/AnalyzeJob.java
@@ -1,8 +1,10 @@
 package com.jongsoft.finance.domain.insight;
 
 import com.jongsoft.finance.core.exception.StatusException;
+import com.jongsoft.finance.domain.user.UserIdentifier;
 import com.jongsoft.finance.messaging.commands.insight.CompleteAnalyzeJob;
 import com.jongsoft.finance.messaging.commands.insight.CreateAnalyzeJob;
+import com.jongsoft.finance.messaging.commands.insight.FailAnalyzeJob;
 import java.time.YearMonth;
 import java.util.UUID;
 import lombok.AllArgsConstructor;
@@ -16,13 +18,15 @@ public class AnalyzeJob {
 
   private final String jobId;
   private final YearMonth month;
+  private final UserIdentifier user;
   private boolean completed;
 
-  public AnalyzeJob(YearMonth month) {
+  public AnalyzeJob(UserIdentifier user, YearMonth month) {
     this.jobId = UUID.randomUUID().toString();
     this.month = month;
+    this.user = user;
 
-    CreateAnalyzeJob.createAnalyzeJob(month);
+    CreateAnalyzeJob.createAnalyzeJob(user, month);
   }
 
   public void complete() {
@@ -32,6 +36,15 @@ public void complete() {
     }
 
     completed = true;
-    CompleteAnalyzeJob.completeAnalyzeJob(month);
+    CompleteAnalyzeJob.completeAnalyzeJob(user, month);
+  }
+
+  public void fail() {
+    if (completed) {
+      throw StatusException.badRequest(
+          "Cannot fail an analyze job that has already completed.", "AnalyzeJob.completed");
+    }
+
+    FailAnalyzeJob.failAnalyzeJob(user, month);
   }
 }
diff --git a/domain/src/main/java/com/jongsoft/finance/messaging/commands/insight/CleanInsightsForMonth.java b/domain/src/main/java/com/jongsoft/finance/messaging/commands/insight/CleanInsightsForMonth.java
@@ -0,0 +1,11 @@
+package com.jongsoft.finance.messaging.commands.insight;
+
+import com.jongsoft.finance.messaging.ApplicationEvent;
+import java.time.YearMonth;
+
+public record CleanInsightsForMonth(YearMonth month) implements ApplicationEvent {
+
+  public static void cleanInsightsForMonth(YearMonth month) {
+    new CleanInsightsForMonth(month).publish();
+  }
+}
diff --git a/domain/src/main/java/com/jongsoft/finance/messaging/commands/insight/CompleteAnalyzeJob.java b/domain/src/main/java/com/jongsoft/finance/messaging/commands/insight/CompleteAnalyzeJob.java
@@ -1,11 +1,12 @@
 package com.jongsoft.finance.messaging.commands.insight;
 
+import com.jongsoft.finance.domain.user.UserIdentifier;
 import com.jongsoft.finance.messaging.ApplicationEvent;
 import java.time.YearMonth;
 
-public record CompleteAnalyzeJob(YearMonth month) implements ApplicationEvent {
+public record CompleteAnalyzeJob(UserIdentifier user, YearMonth month) implements ApplicationEvent {
 
-  public static void completeAnalyzeJob(YearMonth month) {
-    new CompleteAnalyzeJob(month).publish();
+  public static void completeAnalyzeJob(UserIdentifier user, YearMonth month) {
+    new CompleteAnalyzeJob(user, month).publish();
   }
 }
diff --git a/domain/src/main/java/com/jongsoft/finance/messaging/commands/insight/CreateAnalyzeJob.java b/domain/src/main/java/com/jongsoft/finance/messaging/commands/insight/CreateAnalyzeJob.java
@@ -1,11 +1,12 @@
 package com.jongsoft.finance.messaging.commands.insight;
 
+import com.jongsoft.finance.domain.user.UserIdentifier;
 import com.jongsoft.finance.messaging.ApplicationEvent;
 import java.time.YearMonth;
 
-public record CreateAnalyzeJob(YearMonth month) implements ApplicationEvent {
+public record CreateAnalyzeJob(UserIdentifier user, YearMonth month) implements ApplicationEvent {
 
-  public static void createAnalyzeJob(YearMonth month) {
-    new CreateAnalyzeJob(month).publish();
+  public static void createAnalyzeJob(UserIdentifier user, YearMonth month) {
+    new CreateAnalyzeJob(user, month).publish();
   }
 }
diff --git a/domain/src/main/java/com/jongsoft/finance/messaging/commands/insight/FailAnalyzeJob.java b/domain/src/main/java/com/jongsoft/finance/messaging/commands/insight/FailAnalyzeJob.java
@@ -0,0 +1,12 @@
+package com.jongsoft.finance.messaging.commands.insight;
+
+import com.jongsoft.finance.domain.user.UserIdentifier;
+import com.jongsoft.finance.messaging.ApplicationEvent;
+import java.time.YearMonth;
+
+public record FailAnalyzeJob(UserIdentifier user, YearMonth month) implements ApplicationEvent {
+
+  public static void failAnalyzeJob(UserIdentifier user, YearMonth month) {
+    new FailAnalyzeJob(user, month).publish();
+  }
+}
diff --git a/domain/src/test/java/com/jongsoft/finance/domain/insight/AnalyzeJobTest.java b/domain/src/test/java/com/jongsoft/finance/domain/insight/AnalyzeJobTest.java
@@ -1,6 +1,7 @@
 package com.jongsoft.finance.domain.insight;
 
 import com.jongsoft.finance.core.exception.StatusException;
+import com.jongsoft.finance.domain.user.UserIdentifier;
 import com.jongsoft.finance.messaging.EventBus;
 import com.jongsoft.finance.messaging.commands.insight.CompleteAnalyzeJob;
 import com.jongsoft.finance.messaging.commands.insight.CreateAnalyzeJob;
@@ -28,23 +29,23 @@ void setup() {
   void shouldCompleteAnalyzeJobSuccessfully() {
     // Arrange
     YearMonth month = YearMonth.of(2023, 9);
-    AnalyzeJob analyzeJob = new AnalyzeJob(month);
+    AnalyzeJob analyzeJob = new AnalyzeJob(new UserIdentifier("test@local"), month);
     var mockedCompleteAnalyzeJob = mockStatic(CompleteAnalyzeJob.class);
 
     // Act
     analyzeJob.complete();
 
     // Assert
     assertTrue(analyzeJob.isCompleted(), "Expected analyze job to be marked as completed.");
-    mockedCompleteAnalyzeJob.verify(() -> CompleteAnalyzeJob.completeAnalyzeJob(month));
+    mockedCompleteAnalyzeJob.verify(() -> CompleteAnalyzeJob.completeAnalyzeJob(new UserIdentifier("test@local"), month));
     mockedCompleteAnalyzeJob.close();
   }
 
   @Test
   void shouldThrowExceptionWhenCompletingAlreadyCompletedJob() {
     // Arrange
     YearMonth month = YearMonth.of(2023, 9);
-    AnalyzeJob analyzeJob = new AnalyzeJob(month);
+    AnalyzeJob analyzeJob = new AnalyzeJob(new UserIdentifier("test@local"), month);
     analyzeJob.complete();
 
     // Act & Assert
@@ -67,10 +68,10 @@ void shouldCreateAnalyzeJobOnConstruction() {
     var mockedCreateAnalyzeJob = mockStatic(CreateAnalyzeJob.class);
 
     // Act
-    new AnalyzeJob(month);
+    new AnalyzeJob(new UserIdentifier("test@local"), month);
 
     // Assert
-    mockedCreateAnalyzeJob.verify(() -> CreateAnalyzeJob.createAnalyzeJob(month));
+    mockedCreateAnalyzeJob.verify(() -> CreateAnalyzeJob.createAnalyzeJob(new UserIdentifier("test@local"), month));
     mockedCreateAnalyzeJob.close();
   }
 }
diff --git a/jpa-repository/src/main/java/com/jongsoft/finance/jpa/insight/AnalyzeJobJpa.java b/jpa-repository/src/main/java/com/jongsoft/finance/jpa/insight/AnalyzeJobJpa.java
@@ -1,9 +1,7 @@
 package com.jongsoft.finance.jpa.insight;
 
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
+import com.jongsoft.finance.jpa.user.entity.UserAccountJpa;
+import jakarta.persistence.*;
 import lombok.Data;
 
 @Data
@@ -17,5 +15,9 @@ public class AnalyzeJobJpa {
   @Column(name = "year_month_found")
   private String yearMonth;
 
+  @ManyToOne
+  private UserAccountJpa user;
+
   private boolean completed;
+  private boolean failed;
 }
diff --git a/jpa-repository/src/main/java/com/jongsoft/finance/jpa/insight/AnalyzeJobProviderJpa.java b/jpa-repository/src/main/java/com/jongsoft/finance/jpa/insight/AnalyzeJobProviderJpa.java
@@ -2,9 +2,12 @@
 
 import com.jongsoft.finance.annotation.BusinessEventListener;
 import com.jongsoft.finance.domain.insight.AnalyzeJob;
+import com.jongsoft.finance.domain.user.UserIdentifier;
 import com.jongsoft.finance.jpa.query.ReactiveEntityManager;
+import com.jongsoft.finance.jpa.user.entity.UserAccountJpa;
 import com.jongsoft.finance.messaging.commands.insight.CompleteAnalyzeJob;
 import com.jongsoft.finance.messaging.commands.insight.CreateAnalyzeJob;
+import com.jongsoft.finance.messaging.commands.insight.FailAnalyzeJob;
 import com.jongsoft.finance.providers.AnalyzeJobProvider;
 import jakarta.inject.Singleton;
 import java.time.YearMonth;
@@ -27,6 +30,7 @@ public Optional<AnalyzeJob> first() {
     return entityManager
         .from(AnalyzeJobJpa.class)
         .fieldEq("completed", false)
+        .fieldEq("failed", false)
         .orderBy("yearMonth", true)
         .limit(1)
         .singleResult()
@@ -41,6 +45,11 @@ public void createAnalyzeJob(CreateAnalyzeJob command) {
 
     var entity = new AnalyzeJobJpa();
     entity.setId(UUID.randomUUID().toString());
+    entity.setUser(entityManager
+        .from(UserAccountJpa.class)
+        .fieldEq("username", command.user().email())
+        .singleResult()
+        .get());
     entity.setYearMonth(command.month().toString());
 
     entityManager.getEntityManager().persist(entity);
@@ -54,14 +63,29 @@ public void completeAnalyzeJob(CompleteAnalyzeJob command) {
         .update(AnalyzeJobJpa.class)
         .fieldEq("yearMonth", command.month().toString())
         .fieldEq("completed", false)
+        .fieldEq("user.username", command.user().email())
         .set("completed", true)
         .execute();
   }
 
+  @BusinessEventListener
+  public void completeAnalyzeJob(FailAnalyzeJob command) {
+    log.info("Failing analyze job for month {}.", command.month());
+
+    entityManager
+        .update(AnalyzeJobJpa.class)
+        .fieldEq("yearMonth", command.month().toString())
+        .fieldEq("completed", false)
+        .fieldEq("user.username", command.user().email())
+        .set("failed", true)
+        .execute();
+  }
+
   private AnalyzeJob convert(AnalyzeJobJpa entity) {
     return AnalyzeJob.builder()
         .jobId(entity.getId())
         .month(YearMonth.parse(entity.getYearMonth()))
+        .user(new UserIdentifier(entity.getUser().getUsername()))
         .completed(entity.isCompleted())
         .build();
   }
diff --git a/jpa-repository/src/main/java/com/jongsoft/finance/jpa/insight/SpendingInsightProviderJpa.java b/jpa-repository/src/main/java/com/jongsoft/finance/jpa/insight/SpendingInsightProviderJpa.java
@@ -5,6 +5,7 @@
 import com.jongsoft.finance.annotation.BusinessEventListener;
 import com.jongsoft.finance.domain.insight.SpendingInsight;
 import com.jongsoft.finance.jpa.query.ReactiveEntityManager;
+import com.jongsoft.finance.messaging.commands.insight.CleanInsightsForMonth;
 import com.jongsoft.finance.messaging.commands.insight.CreateSpendingInsight;
 import com.jongsoft.finance.providers.SpendingInsightProvider;
 import com.jongsoft.finance.security.AuthenticationFacade;
@@ -115,6 +116,18 @@ public void save(CreateSpendingInsight command) {
     entityManager.persist(jpa);
   }
 
+  @BusinessEventListener
+  public void cleanForMonth(CleanInsightsForMonth command) {
+    log.trace("Cleaning spending insights for month: {}", command.month());
+    entityManager
+        .getEntityManager()
+        .createQuery(
+            "DELETE FROM SpendingInsightJpa WHERE yearMonth = :yearMonth and user.id in (select id from UserAccountJpa a where a.username = :username)")
+        .setParameter("yearMonth", command.month().toString())
+        .setParameter("username", authenticationFacade.authenticated())
+        .executeUpdate();
+  }
+
   private SpendingInsight convert(SpendingInsightJpa source) {
     if (source == null) {
       return null;
diff --git a/jpa-repository/src/main/java/com/jongsoft/finance/jpa/insight/SpendingPatternProviderJpa.java b/jpa-repository/src/main/java/com/jongsoft/finance/jpa/insight/SpendingPatternProviderJpa.java
@@ -7,6 +7,7 @@
 import com.jongsoft.finance.annotation.BusinessEventListener;
 import com.jongsoft.finance.domain.insight.SpendingPattern;
 import com.jongsoft.finance.jpa.query.ReactiveEntityManager;
+import com.jongsoft.finance.messaging.commands.insight.CleanInsightsForMonth;
 import com.jongsoft.finance.messaging.commands.insight.CreateSpendingPattern;
 import com.jongsoft.finance.providers.SpendingPatternProvider;
 import com.jongsoft.finance.security.AuthenticationFacade;
@@ -117,6 +118,18 @@ public void save(CreateSpendingPattern command) {
     entityManager.persist(jpa);
   }
 
+  @BusinessEventListener
+  public void cleanForMonth(CleanInsightsForMonth command) {
+    log.trace("Cleaning spending insights for month: {}", command.month());
+    entityManager
+        .getEntityManager()
+        .createQuery(
+            "DELETE FROM SpendingPatternJpa WHERE yearMonth = :yearMonth and user.id in (select id from UserAccountJpa a where a.username = :username)")
+        .setParameter("yearMonth", command.month().toString())
+        .setParameter("username", authenticationFacade.authenticated())
+        .executeUpdate();
+  }
+
   private SpendingPattern convert(SpendingPatternJpa source) {
     if (source == null) {
       return null;
diff --git a/jpa-repository/src/main/resources/db/migration/mysql/V20250715161600__add_user_to_analyze_job.sql b/jpa-repository/src/main/resources/db/migration/mysql/V20250715161600__add_user_to_analyze_job.sql
@@ -0,0 +1,12 @@
+alter table analyze_job add column user_id bigint;
+alter table analyze_job add column failed bit not null default false;
+
+insert into analyze_job(id, year_month_found, completed, user_id)
+select uuid(), year_month_found, completed, user_account.id
+from analyze_job, user_account;
+
+delete from analyze_job where user_id is null;
+
+alter table analyze_job change column user_id user_id bigint not null;
+
+alter table analyze_job add constraint fk_analyze_job_user foreign key (user_id) references user_account(id);
diff --git a/jpa-repository/src/main/resources/db/migration/psql/V20250715161600__add_user_to_analyze_job.sql b/jpa-repository/src/main/resources/db/migration/psql/V20250715161600__add_user_to_analyze_job.sql
@@ -0,0 +1,12 @@
+alter table analyze_job add column user_id bigint;
+alter table analyze_job add column failed boolean not null default false;
+
+insert into analyze_job(id, year_month_found, completed, user_id)
+select gen_random_uuid(), year_month_found, completed, user_account.id
+from analyze_job, user_account;
+
+delete from analyze_job where user_id is null;
+
+alter table analyze_job alter column user_id set not null;
+
+alter table analyze_job add constraint fk_analyze_job_user foreign key (user_id) references user_account(id);
diff --git a/jpa-repository/src/test/java/com/jongsoft/finance/jpa/insight/AnalyzeJobProviderJpaIT.java b/jpa-repository/src/test/java/com/jongsoft/finance/jpa/insight/AnalyzeJobProviderJpaIT.java
@@ -1,5 +1,6 @@
 package com.jongsoft.finance.jpa.insight;
 
+import com.jongsoft.finance.domain.user.UserIdentifier;
 import com.jongsoft.finance.jpa.JpaTestSetup;
 import com.jongsoft.finance.messaging.EventBus;
 import com.jongsoft.finance.messaging.commands.insight.CompleteAnalyzeJob;
@@ -73,14 +74,15 @@ void firstNoJobs() {
   @Test
   @DisplayName("Test createJob() - Should create a new analyze job")
   void createJob() {
-    CreateAnalyzeJob.createAnalyzeJob(YearMonth.now());
+    CreateAnalyzeJob.createAnalyzeJob(new UserIdentifier("demo-user"), YearMonth.now());
 
     var entity = entityManager.createQuery("select j from AnalyzeJobJpa j where j.yearMonth = :month", AnalyzeJobJpa.class)
         .setParameter("month", YearMonth.now().toString())
         .getSingleResult();
 
     Assertions.assertThat(entity).isNotNull();
     Assertions.assertThat(entity.getYearMonth()).isEqualTo(YearMonth.now().toString());
+    Assertions.assertThat(entity.getUser().getUsername()).isEqualTo("demo-user");
     Assertions.assertThat(entity.isCompleted()).isFalse();
   }
 
@@ -91,7 +93,7 @@ void completeJob() {
         "sql/insight/analyze-job-provider.sql"
     );
 
-    CompleteAnalyzeJob.completeAnalyzeJob(YearMonth.of(2023, 1));
+    CompleteAnalyzeJob.completeAnalyzeJob(new UserIdentifier("demo-user"), YearMonth.of(2023, 1));
 
     var entity = entityManager.createQuery("select j from AnalyzeJobJpa j where j.yearMonth = :month", AnalyzeJobJpa.class)
         .setParameter("month", "2023-01")
diff --git a/jpa-repository/src/test/resources/sql/insight/analyze-job-provider-completed.sql b/jpa-repository/src/test/resources/sql/insight/analyze-job-provider-completed.sql
@@ -1,8 +1,7 @@
 -- Test data for AnalyzeJobProviderJpaIT (all jobs completed)
 
 -- Add only completed analyze jobs for testing
-INSERT INTO analyze_job (id, year_month_found, completed)
-VALUES
-    ('job-1', '2023-01', true),
-    ('job-2', '2023-02', true),
-    ('job-3', '2023-03', true);
+INSERT INTO analyze_job (id, year_month_found, user_id, completed)
+VALUES ('job-1', '2023-01', 1, true),
+       ('job-2', '2023-02', 1, true),
+       ('job-3', '2023-03', 1, true);
diff --git a/jpa-repository/src/test/resources/sql/insight/analyze-job-provider.sql b/jpa-repository/src/test/resources/sql/insight/analyze-job-provider.sql
@@ -1,8 +1,7 @@
 -- Test data for AnalyzeJobProviderJpaIT
 
 -- Add analyze jobs for testing
-INSERT INTO analyze_job (id, year_month_found, completed)
-VALUES
-    ('job-1', '2023-01', false),
-    ('job-2', '2023-02', false),
-    ('job-3', '2023-03', true);
+INSERT INTO analyze_job (id, year_month_found, user_id, completed)
+VALUES ('job-1', '2023-01', 1, false),
+       ('job-2', '2023-02', 1, false),
+       ('job-3', '2023-03', 1, true);
diff --git a/learning/learning-module-spending-patterns/src/main/java/com/jongsoft/finance/spending/detector/AnomalyDetector.java b/learning/learning-module-spending-patterns/src/main/java/com/jongsoft/finance/spending/detector/AnomalyDetector.java
@@ -57,7 +57,10 @@ public void updateBaseline(YearMonth forMonth) {
 
     log.debug("Updating baseline for anomaly detection");
     var transactionsPerBudget = transactionProvider
-        .lookup(filterFactory.transaction().range(Dates.range(startDate, LocalDate.now())))
+        .lookup(filterFactory
+            .transaction()
+            .ownAccounts()
+            .range(Dates.range(startDate, LocalDate.now())))
         .content()
         .stream()
         .filter(t -> t.getBudget() != null)
diff --git a/learning/learning-module-spending-patterns/src/main/java/com/jongsoft/finance/spending/scheduler/AnalysisRunner.java b/learning/learning-module-spending-patterns/src/main/java/com/jongsoft/finance/spending/scheduler/AnalysisRunner.java
diff --git a/learning/learning-module-spending-patterns/src/main/java/com/jongsoft/finance/spending/scheduler/MonthlySpendingAnalysisScheduler.java b/learning/learning-module-spending-patterns/src/main/java/com/jongsoft/finance/spending/scheduler/MonthlySpendingAnalysisScheduler.java
diff --git a/learning/learning-module-spending-patterns/src/main/java/com/jongsoft/finance/spending/scheduler/RunAnalyzeJobScheduler.java b/learning/learning-module-spending-patterns/src/main/java/com/jongsoft/finance/spending/scheduler/RunAnalyzeJobScheduler.java
diff --git a/learning/learning-module-spending-patterns/src/test/java/com/jongsoft/finance/spending/detector/AnomalyDetectorTest.java b/learning/learning-module-spending-patterns/src/test/java/com/jongsoft/finance/spending/detector/AnomalyDetectorTest.java
diff --git a/learning/learning-module-spending-patterns/src/test/java/com/jongsoft/finance/spending/scheduler/AnalysisRunnerTest.java b/learning/learning-module-spending-patterns/src/test/java/com/jongsoft/finance/spending/scheduler/AnalysisRunnerTest.java

Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,12 @@`
`1`	`1`	`package com.jongsoft.finance.messaging.commands.insight;`
`2`	`2`
	`3`	`+import com.jongsoft.finance.domain.user.UserIdentifier;`
`3`	`4`	`import com.jongsoft.finance.messaging.ApplicationEvent;`
`4`	`5`	`import java.time.YearMonth;`
`5`	`6`
`6`		`-public record CompleteAnalyzeJob(YearMonth month) implements ApplicationEvent {`
	`7`	`+public record CompleteAnalyzeJob(UserIdentifier user, YearMonth month) implements ApplicationEvent {`
`7`	`8`
`8`		`- public static void completeAnalyzeJob(YearMonth month) {`
`9`		`- new CompleteAnalyzeJob(month).publish();`
	`9`	`+ public static void completeAnalyzeJob(UserIdentifier user, YearMonth month) {`
	`10`	`+ new CompleteAnalyzeJob(user, month).publish();`
`10`	`11`	`}`
`11`	`12`	`}`