Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
package me.thinkcat.opic.practice.dto.request;

import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Size;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;

import java.time.LocalDateTime;

@Getter
@NoArgsConstructor
@AllArgsConstructor
Expand All @@ -20,4 +23,10 @@ public class UserRegisterRequest {
private String password;

private String email;

@NotNull(message = "Terms agreement timestamp is required")
private LocalDateTime termsAgreedAt;

@NotNull(message = "Privacy agreement timestamp is required")
private LocalDateTime privacyAgreedAt;
}
8 changes: 8 additions & 0 deletions src/main/java/me/thinkcat/opic/practice/entity/User.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
import org.hibernate.annotations.Where;

import java.sql.Types;
import java.time.LocalDateTime;


@Entity
@Table(name = "users")
Expand All @@ -30,6 +32,12 @@ public class User extends BaseEntity {
@Column(unique = true)
private String email;

@Column
private LocalDateTime termsAgreedAt;

@Column
private LocalDateTime privacyAgreedAt;

@JdbcTypeCode(Types.CHAR)
@Column(name = "user_role_code", nullable = false, columnDefinition = "char(7)")
@Builder.Default
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ public UserResponse register(UserRegisterRequest request) {
.username(request.getUsername())
.password(passwordEncoder.encode(request.getPassword()))
.email(request.getEmail())
.termsAgreedAt(request.getTermsAgreedAt())
.privacyAgreedAt(request.getPrivacyAgreedAt())
.build();

User savedUser = userRepository.save(user);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.crypto.password.PasswordEncoder;

import java.time.LocalDateTime;

import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.mockito.ArgumentMatchers.any;
Expand Down Expand Up @@ -43,7 +45,7 @@ class UserServiceTest {
given(userRepository.existsByUsername(any())).willReturn(false);

assertThatThrownBy(() ->
userService.register(new UserRegisterRequest("user", password, "a@b.com")))
userService.register(new UserRegisterRequest("user", password, "a@b.com", LocalDateTime.now(), LocalDateTime.now())))
.isInstanceOf(ValidationException.class);
}

Expand All @@ -55,7 +57,7 @@ class UserServiceTest {
given(userRepository.save(any(User.class))).willReturn(saved);

UserResponse response = userService.register(
new UserRegisterRequest("user", "Password1@", "user@example.com"));
new UserRegisterRequest("user", "Password1@", "user@example.com", LocalDateTime.now(), LocalDateTime.now()));

assertThat(response.getUsername()).isEqualTo("user");
}
Expand All @@ -71,7 +73,7 @@ class UserServiceTest {
given(userRepository.existsByUsername(any())).willReturn(false);

assertThatThrownBy(() ->
userService.register(new UserRegisterRequest("user", "Password1@", email)))
userService.register(new UserRegisterRequest("user", "Password1@", email, LocalDateTime.now(), LocalDateTime.now())))
.isInstanceOf(ValidationException.class);
}
}