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
Expand Up @@ -2,7 +2,6 @@

import MathCaptain.weakness.domain.Chat.dto.request.ChatRequest;
import MathCaptain.weakness.domain.Chat.dto.response.ChatResponse;
import MathCaptain.weakness.domain.User.entity.Users;
import MathCaptain.weakness.domain.common.enums.ChatRole;
import jakarta.persistence.*;
import lombok.AccessLevel;
Expand All @@ -29,7 +28,7 @@ public class Chat {
@Enumerated(EnumType.STRING)
private ChatRole role;

@Column(columnDefinition = "LONGTEXT")
@Column(columnDefinition = "TEXT")
private String message;

@CreatedDate
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,10 @@ private Users(String email, String password, String name, String nickname, Strin
this.phoneNumber = phoneNumber;
}

public static Users of(SaveUserRequest userRequestDto) {
public static Users of(SaveUserRequest userRequestDto, PasswordEncoder passwordEncoder) {
return new Users(
userRequestDto.getEmail(),
userRequestDto.getPassword(),
passwordEncoder.encode(userRequestDto.getPassword()),
userRequestDto.getName(),
userRequestDto.getNickname(),
userRequestDto.getPhoneNumber());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public class UserService {

// 회원가입
public ApiResponse<UserResponse> saveUser(SaveUserRequest userSaveRequest) {
Users user = Users.of(userSaveRequest);
Users user = Users.of(userSaveRequest, passwordEncoder);
userRepository.save(user);
return ApiResponse.ok(UserResponse.of(user));
}
Expand Down

This file was deleted.

This file was deleted.