Feature/3 branch mentoring -> weekly

.github/workflows/SpringBoot-CI.yml

@@ -0,0 +1,45 @@
+name: Spring Boot CI
+on:
+  pull_request:
+    branches:
+      - weekly  # 'weekly' 브랜치로 PR이 생성될 때만 실행
+jobs:
+  build:
+    runs-on: ubuntu-latest # job 가상환경 설정
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+      - name: Set up JDK 11
+        uses: actions/setup-java@v2
+        with:
+          java-version: '11'
+          distribution: 'temurin'
+      - name: Gradle 명령 실행을 위한 권한을 부여합니다
+        run: chmod +x gradlew
+      - name: Cache Gradle dependencies
+        uses: actions/cache@v2
+        with:
+          path: ~/.gradle/caches
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
+          restore-keys: ${{ runner.os }}-gradle
+      - name: Build and Test
+        run: ./gradlew clean build
+      - name: Run Spring Boot App for 30 seconds
+        run: |
+          ./gradlew bootRun &
+          APP_PID=$!
+          sleep 30
+          kill $APP_PID
+        continue-on-error: false
+      - name: 테스트 결과를 PR에 코멘트로 등록합니다
+        uses: EnricoMi/publish-unit-test-result-action@v1
+        if: always()
+        with:
+          files: '**/build/test-results/test/TEST-*.xml'
+      - name: 테스트 실패 시, 실패한 코드 라인에 Check 코멘트를 등록합니다
+        uses: mikepenz/action-junit-report@v3
+        if: always()
+        with:
+          report_paths: '**/build/test-results/test/TEST-*.xml'
+          token: ${{ github.token }}

build.gradle

@@ -43,7 +43,11 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-devtools'
 
 	// local, test : h2
