Skip to content

Commit

Permalink
[ADD] Transactional 어노테이션 수정
Browse files Browse the repository at this point in the history
  • Loading branch information
Kim-Dong-Jun99 committed Jun 29, 2023
1 parent 4b3b3a3 commit e48e2d2
Show file tree
Hide file tree
Showing 11 changed files with 44 additions and 50 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
import com.uliga.uliga_backend.domain.Record.model.Record;
import com.uliga.uliga_backend.domain.Schedule.application.ScheduleService;
import com.uliga.uliga_backend.global.error.exception.NotFoundByIdException;
import jakarta.transaction.Transactional;
import org.springframework.transaction.annotation.Transactional;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.data.domain.Page;
Expand Down Expand Up @@ -84,7 +84,7 @@ public class AccountBookService {
* @param memberId 멤버 아이디
* @return 가계부 정보
*/
@Transactional
@Transactional(readOnly = true)
public AccountBookInfo getSingleAccountBookInfo(Long id, Long memberId) {
AccountBookInfoQ bookInfoById = accountBookRepository.findAccountBookInfoById(id, memberId);
if (bookInfoById == null) {
Expand All @@ -102,7 +102,7 @@ public AccountBookInfo getSingleAccountBookInfo(Long id, Long memberId) {
* @param id 멤버 아이디
* @return 멤버 가계부 정보 리스트
*/
@Transactional
@Transactional(readOnly = true)
public GetAccountBookInfos getMemberAccountBook(Long id) {
List<AccountBookInfo> result = new ArrayList<>();
List<AccountBookInfoQ> accountBookInfosByMemberId = accountBookRepository.findAccountBookInfosByMemberId(id);
Expand Down Expand Up @@ -354,7 +354,7 @@ public CreateResult createItems(Long id, CreateItems createItems) {
* @param id 가계부 아이디
* @return 가계부 카테고리 정보
*/
@Transactional
@Transactional(readOnly = true)
public AccountBookCategories getAccountBookCategories(Long id) {
return new AccountBookCategories(accountBookRepository.findAccountBookCategoryInfoById(id));
}
Expand All @@ -364,7 +364,7 @@ public AccountBookCategories getAccountBookCategories(Long id) {
* @param id 가계부 아이디
* @return 가계부 멤버 정보
*/
@Transactional
@Transactional(readOnly = true)
public AccountBookMembers getAccountBookMembers(Long id) {
return new AccountBookMembers(accountBookRepository.findAccountBookMemberInfoById(id));
}
Expand Down Expand Up @@ -399,7 +399,7 @@ public CategoryCreateResult createCategory(Long memberId, CategoryCreateRequest
* @param month 월
* @return 해당 달 날짜별 수입/지출 총합
*/
@Transactional
@Transactional(readOnly = true)
public AccountBookIncomesAndRecords getAccountBookItems(Long id, Long year, Long month) {

return AccountBookIncomesAndRecords.builder()
Expand All @@ -415,7 +415,7 @@ public AccountBookIncomesAndRecords getAccountBookItems(Long id, Long year, Long
* @param day 날짜
* @return 수입&지출 정보 리스트
*/
@Transactional
@Transactional(readOnly = true)
public RecordAndIncomeDetails getAccountBookItemDetails(Long id, Long year, Long month, Long day) {
HashMap<String, Object> map = new HashMap<>();
map.put("accountBookId", id);
Expand All @@ -442,7 +442,7 @@ public void deleteAccountBookItems(DeleteItemRequest deleteItemRequest) {
* @param month 월
* @return 월별 예산, 지출, 수입 총합 조회
*/
@Transactional
@Transactional(readOnly = true)
public GetAccountBookAssets getAccountBookAssets(Long id, Long year, Long month) {
MonthlySumQ budget = budgetRepository.getMonthlySumByAccountBookId(id, year, month).orElse(new MonthlySumQ(0L));
MonthlySumQ record = recordRepository.getMonthlySumByAccountBookId(id, year, month).orElse(new MonthlySumQ(0L));
Expand Down Expand Up @@ -525,7 +525,7 @@ public AddScheduleResult addSchedule(Long memberId, AddSchedules addSchedules) t
* @param accountBookId 가계부 아이디
* @return 가계부 금융 일정 조회
*/
@Transactional
@Transactional(readOnly = true)
public GetAccountBookSchedules getAccountBookSchedules(Long memberId, Long accountBookId) {
if (accountBookMemberRepository.existsAccountBookMemberByMemberIdAndAccountBookId(memberId, accountBookId)) {

Expand Down Expand Up @@ -561,7 +561,7 @@ public String deleteAccountBook(Long id, Long memberId) {
* @param pageable 페이징 정보
* @return 가계부 내역
*/
@Transactional
@Transactional(readOnly = true)
public Page<AccountBookDataQ> getAccountBookHistory(Long accountBookId, Long categoryId, Long year, Long month, Pageable pageable) {
HashMap<String, Object> map = new HashMap<>();
map.put("accountBookId", accountBookId);
Expand Down Expand Up @@ -644,7 +644,7 @@ public AccountBookUpdateRequest updateAccountBookInfo(Long memberId, Long accoun
* @param month 달
* @return 날짜별 지출 총합
*/
@Transactional
@Transactional(readOnly = true)
public AccountBookDailyRecord getAccountBookDailyRecord(Long id, Long year, Long month) {
List<DailyValueQ> monthlyRecord = accountBookRepository.getMonthlyRecord(id, year, month);

Expand Down Expand Up @@ -688,7 +688,7 @@ public AccountBookDailyRecord getAccountBookDailyRecord(Long id, Long year, Long
* @param month 달
* @return 분석 정보
*/
@Transactional
@Transactional(readOnly = true)
public AccountBookCategoryAnalyze getAccountBookCategoryAnalyze(Long id, Long year, Long month) {
List<AccountBookCategoryAnalyzeQ> categoryAnalyze = accountBookRepository.findAccountBookCategoryAnalyze(id, year, month);
Optional<MonthlySumQ> monthlySum = recordRepository.getMonthlySumByAccountBookId(id, year, month);
Expand Down Expand Up @@ -725,7 +725,7 @@ public AccountBookCategoryAnalyze getAccountBookCategoryAnalyze(Long id, Long ye
* @param memberId 멤버 아이디
* @return 고정 지출 분석 결과
*/
@Transactional
@Transactional(readOnly = true)
public AccountScheduleAnalyze getAccountBookScheduleAnalyze(Long accountBookId, Long memberId) {
return AccountScheduleAnalyze.builder().schedules(scheduleService.findAnalyze(accountBookId, memberId)).sum(accountBookRepository.getMonthlyScheduleValue(accountBookId, memberId).getValue()).build();
}
Expand All @@ -737,7 +737,7 @@ public AccountScheduleAnalyze getAccountBookScheduleAnalyze(Long accountBookId,
* @param month 달
* @return 비교 결과
*/
@Transactional
@Transactional(readOnly = true)
public MonthlyCompare getAccountBookMonthlyCompare(Long accountBookId, Long year, Long month) {
List<MonthlyCompareQ> monthlyCompare = new ArrayList<>();

Expand Down Expand Up @@ -768,7 +768,7 @@ public MonthlyCompare getAccountBookMonthlyCompare(Long accountBookId, Long year
* @param category 카테고리
* @return 내역
*/
@Transactional
@Transactional(readOnly = true)
public Page<AccountBookDataQ> getAccountBookMonthlyRecord(Long accountBookId, Long year, Long month, Pageable pageable, String category) {
HashMap<String, Object> map = new HashMap<>();
map.put("accountBookId", accountBookId);
Expand Down Expand Up @@ -808,7 +808,7 @@ public Page<AccountBookDataQ> getAccountBookMonthlyRecord(Long accountBookId, Lo
* @param month 달
* @return 비교 결과
*/
@Transactional
@Transactional(readOnly = true)
public BudgetCompare getBudgetCompare(Long accountBookId, Long year, Long month) {

Optional<MonthlySumQ> recordSum = recordRepository.getMonthlySumByAccountBookId(accountBookId, year, month);
Expand Down Expand Up @@ -836,7 +836,7 @@ public BudgetCompare getBudgetCompare(Long accountBookId, Long year, Long month)
* @param startDay 분석 시작 일
* @return 주차별 분석 결과
*/
@Transactional
@Transactional(readOnly = true)
public AccountBookWeeklyRecord getAccountBookWeeklyRecord(Long accountBookId, Long year, Long month, Long startDay) {
Long totalSum = 0L;
List<WeeklySum> result = new ArrayList<>();
Expand Down Expand Up @@ -877,8 +877,7 @@ public AccountBookWeeklyRecord getAccountBookWeeklyRecord(Long accountBookId, Lo
* @param pageable 페이지 정보
* @return 해당 기간 가계부 내역 데이터
*/

@Transactional
@Transactional(readOnly = true)
public Page<AccountBookDataQ> getCustomAccountBookData(Long id, Long year, Long month, Long startDay, Long endDay, String category, Pageable pageable) {
HashMap<String, Object> map = new HashMap<>();
map.put("accountBookId", id);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@
import com.uliga.uliga_backend.global.error.exception.IdNotFoundException;
import com.uliga.uliga_backend.global.error.exception.InvalidDataValueException;
import com.uliga.uliga_backend.global.error.exception.NotFoundByIdException;
import jakarta.transaction.Transactional;
import lombok.RequiredArgsConstructor;
import org.springframework.transaction.annotation.Transactional;import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import com.uliga.uliga_backend.domain.Category.exception.DuplicateCategoryException;
import com.uliga.uliga_backend.domain.Category.model.Category;
import com.uliga.uliga_backend.global.error.exception.NotFoundByIdException;
import jakarta.transaction.Transactional;
import org.springframework.transaction.annotation.Transactional;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import com.uliga.uliga_backend.domain.Record.dao.RecordRepository;
import com.uliga.uliga_backend.global.error.exception.IdNotFoundException;
import com.uliga.uliga_backend.global.error.exception.NotFoundByIdException;
import jakarta.transaction.Transactional;
import org.springframework.transaction.annotation.Transactional;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.data.domain.Page;
Expand Down Expand Up @@ -192,7 +192,7 @@ public IncomeUpdateRequest updateIncome(Map<String, Object> updates) {
* @param pageable 페이징 정보
* @return 조회 결과
*/
@Transactional
@Transactional(readOnly = true)
public Page<IncomeInfoQ> getMemberIncomesByAccountBook(Long accountBookId, Long categoryId, Long year, Long month, Pageable pageable) {
HashMap<String, Object> map = new HashMap<>();
map.put("accountBookId", accountBookId);
Expand All @@ -214,7 +214,7 @@ public Page<IncomeInfoQ> getMemberIncomesByAccountBook(Long accountBookId, Long
* @param pageable 페이징 정보
* @return 수입 조회 결과
*/
@Transactional
@Transactional(readOnly = true)
public Page<IncomeInfoQ> getMemberIncomes(Long id, Pageable pageable) {
return incomeRepository.getMemberIncomes(id, pageable);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import com.uliga.uliga_backend.global.jwt.JwtTokenProvider;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.transaction.Transactional;
import org.springframework.transaction.annotation.Transactional;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.data.redis.core.RedisTemplate;
Expand Down Expand Up @@ -152,7 +152,7 @@ public TokenIssueDTO reissue(ReissueRequest reissueRequest) {
* @param email 중복 조회할 이메일
* @return 중복 조회 결과
*/
@Transactional
@Transactional(readOnly = true)
public ExistsCheckDto emailExists(String email) {
Optional<Member> byEmailAndDeleted = memberRepository.findByEmailAndDeleted(email, false);
if (byEmailAndDeleted.isPresent()) {
Expand All @@ -169,7 +169,7 @@ public ExistsCheckDto emailExists(String email) {
* @param nickname 중복 조회할 닉네임
* @return 중복 조회 결과
*/
@Transactional
@Transactional(readOnly = true)
public ExistsCheckDto nicknameExists(String nickname) {
return ExistsCheckDto.builder()
.exists(memberRepository.existsByNickNameAndDeleted(nickname, false)).build();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import com.uliga.uliga_backend.domain.Member.exception.UserNotFoundByEmail;
import com.uliga.uliga_backend.domain.Member.model.Member;
import com.uliga.uliga_backend.global.error.exception.NotFoundByIdException;
import jakarta.transaction.Transactional;
import org.springframework.transaction.annotation.Transactional;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.data.domain.Pageable;
Expand Down Expand Up @@ -42,7 +42,7 @@ public class MemberService {
* @param id 멤버 아이디
* @return 멤버 개인 가계부 아이디
*/
@Transactional
@Transactional(readOnly = true)
public Long getMemberPrivateAccountBookId(Long id) {
Member member = memberRepository.findById(id).orElseThrow(() -> new NotFoundByIdException("해당 아이디로 존재하는 멤버가 없습니다"));
return member.getPrivateAccountBook().getId();
Expand All @@ -55,7 +55,7 @@ public Long getMemberPrivateAccountBookId(Long id) {
* @return 로그인한 멤버 정보
* @throws JsonProcessingException 레디스 관련 예외
*/
@Transactional
@Transactional(readOnly = true)
public GetMemberInfo getCurrentMemberInfo(Long id, Pageable pageable) throws JsonProcessingException {

MemberInfoNativeQ memberInfoById = memberRepository.findMemberInfoById(id);
Expand Down Expand Up @@ -92,7 +92,7 @@ public GetMemberInfo getCurrentMemberInfo(Long id, Pageable pageable) throws Jso
* @param passwordCheck 유저가 입력한 애플리케이션 비밀번호
* @return 비밀번호 일치 여부
*/
@Transactional
@Transactional(readOnly = true)
public boolean checkApplicationPassword(Long id, ApplicationPasswordCheck passwordCheck) {
Member member = memberRepository.findById(id).orElseThrow(() -> new NotFoundByIdException("해당 아이디로 존재하는 멤버가 없습니다"));
return passwordEncoder.matches(passwordCheck.getApplicationPassword(), member.getApplicationPassword());
Expand All @@ -104,7 +104,7 @@ public boolean checkApplicationPassword(Long id, ApplicationPasswordCheck passwo
* @param passwordCheck 확인할 비밀번호
* @return 비밀번호 일치여부
*/
@Transactional
@Transactional(readOnly = true)
public boolean checkPassword(Long id, PasswordCheck passwordCheck) {
Member member = memberRepository.findById(id).orElseThrow(() -> new NotFoundByIdException("해당 아이디로 존재하는 멤버가 없습니다"));
return passwordEncoder.matches(passwordCheck.getPassword(), member.getPassword());
Expand All @@ -117,7 +117,7 @@ public boolean checkPassword(Long id, PasswordCheck passwordCheck) {
* @param nicknameCheckDto 중복 확인할 닉네임
* @return 중복 여부
*/
@Transactional
@Transactional(readOnly = true)
public boolean nicknameExists(Long id, NicknameCheckDto nicknameCheckDto) {
Member member = memberRepository.findById(id).orElseThrow(() -> new NotFoundByIdException("해당 아이디로 존재하는 멤버가 없습니다"));
if (member.getNickName().equals(nicknameCheckDto.getNickname())) {
Expand Down Expand Up @@ -151,7 +151,7 @@ public void deleteMember(Long id) {
* @param byEmail 찾을 이메일
* @return 이메일 검색 결과
*/
@Transactional
@Transactional(readOnly = true)
public SearchEmailResult findMemberByEmail(Long accountBookId, SearchMemberByEmail byEmail) {
Member member = memberRepository.findByEmailAndDeleted(byEmail.getEmail(), false).orElseThrow(UserNotFoundByEmail::new);
if (accountBookId != null) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,11 @@
import com.uliga.uliga_backend.domain.Category.dao.CategoryRepository;
import com.uliga.uliga_backend.domain.Category.model.Category;
import com.uliga.uliga_backend.domain.Common.Date;
import com.uliga.uliga_backend.domain.Income.dao.IncomeMapper;
import com.uliga.uliga_backend.domain.Income.dao.IncomeRepository;
import com.uliga.uliga_backend.domain.Income.model.Income;
import com.uliga.uliga_backend.domain.Member.model.Member;
import com.uliga.uliga_backend.domain.Record.dao.RecordMapper;
import com.uliga.uliga_backend.domain.Record.dao.RecordRepository;
import com.uliga.uliga_backend.domain.Record.dto.NativeQ.RecordInfoQ;
import com.uliga.uliga_backend.domain.Record.dto.RecordDTO;
import com.uliga.uliga_backend.domain.Record.dto.RecordDTO.RecordDeleteRequest;
import com.uliga.uliga_backend.domain.Record.dto.RecordDTO.RecordInfoDetail;
import com.uliga.uliga_backend.domain.Record.dto.RecordDTO.RecordUpdateRequest;
import com.uliga.uliga_backend.domain.Record.exception.InvalidRecordDelete;
Expand All @@ -25,13 +21,13 @@
import com.uliga.uliga_backend.domain.RecordComment.dto.RecordCommentDto.RecordCommentCreateDto;
import com.uliga.uliga_backend.global.error.exception.IdNotFoundException;
import com.uliga.uliga_backend.global.error.exception.NotFoundByIdException;
import jakarta.transaction.Transactional;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageImpl;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.ArrayList;
import java.util.HashMap;
Expand Down Expand Up @@ -200,7 +196,7 @@ public RecordUpdateRequest updateRecord(Map<String, Object> updates) {
* @param pageable 페이징 정보
* @return 조회 결과
*/
@Transactional
@Transactional(readOnly = true)
public Page<RecordInfoQ> getMemberRecordsByAccountBook(Long accountBookId, Long categoryId, Long year, Long month, Pageable pageable) {
HashMap<String, Object> map = new HashMap<>();
map.put("accountBookId", accountBookId);
Expand All @@ -220,7 +216,7 @@ public Page<RecordInfoQ> getMemberRecordsByAccountBook(Long accountBookId, Long
* @param pageable 페이징 정보
* @return 조회 결과
*/
@Transactional
@Transactional(readOnly = true)
public Page<RecordInfoQ> getMemberRecords(Long id, Pageable pageable) {

return recordRepository.getMemberRecords(id, pageable);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import com.uliga.uliga_backend.domain.Schedule.exception.InvalidScheduleDelete;
import com.uliga.uliga_backend.domain.Schedule.model.Schedule;
import com.uliga.uliga_backend.global.error.exception.NotFoundByIdException;
import jakarta.transaction.Transactional;
import org.springframework.transaction.annotation.Transactional;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.data.redis.core.RedisTemplate;
Expand Down Expand Up @@ -49,7 +49,7 @@ public class ScheduleService {
* @param id 멤버 아이디
* @return 금융 일정 조회 결과
*/
@Transactional
@Transactional(readOnly = true)
public GetMemberSchedules getMemberSchedule(Long id) {
LocalDate now = LocalDate.now();
return GetMemberSchedules.builder()
Expand Down Expand Up @@ -142,7 +142,7 @@ public UpdateScheduleRequest updateSchedule(Map<String, Object> updates) {
* @param id 금융 일정 아이디
* @return 금융 일정 정보
*/
@Transactional
@Transactional(readOnly = true)
public ScheduleDetail getScheduleDetails(Long id) {

return ScheduleDetail.builder()
Expand All @@ -155,7 +155,7 @@ public ScheduleDetail getScheduleDetails(Long id) {
* @param accountBookId 가계부 아이디
* @return 가계부 금융 일정
*/
@Transactional
@Transactional(readOnly = true)
public GetAccountBookSchedules getAccountBookSchedules(Long accountBookId) {
List<ScheduleDetail> result = new ArrayList<>();
LocalDate date = LocalDate.now();
Expand Down Expand Up @@ -202,7 +202,7 @@ public void deleteSchedule(Long id, Long currentMemberId) {
* @param memberId 멤버 아이디
* @return 가계부 고정 지출 조회 결과
*/
@Transactional
@Transactional(readOnly = true)
public List<ScheduleAnalyzeQ> findAnalyze(Long id, Long memberId) {
return scheduleRepository.findScheduleAnalyzeByAccountBookId(id, memberId);
}
Expand Down
Loading

0 comments on commit e48e2d2

Please sign in to comment.