Merge pull request #446 from RADAR-base/fix-user-metrics

Fix UserMetrics and User cyclic dependency
RADAR-base · Oct 21, 2023 · 25e6b46 · 25e6b46
2 parents ee10868 + 36f6e30
commit 25e6b46
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/src/main/java/org/radarbase/appserver/entity/UserMetrics.java b/src/main/java/org/radarbase/appserver/entity/UserMetrics.java
@@ -65,7 +65,7 @@ public class UserMetrics extends AuditModel implements Serializable {
  @Column(name = "last_delivered")
  private Instant lastDelivered;
 
- @ToString.Exclude @NonNull @OneToOne private User user;
+ @ToString.Exclude @NonNull @OneToOne(mappedBy = "usermetrics") private User user;
 
  public UserMetrics(Instant lastOpened, Instant lastDelivered) {
  this.lastOpened = lastOpened;

diff --git a/.../resources/db/changelog/changes/00000000000002_update_schema-20231020184827_changelog.yml b/.../resources/db/changelog/changes/00000000000002_update_schema-20231020184827_changelog.yml
@@ -0,0 +1,19 @@
+databaseChangeLog:
+ - changeSet:
+ id: 1697819541-01
+ author: pauline
+ changes:
+ - dropForeignKeyConstraint:
+ baseColumnNames: user_id
+ baseTableName: user_metrics
+ constraintName: FK65c9asnnjs3q0lktqj103mvcv
+ deferrable: false
+ initiallyDeferred: false
+ referencedColumnNames: id
+ referencedTableName: users
+ validate: true
+ - dropColumn:
+ columns:
+ - column:
+ name: user_id
+ tableName: user_metrics