Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import ssu.eatssu.domain.admin.dto.LoginRequest;
import ssu.eatssu.domain.admin.dto.request.LoginRequest;
import ssu.eatssu.domain.admin.service.AuthenticationService;
import ssu.eatssu.domain.user.dto.Tokens;
import ssu.eatssu.domain.user.dto.response.Tokens;
import ssu.eatssu.global.handler.response.BaseResponse;

@Slf4j
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import ssu.eatssu.domain.admin.dto.RegisterCategoryRequest;
import ssu.eatssu.domain.admin.dto.request.RegisterCategoryRequest;
import ssu.eatssu.domain.admin.service.ManageCategoryService;
import ssu.eatssu.domain.restaurant.entity.Restaurant;
import ssu.eatssu.global.handler.response.BaseResponse;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import ssu.eatssu.domain.admin.dto.MenuBoards;
import ssu.eatssu.domain.admin.dto.RegisterFixMenuRequest;
import ssu.eatssu.domain.admin.dto.UpdateFixMenuRequest;
import ssu.eatssu.domain.admin.dto.response.MenuBoards;
import ssu.eatssu.domain.admin.dto.request.RegisterFixMenuRequest;
import ssu.eatssu.domain.admin.dto.request.UpdateFixMenuRequest;
import ssu.eatssu.domain.admin.service.ManageFixMenuService;
import ssu.eatssu.domain.restaurant.entity.Restaurant;
import ssu.eatssu.global.handler.response.BaseResponse;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import ssu.eatssu.domain.admin.dto.InquiryLine;
import ssu.eatssu.domain.admin.dto.PageWrapper;
import ssu.eatssu.domain.admin.dto.UpdateStatusRequest;
import ssu.eatssu.domain.admin.dto.response.InquiryLine;
import ssu.eatssu.domain.admin.dto.response.PageWrapper;
import ssu.eatssu.domain.admin.dto.request.UpdateStatusRequest;
import ssu.eatssu.domain.admin.service.ManageInquiryService;
import ssu.eatssu.global.handler.response.BaseResponse;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import ssu.eatssu.domain.admin.dto.MealInfo;
import ssu.eatssu.domain.admin.dto.MenuBoards;
import ssu.eatssu.domain.admin.dto.RegisterMealRequest;
import ssu.eatssu.domain.admin.dto.response.MenuBoards;
import ssu.eatssu.domain.admin.dto.request.RegisterMealRequest;
import ssu.eatssu.domain.admin.service.ManageMealService;
import ssu.eatssu.domain.menu.entity.constants.TimePart;
import ssu.eatssu.domain.restaurant.entity.Restaurant;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import ssu.eatssu.domain.admin.dto.PageWrapper;
import ssu.eatssu.domain.admin.dto.ReportLine;
import ssu.eatssu.domain.admin.dto.response.PageWrapper;
import ssu.eatssu.domain.admin.dto.response.ReportLine;
import ssu.eatssu.domain.admin.service.ManageReportService;
import ssu.eatssu.global.handler.response.BaseResponse;

Expand Down
2 changes: 2 additions & 0 deletions src/main/java/ssu/eatssu/domain/admin/dto/SectionInBoard.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package ssu.eatssu.domain.admin.dto;

import ssu.eatssu.domain.admin.dto.response.MenuLine;

