Test/#95: 단위 테스트 코드 추가

src/main/java/app/allstackproject/privideo/domain/admin/dto/ReadAllVideoItem.java

@@ -4,9 +4,11 @@
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
 
 @Getter
+@NoArgsConstructor
 public class ReadAllVideoItem {
     private Long id;
 

src/main/java/app/allstackproject/privideo/domain/history/dto/HistoryItem.java

@@ -3,9 +3,11 @@
 import java.time.LocalDateTime;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
 
 @Getter
+@NoArgsConstructor
 @AllArgsConstructor
 public class HistoryItem {
     private Long id;

src/main/java/app/allstackproject/privideo/domain/user/dto/request/PostSignupRequest.java

@@ -35,7 +35,7 @@ public class PostSignupRequest {
     @AgeTypeConstraint
     private Integer age;
 
-    @NotBlank(message = "비밀번호를 입력해주세요.")
+    @NotBlank(message = "전화번호를 입력해주세요.")
     private String phoneNumber;
 
     private String organizationCode;

src/main/java/app/allstackproject/privideo/domain/user/service/UserService.java

@@ -1,36 +1,34 @@
 package app.allstackproject.privideo.domain.user.service;
 
-import static app.allstackproject.privideo.shared.enums.BaseStatusType.ACTIVE;
-import static app.allstackproject.privideo.shared.enums.BaseStatusType.INACTIVE;
 import static app.allstackproject.privideo.domain.organization.dto.enums.JoinStatusType.PENDING;
 import static app.allstackproject.privideo.global.response.status.BaseExceptionResponseStatus.ALREADY_LEAVED_USER;
-import static app.allstackproject.privideo.global.response.status.BaseExceptionResponseStatus.DB_CONSTRAINT_VIOLATE;
 import static app.allstackproject.privideo.global.response.status.BaseExceptionResponseStatus.DUPLICATE_EMAIL;
 import static app.allstackproject.privideo.global.response.status.BaseExceptionResponseStatus.INVALID_ORG_CODE;
 import static app.allstackproject.privideo.global.response.status.BaseExceptionResponseStatus.INVALID_PASSWORD;
 import static app.allstackproject.privideo.global.response.status.BaseExceptionResponseStatus.ORG_CODE_NOT_AVAILABLE;
 import static app.allstackproject.privideo.global.response.status.BaseExceptionResponseStatus.PASSWORD_MISMATCH;
 import static app.allstackproject.privideo.global.response.status.BaseExceptionResponseStatus.PASSWORD_SAME_AS_CURRENT;
 import static app.allstackproject.privideo.global.response.status.BaseExceptionResponseStatus.USER_NOT_FOUND;
+import static app.allstackproject.privideo.shared.enums.BaseStatusType.ACTIVE;
+import static app.allstackproject.privideo.shared.enums.BaseStatusType.INACTIVE;
 
+import app.allstackproject.privideo.domain.member.entity.Member;
+import app.allstackproject.privideo.domain.member.repository.MemberRepository;
+import app.allstackproject.privideo.domain.organization.entity.Organization;
+import app.allstackproject.privideo.domain.organization.repository.OrgRedisRepository;
+import app.allstackproject.privideo.domain.organization.repository.OrganizationRepository;
 import app.allstackproject.privideo.domain.user.dto.enums.GenderType;
-import app.allstackproject.privideo.global.exception.ApiException;
-import app.allstackproject.privideo.global.security.JwtProvider;
 import app.allstackproject.privideo.domain.user.dto.request.PostLoginRequest;
 import app.allstackproject.privideo.domain.user.dto.request.PostSignupRequest;
 import app.allstackproject.privideo.domain.user.dto.request.UpdateUserInfoRequest;
 import app.allstackproject.privideo.domain.user.dto.response.UserInfoResponse;
-import app.allstackproject.privideo.domain.member.entity.Member;
-import app.allstackproject.privideo.domain.organization.entity.Organization;
 import app.allstackproject.privideo.domain.user.entity.User;
-import app.allstackproject.privideo.domain.member.repository.MemberRepository;
-import app.allstackproject.privideo.domain.organization.repository.OrgRedisRepository;
-import app.allstackproject.privideo.domain.organization.repository.OrganizationRepository;
 import app.allstackproject.privideo.domain.user.repository.UserRepository;
+import app.allstackproject.privideo.global.exception.ApiException;
+import app.allstackproject.privideo.global.security.JwtProvider;
 import jakarta.validation.Valid;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
-import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -65,11 +63,7 @@ public boolean signup(@Valid PostSignupRequest postSignupRequest) {
                 postSignupRequest.getAge()
         ).hashPassword(passwordEncoder);
 
-        try {
-            userRepository.save(user);
-        } catch (DataIntegrityViolationException e) {
-            throw new ApiException(DB_CONSTRAINT_VIOLATE);
-        }
+        userRepository.save(user);
 
         String orgCode = postSignupRequest.getOrganizationCode();
         if (orgCode != null && !orgCode.isBlank()) {

src/test/java/app/allstackproject/privideo/domain/admin/NoticeAdminServiceTest.java

@@ -0,0 +1,194 @@
+package app.allstackproject.privideo.domain.admin;
+
+import static app.allstackproject.privideo.domain.organization.dto.enums.OpenScopeType.GROUP;
+import static app.allstackproject.privideo.domain.organization.dto.enums.OpenScopeType.PUBLIC;
+import static app.allstackproject.privideo.global.response.status.BaseExceptionResponseStatus.INVALID_MEMBER_GROUP_IDS;
+import static app.allstackproject.privideo.global.response.status.BaseExceptionResponseStatus.MEMBER_NOT_IN_ORGANIZATION;
+import static app.allstackproject.privideo.global.response.status.BaseExceptionResponseStatus.NOTICE_NOT_IN_ORGANIZATION;
+import static app.allstackproject.privideo.global.response.status.BaseExceptionResponseStatus.ORGANIZATION_NOT_FOUND;
+import static app.allstackproject.privideo.shared.enums.BaseStatusType.ACTIVE;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
+import app.allstackproject.privideo.domain.admin.dto.AdminReadNoticeResponse;
+import app.allstackproject.privideo.domain.admin.dto.CreateNoticeRequest;
+import app.allstackproject.privideo.domain.admin.dto.MemberGroupItem;
+import app.allstackproject.privideo.domain.admin.service.NoticeAdminService;
+import app.allstackproject.privideo.domain.member.entity.Member;
+import app.allstackproject.privideo.domain.member.entity.MemberGroup;
+import app.allstackproject.privideo.domain.member.repository.MemberGroupRepository;
+import app.allstackproject.privideo.domain.member.repository.MemberRepository;
+import app.allstackproject.privideo.domain.notice.entity.Notice;
+import app.allstackproject.privideo.domain.notice.entity.NoticeMemberGroupMapping;
+import app.allstackproject.privideo.domain.notice.repository.NoticeMemberGroupMappingRepository;
+import app.allstackproject.privideo.domain.notice.repository.NoticeRepository;
+import app.allstackproject.privideo.domain.organization.entity.Organization;
+import app.allstackproject.privideo.domain.organization.repository.OrganizationRepository;
+import app.allstackproject.privideo.global.exception.ApiException;
+import java.util.List;
+import java.util.Optional;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+@ExtendWith(MockitoExtension.class)
+public class NoticeAdminServiceTest {
+    @InjectMocks
+    private NoticeAdminService noticeAdminService;
+
+    @Mock
+    private OrganizationRepository organizationRepository;
+    @Mock
+    private MemberRepository memberRepository;
+    @Mock
+    private MemberGroupRepository memberGroupRepository;
+    @Mock
+    private NoticeRepository noticeRepository;
+    @Mock
+    private NoticeMemberGroupMappingRepository noticeMemberGroupMappingRepository;
+
+    @Test
+    @DisplayName("readNotice - 다른 조직 공지는 NOTICE_NOT_IN_ORGANIZATION")
+    void readNotice_notInOrg() {
+        Long orgId = 1L;
+        Long noticeId = 10L;
+
+        given(noticeRepository.findByIdAndOrganizationId(noticeId, orgId))
+                .willReturn(Optional.empty());
+
+        ApiException ex = assertThrows(ApiException.class,
+                () -> noticeAdminService.readNotice(orgId, noticeId));
+
+        assertThat(ex.getResponseStatus()).isEqualTo(NOTICE_NOT_IN_ORGANIZATION);
+    }
+
+    @Test
+    @DisplayName("readNotice - 조회 시 notice.watch() 호출 및 그룹 정보 포함")
+    void readNotice_success() {
+        Long orgId = 1L;
+        Long noticeId = 10L;
+
+        Organization org = mock(Organization.class);
+        Notice notice = mock(Notice.class);
+        MemberGroup group1 = mock(MemberGroup.class);
+        MemberGroup group2 = mock(MemberGroup.class);
+
+        given(noticeRepository.findByIdAndOrganizationId(noticeId, orgId))
+                .willReturn(Optional.of(notice));
+        given(memberGroupRepository.findAllByOrganizationId(orgId))
+                .willReturn(List.of(
+                        new MemberGroupItem(1L, "A"),
+                        new MemberGroupItem(2L, "B")
+                ));
+
+        NoticeMemberGroupMapping m1 = mock(NoticeMemberGroupMapping.class);
+        NoticeMemberGroupMapping m2 = mock(NoticeMemberGroupMapping.class);
+        given(m1.getMemberGroup()).willReturn(group1);
+        given(m2.getMemberGroup()).willReturn(group2);
+        given(group1.getId()).willReturn(1L);
+        given(group2.getId()).willReturn(2L);
+
+        given(noticeMemberGroupMappingRepository.findAllByNoticeId(noticeId))
+                .willReturn(List.of(m1, m2));
+
+        AdminReadNoticeResponse res = noticeAdminService.readNotice(orgId, noticeId);
+
+        verify(notice).watch();
+        assertThat(res.getMemberGroups())
+                .extracting("id")
+                .containsExactlyInAnyOrder(1L, 2L);
+    }
+
+    @Test
+    @DisplayName("createNotice - 조직이 없으면 ORGANIZATION_NOT_FOUND")
+    void createNotice_orgNotFound() {
+        Long orgId = 1L;
+        Long memberId = 10L;
+        CreateNoticeRequest req = new CreateNoticeRequest("t", "c", PUBLIC, List.of());
+
+        given(organizationRepository.findById(orgId))
+                .willReturn(Optional.empty());
+
+        ApiException ex = assertThrows(ApiException.class,
+                () -> noticeAdminService.createNotice(orgId, memberId, req));
+
+        assertThat(ex.getResponseStatus()).isEqualTo(ORGANIZATION_NOT_FOUND);
+    }
+
+    @Test
+    @DisplayName("createNotice - 조직 멤버가 아니면 MEMBER_NOT_IN_ORGANIZATION")
+    void createNotice_memberNotInOrg() {
+        Long orgId = 1L;
+        Long memberId = 10L;
+        CreateNoticeRequest req = new CreateNoticeRequest("t", "c", PUBLIC, List.of());
+
+        Organization org = mock(Organization.class);
+
+        given(organizationRepository.findById(orgId)).willReturn(Optional.of(org));
+        given(memberRepository.findByIdAndOrganizationIdAndStatus(memberId, orgId, ACTIVE))
+                .willReturn(Optional.empty());
+
+        ApiException ex = assertThrows(ApiException.class,
+                () -> noticeAdminService.createNotice(orgId, memberId, req));
+
+        assertThat(ex.getResponseStatus()).isEqualTo(MEMBER_NOT_IN_ORGANIZATION);
+    }
+
+    @Test
+    @DisplayName("createNotice - GROUP 공개인데 memberGroups 비어 있으면 INVALID_MEMBER_GROUP_IDS")
+    void createNotice_groupScope_emptyGroups() {
+        Long orgId = 1L;
+        Long memberId = 10L;
+        CreateNoticeRequest req = new CreateNoticeRequest("t", "c", GROUP, List.of());
+
+        Organization org = mock(Organization.class);
+        Member member = mock(Member.class);
+
+        given(organizationRepository.findById(orgId)).willReturn(Optional.of(org));
+        given(memberRepository.findByIdAndOrganizationIdAndStatus(memberId, orgId, ACTIVE))
+                .willReturn(Optional.of(member));
+
+        ApiException ex = assertThrows(ApiException.class,
+                () -> noticeAdminService.createNotice(orgId, memberId, req));
+
+        assertThat(ex.getResponseStatus()).isEqualTo(INVALID_MEMBER_GROUP_IDS);
+    }
+
+    @Test
+    @DisplayName("deleteNotice - 다른 조직 공지 삭제 시 NOTICE_NOT_IN_ORGANIZATION")
+    void deleteNotice_notInOrg() {
+        Long orgId = 1L;
+        Long noticeId = 10L;
+
+        given(noticeRepository.findByIdAndOrganizationId(noticeId, orgId))
+                .willReturn(Optional.empty());
+
+        ApiException ex = assertThrows(ApiException.class,
+                () -> noticeAdminService.deleteNotice(orgId, noticeId));
+
+        assertThat(ex.getResponseStatus()).isEqualTo(NOTICE_NOT_IN_ORGANIZATION);
+    }
+
+    @Test
+    @DisplayName("deleteNotice - 정상 삭제 시 매핑 + 공지 삭제")
+    void deleteNotice_success() {
+        Long orgId = 1L;
+        Long noticeId = 10L;
+        Notice notice = mock(Notice.class);
+
+        given(noticeRepository.findByIdAndOrganizationId(noticeId, orgId))
+                .willReturn(Optional.of(notice));
+
+        boolean result = noticeAdminService.deleteNotice(orgId, noticeId);
+
+        assertThat(result).isTrue();
+        verify(noticeMemberGroupMappingRepository).deleteAllByNoticeId(noticeId);
+        verify(noticeRepository).delete(notice);
+    }
+}