dev ➡️ main 반영

src/main/java/dev/woori/wooriLog/domain/DomainConstants.java

@@ -2,4 +2,5 @@
 
 public abstract class DomainConstants {
     public static final String LEADER = "팀장";
+    public static final String MEMBER = "팀원";
 }

src/main/java/dev/woori/wooriLog/domain/blog/controller/BlogController.java

@@ -1,6 +1,6 @@
 package dev.woori.wooriLog.domain.blog.controller;
 
-import dev.woori.wooriLog.domain.blog.dto.request.BlogCreateReq;
+import dev.woori.wooriLog.domain.blog.dto.request.BlogCreateOrUpdateReq;
 import dev.woori.wooriLog.domain.blog.dto.response.BlogCreateRes;
 import dev.woori.wooriLog.domain.blog.dto.response.BlogDetailInfoRes;
 import dev.woori.wooriLog.domain.blog.service.BlogService;
@@ -10,39 +10,60 @@
 import dev.woori.wooriLog.global.response.SuccessCode;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Optional;
 
+
+@Slf4j
 @RestController
 @RequestMapping("/api")
 @RequiredArgsConstructor
 public class BlogController {
 
     private final BlogService blogService;
 
+    // 최신 5개의 블로그 조회 (홈화면)
     @GetMapping("/blog/home")
     public ResponseEntity<BaseResponse<?>> getHomeBlogInfos() {
         return ApiResponseUtil.success(SuccessCode.OK, blogService.getBlogBasicInfos());
     }
 
+    // 블로그 작성
     @PostMapping("/blog/{projectId}")
     public ResponseEntity<BaseResponse<?>> createBlog(
             @PathVariable("projectId") Long projectId,
             @UserId Long userId,
-            @Valid @RequestBody BlogCreateReq request
+            @Valid @RequestBody BlogCreateOrUpdateReq request
     ) {
         return ApiResponseUtil.success(
                 SuccessCode.OK,
                 BlogCreateRes.from(blogService.createBlog(projectId, userId, request))
         );
     }
 
+    // 블로그 조회
     @GetMapping("/blog/{postId}")
     public ResponseEntity<BaseResponse<?>> getBlogInfo(
+            @UserId Optional<Long> userId,
             @PathVariable("postId") Long postId
     ) {
-        BlogDetailInfoRes res = blogService.getBlogInfo(postId);
+        BlogDetailInfoRes res = blogService.getBlogInfo(userId, postId);
         return ApiResponseUtil.success(SuccessCode.OK, res);
     }
+
+    // 블로그 수정
+    @PutMapping("/blog/{postId}")
+    public ResponseEntity<BaseResponse<?>> updateBlog(@UserId Long userId, @PathVariable("postId") Long postId, @Valid @RequestBody BlogCreateOrUpdateReq request){
+        return ApiResponseUtil.success(SuccessCode.OK, blogService.updateBlog(userId, postId, request));
+    }
+
+    // 블로그 삭제
+    @DeleteMapping("/blog/{postId}")
+    public ResponseEntity<BaseResponse<?>> deleteBlog(@UserId Long userId, @PathVariable("postId") Long postId) {
+        blogService.deleteBlog(userId, postId);
+        return ApiResponseUtil.success(SuccessCode.OK);
+    }
 }

src/main/java/dev/woori/wooriLog/domain/blog/dto/request/BlogCreateReq.java → src/main/java/dev/woori/wooriLog/domain/blog/dto/request/BlogCreateOrUpdateReq.java

@@ -1,16 +1,14 @@
 package dev.woori.wooriLog.domain.blog.dto.request;
 
-import dev.woori.wooriLog.domain.blog.entity.Progress;
 import dev.woori.wooriLog.domain.blog.enums.Category;
-import dev.woori.wooriLog.domain.blog.enums.ProgressValue;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import lombok.Builder;
 
 import java.util.List;
 
 @Builder
