Skip to content

[refactor/#312] 패키지 구조 관련 변경 #313

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PicturePark1101 merged 2 commits into from
Mar 22, 2025
Merged

[refactor/#312] 패키지 구조 관련 변경 #313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
13dcbc4
refactor : 패키지 구조 변경 작업 #312
PicturePark1101 Mar 20, 2025
483ec5d
refactor : QClass 관련 설정 #312
PicturePark1101 Mar 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions .../juinjang/controller/OAuthController.java → .../api/auth/controller/OAuthController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package umc.th.juinjang.controller;
package umc.th.juinjang.api.auth.controller;

import io.micrometer.common.lang.Nullable;
import jakarta.servlet.http.HttpServletRequest;
Expand All @@ -8,23 +8,23 @@
import org.springframework.util.StringUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import umc.th.juinjang.apiPayload.ApiResponse;
import umc.th.juinjang.apiPayload.ExceptionHandler;
import umc.th.juinjang.apiPayload.code.status.SuccessStatus;
import umc.th.juinjang.model.dto.auth.LoginResponseDto;
import umc.th.juinjang.model.dto.auth.LoginResponseVersion2Dto;
import umc.th.juinjang.model.dto.auth.WithdrawReasonRequestDto;
import umc.th.juinjang.model.dto.auth.apple.AppleLoginRequestDto;
import umc.th.juinjang.model.dto.auth.apple.AppleSignUpRequestDto;
import umc.th.juinjang.model.dto.auth.apple.AppleSignUpRequestVersion2Dto;
import umc.th.juinjang.model.dto.auth.kakao.KakaoLoginRequestDto;
import umc.th.juinjang.model.dto.auth.kakao.KakaoSignUpRequestDto;
import umc.th.juinjang.model.dto.auth.kakao.KakaoSignUpRequestVersion2Dto;
import umc.th.juinjang.model.entity.Member;
import umc.th.juinjang.service.withdraw.WithdrawService;
import umc.th.juinjang.service.auth.OAuthService;

import static umc.th.juinjang.apiPayload.code.status.ErrorStatus.*;
import umc.th.juinjang.api.dto.ApiResponse;
import umc.th.juinjang.common.ExceptionHandler;
import umc.th.juinjang.common.code.status.SuccessStatus;
import umc.th.juinjang.api.auth.service.response.LoginResponseDto;
import umc.th.juinjang.api.auth.service.response.LoginResponseVersion2Dto;
import umc.th.juinjang.api.auth.controller.request.WithdrawReasonRequestDto;
import umc.th.juinjang.api.auth.controller.request.AppleLoginRequestDto;
import umc.th.juinjang.api.auth.controller.request.AppleSignUpRequestDto;
import umc.th.juinjang.api.auth.controller.request.AppleSignUpRequestVersion2Dto;
import umc.th.juinjang.api.auth.controller.request.KakaoLoginRequestDto;
import umc.th.juinjang.api.auth.controller.request.KakaoSignUpRequestDto;
import umc.th.juinjang.api.auth.controller.request.KakaoSignUpRequestVersion2Dto;
import umc.th.juinjang.domain.member.model.Member;
import umc.th.juinjang.api.auth.service.WithdrawService;
import umc.th.juinjang.api.auth.service.OAuthService;

import static umc.th.juinjang.common.code.status.ErrorStatus.*;

@Slf4j
@RestController
Expand Down
2 changes: 1 addition & 1 deletion ...njang/model/dto/auth/apple/AppleInfo.java → ...pi/auth/controller/request/AppleInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package umc.th.juinjang.model.dto.auth.apple;
package umc.th.juinjang.api.auth.controller.request;

import lombok.AccessLevel;
import lombok.Builder;
Expand Down
2 changes: 1 addition & 1 deletion .../dto/auth/apple/AppleLoginRequestDto.java → ...troller/request/AppleLoginRequestDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package umc.th.juinjang.model.dto.auth.apple;
package umc.th.juinjang.api.auth.controller.request;

import jakarta.validation.constraints.NotEmpty;
import lombok.AccessLevel;
Expand Down
2 changes: 1 addition & 1 deletion ...dto/auth/apple/AppleSignUpRequestDto.java → ...roller/request/AppleSignUpRequestDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package umc.th.juinjang.model.dto.auth.apple;
package umc.th.juinjang.api.auth.controller.request;

import jakarta.validation.constraints.NotEmpty;
import lombok.AccessLevel;
Expand Down
2 changes: 1 addition & 1 deletion .../apple/AppleSignUpRequestVersion2Dto.java → ...equest/AppleSignUpRequestVersion2Dto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package umc.th.juinjang.model.dto.auth.apple;
package umc.th.juinjang.api.auth.controller.request;

import jakarta.validation.constraints.NotEmpty;
import lombok.AccessLevel;
Expand Down
2 changes: 1 addition & 1 deletion ...del/dto/auth/apple/AppleTokenRequest.java → ...controller/request/AppleTokenRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package umc.th.juinjang.model.dto.auth.apple;
package umc.th.juinjang.api.auth.controller.request;

import lombok.Builder;
import lombok.Getter;
Expand Down
2 changes: 1 addition & 1 deletion .../dto/auth/kakao/KakaoLoginRequestDto.java → ...troller/request/KakaoLoginRequestDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package umc.th.juinjang.model.dto.auth.kakao;
package umc.th.juinjang.api.auth.controller.request;

import jakarta.validation.constraints.NotEmpty;
import lombok.AccessLevel;
Expand Down
2 changes: 1 addition & 1 deletion ...dto/auth/kakao/KakaoSignUpRequestDto.java → ...roller/request/KakaoSignUpRequestDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package umc.th.juinjang.model.dto.auth.kakao;
package umc.th.juinjang.api.auth.controller.request;

import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
Expand Down
2 changes: 1 addition & 1 deletion .../kakao/KakaoSignUpRequestVersion2Dto.java → ...equest/KakaoSignUpRequestVersion2Dto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package umc.th.juinjang.model.dto.auth.kakao;
package umc.th.juinjang.api.auth.controller.request;

import jakarta.validation.constraints.NotEmpty;
import lombok.AccessLevel;
Expand Down
2 changes: 1 addition & 1 deletion ...el/dto/auth/WithdrawReasonRequestDto.java → ...ler/request/WithdrawReasonRequestDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package umc.th.juinjang.model.dto.auth;
package umc.th.juinjang.api.auth.controller.request;

import jakarta.validation.constraints.NotEmpty;
import lombok.AccessLevel;
Expand Down
61 changes: 34 additions & 27 deletions ...h/juinjang/service/auth/OAuthService.java → ...injang/api/auth/service/OAuthService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package umc.th.juinjang.service.auth;
package umc.th.juinjang.api.auth.service;

import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
Expand All @@ -7,39 +7,45 @@
import org.springframework.stereotype.Service;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.transaction.annotation.Transactional;
import umc.th.juinjang.apiPayload.ExceptionHandler;
import umc.th.juinjang.apiPayload.exception.handler.MemberHandler;
import umc.th.juinjang.controller.KakaoUnlinkClient;
import umc.th.juinjang.api.auth.controller.request.AppleInfo;
import umc.th.juinjang.api.auth.controller.request.AppleLoginRequestDto;
import umc.th.juinjang.api.auth.controller.request.AppleSignUpRequestDto;
import umc.th.juinjang.api.auth.controller.request.AppleSignUpRequestVersion2Dto;
import umc.th.juinjang.auth.jwt.JwtService;
import umc.th.juinjang.common.ExceptionHandler;
import umc.th.juinjang.common.exception.handler.MemberHandler;
import umc.th.juinjang.event.publisher.MemberEventPublisher;
import umc.th.juinjang.model.dto.auth.LoginResponseDto;
import umc.th.juinjang.model.dto.auth.LoginResponseVersion2Dto;
import umc.th.juinjang.model.dto.auth.TokenDto;
import umc.th.juinjang.model.dto.auth.apple.*;
import umc.th.juinjang.model.dto.auth.kakao.KakaoLoginRequestDto;
import umc.th.juinjang.model.dto.auth.kakao.KakaoSignUpRequestDto;
import umc.th.juinjang.model.dto.auth.kakao.KakaoSignUpRequestVersion2Dto;
import umc.th.juinjang.model.entity.Image;
import umc.th.juinjang.model.entity.Limjang;
import umc.th.juinjang.model.entity.Member;
import umc.th.juinjang.model.entity.Record;
import umc.th.juinjang.model.entity.enums.MemberProvider;
import umc.th.juinjang.repository.checklist.ChecklistAnswerRepository;
import umc.th.juinjang.repository.checklist.ReportRepository;
import umc.th.juinjang.repository.image.ImageRepository;
import umc.th.juinjang.repository.limjang.LimjangPriceRepository;
import umc.th.juinjang.repository.limjang.LimjangRepository;
import umc.th.juinjang.repository.limjang.MemberRepository;
import umc.th.juinjang.repository.limjang.ScrapRepository;
import umc.th.juinjang.repository.record.RecordRepository;
import umc.th.juinjang.service.external.S3Service;
import umc.th.juinjang.api.auth.service.response.LoginResponseDto;
import umc.th.juinjang.api.auth.service.response.LoginResponseVersion2Dto;
import umc.th.juinjang.auth.jwt.TokenDto;
import umc.th.juinjang.external.openfeign.apple.AppleClientSecretGenerator;
import umc.th.juinjang.external.openfeign.apple.AppleOAuthProvider;
import umc.th.juinjang.api.auth.controller.request.KakaoLoginRequestDto;
import umc.th.juinjang.api.auth.controller.request.KakaoSignUpRequestDto;
import umc.th.juinjang.api.auth.controller.request.KakaoSignUpRequestVersion2Dto;
import umc.th.juinjang.domain.image.model.Image;
import umc.th.juinjang.domain.limjang.model.Limjang;
import umc.th.juinjang.domain.member.model.Member;
import umc.th.juinjang.domain.record.model.Record;
import umc.th.juinjang.domain.member.model.MemberProvider;
import umc.th.juinjang.domain.checklist.repository.ChecklistAnswerRepository;
import umc.th.juinjang.domain.report.repository.ReportRepository;
import umc.th.juinjang.domain.image.repository.ImageRepository;
import umc.th.juinjang.domain.limjang.repository.LimjangPriceRepository;
import umc.th.juinjang.domain.limjang.repository.LimjangRepository;
import umc.th.juinjang.domain.member.repository.MemberRepository;
import umc.th.juinjang.domain.scrap.repository.ScrapRepository;
import umc.th.juinjang.domain.record.repository.RecordRepository;
import umc.th.juinjang.external.openfeign.kakao.KakaoUnlinkClient;
import umc.th.juinjang.external.s3.S3Service;

import java.time.LocalDateTime;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;

import static umc.th.juinjang.apiPayload.code.status.ErrorStatus.*;
import static umc.th.juinjang.common.code.status.ErrorStatus.*;

@Slf4j
@Service
Expand Down Expand Up @@ -538,7 +544,8 @@ public LoginResponseVersion2Dto appleLoginVersion2(AppleLoginRequestDto appleLog
}

@Transactional
public LoginResponseVersion2Dto appleSignUpVersion2(AppleSignUpRequestVersion2Dto appleSignUpRequestDto) {
public LoginResponseVersion2Dto appleSignUpVersion2(
AppleSignUpRequestVersion2Dto appleSignUpRequestDto) {
// email, sub값 추출 후 db에서 해당 email값 그리고 sub값을 가진 유저가 있는지 find
// 1. 추출한 email, sub 값이 null이면 -> 잘못된 apple token
// 2. db에서 각각 find한 회원 id가 다르면 에러 (올바르지 않은 정보)
Expand Down
12 changes: 6 additions & 6 deletions ...ang/service/withdraw/WithdrawService.java → ...ang/api/auth/service/WithdrawService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package umc.th.juinjang.service.withdraw;
package umc.th.juinjang.api.auth.service;

import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import umc.th.juinjang.apiPayload.ExceptionHandler;
import umc.th.juinjang.apiPayload.code.status.ErrorStatus;
import umc.th.juinjang.model.entity.Withdraw;
import umc.th.juinjang.model.entity.enums.WithdrawReason;
import umc.th.juinjang.repository.withdraw.WithdrawRepository;
import umc.th.juinjang.common.ExceptionHandler;
import umc.th.juinjang.common.code.status.ErrorStatus;
import umc.th.juinjang.domain.withdraw.model.Withdraw;
import umc.th.juinjang.domain.withdraw.model.WithdrawReason;
import umc.th.juinjang.domain.withdraw.repository.WithdrawRepository;

import java.util.List;

Expand Down
2 changes: 1 addition & 1 deletion ...jang/model/dto/auth/LoginResponseDto.java → ...th/service/response/LoginResponseDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package umc.th.juinjang.model.dto.auth;
package umc.th.juinjang.api.auth.service.response;

import lombok.AccessLevel;
import lombok.Builder;
Expand Down
2 changes: 1 addition & 1 deletion ...el/dto/auth/LoginResponseVersion2Dto.java → ...ce/response/LoginResponseVersion2Dto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package umc.th.juinjang.model.dto.auth;
package umc.th.juinjang.api.auth.service.response;

import lombok.AccessLevel;
import lombok.Builder;
Expand Down
13 changes: 8 additions & 5 deletions ...njang/controller/ChecklistController.java → ...klist/controller/ChecklistController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
package umc.th.juinjang.controller;
package umc.th.juinjang.api.checklist.controller;

import io.swagger.v3.oas.annotations.Operation;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import umc.th.juinjang.apiPayload.ApiResponse;
import umc.th.juinjang.model.dto.checklist.*;
import umc.th.juinjang.service.checklist.ChecklistCommandService;
import umc.th.juinjang.service.checklist.ChecklistQueryService;
import umc.th.juinjang.api.checklist.controller.request.ChecklistAnswerRequestDTO;
import umc.th.juinjang.api.checklist.service.response.ChecklistAnswerAndReportResponseDTO;
import umc.th.juinjang.api.checklist.service.response.ChecklistAnswerResponseDTO;
import umc.th.juinjang.api.checklist.service.response.ReportResponseDTO;
import umc.th.juinjang.api.dto.ApiResponse;
import umc.th.juinjang.api.checklist.service.ChecklistCommandService;
import umc.th.juinjang.api.checklist.service.ChecklistQueryService;

import java.util.List;

Expand Down
13 changes: 13 additions & 0 deletions src/main/java/umc/th/juinjang/api/checklist/controller/ChecklistControllerV2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package umc.th.juinjang.api.checklist.controller;

import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

@RestController
@RequestMapping("/api/v2")
@RequiredArgsConstructor
@Validated
public class ChecklistControllerV2 {
int test;
}
2 changes: 1 addition & 1 deletion .../checklist/ChecklistAnswerRequestDTO.java → ...er/request/ChecklistAnswerRequestDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package umc.th.juinjang.model.dto.checklist;
package umc.th.juinjang.api.checklist.controller.request;

import lombok.*;

Expand Down
2 changes: 1 addition & 1 deletion ...l/dto/checklist/ChecklistQuestionDTO.java → ...troller/request/ChecklistQuestionDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package umc.th.juinjang.model.dto.checklist;
package umc.th.juinjang.api.checklist.controller.request;

import lombok.*;

Expand Down
10 changes: 10 additions & 0 deletions src/main/java/umc/th/juinjang/api/checklist/service/ChecklistCommandService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package umc.th.juinjang.api.checklist.service;

import umc.th.juinjang.api.checklist.service.response.ChecklistAnswerAndReportResponseDTO;
import umc.th.juinjang.api.checklist.controller.request.ChecklistAnswerRequestDTO;

import java.util.List;

public interface ChecklistCommandService {
public ChecklistAnswerAndReportResponseDTO saveChecklistAnswerList(Long limjangId, List<ChecklistAnswerRequestDTO.AnswerDto> answerDtoList);
}
34 changes: 17 additions & 17 deletions ...hecklist/ChecklistCommandServiceImpl.java → .../service/ChecklistCommandServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
package umc.th.juinjang.service.checklist;
package umc.th.juinjang.api.checklist.service;

import jakarta.transaction.Transactional;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import umc.th.juinjang.apiPayload.code.status.ErrorStatus;
import umc.th.juinjang.apiPayload.exception.handler.ChecklistHandler;
import umc.th.juinjang.apiPayload.exception.handler.LimjangHandler;
import umc.th.juinjang.converter.checklist.ChecklistAnswerAndReportConverter;
import umc.th.juinjang.model.dto.checklist.ChecklistAnswerAndReportResponseDTO;
import umc.th.juinjang.model.dto.checklist.ChecklistAnswerRequestDTO;
import umc.th.juinjang.model.entity.ChecklistAnswer;
import umc.th.juinjang.model.entity.ChecklistQuestionShort;
import umc.th.juinjang.model.entity.Limjang;
import umc.th.juinjang.model.entity.Report;
import umc.th.juinjang.model.entity.enums.ChecklistQuestionCategory;
import umc.th.juinjang.model.entity.enums.ChecklistQuestionType;
import umc.th.juinjang.repository.checklist.ChecklistAnswerRepository;
import umc.th.juinjang.repository.checklist.ChecklistQuestionRepository;
import umc.th.juinjang.repository.checklist.ReportRepository;
import umc.th.juinjang.repository.limjang.LimjangRepository;
import umc.th.juinjang.common.code.status.ErrorStatus;
import umc.th.juinjang.common.exception.handler.ChecklistHandler;
import umc.th.juinjang.common.exception.handler.LimjangHandler;
import umc.th.juinjang.api.checklist.service.converter.ChecklistAnswerAndReportConverter;
import umc.th.juinjang.api.checklist.service.response.ChecklistAnswerAndReportResponseDTO;
import umc.th.juinjang.api.checklist.controller.request.ChecklistAnswerRequestDTO;
import umc.th.juinjang.domain.checklist.model.ChecklistAnswer;
import umc.th.juinjang.domain.checklist.model.ChecklistQuestionShort;
import umc.th.juinjang.domain.limjang.model.Limjang;
import umc.th.juinjang.domain.report.model.Report;
import umc.th.juinjang.domain.checklist.model.ChecklistQuestionCategory;
import umc.th.juinjang.domain.checklist.model.ChecklistQuestionType;
import umc.th.juinjang.domain.checklist.repository.ChecklistAnswerRepository;
import umc.th.juinjang.domain.checklist.repository.ChecklistQuestionRepository;
import umc.th.juinjang.domain.report.repository.ReportRepository;
import umc.th.juinjang.domain.limjang.repository.LimjangRepository;

import java.util.List;
import java.util.Map;
Expand Down
6 changes: 3 additions & 3 deletions ...vice/checklist/ChecklistQueryService.java → ...cklist/service/ChecklistQueryService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package umc.th.juinjang.service.checklist;
package umc.th.juinjang.api.checklist.service;

import umc.th.juinjang.model.dto.checklist.ChecklistAnswerResponseDTO;
import umc.th.juinjang.model.dto.checklist.ReportResponseDTO;
import umc.th.juinjang.api.checklist.service.response.ChecklistAnswerResponseDTO;
import umc.th.juinjang.api.checklist.service.response.ReportResponseDTO;

import java.util.List;

Expand Down
28 changes: 14 additions & 14 deletions .../checklist/ChecklistQueryServiceImpl.java → ...st/service/ChecklistQueryServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
package umc.th.juinjang.service.checklist;
package umc.th.juinjang.api.checklist.service;

import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import umc.th.juinjang.apiPayload.code.status.ErrorStatus;
import umc.th.juinjang.apiPayload.exception.handler.ChecklistHandler;
import umc.th.juinjang.apiPayload.exception.handler.LimjangHandler;
import umc.th.juinjang.converter.checklist.ChecklistAnswerAndReportConverter;
import umc.th.juinjang.model.dto.checklist.ChecklistAnswerResponseDTO;
import umc.th.juinjang.model.dto.checklist.ReportResponseDTO;
import umc.th.juinjang.model.entity.ChecklistAnswer;
import umc.th.juinjang.model.entity.Limjang;
import umc.th.juinjang.model.entity.Report;
import umc.th.juinjang.repository.checklist.ChecklistAnswerRepository;
import umc.th.juinjang.repository.checklist.ChecklistQuestionRepository;
import umc.th.juinjang.repository.checklist.ReportRepository;
import umc.th.juinjang.repository.limjang.LimjangRepository;
import umc.th.juinjang.common.code.status.ErrorStatus;
import umc.th.juinjang.common.exception.handler.ChecklistHandler;
import umc.th.juinjang.common.exception.handler.LimjangHandler;
import umc.th.juinjang.api.checklist.service.converter.ChecklistAnswerAndReportConverter;
import umc.th.juinjang.api.checklist.service.response.ChecklistAnswerResponseDTO;
import umc.th.juinjang.api.checklist.service.response.ReportResponseDTO;
import umc.th.juinjang.domain.checklist.model.ChecklistAnswer;
import umc.th.juinjang.domain.limjang.model.Limjang;
import umc.th.juinjang.domain.report.model.Report;
import umc.th.juinjang.domain.checklist.repository.ChecklistAnswerRepository;
import umc.th.juinjang.domain.checklist.repository.ChecklistQuestionRepository;
import umc.th.juinjang.domain.report.repository.ReportRepository;
import umc.th.juinjang.domain.limjang.repository.LimjangRepository;

import java.util.List;
import java.util.stream.Collectors;
Expand Down
20 changes: 10 additions & 10 deletions ...st/ChecklistAnswerAndReportConverter.java → ...er/ChecklistAnswerAndReportConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package umc.th.juinjang.converter.checklist;

import umc.th.juinjang.converter.limjang.LimjangDetailConverter;
import umc.th.juinjang.model.dto.checklist.ChecklistAnswerAndReportResponseDTO;
import umc.th.juinjang.model.dto.checklist.ChecklistAnswerResponseDTO;
import umc.th.juinjang.model.dto.checklist.ReportResponseDTO;
import umc.th.juinjang.model.dto.limjang.response.LimjangDetailResponseDTO;
import umc.th.juinjang.model.entity.ChecklistAnswer;
import umc.th.juinjang.model.entity.Limjang;
import umc.th.juinjang.model.entity.Report;
package umc.th.juinjang.api.checklist.service.converter;

import umc.th.juinjang.api.limjang.service.converter.LimjangDetailConverter;
import umc.th.juinjang.api.checklist.service.response.ChecklistAnswerAndReportResponseDTO;
import umc.th.juinjang.api.checklist.service.response.ChecklistAnswerResponseDTO;
import umc.th.juinjang.api.checklist.service.response.ReportResponseDTO;
import umc.th.juinjang.api.limjang.service.response.LimjangDetailResponseDTO;
import umc.th.juinjang.domain.checklist.model.ChecklistAnswer;
import umc.th.juinjang.domain.limjang.model.Limjang;
import umc.th.juinjang.domain.report.model.Report;

import java.util.List;
import java.util.stream.Collectors;
Expand Down
Loading