public interface SectionInBoard {
void addMenuLine(MenuLine menuLine);
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ssu.eatssu.domain.admin.dto;
package ssu.eatssu.domain.admin.dto.request;

import ssu.eatssu.global.log.annotation.LogMask;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ssu.eatssu.domain.admin.dto;
package ssu.eatssu.domain.admin.dto.request;

public record RegisterCategoryRequest(String name) {
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ssu.eatssu.domain.admin.dto;
package ssu.eatssu.domain.admin.dto.request;

public record RegisterFixMenuRequest(Long categoryId, String name, Integer price) {
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ssu.eatssu.domain.admin.dto;
package ssu.eatssu.domain.admin.dto.request;

import java.util.List;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ssu.eatssu.domain.admin.dto;
package ssu.eatssu.domain.admin.dto.request;

public record UpdateFixMenuRequest(String name, Integer price) {
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ssu.eatssu.domain.admin.dto;
package ssu.eatssu.domain.admin.dto.request;

import ssu.eatssu.domain.inquiry.entity.InquiryStatus;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ssu.eatssu.domain.admin.dto;
package ssu.eatssu.domain.admin.dto.response;

import ssu.eatssu.domain.inquiry.entity.Inquiry;
import ssu.eatssu.domain.inquiry.entity.InquiryStatus;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
package ssu.eatssu.domain.admin.dto;
package ssu.eatssu.domain.admin.dto.response;

import ssu.eatssu.domain.admin.dto.SectionInBoard;

import java.util.ArrayList;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
package ssu.eatssu.domain.admin.dto;
package ssu.eatssu.domain.admin.dto.response;

import ssu.eatssu.domain.admin.dto.SectionInBoard;

import java.util.ArrayList;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ssu.eatssu.domain.admin.dto;
package ssu.eatssu.domain.admin.dto.response;

import java.util.ArrayList;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ssu.eatssu.domain.admin.dto;
package ssu.eatssu.domain.admin.dto.response;

public record MenuLine(Long id, String name, Integer price, Double rating) {
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
package ssu.eatssu.domain.admin.dto;
package ssu.eatssu.domain.admin.dto.response;

import ssu.eatssu.domain.admin.dto.SectionInBoard;

import ssu.eatssu.domain.menu.entity.MenuCategory;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ssu.eatssu.domain.admin.dto;
package ssu.eatssu.domain.admin.dto.response;

import org.springframework.data.domain.Page;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ssu.eatssu.domain.admin.dto;
package ssu.eatssu.domain.admin.dto.response;

import ssu.eatssu.domain.review.entity.Report;
import ssu.eatssu.domain.review.entity.Review;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import org.springframework.data.domain.Pageable;
import org.springframework.data.support.PageableExecutionUtils;
import org.springframework.stereotype.Repository;
import ssu.eatssu.domain.admin.dto.ReportLine;
import ssu.eatssu.domain.admin.dto.response.ReportLine;
import ssu.eatssu.domain.review.entity.QReport;
import ssu.eatssu.domain.review.entity.QReview;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.stereotype.Service;
import ssu.eatssu.domain.admin.controller.AdminAuth;
import ssu.eatssu.domain.admin.dto.LoginRequest;
import ssu.eatssu.domain.admin.dto.request.LoginRequest;
import ssu.eatssu.domain.auth.security.JwtTokenProvider;
import ssu.eatssu.domain.user.dto.Tokens;
import ssu.eatssu.domain.user.dto.response.Tokens;
import ssu.eatssu.domain.user.entity.User;
import ssu.eatssu.domain.user.repository.UserRepository;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import ssu.eatssu.domain.admin.dto.RegisterCategoryRequest;
import ssu.eatssu.domain.admin.dto.request.RegisterCategoryRequest;
import ssu.eatssu.domain.admin.persistence.LoadCategoryRepository;
import ssu.eatssu.domain.admin.persistence.ManageCategoryRepository;
import ssu.eatssu.domain.menu.entity.MenuCategory;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import ssu.eatssu.domain.admin.dto.BriefMenu;
import ssu.eatssu.domain.admin.dto.MenuBoard;
import ssu.eatssu.domain.admin.dto.MenuBoards;
import ssu.eatssu.domain.admin.dto.MenuLine;
import ssu.eatssu.domain.admin.dto.MenuSection;
import ssu.eatssu.domain.admin.dto.RegisterFixMenuRequest;
import ssu.eatssu.domain.admin.dto.UpdateFixMenuRequest;
import ssu.eatssu.domain.admin.dto.response.MenuBoard;
import ssu.eatssu.domain.admin.dto.response.MenuBoards;
import ssu.eatssu.domain.admin.dto.response.MenuLine;
import ssu.eatssu.domain.admin.dto.response.MenuSection;
import ssu.eatssu.domain.admin.dto.request.RegisterFixMenuRequest;
import ssu.eatssu.domain.admin.dto.request.UpdateFixMenuRequest;
import ssu.eatssu.domain.admin.persistence.LoadFixMenuRepository;
import ssu.eatssu.domain.admin.persistence.ManageMenuRepository;
import ssu.eatssu.domain.admin.persistence.MenuRatingRepository;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
import ssu.eatssu.domain.admin.dto.InquiryLine;
import ssu.eatssu.domain.admin.dto.PageWrapper;
import ssu.eatssu.domain.admin.dto.UpdateStatusRequest;
import ssu.eatssu.domain.admin.dto.response.InquiryLine;
import ssu.eatssu.domain.admin.dto.response.PageWrapper;
import ssu.eatssu.domain.admin.dto.request.UpdateStatusRequest;
import ssu.eatssu.domain.admin.persistence.LoadInquiryRepository;
import ssu.eatssu.domain.admin.persistence.ManageInquiryRepository;
import ssu.eatssu.domain.inquiry.entity.Inquiry;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
import org.springframework.stereotype.Service;
import ssu.eatssu.domain.admin.dto.BriefMenu;
import ssu.eatssu.domain.admin.dto.MealInfo;
import ssu.eatssu.domain.admin.dto.MealSection;
import ssu.eatssu.domain.admin.dto.MenuBoard;
import ssu.eatssu.domain.admin.dto.MenuBoards;
import ssu.eatssu.domain.admin.dto.MenuLine;
import ssu.eatssu.domain.admin.dto.RegisterMealRequest;
import ssu.eatssu.domain.admin.dto.response.MealSection;
import ssu.eatssu.domain.admin.dto.response.MenuBoard;
import ssu.eatssu.domain.admin.dto.response.MenuBoards;
import ssu.eatssu.domain.admin.dto.response.MenuLine;
import ssu.eatssu.domain.admin.dto.request.RegisterMealRequest;
import ssu.eatssu.domain.admin.persistence.LoadMealRepository;
import ssu.eatssu.domain.admin.persistence.ManageMealMenuRepository;
import ssu.eatssu.domain.admin.persistence.ManageMealRepository;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
import ssu.eatssu.domain.admin.dto.PageWrapper;
import ssu.eatssu.domain.admin.dto.ReportLine;
import ssu.eatssu.domain.admin.dto.response.PageWrapper;
import ssu.eatssu.domain.admin.dto.response.ReportLine;
import ssu.eatssu.domain.admin.persistence.LoadReportRepository;
import ssu.eatssu.domain.admin.persistence.ManageReportRepository;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ssu.eatssu.domain.auth.dto;
package ssu.eatssu.domain.auth.dto.request;

import io.swagger.v3.oas.annotations.media.Schema;
import ssu.eatssu.global.log.annotation.LogMask;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ssu.eatssu.domain.auth.dto;
package ssu.eatssu.domain.auth.dto.request;

import io.swagger.v3.oas.annotations.media.Schema;
import ssu.eatssu.domain.user.entity.DeviceType;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ssu.eatssu.domain.auth.dto;
package ssu.eatssu.domain.auth.dto.request;

import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.Email;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ssu.eatssu.domain.auth.dto;
package ssu.eatssu.domain.auth.dto.request;

import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.Email;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ssu.eatssu.domain.auth.dto;
package ssu.eatssu.domain.auth.dto.request;

import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,14 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import ssu.eatssu.domain.auth.dto.*;
import ssu.eatssu.domain.auth.dto.request.AppleLoginRequest;
import ssu.eatssu.domain.auth.dto.request.AppleLoginRequestV2;
import ssu.eatssu.domain.auth.dto.request.KakaoLoginRequest;
import ssu.eatssu.domain.auth.dto.request.KakaoLoginRequestV2;
import ssu.eatssu.domain.auth.dto.request.ValidRequest;
import ssu.eatssu.domain.auth.presentation.docs.OAuthControllerDocs;
import ssu.eatssu.domain.auth.service.OAuthService;
import ssu.eatssu.domain.user.dto.Tokens;
import ssu.eatssu.domain.user.dto.response.Tokens;
import ssu.eatssu.global.handler.response.BaseResponse;

import static ssu.eatssu.domain.auth.infrastructure.SecurityUtil.getLoginUser;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
import io.swagger.v3.oas.annotations.responses.ApiResponse;
import io.swagger.v3.oas.annotations.responses.ApiResponses;
import io.swagger.v3.oas.annotations.tags.Tag;
import ssu.eatssu.domain.auth.dto.AppleLoginRequest;
import ssu.eatssu.domain.auth.dto.AppleLoginRequestV2;
import ssu.eatssu.domain.auth.dto.KakaoLoginRequest;
import ssu.eatssu.domain.auth.dto.KakaoLoginRequestV2;
import ssu.eatssu.domain.auth.dto.ValidRequest;
import ssu.eatssu.domain.user.dto.Tokens;
import ssu.eatssu.domain.auth.dto.request.AppleLoginRequest;
import ssu.eatssu.domain.auth.dto.request.AppleLoginRequestV2;
import ssu.eatssu.domain.auth.dto.request.KakaoLoginRequest;
import ssu.eatssu.domain.auth.dto.request.KakaoLoginRequestV2;
import ssu.eatssu.domain.auth.dto.request.ValidRequest;
import ssu.eatssu.domain.user.dto.response.Tokens;
import ssu.eatssu.global.handler.response.BaseResponse;

@Tag(name = "Oauth", description = "Oauth API")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.authority.SimpleGrantedAuthority;
import org.springframework.stereotype.Component;
import ssu.eatssu.domain.user.dto.Tokens;
import ssu.eatssu.domain.user.dto.response.Tokens;
import ssu.eatssu.global.handler.response.BaseException;
import ssu.eatssu.global.handler.response.BaseResponseStatus;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,17 @@
import org.springframework.security.core.Authentication;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import ssu.eatssu.domain.auth.dto.*;
import ssu.eatssu.domain.auth.dto.OAuthInfo;
import ssu.eatssu.domain.auth.dto.request.AppleLoginRequest;
import ssu.eatssu.domain.auth.dto.request.AppleLoginRequestV2;
import ssu.eatssu.domain.auth.dto.request.KakaoLoginRequest;
import ssu.eatssu.domain.auth.dto.request.KakaoLoginRequestV2;
import ssu.eatssu.domain.auth.dto.request.ValidRequest;
import ssu.eatssu.domain.auth.entity.AppleAuthenticator;
import ssu.eatssu.domain.auth.entity.OAuthProvider;
import ssu.eatssu.domain.auth.security.JwtTokenProvider;
import ssu.eatssu.domain.auth.util.RandomNicknameUtil;
import ssu.eatssu.domain.user.dto.Tokens;
import ssu.eatssu.domain.user.dto.response.Tokens;
import ssu.eatssu.domain.user.entity.DeviceType;
import ssu.eatssu.domain.user.entity.User;
import ssu.eatssu.domain.user.repository.UserRepository;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ssu.eatssu.domain.inquiry.dto;
package ssu.eatssu.domain.inquiry.dto.request;

import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ssu.eatssu.domain.inquiry.dto;
package ssu.eatssu.domain.inquiry.dto.response;

import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import ssu.eatssu.domain.auth.security.CustomUserDetails;
import ssu.eatssu.domain.inquiry.dto.CreateInquiryRequest;
import ssu.eatssu.domain.inquiry.dto.request.CreateInquiryRequest;
import ssu.eatssu.domain.inquiry.entity.Inquiry;
import ssu.eatssu.domain.inquiry.presentation.docs.InquiryControllerDocs;
import ssu.eatssu.domain.inquiry.service.InquiryService;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import io.swagger.v3.oas.annotations.responses.ApiResponses;
import io.swagger.v3.oas.annotations.tags.Tag;
import ssu.eatssu.domain.auth.security.CustomUserDetails;
import ssu.eatssu.domain.inquiry.dto.CreateInquiryRequest;
import ssu.eatssu.domain.inquiry.dto.request.CreateInquiryRequest;
import ssu.eatssu.global.handler.response.BaseResponse;

@Tag(name = "Inquiry", description = "문의 API")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import ssu.eatssu.domain.auth.security.CustomUserDetails;
import ssu.eatssu.domain.inquiry.dto.CreateInquiryRequest;
import ssu.eatssu.domain.inquiry.dto.request.CreateInquiryRequest;
import ssu.eatssu.domain.inquiry.entity.Inquiry;
import ssu.eatssu.domain.inquiry.repository.InquiryRepository;
import ssu.eatssu.domain.user.entity.User;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ssu.eatssu.domain.partnership.dto;
package ssu.eatssu.domain.partnership.dto.request;

import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
Expand Down
Loading
Loading