From b79e9cbda9945548336df1ad71334432b7a98acf Mon Sep 17 00:00:00 2001 From: Art Date: Sat, 18 Sep 2021 08:43:00 +0300 Subject: [PATCH] modified User to do not serialize id (#19, #18) --- .../fullstack/supportportal/backend/domain/User.java | 1 + .../backend/controller/UserResourceTest.java | 12 ++++++------ .../backend/controller/UserResourceUnSecureTest.java | 12 ++++++------ 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/support-portal-backend/src/main/java/net/shyshkin/study/fullstack/supportportal/backend/domain/User.java b/support-portal-backend/src/main/java/net/shyshkin/study/fullstack/supportportal/backend/domain/User.java index 049a486..0c8d610 100644 --- a/support-portal-backend/src/main/java/net/shyshkin/study/fullstack/supportportal/backend/domain/User.java +++ b/support-portal-backend/src/main/java/net/shyshkin/study/fullstack/supportportal/backend/domain/User.java @@ -24,6 +24,7 @@ public class User implements Serializable { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @EqualsAndHashCode.Include + @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) private Long id; private String userId; diff --git a/support-portal-backend/src/test/java/net/shyshkin/study/fullstack/supportportal/backend/controller/UserResourceTest.java b/support-portal-backend/src/test/java/net/shyshkin/study/fullstack/supportportal/backend/controller/UserResourceTest.java index f7921a2..a076464 100644 --- a/support-portal-backend/src/test/java/net/shyshkin/study/fullstack/supportportal/backend/controller/UserResourceTest.java +++ b/support-portal-backend/src/test/java/net/shyshkin/study/fullstack/supportportal/backend/controller/UserResourceTest.java @@ -120,7 +120,7 @@ class UserResourceTest extends BaseUserTest { User registeredUser = responseEntity.getBody(); assertThat(registeredUser) .isNotNull() - .hasNoNullFieldsOrPropertiesExcept("lastLoginDate", "lastLoginDateDisplay", "password") + .hasNoNullFieldsOrPropertiesExcept("lastLoginDate", "lastLoginDateDisplay", "password", "id") .hasFieldOrPropertyWithValue("username", fakeUser.getUsername()) .hasFieldOrPropertyWithValue("email", fakeUser.getEmail()) .hasFieldOrPropertyWithValue("firstName", fakeUser.getFirstName()) @@ -208,7 +208,7 @@ class UserResourceTest extends BaseUserTest { assertThat(responseEntity.getStatusCode()).isEqualTo(OK); assertThat(responseEntity.getBody()) .isNotNull() - .hasNoNullFieldsOrPropertiesExcept("lastLoginDate", "lastLoginDateDisplay", "password") + .hasNoNullFieldsOrPropertiesExcept("lastLoginDate", "lastLoginDateDisplay", "password", "id") .hasFieldOrPropertyWithValue("username", fakeUser.getUsername()) .hasFieldOrPropertyWithValue("email", fakeUser.getEmail()) .hasFieldOrPropertyWithValue("firstName", fakeUser.getFirstName()) @@ -387,7 +387,7 @@ class UserResourceTest extends BaseUserTest { assertThat(responseEntity.getStatusCode()).isEqualTo(OK); assertThat(responseEntity.getBody()) .isNotNull() - .hasNoNullFieldsOrPropertiesExcept("lastLoginDate", "lastLoginDateDisplay", "password") + .hasNoNullFieldsOrPropertiesExcept("lastLoginDate", "lastLoginDateDisplay", "password", "id") .hasFieldOrPropertyWithValue("username", userDto.getUsername()) .hasFieldOrPropertyWithValue("email", userDto.getEmail()) .hasFieldOrPropertyWithValue("firstName", userDto.getFirstName()) @@ -475,7 +475,7 @@ class UserResourceTest extends BaseUserTest { assertThat(responseEntity.getStatusCode()).isEqualTo(OK); assertThat(responseEntity.getBody()) .isNotNull() - .hasNoNullFieldsOrPropertiesExcept("lastLoginDate", "lastLoginDateDisplay", "password") + .hasNoNullFieldsOrPropertiesExcept("lastLoginDate", "lastLoginDateDisplay", "password", "id") .hasFieldOrPropertyWithValue("username", userDto.getUsername()) .hasFieldOrPropertyWithValue("email", userDto.getEmail()) .hasFieldOrPropertyWithValue("firstName", userDto.getFirstName()) @@ -565,7 +565,7 @@ class UserResourceTest extends BaseUserTest { assertThat(responseEntity.getStatusCode()).isEqualTo(OK); assertThat(responseEntity.getBody()) .isNotNull() - .hasNoNullFieldsOrPropertiesExcept("lastLoginDate", "lastLoginDateDisplay", "password") + .hasNoNullFieldsOrPropertiesExcept("lastLoginDate", "lastLoginDateDisplay", "password", "id") .hasFieldOrPropertyWithValue("username", userDto.getUsername()) .hasFieldOrPropertyWithValue("email", userDto.getEmail()) .hasFieldOrPropertyWithValue("firstName", userDto.getFirstName()) @@ -623,7 +623,7 @@ class UserResourceTest extends BaseUserTest { assertThat(responseEntity.getStatusCode()).isEqualTo(OK); assertThat(responseEntity.getBody()) .isNotNull() - .hasNoNullFieldsOrPropertiesExcept("lastLoginDate", "lastLoginDateDisplay", "password") + .hasNoNullFieldsOrPropertiesExcept("lastLoginDate", "lastLoginDateDisplay", "password", "id") .hasFieldOrPropertyWithValue("username", userDto.getUsername()) .hasFieldOrPropertyWithValue("email", userDto.getEmail()) .hasFieldOrPropertyWithValue("firstName", userDto.getFirstName()) diff --git a/support-portal-backend/src/test/java/net/shyshkin/study/fullstack/supportportal/backend/controller/UserResourceUnSecureTest.java b/support-portal-backend/src/test/java/net/shyshkin/study/fullstack/supportportal/backend/controller/UserResourceUnSecureTest.java index b457eb8..1197774 100644 --- a/support-portal-backend/src/test/java/net/shyshkin/study/fullstack/supportportal/backend/controller/UserResourceUnSecureTest.java +++ b/support-portal-backend/src/test/java/net/shyshkin/study/fullstack/supportportal/backend/controller/UserResourceUnSecureTest.java @@ -82,7 +82,7 @@ class UserResourceUnSecureTest extends BaseUserTest { assertThat(responseEntity.getStatusCode()).isEqualTo(OK); assertThat(responseEntity.getBody()) .isNotNull() - .hasNoNullFieldsOrPropertiesExcept("lastLoginDate", "lastLoginDateDisplay", "password") + .hasNoNullFieldsOrPropertiesExcept("lastLoginDate", "lastLoginDateDisplay", "password", "id") .hasFieldOrPropertyWithValue("username", userDto.getUsername()) .hasFieldOrPropertyWithValue("email", userDto.getEmail()) .hasFieldOrPropertyWithValue("firstName", userDto.getFirstName()) @@ -285,7 +285,7 @@ class UserResourceUnSecureTest extends BaseUserTest { assertThat(responseEntity.getStatusCode()).isEqualTo(OK); assertThat(responseEntity.getBody()) .isNotNull() - .hasNoNullFieldsOrPropertiesExcept("lastLoginDate", "lastLoginDateDisplay", "password") + .hasNoNullFieldsOrPropertiesExcept("lastLoginDate", "lastLoginDateDisplay", "password", "id") .hasFieldOrPropertyWithValue("username", userDto.getUsername()) .hasFieldOrPropertyWithValue("email", userDto.getEmail()) .hasFieldOrPropertyWithValue("firstName", userDto.getFirstName()) @@ -332,7 +332,7 @@ class UserResourceUnSecureTest extends BaseUserTest { assertThat(responseEntity.getStatusCode()).isEqualTo(OK); assertThat(responseEntity.getBody()) .isNotNull() - .hasNoNullFieldsOrPropertiesExcept("lastLoginDate", "lastLoginDateDisplay", "password") + .hasNoNullFieldsOrPropertiesExcept("lastLoginDate", "lastLoginDateDisplay", "password", "id") .hasFieldOrPropertyWithValue("username", userDto.getUsername()) .hasFieldOrPropertyWithValue("email", userDto.getEmail()) .hasFieldOrPropertyWithValue("firstName", userDto.getFirstName()) @@ -454,7 +454,7 @@ class UserResourceUnSecureTest extends BaseUserTest { assertThat(responseEntity.getStatusCode()).isEqualTo(OK); assertThat(responseEntity.getBody()) .isNotNull() - .hasNoNullFieldsOrPropertiesExcept("lastLoginDate", "lastLoginDateDisplay", "password") + .hasNoNullFieldsOrPropertiesExcept("lastLoginDate", "lastLoginDateDisplay", "password", "id") .hasFieldOrPropertyWithValue("username", username) .hasFieldOrPropertyWithValue("email", user.getEmail()) .hasFieldOrPropertyWithValue("firstName", user.getFirstName()) @@ -584,7 +584,7 @@ class UserResourceUnSecureTest extends BaseUserTest { assertThat(responseEntity.getStatusCode()).isEqualTo(OK); assertThat(responseEntity.getBody()) .isNotNull() - .hasNoNullFieldsOrPropertiesExcept("lastLoginDate", "lastLoginDateDisplay", "password") + .hasNoNullFieldsOrPropertiesExcept("lastLoginDate", "lastLoginDateDisplay", "password", "id") .hasFieldOrPropertyWithValue("username", username) .hasFieldOrPropertyWithValue("email", user.getEmail()) .hasFieldOrPropertyWithValue("firstName", user.getFirstName()) @@ -775,7 +775,7 @@ class UserResourceUnSecureTest extends BaseUserTest { assertThat(responseEntity.getStatusCode()).isEqualTo(OK); assertThat(responseEntity.getBody()) .isNotNull() - .hasNoNullFieldsOrPropertiesExcept("lastLoginDate", "lastLoginDateDisplay", "password") + .hasNoNullFieldsOrPropertiesExcept("lastLoginDate", "lastLoginDateDisplay", "password", "id") .hasFieldOrPropertyWithValue("username", username) .hasFieldOrPropertyWithValue("email", user.getEmail()) .hasFieldOrPropertyWithValue("firstName", user.getFirstName())