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
@@ -1,14 +1,10 @@
package com.example.solidconnection.board.controller;
package com.example.solidconnection.community.board.controller;

import com.example.solidconnection.board.service.BoardService;
import com.example.solidconnection.post.dto.BoardFindPostResponse;
import com.example.solidconnection.type.BoardCode;
import lombok.RequiredArgsConstructor;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

import java.util.ArrayList;
Expand All @@ -19,8 +15,6 @@
@RequestMapping("/communities")
public class BoardController {

private final BoardService boardService;

// todo: 회원별로 접근 가능한 게시판 목록 조회 기능 개발
@GetMapping()
public ResponseEntity<?> findAccessibleCodes() {
Expand All @@ -30,14 +24,4 @@ public ResponseEntity<?> findAccessibleCodes() {
}
return ResponseEntity.ok().body(accessibleCodeList);
}

@GetMapping("/{code}")
public ResponseEntity<?> findPostsByCodeAndCategory(
@PathVariable(value = "code") String code,
@RequestParam(value = "category", defaultValue = "전체") String category) {

List<BoardFindPostResponse> postsByCodeAndPostCategory = boardService
.findPostsByCodeAndPostCategory(code, category);
return ResponseEntity.ok().body(postsByCodeAndPostCategory);
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.example.solidconnection.board.domain;
package com.example.solidconnection.community.board.domain;

import com.example.solidconnection.post.domain.Post;
import com.example.solidconnection.community.post.domain.Post;
import jakarta.persistence.CascadeType;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.example.solidconnection.board.dto;
package com.example.solidconnection.community.board.dto;

import com.example.solidconnection.board.domain.Board;
import com.example.solidconnection.community.board.domain.Board;

public record PostFindBoardResponse(
String code,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.example.solidconnection.board.repository;
package com.example.solidconnection.community.board.repository;

import com.example.solidconnection.board.domain.Board;
import com.example.solidconnection.community.board.domain.Board;
import com.example.solidconnection.custom.exception.CustomException;
import com.example.solidconnection.custom.exception.ErrorCode;
import org.springframework.data.jpa.repository.EntityGraph;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package com.example.solidconnection.community.board.service;

import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;

@Service
@RequiredArgsConstructor
public class BoardService {
}
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package com.example.solidconnection.comment.controller;
package com.example.solidconnection.community.comment.controller;

import com.example.solidconnection.comment.dto.CommentCreateRequest;
import com.example.solidconnection.comment.dto.CommentCreateResponse;
import com.example.solidconnection.comment.dto.CommentDeleteResponse;
import com.example.solidconnection.comment.dto.CommentUpdateRequest;
import com.example.solidconnection.comment.dto.CommentUpdateResponse;
import com.example.solidconnection.comment.service.CommentService;
import com.example.solidconnection.community.comment.dto.CommentCreateRequest;
import com.example.solidconnection.community.comment.dto.CommentCreateResponse;
import com.example.solidconnection.community.comment.dto.CommentDeleteResponse;
import com.example.solidconnection.community.comment.dto.CommentUpdateRequest;
import com.example.solidconnection.community.comment.dto.CommentUpdateResponse;
import com.example.solidconnection.community.comment.service.CommentService;
import com.example.solidconnection.custom.resolver.AuthorizedUser;
import com.example.solidconnection.siteuser.domain.SiteUser;
import jakarta.validation.Valid;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.example.solidconnection.comment.domain;
package com.example.solidconnection.community.comment.domain;

import com.example.solidconnection.entity.common.BaseEntity;
import com.example.solidconnection.post.domain.Post;
import com.example.solidconnection.community.post.domain.Post;
import com.example.solidconnection.siteuser.domain.SiteUser;
import jakarta.persistence.CascadeType;
import jakarta.persistence.Column;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.example.solidconnection.comment.dto;
package com.example.solidconnection.community.comment.dto;

import com.example.solidconnection.comment.domain.Comment;
import com.example.solidconnection.post.domain.Post;
import com.example.solidconnection.community.comment.domain.Comment;
import com.example.solidconnection.community.post.domain.Post;
import com.example.solidconnection.siteuser.domain.SiteUser;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Size;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.example.solidconnection.comment.dto;
package com.example.solidconnection.community.comment.dto;

import com.example.solidconnection.comment.domain.Comment;
import com.example.solidconnection.community.comment.domain.Comment;

public record CommentCreateResponse(
Long id
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.solidconnection.comment.dto;
package com.example.solidconnection.community.comment.dto;

public record CommentDeleteResponse(
Long id
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.solidconnection.comment.dto;
package com.example.solidconnection.community.comment.dto;

import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Size;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.example.solidconnection.comment.dto;
package com.example.solidconnection.community.comment.dto;

import com.example.solidconnection.comment.domain.Comment;
import com.example.solidconnection.community.comment.domain.Comment;

public record CommentUpdateResponse(
Long id
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.example.solidconnection.comment.dto;
package com.example.solidconnection.community.comment.dto;

import com.example.solidconnection.comment.domain.Comment;
import com.example.solidconnection.community.comment.domain.Comment;
import com.example.solidconnection.siteuser.dto.PostFindSiteUserResponse;

import java.time.ZonedDateTime;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.example.solidconnection.comment.repository;
package com.example.solidconnection.community.comment.repository;

import com.example.solidconnection.comment.domain.Comment;
import com.example.solidconnection.community.comment.domain.Comment;
import com.example.solidconnection.custom.exception.CustomException;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
package com.example.solidconnection.comment.service;

import com.example.solidconnection.comment.domain.Comment;
import com.example.solidconnection.comment.dto.CommentCreateRequest;
import com.example.solidconnection.comment.dto.CommentCreateResponse;
import com.example.solidconnection.comment.dto.CommentDeleteResponse;
import com.example.solidconnection.comment.dto.CommentUpdateRequest;
import com.example.solidconnection.comment.dto.CommentUpdateResponse;
import com.example.solidconnection.comment.dto.PostFindCommentResponse;
import com.example.solidconnection.comment.repository.CommentRepository;
package com.example.solidconnection.community.comment.service;

import com.example.solidconnection.community.comment.domain.Comment;
import com.example.solidconnection.community.comment.dto.CommentCreateRequest;
import com.example.solidconnection.community.comment.dto.CommentCreateResponse;
import com.example.solidconnection.community.comment.dto.CommentDeleteResponse;
import com.example.solidconnection.community.comment.dto.CommentUpdateRequest;
import com.example.solidconnection.community.comment.dto.CommentUpdateResponse;
import com.example.solidconnection.community.comment.dto.PostFindCommentResponse;
import com.example.solidconnection.community.comment.repository.CommentRepository;
import com.example.solidconnection.custom.exception.CustomException;
import com.example.solidconnection.post.domain.Post;
import com.example.solidconnection.post.repository.PostRepository;
import com.example.solidconnection.community.post.domain.Post;
import com.example.solidconnection.community.post.repository.PostRepository;
import com.example.solidconnection.siteuser.domain.SiteUser;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
package com.example.solidconnection.post.controller;
package com.example.solidconnection.community.post.controller;

import com.example.solidconnection.community.post.dto.PostListResponse;
import com.example.solidconnection.custom.resolver.AuthorizedUser;
import com.example.solidconnection.post.dto.PostCreateRequest;
import com.example.solidconnection.post.dto.PostCreateResponse;
import com.example.solidconnection.post.dto.PostDeleteResponse;
import com.example.solidconnection.post.dto.PostDislikeResponse;
import com.example.solidconnection.post.dto.PostFindResponse;
import com.example.solidconnection.post.dto.PostLikeResponse;
import com.example.solidconnection.post.dto.PostUpdateRequest;
import com.example.solidconnection.post.dto.PostUpdateResponse;
import com.example.solidconnection.post.service.PostCommandService;
import com.example.solidconnection.post.service.PostLikeService;
import com.example.solidconnection.post.service.PostQueryService;
import com.example.solidconnection.community.post.dto.PostCreateRequest;
import com.example.solidconnection.community.post.dto.PostCreateResponse;
import com.example.solidconnection.community.post.dto.PostDeleteResponse;
import com.example.solidconnection.community.post.dto.PostDislikeResponse;
import com.example.solidconnection.community.post.dto.PostFindResponse;
import com.example.solidconnection.community.post.dto.PostLikeResponse;
import com.example.solidconnection.community.post.dto.PostUpdateRequest;
import com.example.solidconnection.community.post.dto.PostUpdateResponse;
import com.example.solidconnection.community.post.service.PostCommandService;
import com.example.solidconnection.community.post.service.PostLikeService;
import com.example.solidconnection.community.post.service.PostQueryService;
import com.example.solidconnection.siteuser.domain.SiteUser;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
Expand Down Expand Up @@ -39,6 +40,16 @@ public class PostController {
private final PostCommandService postCommandService;
private final PostLikeService postLikeService;

@GetMapping("/{code}")
public ResponseEntity<?> findPostsByCodeAndCategory(
@PathVariable(value = "code") String code,
@RequestParam(value = "category", defaultValue = "전체") String category) {

List<PostListResponse> postsByCodeAndPostCategory = postQueryService
.findPostsByCodeAndPostCategory(code, category);
return ResponseEntity.ok().body(postsByCodeAndPostCategory);
}

@PostMapping(value = "/{code}/posts")
public ResponseEntity<?> createPost(
@AuthorizedUser SiteUser siteUser,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
package com.example.solidconnection.post.domain;
package com.example.solidconnection.community.post.domain;

import com.example.solidconnection.board.domain.Board;
import com.example.solidconnection.comment.domain.Comment;
import com.example.solidconnection.entity.PostImage;
import com.example.solidconnection.community.board.domain.Board;
import com.example.solidconnection.community.comment.domain.Comment;
import com.example.solidconnection.entity.common.BaseEntity;
import com.example.solidconnection.post.dto.PostUpdateRequest;
import com.example.solidconnection.community.post.dto.PostUpdateRequest;
import com.example.solidconnection.siteuser.domain.SiteUser;
import com.example.solidconnection.type.PostCategory;
import jakarta.persistence.CascadeType;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.example.solidconnection.entity;
package com.example.solidconnection.community.post.domain;

import com.example.solidconnection.post.domain.Post;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.FetchType;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.solidconnection.post.domain;
package com.example.solidconnection.community.post.domain;

import com.example.solidconnection.siteuser.domain.SiteUser;
import jakarta.persistence.Entity;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.example.solidconnection.post.dto;
package com.example.solidconnection.community.post.dto;

import com.example.solidconnection.board.domain.Board;
import com.example.solidconnection.post.domain.Post;
import com.example.solidconnection.community.board.domain.Board;
import com.example.solidconnection.community.post.domain.Post;
import com.example.solidconnection.siteuser.domain.SiteUser;
import com.example.solidconnection.type.PostCategory;
import jakarta.validation.constraints.NotBlank;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.example.solidconnection.post.dto;
package com.example.solidconnection.community.post.dto;

import com.example.solidconnection.post.domain.Post;
import com.example.solidconnection.community.post.domain.Post;

public record PostCreateResponse(
Long id
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.solidconnection.post.dto;
package com.example.solidconnection.community.post.dto;

public record PostDeleteResponse(
Long id
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.example.solidconnection.post.dto;
package com.example.solidconnection.community.post.dto;

import com.example.solidconnection.post.domain.Post;
import com.example.solidconnection.community.post.domain.Post;

public record PostDislikeResponse(
Long likeCount,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.example.solidconnection.post.dto;
package com.example.solidconnection.community.post.dto;

import com.example.solidconnection.entity.PostImage;
import com.example.solidconnection.community.post.domain.PostImage;

import java.util.List;
import java.util.stream.Collectors;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.example.solidconnection.post.dto;
package com.example.solidconnection.community.post.dto;

import com.example.solidconnection.board.dto.PostFindBoardResponse;
import com.example.solidconnection.comment.dto.PostFindCommentResponse;
import com.example.solidconnection.post.domain.Post;
import com.example.solidconnection.community.board.dto.PostFindBoardResponse;
import com.example.solidconnection.community.comment.dto.PostFindCommentResponse;
import com.example.solidconnection.community.post.domain.Post;
import com.example.solidconnection.siteuser.dto.PostFindSiteUserResponse;

import java.time.ZonedDateTime;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.example.solidconnection.post.dto;
package com.example.solidconnection.community.post.dto;

import com.example.solidconnection.post.domain.Post;
import com.example.solidconnection.community.post.domain.Post;

public record PostLikeResponse(
Long likeCount,
Expand Down
Loading