From 537ee48ab32bb44aa21e00f2933442a275b481a3 Mon Sep 17 00:00:00 2001 From: Pauline Date: Fri, 20 Oct 2023 17:32:41 +0100 Subject: [PATCH 1/2] Fix UserMetrics and User cyclic dependency --- .../radarbase/appserver/entity/UserMetrics.java | 2 +- ...0002_update_schema-20231020184827_changelog.yml | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/db/changelog/changes/00000000000002_update_schema-20231020184827_changelog.yml diff --git a/src/main/java/org/radarbase/appserver/entity/UserMetrics.java b/src/main/java/org/radarbase/appserver/entity/UserMetrics.java index 1ccb9c91..912e503e 100644 --- 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/src/main/resources/db/changelog/changes/00000000000002_update_schema-20231020184827_changelog.yml b/src/main/resources/db/changelog/changes/00000000000002_update_schema-20231020184827_changelog.yml new file mode 100644 index 00000000..5494024f --- /dev/null +++ b/src/main/resources/db/changelog/changes/00000000000002_update_schema-20231020184827_changelog.yml @@ -0,0 +1,14 @@ +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 \ No newline at end of file From 36f6e30cd8dab0060441b06e65cf65579bc9acd2 Mon Sep 17 00:00:00 2001 From: Pauline Date: Sat, 21 Oct 2023 13:12:18 +0100 Subject: [PATCH 2/2] Drop user_id column in user_metrics --- ...000000000002_update_schema-20231020184827_changelog.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/resources/db/changelog/changes/00000000000002_update_schema-20231020184827_changelog.yml b/src/main/resources/db/changelog/changes/00000000000002_update_schema-20231020184827_changelog.yml index 5494024f..771504a1 100644 --- a/src/main/resources/db/changelog/changes/00000000000002_update_schema-20231020184827_changelog.yml +++ b/src/main/resources/db/changelog/changes/00000000000002_update_schema-20231020184827_changelog.yml @@ -11,4 +11,9 @@ databaseChangeLog: initiallyDeferred: false referencedColumnNames: id referencedTableName: users - validate: true \ No newline at end of file + validate: true + - dropColumn: + columns: + - column: + name: user_id + tableName: user_metrics \ No newline at end of file