-public record BlogCreateReq(
+public record BlogCreateOrUpdateReq(
         @NotBlank
         String title,
 

src/main/java/dev/woori/wooriLog/domain/blog/dto/response/BlogBasicInfoRes.java

@@ -4,8 +4,10 @@
 import dev.woori.wooriLog.domain.blog.entity.Blog;
 import dev.woori.wooriLog.domain.blog.entity.Progress;
 import dev.woori.wooriLog.domain.blog.enums.Category;
+import dev.woori.wooriLog.domain.member.entity.Member;
 import lombok.Builder;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 @Builder
@@ -14,19 +16,27 @@ public record BlogBasicInfoRes(
         String title,
         String projectName,
         String authorName,
+        String authorProfileUrl,
         Category category,
         List<String> tags,
-        List<ProgressDto> progresses
+        List<ProgressDto> progresses,
+        LocalDateTime createdAt,
+        LocalDateTime updatedAt
 ) {
     public static BlogBasicInfoRes create(Blog blog) {
+        Member author = blog.getMember();
+
         return BlogBasicInfoRes.builder()
                 .blogId(blog.getId())
                 .title(blog.getTitle())
                 .projectName(blog.getProject().getProjectName())
-                .authorName(blog.getMember().getName())
+                .authorName(author.getName())
+                .authorProfileUrl(author.getProfileUrl())
                 .category(blog.getCategory())
                 .tags(blog.getTags())
                 .progresses(transProgressDtos(blog.getProgresses()))
+                .createdAt(blog.getCreatedAt())
+                .updatedAt(blog.getUpdatedAt())
                 .build();
     }
 

src/main/java/dev/woori/wooriLog/domain/blog/dto/response/BlogDetailInfoRes.java

@@ -7,16 +7,19 @@
 
 @Builder
 public record BlogDetailInfoRes(
+        boolean isAuthor,
         BlogDto post,
         BlogProjectDto project,
         MemberInfoDto author
 ) {
     public static BlogDetailInfoRes create(
+            boolean isAuthor,
             BlogDto post,
             BlogProjectDto project,
             MemberInfoDto author
     ) {
         return BlogDetailInfoRes.builder()
+                .isAuthor(isAuthor)
                 .post(post)
                 .project(project)
                 .author(author)

src/main/java/dev/woori/wooriLog/domain/blog/entity/Blog.java

@@ -1,6 +1,6 @@
 package dev.woori.wooriLog.domain.blog.entity;
 
-import dev.woori.wooriLog.domain.blog.dto.request.BlogCreateReq;
+import dev.woori.wooriLog.domain.blog.dto.request.BlogCreateOrUpdateReq;
 import dev.woori.wooriLog.domain.blog.enums.Category;
 import dev.woori.wooriLog.domain.member.entity.Member;
 import dev.woori.wooriLog.domain.project.entity.Project;
@@ -55,7 +55,7 @@ public class Blog extends BaseEntity {
     @Builder.Default
     private List<Progress> progresses = new ArrayList<>();
 
-    public static Blog create(Project project, Member member, BlogCreateReq request, List<Progress> progresses) {
+    public static Blog create(Project project, Member member, BlogCreateOrUpdateReq request, List<Progress> progresses) {
         Blog blog = Blog.builder()
                 .document(request.document())
                 .title(request.title())
@@ -68,6 +68,18 @@ public static Blog create(Project project, Member member, BlogCreateReq request,
         return blog;
     }
 
+    public void update(BlogCreateOrUpdateReq request, List<Progress> progresses) {
+        this.title = request.title();
+        this.category = request.category();
+        this.document = request.document();
+        // 태그 초기화 및 업데이트
+        this.tags.clear();
+        this.tags.addAll(request.tags());
+        // Progress 초기화 및 업데이트
+        this.progresses.clear();
+        addProgresses(progresses);
+    }
+
     private void addProgress(Progress p) {
         this.progresses.add(p);
         p.setBlog(this);

src/main/java/dev/woori/wooriLog/domain/blog/enums/Category.java

@@ -4,10 +4,11 @@
 import com.fasterxml.jackson.annotation.JsonValue;
 
 public enum Category {
-    BLOG("블로그"),
     CHECKPOINT("체크포인트"),
-    REVIEW("리뷰"),
-    TECH("기술/딥다이브");
+    REVIEW("회고"),
+    TROUBLESHOOTING("트러블슈팅"),
+    DEEPDIVE("딥다이브"),
+    ETC("기타");
 
     private final String value;
 

src/main/java/dev/woori/wooriLog/domain/blog/enums/ProgressValue.java

@@ -4,10 +4,23 @@
 import com.fasterxml.jackson.annotation.JsonValue;
 
 public enum ProgressValue {
+    // 회고
+    OUTLINE("개요"),
+    KEEP("잘했던 점"),
+    PROBLEM("아쉬웠던 점"),
+    TRY("배운 점 & 개선 방안"),
+    // 트러블 슈팅
     SITUATION("상황"),
     CONCERN("고민"),
     ACTION("실행"),
-    REFLECTION("회고/성장");
+    REFLECTION("회고/성장"),
+    // 딥다이브
+    INTRODUCE("기술소개"),
+    EXAMPLE("예시"),
+    CORE("핵심 개념"),
+    CONCLUSION("결론"),
+    // 기타
+    SUMMARY("요약");
 
     private final String value;
 

src/main/java/dev/woori/wooriLog/domain/blog/repository/BlogRepository.java

@@ -15,6 +15,9 @@
 public interface BlogRepository extends JpaRepository<Blog, Long> {
     Optional<Blog> findById(Long blogId);
 
+    @Query("SELECT b FROM Blog b JOIN FETCH b.member WHERE b.id = :blogId")
+    Optional<Blog> findByIdWithMember(@Param("blogId") Long blogId);
+
     @Query("SELECT b FROM Blog b LEFT JOIN FETCH b.tags WHERE b.member.id = :memberId")
     List<Blog> findByMemberId(Long memberId);
 

src/main/java/dev/woori/wooriLog/domain/blog/service/BlogService.java

@@ -2,7 +2,7 @@
 
 
 import dev.woori.wooriLog.domain.blog.dto.*;
-import dev.woori.wooriLog.domain.blog.dto.request.BlogCreateReq;
+import dev.woori.wooriLog.domain.blog.dto.request.BlogCreateOrUpdateReq;
 import dev.woori.wooriLog.domain.blog.dto.response.BlogBasicInfoRes;
 import dev.woori.wooriLog.domain.blog.dto.response.BlogDetailInfoRes;
 import dev.woori.wooriLog.domain.blog.entity.Blog;
@@ -17,10 +17,12 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.PageRequest;
+import org.springframework.security.access.AccessDeniedException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
+import java.util.Optional;
 
 import static dev.woori.wooriLog.global.response.error.ErrorMessage.*;
 
@@ -41,17 +43,14 @@ public class BlogService {
      * @param request 새로운 글의 데이터가 담긴 request
      */
     @Transactional
-    public Long createBlog(Long projectId, Long userId, BlogCreateReq request) {
+    public Long createBlog(Long projectId, Long userId, BlogCreateOrUpdateReq request) {
         log.info("[Blog Service] Create Blog : projectId={}, userId={}", projectId, userId);
         // 프로젝트-멤버 관계 조회
         ProjectMember projectMember = projectMemberRepository.findWithMemberAndProjectByIds(projectId, userId)
                 .orElseThrow(() -> new EntityNotFoundException(RELATION_NOT_FOUND));
 
         // Progress Entity 생성
-        List<Progress> progresses = request.progresses().stream()
-                .filter(progressDto -> progressDto.message() != null && !progressDto.message().isBlank())
-                .map(Progress::create)
-                .toList();
+        List<Progress> progresses = filterAndCreateProgress(request);
 
         // Blog Entity 생성
         Blog createdBlog = Blog.create(
@@ -72,16 +71,17 @@ public Long createBlog(Long projectId, Long userId, BlogCreateReq request) {
      * @return BlogDetailInfoRes: 열람할 글, 작성자, 작성 프로젝트의 정보
      */
     @Transactional
-    public BlogDetailInfoRes getBlogInfo(Long postId) {
+    public BlogDetailInfoRes getBlogInfo(Optional<Long> memberId, Long postId) {
         log.info("[Blog Service] Get Blog Info : blogId={}", postId);
-
         Blog blog = blogRepository.findBlogByIdWithDetails(postId)
                 .orElseThrow(() -> new EntityNotFoundException(BLOG_NOT_FOUND));
 
         Project project = blog.getProject();
         Member author = blog.getMember();
+        boolean isAuthor = checkAuthor(memberId, author.getId());
 
         return BlogDetailInfoRes.create(
+                isAuthor,
                 BlogDto.create(blog),
                 createBlogProjectDTO(project, author),
                 MemberInfoDto.create(author)
@@ -117,4 +117,65 @@ private BlogProjectDto createBlogProjectDTO(Project project, Member author) {
 
         return BlogProjectDto.create(project, memberList);
     }
+
+    /**
+     * 블로그 id와 수정된 블로그 포스팅 정보를 통해 블로그 글을 수정
+     * 블로그 글 작성자 id와 요청을 보낸 사용자 id가 일치하지 않으면 예외 발생
+     * @param userId 사용자 id
+     * @param blogId 블로그 id
+     * @param request 블로그 수정 폼에 담긴 내용들
+     * @return blogId 블로그 id
+     */
+    @Transactional
+    public Long updateBlog(Long userId, Long blogId, BlogCreateOrUpdateReq request) {
+        log.info("[Blog Service] Update Blog : blogId={}", blogId);
+        Blog blog = findBlogAndCheckOwnerShip(userId, blogId);
+        List<Progress> progresses = filterAndCreateProgress(request);
+        blog.update(request, progresses);
+        return blogId;
+    }
+
+    /**
+     * 블로그 id를 받아와 해당 블로그 글을 삭제
+     * 블로그 글 작성자 id와 요청을 보낸 사용자 id가 일치하지 않으면 예외 발생
+     * @param userId 사용자 id
+     * @param blogId 블로그 id
+     */
+    @Transactional
+    public void deleteBlog(Long userId, Long blogId) {
+        log.info("[Blog Service] Delete Blog : blogId={}", blogId);
+        Blog blog = findBlogAndCheckOwnerShip(userId, blogId);
+        blogRepository.delete(blog);
+    }
+
+    /**
+     * 블로그 글 id를 통해 블로그 글을 가져오고 글의 작성자인지 확인하는 메서드
+     * @param userId 사용자 id
+     * @param blogId 블로그 id
+     * @return Blog 요청을 보낸 사람이 작성자인 게 확인된 블로그 entity
+     */
+    private Blog findBlogAndCheckOwnerShip(Long userId, Long blogId) {
+        Blog blog = blogRepository.findByIdWithMember(blogId).orElseThrow(() -> new EntityNotFoundException(BLOG_NOT_FOUND));
+        if (!blog.getMember().getId().equals(userId)) {
+            throw new AccessDeniedException(BLOG_ACCESS_DENIED);
+        }
+        return blog;
+    }
+
+    /**
+     * 글의 작성자인지 확인하는 메서드
+     * @param memberId 조회한 유저의 memberId
+     * @param authorId 작성자의 memberId
+     * @return boolean 조회한 클라이언트가 작성자인지 여부
+     */
+    private static boolean checkAuthor(Optional<Long> memberId, Long authorId) {
+        return memberId.filter(id -> id.equals(authorId)).isPresent();
+    }
+
+    private static List<Progress> filterAndCreateProgress(BlogCreateOrUpdateReq request) {
+        return request.progresses().stream()
+                .filter(progressDto -> progressDto.message() != null && !progressDto.message().isBlank())
+                .map(Progress::create)
+                .toList();
+    }
 }

src/main/java/dev/woori/wooriLog/domain/member/controller/MemberController.java

@@ -17,21 +17,25 @@ public class MemberController {
 
     private final MemberService memberService;
 
+    // 이메일을 이용한 유저 검색
     @GetMapping("/members/search")
     public ResponseEntity<?> getMembersInfoByEmail(@RequestParam String email, @UserId Long memberId) {
         return ApiResponseUtil.success(SuccessCode.OK, memberService.findMembersByEmail(email, memberId));
     }
 
+    // 유저 조회
     @GetMapping("/members")
     public ResponseEntity<?> getMemberInfoById(@UserId Long userId) {
         return ApiResponseUtil.success(SuccessCode.OK, memberService.getMemberInfo(userId));
     }
 
+    // 유저 프로필 조회
     @GetMapping("/members/profile")
     public ResponseEntity<?> getProfileInfoById(@UserId Long userId) {
         return ApiResponseUtil.success(SuccessCode.OK, memberService.getProfileInfoById(userId));
     }
 
+    // 유저 프로필 수정
     @PutMapping("/members/profile")
     public ResponseEntity<?> updateMemberInfo(@UserId Long userId, @Valid @RequestBody MemberUpdateReq request) {
         return ApiResponseUtil.success(SuccessCode.OK, memberService.updateMemberInfo(userId, request));