Skip to content

Commit

Permalink
Merge pull request #245 from Modagbul/main
Browse files Browse the repository at this point in the history 
[release] MNG-17, MNG-12
  • Loading branch information
@minsu20
minsu20 authored Feb 11, 2024
2 parents 358dbf0 + a40b0f7 commit 00a21a2
Show file tree
Hide file tree
Showing 2 changed files with 179 additions and 179 deletions.
2 changes: 1 addition & 1 deletion src/main/java/com/moing/backend/domain/mission/application/service/MissionUpdateUseCase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public MissionCreateRes updateMission(String userSocialId, Long missionId, Missi
* 미션 생성자 확인
*/

if (!memberId.equals(mission.getMakerId()) || memberId.equals(team.getLeaderId())) {
if (!(memberId.equals(mission.getMakerId()) || memberId.equals(team.getLeaderId()))) {
throw new NoAccessUpdateMission();
}
mission.updateMission(missionReq);
Expand Down
356 changes: 178 additions & 178 deletions src/test/java/com/moing/backend/domain/board/domain/BoardRepositoryTest.java
View file
Original file line number Diff line number Diff line change
@@ -1,178 +1,178 @@
package com.moing.backend.domain.board.domain;

import com.moing.backend.domain.block.domain.entity.Block;
import com.moing.backend.domain.block.domain.repository.BlockRepository;
import com.moing.backend.domain.board.application.dto.request.CreateBoardRequest;
import com.moing.backend.domain.board.application.dto.response.GetAllBoardResponse;
import com.moing.backend.domain.board.application.mapper.BoardMapper;
import com.moing.backend.domain.board.domain.entity.Board;
import com.moing.backend.domain.board.domain.repository.BoardRepository;
import com.moing.backend.domain.boardRead.domain.entity.BoardRead;
import com.moing.backend.domain.boardRead.domain.repository.BoardReadRepository;
import com.moing.backend.domain.member.domain.constant.Gender;
import com.moing.backend.domain.member.domain.constant.RegistrationStatus;
import com.moing.backend.domain.member.domain.constant.Role;
import com.moing.backend.domain.member.domain.constant.SocialProvider;
import com.moing.backend.domain.member.domain.entity.Member;
import com.moing.backend.domain.member.domain.repository.MemberRepository;
import com.moing.backend.domain.team.domain.constant.ApprovalStatus;
import com.moing.backend.domain.team.domain.entity.Team;
import com.moing.backend.domain.team.domain.repository.TeamRepository;
import com.moing.backend.domain.teamMember.domain.entity.TeamMember;
import com.moing.backend.domain.teamMember.domain.repository.TeamMemberRepository;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.ActiveProfiles;
import org.springframework.transaction.annotation.Transactional;

import static org.assertj.core.api.AssertionsForClassTypes.assertThat;


@SpringBootTest
@AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.NONE)
@ActiveProfiles("dev")
@Transactional
public class BoardRepositoryTest {

@Autowired
MemberRepository memberRepository;

@Autowired
TeamMemberRepository teamMemberRepository;

@Autowired
TeamRepository teamRepository;

@Autowired
BoardRepository boardRepository;

@Autowired
BoardReadRepository boardReadRepository;

@Autowired
BlockRepository blockRepository;

private Member checkingMember, member1, member2;

private Team team;
private TeamMember checkingTM, tm1Deleted, tm2NotDeleted;
private CreateBoardRequest createBoardRequest;

@BeforeEach
void setUp() {
//given
checkingMember = memberRepository.save(new Member(null, "[email protected]", "undef", Gender.WOMAN, null, "민수", null, SocialProvider.KAKAO, RegistrationStatus.COMPLETED, Role.USER, "KAKAO@alstn"));
member1 = memberRepository.save(new Member(null, "[email protected]", "undef", Gender.WOMAN, null, "승연", null, SocialProvider.KAKAO, RegistrationStatus.COMPLETED, Role.USER, "KAKAO@tmddus"));
member2 = memberRepository.save(new Member(null, "[email protected]", "undef", Gender.WOMAN, null, "채영", null, SocialProvider.KAKAO, RegistrationStatus.COMPLETED, Role.USER, "KAKAO@codud"));

team = teamRepository.save(Team.builder()
.category("ETC")
.name("소모임 이름")
.introduction("소모임 소개")
.promise("소모임 각오")
.profileImgUrl("소모임 프로필 이미지 url")
.approvalStatus(ApprovalStatus.APPROVAL)
.leaderId(1L)
.numOfMember(2)
.levelOfFire(1)
.build());

checkingTM = teamMemberRepository.save(TeamMember.builder().team(team).member(checkingMember).isDeleted(false).build());
tm1Deleted = teamMemberRepository.save(TeamMember.builder().team(team).member(member1).isDeleted(true).build());
tm2NotDeleted = teamMemberRepository.save(TeamMember.builder().team(team).member(member2).isDeleted(true).build());

createBoardRequest = CreateBoardRequest.builder()
.title("게시글 제목")
.content("게시글 내용")
.isNotice(false)
.build();
}

@Test
@DisplayName("게시글을 읽은 경우")
void whenBoardIsRead_thenMarkAsRead() {
//given
Board board = boardRepository.save(BoardMapper.toBoard(checkingTM, team, createBoardRequest, false));

boardReadRepository.save(new BoardRead(null, board, team, checkingMember));

//when
GetAllBoardResponse response = boardRepository.findBoardAll(team.getTeamId(), checkingMember.getMemberId());

//then
assertThat(response.getNotNoticeBlocks().get(0).getIsRead()).isTrue();
}

@Test
@DisplayName("게시글을 읽지 않은 경우")
void whenBoardIsNotRead_thenMarkAsUnread() {
//given
Board board = boardRepository.save(BoardMapper.toBoard(checkingTM, team, createBoardRequest, false));

//when
GetAllBoardResponse response = boardRepository.findBoardAll(team.getTeamId(), checkingMember.getMemberId());

//then
assertThat(response.getNotNoticeBlocks().get(0).getIsRead()).isFalse();
}
@Test
@DisplayName("작성자가 삭제된 경우")
void 게시글_작성자가_탈퇴하지_않은_경우_게시글_전체_조회() {
//given
Board board = boardRepository.save(BoardMapper.toBoard(tm1Deleted, team, createBoardRequest, false)); //작성자 탈퇴한 경우

//when
GetAllBoardResponse response = boardRepository.findBoardAll(team.getTeamId(), checkingMember.getMemberId());

//then
assertThat(response.getNotNoticeBlocks().get(0).getWriterNickName()).isEqualTo("(알 수 없음)");
}

@Test
@DisplayName("유저 차단 경우 작성자 탈퇴 아님")
void 유저_탈퇴안했을때_차단_조회() {
//given
Board board = boardRepository.save(BoardMapper.toBoard(tm2NotDeleted, team, createBoardRequest, false)); //작성자 탈퇴한 경우
Block block = blockRepository.save(new Block(checkingMember.getMemberId(), member2.getMemberId()));

//when
GetAllBoardResponse response = boardRepository.findBoardAll(team.getTeamId(), checkingMember.getMemberId());

//then
assertThat(response.getNotNoticeBlocks().size()).isEqualTo(0);

}

@Test
@DisplayName("유저 차단 경우 작성자 탈퇴")
void 유저_탈퇴했을때_차단_조회() {
//given
Board board = boardRepository.save(BoardMapper.toBoard(tm1Deleted, team, createBoardRequest, false)); //작성자 탈퇴한 경우
Block block = blockRepository.save(new Block(checkingMember.getMemberId(), member1.getMemberId()));

//when
GetAllBoardResponse response = boardRepository.findBoardAll(team.getTeamId(), checkingMember.getMemberId());

//then
assertThat(response.getNotNoticeBlocks().size()).isEqualTo(0);
}

@Test
@DisplayName("유저 차단 경우 목표보드 게시글 개수")
void 유저_차단_게시글_조회(){
//given
Board board = boardRepository.save(BoardMapper.toBoard(tm2NotDeleted, team, createBoardRequest, false)); //작성자 탈퇴한 경우
Block block = blockRepository.save(new Block(checkingMember.getMemberId(), member2.getMemberId()));

//when
Integer unReadBoardNum= boardRepository.findUnReadBoardNum(team.getTeamId(), checkingMember.getMemberId());

//then
assertThat(unReadBoardNum).isEqualTo(0);
}

}
//package com.moing.backend.domain.board.domain;
//
//import com.moing.backend.domain.block.domain.entity.Block;
//import com.moing.backend.domain.block.domain.repository.BlockRepository;
//import com.moing.backend.domain.board.application.dto.request.CreateBoardRequest;
//import com.moing.backend.domain.board.application.dto.response.GetAllBoardResponse;
//import com.moing.backend.domain.board.application.mapper.BoardMapper;
//import com.moing.backend.domain.board.domain.entity.Board;
//import com.moing.backend.domain.board.domain.repository.BoardRepository;
//import com.moing.backend.domain.boardRead.domain.entity.BoardRead;
//import com.moing.backend.domain.boardRead.domain.repository.BoardReadRepository;
//import com.moing.backend.domain.member.domain.constant.Gender;
//import com.moing.backend.domain.member.domain.constant.RegistrationStatus;
//import com.moing.backend.domain.member.domain.constant.Role;
//import com.moing.backend.domain.member.domain.constant.SocialProvider;
//import com.moing.backend.domain.member.domain.entity.Member;
//import com.moing.backend.domain.member.domain.repository.MemberRepository;
//import com.moing.backend.domain.team.domain.constant.ApprovalStatus;
//import com.moing.backend.domain.team.domain.entity.Team;
//import com.moing.backend.domain.team.domain.repository.TeamRepository;
//import com.moing.backend.domain.teamMember.domain.entity.TeamMember;
//import com.moing.backend.domain.teamMember.domain.repository.TeamMemberRepository;
//import org.junit.jupiter.api.BeforeEach;
//import org.junit.jupiter.api.DisplayName;
//import org.junit.jupiter.api.Test;
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
//import org.springframework.boot.test.context.SpringBootTest;
//import org.springframework.test.context.ActiveProfiles;
//import org.springframework.transaction.annotation.Transactional;
//
//import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
//
//
//@SpringBootTest
//@AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.NONE)
//@ActiveProfiles("local")
//@Transactional
//public class BoardRepositoryTest {
//
// @Autowired
// MemberRepository memberRepository;
//
// @Autowired
// TeamMemberRepository teamMemberRepository;
//
// @Autowired
// TeamRepository teamRepository;
//
// @Autowired
// BoardRepository boardRepository;
//
// @Autowired
// BoardReadRepository boardReadRepository;
//
// @Autowired
// BlockRepository blockRepository;
//
// private Member checkingMember, member1, member2;
//
// private Team team;
// private TeamMember checkingTM, tm1Deleted, tm2NotDeleted;
// private CreateBoardRequest createBoardRequest;
//
// @BeforeEach
// void setUp() {
// //given
// checkingMember = memberRepository.save(new Member(null, "[email protected]", "undef", Gender.WOMAN, null, "민수", null, SocialProvider.KAKAO, RegistrationStatus.COMPLETED, Role.USER, "KAKAO@alstn"));
// member1 = memberRepository.save(new Member(null, "[email protected]", "undef", Gender.WOMAN, null, "승연", null, SocialProvider.KAKAO, RegistrationStatus.COMPLETED, Role.USER, "KAKAO@tmddus"));
// member2 = memberRepository.save(new Member(null, "[email protected]", "undef", Gender.WOMAN, null, "채영", null, SocialProvider.KAKAO, RegistrationStatus.COMPLETED, Role.USER, "KAKAO@codud"));
//
// team = teamRepository.save(Team.builder()
// .category("ETC")
// .name("소모임 이름")
// .introduction("소모임 소개")
// .promise("소모임 각오")
// .profileImgUrl("소모임 프로필 이미지 url")
// .approvalStatus(ApprovalStatus.APPROVAL)
// .leaderId(1L)
// .numOfMember(2)
// .levelOfFire(1)
// .build());
//
// checkingTM = teamMemberRepository.save(TeamMember.builder().team(team).member(checkingMember).isDeleted(false).build());
// tm1Deleted = teamMemberRepository.save(TeamMember.builder().team(team).member(member1).isDeleted(true).build());
// tm2NotDeleted = teamMemberRepository.save(TeamMember.builder().team(team).member(member2).isDeleted(true).build());
//
// createBoardRequest = CreateBoardRequest.builder()
// .title("게시글 제목")
// .content("게시글 내용")
// .isNotice(false)
// .build();
// }
//
// @Test
// @DisplayName("게시글을 읽은 경우")
// void whenBoardIsRead_thenMarkAsRead() {
// //given
// Board board = boardRepository.save(BoardMapper.toBoard(checkingTM, team, createBoardRequest, false));
//
// boardReadRepository.save(new BoardRead(null, board, team, checkingMember));
//
// //when
// GetAllBoardResponse response = boardRepository.findBoardAll(team.getTeamId(), checkingMember.getMemberId());
//
// //then
// assertThat(response.getNotNoticeBlocks().get(0).getIsRead()).isTrue();
// }
//
// @Test
// @DisplayName("게시글을 읽지 않은 경우")
// void whenBoardIsNotRead_thenMarkAsUnread() {
// //given
// Board board = boardRepository.save(BoardMapper.toBoard(checkingTM, team, createBoardRequest, false));
//
// //when
// GetAllBoardResponse response = boardRepository.findBoardAll(team.getTeamId(), checkingMember.getMemberId());
//
// //then
// assertThat(response.getNotNoticeBlocks().get(0).getIsRead()).isFalse();
// }
// @Test
// @DisplayName("작성자가 삭제된 경우")
// void 게시글_작성자가_탈퇴하지_않은_경우_게시글_전체_조회() {
// //given
// Board board = boardRepository.save(BoardMapper.toBoard(tm1Deleted, team, createBoardRequest, false)); //작성자 탈퇴한 경우
//
// //when
// GetAllBoardResponse response = boardRepository.findBoardAll(team.getTeamId(), checkingMember.getMemberId());
//
// //then
// assertThat(response.getNotNoticeBlocks().get(0).getWriterNickName()).isEqualTo("(알 수 없음)");
// }
//
// @Test
// @DisplayName("유저 차단 경우 작성자 탈퇴 아님")
// void 유저_탈퇴안했을때_차단_조회() {
// //given
// Board board = boardRepository.save(BoardMapper.toBoard(tm2NotDeleted, team, createBoardRequest, false)); //작성자 탈퇴한 경우
// Block block = blockRepository.save(new Block(checkingMember.getMemberId(), member2.getMemberId()));
//
// //when
// GetAllBoardResponse response = boardRepository.findBoardAll(team.getTeamId(), checkingMember.getMemberId());
//
// //then
// assertThat(response.getNotNoticeBlocks().size()).isEqualTo(0);
//
// }
//
// @Test
// @DisplayName("유저 차단 경우 작성자 탈퇴")
// void 유저_탈퇴했을때_차단_조회() {
// //given
// Board board = boardRepository.save(BoardMapper.toBoard(tm1Deleted, team, createBoardRequest, false)); //작성자 탈퇴한 경우
// Block block = blockRepository.save(new Block(checkingMember.getMemberId(), member1.getMemberId()));
//
// //when
// GetAllBoardResponse response = boardRepository.findBoardAll(team.getTeamId(), checkingMember.getMemberId());
//
// //then
// assertThat(response.getNotNoticeBlocks().size()).isEqualTo(0);
// }
//
// @Test
// @DisplayName("유저 차단 경우 목표보드 게시글 개수")
// void 유저_차단_게시글_조회(){
// //given
// Board board = boardRepository.save(BoardMapper.toBoard(tm2NotDeleted, team, createBoardRequest, false)); //작성자 탈퇴한 경우
// Block block = blockRepository.save(new Block(checkingMember.getMemberId(), member2.getMemberId()));
//
// //when
// Integer unReadBoardNum= boardRepository.findUnReadBoardNum(team.getTeamId(), checkingMember.getMemberId());
//
// //then
// assertThat(unReadBoardNum).isEqualTo(0);
// }
//
//}

0 comments on commit 00a21a2

Please sign in to comment.