-	runtimeOnly 'com.h2database:h2'
+	implementation 'com.h2database:h2'
+
+	// swagger
+	implementation 'io.springfox:springfox-boot-starter:3.0.0'
+	implementation 'io.springfox:springfox-swagger-ui:3.0.0'
 }
 
 tasks.named('test') {

src/main/java/com/example/demo/GardenBeApplication.java

@@ -4,8 +4,8 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 
-@SpringBootApplication
 @EnableJpaAuditing
+@SpringBootApplication
 public class GardenBeApplication {
 
 	public static void main(String[] args) {

src/main/java/com/example/demo/config/auth/CustomUserDetails.java

@@ -14,21 +14,21 @@
 @RequiredArgsConstructor
 @Getter
 public class CustomUserDetails implements UserDetails {
-    private final User account;
+    private final User user;
 
     @Override
     public Collection<? extends GrantedAuthority> getAuthorities() {
-        return Arrays.stream(account.getEmail().split(",")).map(SimpleGrantedAuthority::new).collect(Collectors.toList());
+        return Arrays.stream(user.getEmail().split(",")).map(SimpleGrantedAuthority::new).collect(Collectors.toList());
     }
 
     @Override
     public String getPassword() {
-        return account.getPassword();
+        return user.getPassword();
     }
 
     @Override
     public String getUsername() {
-        return account.getEmail();
+        return user.getEmail();
     }
 
     @Override

src/main/java/com/example/demo/config/jwt/JWTAuthenticationFilter.java

@@ -35,9 +35,9 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
 
         try {
             DecodedJWT decodedJWT = JWTTokenProvider.verify(jwt);
-            int uid = decodedJWT.getClaim("user_id").asInt();
+            int id = decodedJWT.getClaim("user_id").asInt();
             String email = decodedJWT.getClaim("user_email").asString();
-            User user = User.builder().id(uid).email(email).build();
+            User user = User.builder().id(id).email(email).build();
             CustomUserDetails customUserDetails = new CustomUserDetails(user);
             Authentication authentication =
                     new UsernamePasswordAuthenticationToken(

src/main/java/com/example/demo/config/swagger/SwaggerConfig.java

@@ -0,0 +1,38 @@
+package com.example.demo.config.swagger;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.service.Contact;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+@Configuration
+@EnableSwagger2
+public class SwaggerConfig {
+    private String version = "V0.1";
+
+    @Bean
+    public Docket api() {
+        return new Docket(DocumentationType.SWAGGER_2)
+                .select()
+                .apis(RequestHandlerSelectors.withClassAnnotation(RestController.class))
+                .paths(PathSelectors.any())
+                .build()
+                .apiInfo(apiInfo());
+    }
+
+    private ApiInfo apiInfo() {
+        return new ApiInfoBuilder()
+                .title("제목")
+                .description("설명")
+                .version(version)
+                .contact(new Contact("이름", "홈페이지 URL", "e-mail"))
+                .build();
+    }
+}

src/main/java/com/example/demo/interest/Interest.java

@@ -10,7 +10,7 @@
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Entity
-@Table(name = "interest")
+@Table(name = "interest_tb")
 public class Interest {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)

src/main/java/com/example/demo/mentoring/MentorPost.java

@@ -0,0 +1,35 @@
+package com.example.demo.mentoring;
+
+import com.example.demo.config.utils.BaseTime;
+import com.example.demo.user.User;
+import lombok.AccessLevel;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.*;
+
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@Entity
+@Table(name = "mentorPost_tb")
+public class MentorPost extends BaseTime {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private int id;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    private User writer;
+
+    @Column(nullable = false)
+    private String title;
+
+    private String content;
+
+    @Builder
+    public MentorPost(User writer, String title, String content){
+        this.writer = writer;
+        this.title = title;
+        this.content = content;
+    }
+}

src/main/java/com/example/demo/mentoring/MentorPostJPARepostiory.java

@@ -0,0 +1,17 @@
+package com.example.demo.mentoring;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.util.Optional;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+
+public interface MentorPostJPARepostiory extends JpaRepository<MentorPost, Integer> {
+
+    @Query("select m from MentorPost m where m.writer.id = :writer")
+    List<MentorPost> findAllByWriter(@Param("writer") int writer);
+
+    MentorPost findById(int id);
+}

src/main/java/com/example/demo/mentoring/MentorPostRequest.java

@@ -0,0 +1,26 @@
+package com.example.demo.mentoring;
+
+import com.example.demo.user.User;
+import lombok.Getter;
+import lombok.Setter;
+import javax.validation.constraints.NotNull;
+
+public class MentorPostRequest {
+
+    @Getter
+    @Setter
+    public class CreateDTO {
+        @NotNull
+        private String title;
+
+        private String content;
+
+        public MentorPost toEntity(User writer) {
+            return MentorPost.builder()
+                    .writer(writer)
+                    .title(title)
+                    .content(content)
+                    .build();
+        }
+    }
+}

src/main/java/com/example/demo/mentoring/MentorPostResponse.java

@@ -0,0 +1,52 @@
+package com.example.demo.mentoring;
+
+
+import com.example.demo.user.Role;
+import com.example.demo.user.User;
+import com.example.demo.user.userInterest.UserInterest;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class MentorPostResponse {
+
+    @Getter
+    @Setter
+    public static class MentorPostDTO {
+        private int postId;
+        private String title;
+        private String content;
+        private WriterDTO writerDTO;
+
+        public MentorPostDTO(MentorPost mentorPost, WriterDTO writerDTO) {
+            this.postId = mentorPost.getId();
+            this.title = mentorPost.getTitle();
+            this.content = mentorPost.getContent();
+            this.writerDTO = writerDTO;
+        }
+
+        @Getter @Setter
+        public static class WriterDTO {
+            private int mentorId;
+            private String profileImage;
+            private String name;
+            private String country;
+            private Role role;
+            private List<String> favorites;
+
+            public WriterDTO(User user, List<UserInterest> userInterests) {
+                this.mentorId = user.getId();
+                this.profileImage = user.getProfileImage();
+                this.name = user.getFirstName() + " " + user.getLastName();
+                this.country = user.getCountry();
+                this.role = user.getRole();
+                this.favorites = userInterests.stream()
+                        .filter(userInterest -> userInterest.getUser().getId() == user.getId())
+                        .map(userInterest -> userInterest.getInterest().getCategory())
+                        .collect(Collectors.toList());
+            }
+        }
+    }
+}

src/main/java/com/example/demo/mentoring/MentorPostRestController.java

@@ -0,0 +1,23 @@
+package com.example.demo.mentoring;
+
+import com.example.demo.config.auth.CustomUserDetails;
+import com.example.demo.config.utils.ApiUtils;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.validation.Errors;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.bind.annotation.RestController;
+
+@RequiredArgsConstructor
+@RestController
+public class MentorPostRestController {
+    private final MentorPostService mentorPostService;
+
+    @PostMapping(value = "/mentorings")
+    public ResponseEntity<?> createMentorPost(@RequestPart MentorPostRequest.CreateDTO requestDTO, Errors errors, @AuthenticationPrincipal CustomUserDetails userDetails) {
+        mentorPostService.createMentorPost(requestDTO, userDetails.getUser());
+        return ResponseEntity.ok().body(ApiUtils.success(true));
+    }
+}

src/main/java/com/example/demo/mentoring/MentorPostService.java

@@ -0,0 +1,40 @@
+package com.example.demo.mentoring;
+
+import com.example.demo.user.User;
+import com.example.demo.user.userInterest.UserInterest;
+import com.example.demo.user.userInterest.UserInterestJPARepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Transactional
+@RequiredArgsConstructor
+@Service
+public class MentorPostService {
+    private final MentorPostJPARepostiory mentorPostJPARepostiory;
+    private final UserInterestJPARepository userInterestJPARepository;
+
+    //mentorPost생성
+    @Transactional
+    public void createMentorPost(MentorPostRequest.CreateDTO createDTO, User writer) {
+        mentorPostJPARepostiory.save(createDTO.toEntity(writer));
+    }
+
+   /* 1. mentorPostList를 조회
+    2. 각 List당 writer별 writerInterests를 조회
+    3. MentorPostDTO 생성*/
+    public List<MentorPostResponse.MentorPostDTO> findAllMentorPost() {
+        List<MentorPost> mentorPostList = mentorPostJPARepostiory.findAll();
+        List<MentorPostResponse.MentorPostDTO> mentorPostDTOList = mentorPostList.stream().map(
+                mentorPost -> {
+                    List<UserInterest> writerInterests = userInterestJPARepository.findAllById(mentorPost.getWriter().getId());
+                    MentorPostResponse.MentorPostDTO.WriterDTO writerDTO = new MentorPostResponse.MentorPostDTO.WriterDTO(mentorPost.getWriter(), writerInterests);
+                    return new MentorPostResponse.MentorPostDTO(mentorPost,writerDTO);
+                }
+        ).collect(Collectors.toList());
+        return mentorPostDTOList;
+    }
+}

src/main/java/com/example/demo/mentoring/contact/ContactJPARepository.java

@@ -0,0 +1,14 @@
+package com.example.demo.mentoring.contact;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+
+public interface ContactJPARepository extends JpaRepository<NotConnectedRegisterUser, Integer> {
+
+    @Query("SELECT ncru FROM NotConnectedRegisterUser ncru WHERE ncru.mentorPost.id = :mentorPostId")
+    List<NotConnectedRegisterUser> findAllByMentorPostId(@Param("mentorPostId") int mentorPostId);
+
+}

src/main/java/com/example/demo/mentoring/contact/ContactRequest.java

@@ -0,0 +1,4 @@
+package com.example.demo.mentoring.contact;
+
+public class ContactRequest {
+}