✅ [Deploy] main <- develop 배포

.gitignore

@@ -48,3 +48,4 @@ out/
 
 ### VS Code ###
 .vscode/
+app.log

README.md

@@ -13,5 +13,39 @@ VECO는 **AI를 활용해 분산된 정보를 한곳에 모으고, 목표를 명
 - Redis
 - WebClient
 - AWS S3
-- Security
+- Spring Security
 ---
+## 🏗️ 프로젝트 구조
+- 도메인 주도 설계 (DDD)
+- main - develop 브랜치 구조: main = 배포 환경 / develop = 개발 환경
+- 새로운 브랜치명은 #이슈번호-이슈제목 으로 통일
+- 새로운 기능은 Feat/, 리팩토링은 Refactor/, 핫픽스는 Fix/로 통일
+
+### 📋 커밋 메시지 컨벤션
+|   Gitmoji   |    Tag     | Description |
+|:-----------:|:----------:| --- |
+|      ✨     |   `feat`   | 새로운 기능 추가 |
+|     🐛      |   `fix`    | 버그 수정 |
+|     📝      |   `docs`   | 문서 추가, 수정, 삭제 |
+|     ✅      |   `test`   | 테스트 코드 추가, 수정, 삭제 |
+|     💄      |  `style`   | 코드 형식 변경 |
+|     ♻️      | `refactor` | 코드 리팩토링 |
+|     ⚡️      |   `perf`   | 성능 개선 |
+|     💚      |    `ci`    | CI 관련 설정 수정 |
+|     🚀      |  `chore`   | 기타 변경사항 |
+|     🔥️      |  `remove`  | 코드 및 파일 제거 |
+
+---
+## 👤 담당 도메인
+- 이람/박승범: 외부이슈, Github 연동
+- 나우/고낭연: 워크스페이스, 사용자 세팅
+- 비니/문소빈: OAuth, 이슈
+- 이영/이은영: 이슈, 알림
+- 마크/김주헌: 목표, Slack 연동
+---
+## 🛜 서버 현황
+<img width="776" height="567" alt="스크린샷 2025-08-09 04 46 30" src="https://github.com/user-attachments/assets/f109d3c6-85dd-4725-9ae0-59a8ef432026" />
+
+- main-develop 브랜치 구조에 따라 배포환경, 개발환경을 따로 구성
+- 개발 환경(localhost:5173)과 배포 환경(web.vecoservice.shop)간 테스트를 진행
+- 추후, 서버를 통합 관리해 무중단 배포 전략(블루-그린) 사용

src/main/java/com/example/Veco/domain/assignee/converter/AssigneeConverter.java

@@ -1,6 +1,7 @@
 package com.example.Veco.domain.assignee.converter;
 
 import com.example.Veco.domain.assignee.entity.Assignee;
+import com.example.Veco.domain.external.entity.External;
 import com.example.Veco.domain.goal.entity.Goal;
 import com.example.Veco.domain.issue.entity.Issue;
 import com.example.Veco.domain.mapping.entity.MemberTeam;
@@ -34,4 +35,17 @@ public static Assignee toIssueAssignee(
                 .issue(issue)
                 .build();
     }
+
+    public static Assignee toExternalAssignee(
+            MemberTeam memberTeam,
+            Category type,
+            External external
+    ) {
+        return Assignee.builder()
+                .targetId(external.getId())
+                .type(type)
+                .memberTeam(memberTeam)
+                .external(external)
+                .build();
+    }
 }

src/main/java/com/example/Veco/domain/assignee/entity/Assignee.java

@@ -45,4 +45,9 @@ public class Assignee extends BaseEntity {
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "member_team_id")
     private MemberTeam memberTeam;
+
+    // update
+    public void updateMemberTeam(MemberTeam memberTeam) {
+        this.memberTeam = memberTeam;
+    }
 }

src/main/java/com/example/Veco/domain/assignee/repository/AssigneeQueryDsl.java

@@ -12,5 +12,6 @@ public interface AssigneeQueryDsl {
     List<Assignee> findByGoalIdIn(List<Long> goalIds);
     List<Assignee> findByExternalIdIn(List<Long> externalIds);
     void deleteAllByTypeAndTargetIds(Category type, List<Long> targetIds);
+    List<Assignee> findByTypeAndTargetId(Category type, Long targetId);
 }
 

src/main/java/com/example/Veco/domain/assignee/repository/AssigneeQueryDslImpl.java

@@ -89,4 +89,19 @@ public void deleteAllByTypeAndTargetIds(Category type, List<Long> targetIds) {
                 )
                 .execute();
     }
