diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Chat/entity/Chat.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Chat/entity/Chat.java index b1f80fc..284b4df 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Chat/entity/Chat.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Chat/entity/Chat.java @@ -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; @@ -29,7 +28,7 @@ public class Chat { @Enumerated(EnumType.STRING) private ChatRole role; - @Column(columnDefinition = "LONGTEXT") + @Column(columnDefinition = "TEXT") private String message; @CreatedDate diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/User/entity/Users.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/User/entity/Users.java index 891b416..f95f6f8 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/User/entity/Users.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/User/entity/Users.java @@ -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()); diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/User/service/UserService.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/User/service/UserService.java index 5aee71f..13ec44e 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/User/service/UserService.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/User/service/UserService.java @@ -41,7 +41,7 @@ public class UserService { // 회원가입 public ApiResponse saveUser(SaveUserRequest userSaveRequest) { - Users user = Users.of(userSaveRequest); + Users user = Users.of(userSaveRequest, passwordEncoder); userRepository.save(user); return ApiResponse.ok(UserResponse.of(user)); } diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/global/config/PrimaryDBConfig.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/global/config/PrimaryDBConfig.java deleted file mode 100644 index 04ba225..0000000 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/global/config/PrimaryDBConfig.java +++ /dev/null @@ -1,85 +0,0 @@ -//package MathCaptain.weakness.global.config; -// -//import com.zaxxer.hikari.HikariDataSource; -//import jakarta.persistence.EntityManagerFactory; -//import org.springframework.beans.factory.annotation.Qualifier; -//import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties; -//import org.springframework.boot.autoconfigure.orm.jpa.JpaProperties; -//import org.springframework.boot.context.properties.ConfigurationProperties; -//import org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder; -//import org.springframework.context.annotation.Bean; -//import org.springframework.context.annotation.Configuration; -//import org.springframework.context.annotation.Primary; -//import org.springframework.data.jpa.repository.config.EnableJpaRepositories; -//import org.springframework.orm.jpa.JpaTransactionManager; -//import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean; -//import org.springframework.transaction.PlatformTransactionManager; -//import org.springframework.transaction.annotation.EnableTransactionManagement; -// -//import javax.sql.DataSource; -//import java.util.HashMap; -//import java.util.Map; -// -//@Configuration -//@EnableTransactionManagement -//@EnableJpaRepositories( -// basePackages = { -// "MathCaptain.weakness.domain.User.repository", -// "MathCaptain.weakness.domain.Record.repository.record", -// "MathCaptain.weakness.domain.Group.repository", -// "MathCaptain.weakness.domain.Notification.repository", -// "MathCaptain.weakness.domain.Recruitment.repository" -// }, -// entityManagerFactoryRef = "primaryEntityManagerFactory", -// transactionManagerRef = "primaryTransactionManager" -//) -//public class PrimaryDBConfig { -// -// @Bean(name = "primaryDataSource") -// @Primary -// @ConfigurationProperties("spring.datasource.hikari") -// public HikariDataSource primaryDataSource(@Qualifier("primaryDataSourceProperties") DataSourceProperties properties) { -// return properties.initializeDataSourceBuilder().type(HikariDataSource.class).build(); -// } -// -// @Bean(name = "primaryDataSourceProperties") -// @Primary -// @ConfigurationProperties("spring.datasource") -// public DataSourceProperties primaryDataSourceProperties() { -// return new DataSourceProperties(); -// } -// -// @Bean -// @Primary -// @ConfigurationProperties("spring.jpa") -// public JpaProperties primaryJpaProperties() { -// return new JpaProperties(); -// } -// -// @Primary -// @Bean(name = "primaryEntityManagerFactory") -// public LocalContainerEntityManagerFactoryBean primaryEntityManagerFactory( -// EntityManagerFactoryBuilder builder, -// @Qualifier("primaryDataSource") DataSource dataSource -// ) { -// Map jpaProperties = new HashMap<>(); -// jpaProperties.put("hibernate.hbm2ddl.auto", "create"); -// jpaProperties.put("hibernate.dialect", "org.hibernate.dialect.MySQLDialect"); -// jpaProperties.put("hibernate.format_sql", true); -// -// return builder -// .dataSource(dataSource) -// .packages("MathCaptain.weakness.domain") -// .properties(jpaProperties) -// .persistenceUnit("primary") -// .build(); -// } -// -// @Primary -// @Bean(name = "primaryTransactionManager") -// public PlatformTransactionManager primaryTransactionManager( -// @Qualifier("primaryEntityManagerFactory") EntityManagerFactory entityManagerFactory) { -// -// return new JpaTransactionManager(entityManagerFactory); -// } -//} \ No newline at end of file diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/global/config/SecondDBConfig.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/global/config/SecondDBConfig.java deleted file mode 100644 index 7a7bbe3..0000000 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/global/config/SecondDBConfig.java +++ /dev/null @@ -1,69 +0,0 @@ -//package MathCaptain.weakness.global.config; -// -//import javax.sql.DataSource; -//import jakarta.persistence.EntityManagerFactory; -//import org.springframework.beans.factory.annotation.Qualifier; -//import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties; -//import org.springframework.boot.context.properties.ConfigurationProperties; -//import org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder; -//import org.springframework.context.annotation.Bean; -//import org.springframework.context.annotation.Configuration; -//import org.springframework.data.jpa.repository.config.EnableJpaRepositories; -//import org.springframework.orm.jpa.JpaTransactionManager; -//import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean; -//import org.springframework.transaction.PlatformTransactionManager; -//import org.springframework.transaction.annotation.EnableTransactionManagement; -// -//import java.util.HashMap; -//import java.util.Map; -// -//@Configuration -//@EnableTransactionManagement -//@EnableJpaRepositories( -// basePackages = { -// "MathCaptain.weakness.domain.Record.repository.userLog", -// "MathCaptain.weakness.domain.Chat.repository", -// }, -// entityManagerFactoryRef = "secondEntityManagerFactory", -// transactionManagerRef = "secondTransactionManager" -//) -//public class SecondDBConfig { -// -// // DataSourceProperties는 application.yml에 설정된 DB 정보를 읽어옴 -// @Bean(name = "secondDataSourceProperties") -// @ConfigurationProperties(prefix = "second.datasource") -// public DataSourceProperties secondDataSourceProperties() { -// return new DataSourceProperties(); -// } -// -// // DataSource는 DataSourceProperties를 통해 DB에 연결하는 객체 -// @Bean(name = "secondDataSource") -// public DataSource secondDataSource() { -// return secondDataSourceProperties().initializeDataSourceBuilder().build(); -// } -// -// // EntityManagerFactory는 JPA에서 DB와의 연결을 관리하는 객체 -// @Bean(name = "secondEntityManagerFactory") -// public LocalContainerEntityManagerFactoryBean secondEntityManagerFactory( -// EntityManagerFactoryBuilder builder) { -// Map props = new HashMap<>(); -// props.put("hibernate.hbm2ddl.auto", "update"); -// props.put("show_sql", true); -// props.put("hibernate.format_sql", true); -// props.put("hibernate.jdbc.lob.non_contextual_creation", true); -// -// return builder -// .dataSource(secondDataSource()) -// .packages("MathCaptain.weakness.domain.Record.entity.UserLog", "MathCaptain.weakness.domain.Chat.entity") // entity 위치 -// .properties(props) -// .persistenceUnit("second") -// .build(); -// } -// -// // TransactionManager는 DB 트랜잭션을 관리하는 객체 -// @Bean(name = "secondTransactionManager") -// public PlatformTransactionManager secondTransactionManager( -// @Qualifier("secondEntityManagerFactory") EntityManagerFactory factory) { -// return new JpaTransactionManager(factory); -// } -//}