Skip to content

Commit 25e6b46

Browse files
authored
Merge pull request #446 from RADAR-base/fix-user-metrics
Fix UserMetrics and User cyclic dependency
2 parents ee10868 + 36f6e30 commit 25e6b46

File tree

2 files changed

+20
-1
lines changed

2 files changed

+20
-1
lines changed

src/main/java/org/radarbase/appserver/entity/UserMetrics.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public class UserMetrics extends AuditModel implements Serializable {
6565
@Column(name = "last_delivered")
6666
private Instant lastDelivered;
6767

68-
@ToString.Exclude @NonNull @OneToOne private User user;
68+
@ToString.Exclude @NonNull @OneToOne(mappedBy = "usermetrics") private User user;
6969

7070
public UserMetrics(Instant lastOpened, Instant lastDelivered) {
7171
this.lastOpened = lastOpened;
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
databaseChangeLog:
2+
- changeSet:
3+
id: 1697819541-01
4+
author: pauline
5+
changes:
6+
- dropForeignKeyConstraint:
7+
baseColumnNames: user_id
8+
baseTableName: user_metrics
9+
constraintName: FK65c9asnnjs3q0lktqj103mvcv
10+
deferrable: false
11+
initiallyDeferred: false
12+
referencedColumnNames: id
13+
referencedTableName: users
14+
validate: true
15+
- dropColumn:
16+
columns:
17+
- column:
18+
name: user_id
19+
tableName: user_metrics

0 commit comments

Comments
 (0)