+
+    @Override
+    public List<Assignee> findByTypeAndTargetId(Category type, Long targetId) {
+        QAssignee assignee = QAssignee.assignee;
+        QMember member = QMember.member;
+
+        return queryFactory.selectFrom(assignee)
+                .innerJoin(member).on(member.id.eq(assignee.memberTeam.member.id))
+                .where(
+                        assignee.type.eq(type),
+                        assignee.targetId.eq(targetId),
+                        member.deletedAt.isNull()
+                )
+                .fetch();
+    }
 }

src/main/java/com/example/Veco/domain/assignee/repository/AssigneeRepository.java

@@ -12,5 +12,7 @@ public interface AssigneeRepository extends JpaRepository<Assignee, Long> , Assi
 
     void deleteAllByTypeAndTargetId(Category type, Long targetId);
 
-    List<Assignee> findAllByTypeAndMemberTeam_Team_id(Category type, Long memberTeamTeamId);
+    List<Assignee> findAllByMemberTeamIdIn(List<Long> memberTeamIds);
+
+    List<Assignee> findAllByGoal_TeamIdAndMemberTeamIsNull(Long teamId);
 }

src/main/java/com/example/Veco/domain/comment/entity/Comment.java

@@ -1,11 +1,15 @@
 package com.example.Veco.domain.comment.entity;
 
 import com.example.Veco.domain.common.BaseEntity;
+import com.example.Veco.domain.mapping.entity.CommentMember;
 import com.example.Veco.domain.member.entity.Member;
 
 import jakarta.persistence.*;
 import lombok.*;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @Entity
 @Getter
 @Builder
@@ -27,6 +31,9 @@ public class Comment extends BaseEntity {
     @JoinColumn(name = "comment_room_id")
     private CommentRoom commentRoom;
 
+    @OneToMany(mappedBy = "comment", cascade = CascadeType.REMOVE, orphanRemoval = true)
+    private List<CommentMember> commentMembers = new ArrayList<>();
+
     public void setMember(Member member) {
         this.member = member;
     }

src/main/java/com/example/Veco/domain/comment/repository/CommentQueryDsl.java

@@ -0,0 +1,10 @@
+package com.example.Veco.domain.comment.repository;
+
+import com.example.Veco.domain.comment.entity.Comment;
+import com.example.Veco.domain.comment.entity.CommentRoom;
+
+import java.util.List;
+
+public interface CommentQueryDsl {
+    List<Comment> findByCommentRoomOrderByIdDesc(CommentRoom commentRoom);
+}

src/main/java/com/example/Veco/domain/comment/repository/CommentQueryDslImpl.java

@@ -0,0 +1,36 @@
+package com.example.Veco.domain.comment.repository;
+
+import com.example.Veco.domain.comment.entity.Comment;
+import com.example.Veco.domain.comment.entity.CommentRoom;
+import com.example.Veco.domain.comment.entity.QComment;
+import com.example.Veco.domain.comment.entity.QCommentRoom;
+import com.querydsl.jpa.impl.JPAQueryFactory;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Repository;
+
+import java.util.Collections;
+import java.util.List;
+
+@Repository
+@RequiredArgsConstructor
+@Slf4j
+public class CommentQueryDslImpl implements CommentQueryDsl {
+
+    private final JPAQueryFactory queryFactory;
+
+    @Override
+    public List<Comment> findByCommentRoomOrderByIdDesc(CommentRoom commentRoom) {
+        QComment comment = QComment.comment;
+
+        if (commentRoom == null) {
+            return Collections.emptyList();
+        }
+
+        return queryFactory
+                .selectFrom(comment)
+                .where(comment.commentRoom.eq(commentRoom))
+                .orderBy(comment.id.desc())
+                .fetch();
+    }
+}

src/main/java/com/example/Veco/domain/comment/repository/CommentRepository.java

@@ -2,10 +2,14 @@
 
 import com.example.Veco.domain.comment.entity.Comment;
 import com.example.Veco.domain.comment.entity.CommentRoom;
+import com.example.Veco.domain.member.entity.Member;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;
 
-public interface CommentRepository extends JpaRepository<Comment, Long> {
+public interface CommentRepository extends JpaRepository<Comment, Long>, CommentQueryDsl {
     List<Comment> findAllByCommentRoomOrderByIdDesc(CommentRoom commentRoom);
+    List<Comment> findAllByCommentRoomOrderByIdAsc(CommentRoom commentRoom);
+    List<Comment> findByCommentRoomOrderByIdAsc(CommentRoom commentRoom);
+    void deleteAllByMember(Member member);
 }