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

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@ public UserJpaEntity process(final OAuthUserInfo info) {
.phoneNumber(info.phoneNumber())
.userRole(UserRole.ROLE_PENDING)
.provider(AuthProvider.KAKAO)
.agreedToTermsOfService(true)
.agreedToPrivacyPolicy(true)
.agreedToMarketing(info.marketingAgreed())
.build();
return userRepository.save(newUser);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package life.mosu.mosuserver.domain.file;

import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
Expand All @@ -17,6 +18,7 @@ public class FileMoveFailLog extends BaseTimeEntity {

private Long faqId;

@Column(columnDefinition = "TEXT")
private String s3Key;

private Folder destinationFolder;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public abstract class FileWithTime extends BaseTimeEntity {
@Column
private String fileName;

@Column
@Column(columnDefinition = "TEXT")
private String s3Key;

@Enumerated(EnumType.STRING)
Expand Down
96 changes: 0 additions & 96 deletions src/main/java/life/mosu/mosuserver/domain/form/FormJpaEntity.java

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -47,18 +47,12 @@ public class UserJpaEntity extends BaseTimeEntity {
@Column(name = "birth")
private LocalDate birth;

@Column(name = "phone_number")
@Column(name = "phone_number", unique = true)
private String phoneNumber;

@Column(name = "customer_key")
private String customerKey;

@Column(name = "agreed_to_terms_of_service")
private boolean agreedToTermsOfService;

@Column(name = "agreed_to_privacy_policy")
private boolean agreedToPrivacyPolicy;

@Column(name = "agreed_to_marketing")
private boolean agreedToMarketing;

Expand All @@ -72,8 +66,7 @@ public class UserJpaEntity extends BaseTimeEntity {

@Builder
public UserJpaEntity(String loginId, String password, Gender gender, String name,
String phoneNumber,
LocalDate birth, boolean agreedToTermsOfService, boolean agreedToPrivacyPolicy,
String phoneNumber, LocalDate birth,
boolean agreedToMarketing, UserRole userRole, AuthProvider provider) {
this.loginId = loginId;
this.password = password;
Expand All @@ -82,8 +75,6 @@ public UserJpaEntity(String loginId, String password, Gender gender, String name
this.phoneNumber = phoneNumber;
this.birth = birth;
this.customerKey = generateUUIDCustomerKey();
this.agreedToTermsOfService = agreedToTermsOfService;
this.agreedToPrivacyPolicy = agreedToPrivacyPolicy;
this.agreedToMarketing = agreedToMarketing;
this.userRole = userRole;
this.provider = provider;
Expand Down
Empty file.
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,6 @@ public UserJpaEntity toUserJpaEntity() {
.userRole(UserRole.ROLE_USER)
.provider(AuthProvider.MOSU)
.agreedToMarketing(true)
.agreedToPrivacyPolicy(true)
.agreedToTermsOfService(true)
.build();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,6 @@ public UserJpaEntity toAuthEntity(PasswordEncoder passwordEncoder) {
return UserJpaEntity.builder()
.loginId(id)
.password(passwordEncode(passwordEncoder, password))
.agreedToTermsOfService(true)
.agreedToPrivacyPolicy(true)
.agreedToMarketing(serviceTermRequest.agreedToMarketing())
.gender(Gender.fromName(gender))
.name(userName)
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading