diff --git a/.jhipster/Registration.json b/.jhipster/Registration.json index ccb7d33..12f985f 100644 --- a/.jhipster/Registration.json +++ b/.jhipster/Registration.json @@ -40,6 +40,13 @@ "relationshipName": "event", "relationshipSide": "right", "relationshipType": "many-to-one" + }, + { + "otherEntityField": "name", + "otherEntityName": "userAccount", + "relationshipName": "userAccount", + "relationshipSide": "left", + "relationshipType": "many-to-one" } ], "searchEngine": "no" diff --git a/src/main/java/com/sasiedzi/event/domain/Registration.java b/src/main/java/com/sasiedzi/event/domain/Registration.java index 4466bbf..f3abc3c 100644 --- a/src/main/java/com/sasiedzi/event/domain/Registration.java +++ b/src/main/java/com/sasiedzi/event/domain/Registration.java @@ -46,6 +46,10 @@ public class Registration implements Serializable { @JsonIgnoreProperties(value = { "registrations", "transactions" }, allowSetters = true) private Event event; + @ManyToOne(fetch = FetchType.EAGER) + @JsonIgnoreProperties(value = { "users", "transactionItems" }, allowSetters = true) + private UserAccount userAccount; + @OneToMany(fetch = FetchType.LAZY, mappedBy = "registration") @JsonIgnoreProperties(value = { "userAccount", "transaction", "event", "registration" }, allowSetters = true) private Set transactionItems = new HashSet<>(); @@ -143,6 +147,19 @@ public class Registration implements Serializable { return this; } + public UserAccount getUserAccount() { + return this.userAccount; + } + + public void setUserAccount(UserAccount userAccount) { + this.userAccount = userAccount; + } + + public Registration userAccount(UserAccount userAccount) { + this.setUserAccount(userAccount); + return this; + } + public Set getTransactionItems() { return this.transactionItems; } diff --git a/src/main/resources/config/liquibase/changelog/20241118103414_changelog.xml b/src/main/resources/config/liquibase/changelog/20241118103414_changelog.xml new file mode 100644 index 0000000..75b9c6a --- /dev/null +++ b/src/main/resources/config/liquibase/changelog/20241118103414_changelog.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + diff --git a/src/main/resources/config/liquibase/master.xml b/src/main/resources/config/liquibase/master.xml index 0ec10fa..56cc6b4 100644 --- a/src/main/resources/config/liquibase/master.xml +++ b/src/main/resources/config/liquibase/master.xml @@ -24,5 +24,6 @@ - + + diff --git a/src/test/java/com/sasiedzi/event/domain/RegistrationAsserts.java b/src/test/java/com/sasiedzi/event/domain/RegistrationAsserts.java index d23f498..b274d17 100644 --- a/src/test/java/com/sasiedzi/event/domain/RegistrationAsserts.java +++ b/src/test/java/com/sasiedzi/event/domain/RegistrationAsserts.java @@ -65,6 +65,7 @@ public class RegistrationAsserts { public static void assertRegistrationUpdatableRelationshipsEquals(Registration expected, Registration actual) { assertThat(expected) .as("Verify Registration relationships") - .satisfies(e -> assertThat(e.getEvent()).as("check event").isEqualTo(actual.getEvent())); + .satisfies(e -> assertThat(e.getEvent()).as("check event").isEqualTo(actual.getEvent())) + .satisfies(e -> assertThat(e.getUserAccount()).as("check userAccount").isEqualTo(actual.getUserAccount())); } } diff --git a/src/test/java/com/sasiedzi/event/domain/RegistrationTest.java b/src/test/java/com/sasiedzi/event/domain/RegistrationTest.java index 693bad4..1f91203 100644 --- a/src/test/java/com/sasiedzi/event/domain/RegistrationTest.java +++ b/src/test/java/com/sasiedzi/event/domain/RegistrationTest.java @@ -3,6 +3,7 @@ package com.sasiedzi.event.domain; import static com.sasiedzi.event.domain.EventTestSamples.*; import static com.sasiedzi.event.domain.RegistrationTestSamples.*; import static com.sasiedzi.event.domain.TransactionItemTestSamples.*; +import static com.sasiedzi.event.domain.UserAccountTestSamples.*; import static org.assertj.core.api.Assertions.assertThat; import com.sasiedzi.event.web.rest.TestUtil; @@ -38,6 +39,18 @@ class RegistrationTest { assertThat(registration.getEvent()).isNull(); } + @Test + void userAccountTest() { + Registration registration = getRegistrationRandomSampleGenerator(); + UserAccount userAccountBack = getUserAccountRandomSampleGenerator(); + + registration.setUserAccount(userAccountBack); + assertThat(registration.getUserAccount()).isEqualTo(userAccountBack); + + registration.userAccount(null); + assertThat(registration.getUserAccount()).isNull(); + } + @Test void transactionItemTest() { Registration registration = getRegistrationRandomSampleGenerator();