Jeonghui

.gitignore

@@ -35,3 +35,6 @@ out/
 
 ### VS Code ###
 .vscode/
+src/main/java/mos/mosback/web/dto/PostsListResponseDto.java
+src/main/java/mos/mosback/web/dto/PostsListResponseDto.java
+src/main/java/mos/mosback/web/dto/PostsListResponseDto.java

build.gradle

@@ -1,12 +1,17 @@
-plugins {
-    id 'org.springframework.boot' version '2.7.3'
-    id 'io.spring.dependency-management' version '1.0.13.RELEASE'
+plugins { // (1)
+    id 'org.springframework.boot' version '2.4.1'
+    id 'io.spring.dependency-management' version '1.0.10.RELEASE'
     id 'java'
+    id 'maven-publish'
 }
 
-group = 'login'
-version = '0.0.1-SNAPSHOT'
-sourceCompatibility = '1.8'
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
+
+group = 'mos'
+version '1.0-SNAPSHOT'
 
 configurations {
     compileOnly {
@@ -16,31 +21,70 @@ configurations {
 
 repositories {
     mavenCentral()
+    maven {
+        url 'https://repo.clojars.org'
+        name 'Clojars'
+    }
+}
+jar {
+    enabled = false
+}
+
+jar {
+    manifest {
+        attributes 'Main-Class': 'mos.mosback.Application'
+    }
+}
+// for Junit 5
+test { // (2)
+    useJUnitPlatform()
 }
 
 dependencies {
+
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
-    implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
-    implementation 'org.springframework.boot:spring-boot-starter-security'
+    implementation 'org.springframework.boot:spring-boot-starter-validation'
+    implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
+    implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity5'
     implementation 'org.springframework.boot:spring-boot-starter-web'
-    implementation 'com.auth0:java-jwt:4.2.1'
+    implementation 'org.springframework.boot:spring-boot-devtools'
+    implementation 'io:io:0.2.1'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.8.1'
     compileOnly 'org.projectlombok:lombok'
     runtimeOnly 'com.h2database:h2'
+    implementation 'org.mariadb.jdbc:mariadb-java-client'
     annotationProcessor 'org.projectlombok:lombok'
-    testCompileOnly 'org.projectlombok:lombok'
-    testAnnotationProcessor 'org.projectlombok:lombok'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
-    testImplementation 'org.springframework.security:spring-security-test'
+    implementation 'org.springframework.boot:spring-boot-starter-security'
+    implementation 'mysql:mysql-connector-java:8.0.34'
     implementation 'org.springframework.boot:spring-boot-starter-mail' //메일 의존성
-//    implementation 'org.springframework.boot:spring-boot-starter-log4j2'
 
-    //    로그인 jwt 의존성
+    testImplementation 'org.springframework.boot:spring-boot-starter-test'
+    testImplementation 'org.springframework.security:spring-security-test'
+
+//    로그인 jwt 의존성
     implementation group: 'io.jsonwebtoken', name: 'jjwt-api', version: '0.11.2'
     runtimeOnly group: 'io.jsonwebtoken', name: 'jjwt-impl', version: '0.11.2'
     runtimeOnly group: 'io.jsonwebtoken', name: 'jjwt-jackson', version: '0.11.2'
     implementation group: 'org.postgresql', name: 'postgresql', version: '42.2.23'
-}
 
-tasks.named('test') {
-    useJUnitPlatform()
+    implementation 'org.mariadb.jdbc:mariadb-java-client:3.1.2'
+    implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
+    implementation 'com.auth0:java-jwt:4.2.1'
+    implementation 'mysql:mysql-connector-java:8.0.26'
+    implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
+    implementation 'com.auth0:java-jwt:4.2.1'
+
+    implementation 'org.springframework.cloud:spring-cloud-starter-aws:2.2.6.RELEASE'
+    implementation "software.amazon.awssdk:s3:2.13.0"
+
+
+    // lombok
+    implementation('org.projectlombok:lombok:1.18.20')
+    testImplementation 'junit:junit:4.13.1'
+    annotationProcessor('org.projectlombok:lombok:1.18.20')
+    testImplementation('org.projectlombok:lombok:1.18.20')
+    testAnnotationProcessor('org.projectlombok:lombok:1.18.20')
+
+
 }

src/main/java/mos/mosback/Application.java

@@ -5,9 +5,14 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
+
 @Slf4j
-@EnableJpaAuditing //JPA Auditing 활성화
-@SpringBootApplication(exclude = {SecurityAutoConfiguration.class})
+@EnableJpaAuditing
+@SpringBootApplication(exclude = {SecurityAutoConfiguration.class,
+        org.springframework.cloud.aws.autoconfigure.context.ContextInstanceDataAutoConfiguration.class,
+        org.springframework.cloud.aws.autoconfigure.context.ContextStackAutoConfiguration.class,
+        org.springframework.cloud.aws.autoconfigure.context.ContextRegionProviderAutoConfiguration.class
+})
 public class Application {
     public static void main(String[] args) {
         SpringApplication.run(Application.class, args);

src/main/java/mos/mosback/login/domain/user/User.java

@@ -2,11 +2,14 @@
 
 
 import lombok.*;
+import mos.mosback.stRoom.domain.stRoom.StRoomEntity;
+import mos.mosback.stRoom.domain.stRoom.StudyMemberEntity;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.crypto.password.PasswordEncoder;
 
 import javax.persistence.*;
-import java.util.Date;
+import java.util.*;
+import java.util.stream.Collectors;
 
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
@@ -19,19 +22,64 @@ public class User {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "user_id")
+
     private Long id;
 
+    @Column(name ="room_id")
+    private Long roomId;
+
+    @OneToMany
+    private List<StRoomEntity> stRooms= new ArrayList<>();
+
+    @OneToMany(mappedBy = "user", cascade = CascadeType.ALL)
+    private List<StudyMemberEntity> studyMemberships = new ArrayList<>();
+
+    public List<StudyMemberEntity> getStudyMemberships() {
+        return studyMemberships;
+    }
+    public void addStudyMembership(StudyMemberEntity studyMember) {
+        this.studyMemberships.add(studyMember);
+        studyMember.setUser(this);
+    }
+
     private String email; // 이메일
     private String password; // 비밀번호
 
     private String name;
+
     private String nickname; // 닉네임
+
+
+    @Column(name = "image_url")
     private String imageUrl; // 프로필 이미지
     private Date str_duration;
 
     private Date end_duration;
     private String message;
+
     private String company;
+
+    private String tend1;
+    private String tend2;
+
+
+    public String getTend1() {
+        return tend1;
+    }
+
+    public void setTend1(String tend1) {
+        this.tend1 = tend1;
+    }
+
+    public String getTend2() {
+        return tend2;
+    }
+
+    public void setTend2(String tend2) {
+        this.tend2 = tend2;
+    }
+
+
     @Enumerated(EnumType.STRING)
     private Role role;
 
@@ -42,6 +90,7 @@ public class User {
 
     private String refreshToken; // 리프레시 토큰
 
+
     // 유저 권한 설정 메소드
     public void authorizeUser() {
         this.role = Role.USER;
@@ -53,12 +102,18 @@ public void passwordEncode(PasswordEncoder passwordEncoder) {
     }
 
     //==setter==//
+    public Long getRoomId() {
+        return roomId;
+    }
 
-
-    public Long getId() {
-        return id;
+    public void setRoomId(Long roomId) {
+        this.roomId = roomId;
     }
 
+
+
+
+
     public void setId(Long id) {
         this.id = id;
     }
@@ -133,6 +188,14 @@ public void setCompany(String company) {
         this.company = company;
     }
 
+    public Role getRole() {
+        return role;
+    }
+
+    public void setRole(Role role) {
+        this.role = role;
+    }
+
     //== 유저 필드 업데이트 ==//
     public void updateNickname(String updateNickname) {
         this.nickname = updateNickname;
@@ -154,13 +217,6 @@ public void updateCompany(String updateCompany) {
         this.company = updateCompany;
     }
 
-    public Role getRole() {
-        return role;
-    }
-
-    public void setRole(Role role) {
-        this.role = role;
-    }
 
     public void updatePassword(String updatePassword, PasswordEncoder passwordEncoder) {
         this.password = passwordEncoder.encode(updatePassword);
@@ -178,4 +234,4 @@ public String cryptopassword(String password) {
     public void updateRefreshToken(String updateRefreshToken) {
         this.refreshToken = updateRefreshToken;
     }
-}
+}