Developer

src/main/java/org/atdev/artrip/domain/auth/data/User.java

@@ -42,6 +42,9 @@ public class User {
     @Column(name = "stamp_num")
     private Byte stampNum;
 
+    @Column(name = "profile_image_Url")
+    private String profileImageUrl;
+
     @Column(name = "nick_name")
     private String nickName;
 
@@ -72,4 +75,12 @@ public boolean updateUserInfo(String name, String email) {
 
         return changed;
     }
+
+    public void updateNickname(String nickName) {
+        this.nickName=nickName.trim();
+    }
+
+    public void updateProfileImage(String url){
+        this.profileImageUrl=url;
+    }
 }

src/main/java/org/atdev/artrip/domain/auth/repository/UserRepository.java

@@ -20,4 +20,6 @@ public interface UserRepository extends JpaRepository<User,Long> {
 
     @Query("SELECT u FROM User u JOIN FETCH u.socialAccounts sa WHERE sa.provider = :provider AND sa.providerId = :providerId")
     Optional<User> findBySocialAccountsProviderAndProviderId(@Param("provider") Provider provider, @Param("providerId") String providerId);
+
+    boolean existsByNickName(String nickname);
 }

src/main/java/org/atdev/artrip/domain/exhibit/repository/ExhibitRepositoryCustom.java

@@ -1,9 +1,9 @@
 package org.atdev.artrip.domain.exhibit.repository;
 
 import org.atdev.artrip.domain.exhibit.data.Exhibit;
-import org.atdev.artrip.domain.exhibit.web.dto.request.ExhibitFilterRequestDto;
+import org.atdev.artrip.domain.exhibit.web.dto.request.ExhibitFilterRequest;
 import org.atdev.artrip.domain.home.response.HomeListResponse;
-import org.atdev.artrip.domain.home.web.dto.RandomExhibitRequest;
+import org.atdev.artrip.domain.home.web.dto.request.RandomExhibitRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Slice;
 import org.springframework.stereotype.Repository;
@@ -13,7 +13,7 @@
 @Repository
 public interface ExhibitRepositoryCustom {
 
-    Slice<Exhibit> findExhibitByFilters(ExhibitFilterRequestDto filter, Pageable pageable, Long cursorId);
+    Slice<Exhibit> findExhibitByFilters(ExhibitFilterRequest filter, Pageable pageable, Long cursorId);
 
     List<HomeListResponse> findRandomExhibits(RandomExhibitRequest condition);
 

src/main/java/org/atdev/artrip/domain/exhibit/repository/ExhibitRepositoryImpl.java

@@ -11,17 +11,16 @@
 import org.atdev.artrip.domain.Enum.Status;
 import org.atdev.artrip.domain.exhibit.data.Exhibit;
 import org.atdev.artrip.domain.exhibit.data.QExhibit;
-import org.atdev.artrip.domain.exhibit.web.dto.request.ExhibitFilterRequestDto;
+import org.atdev.artrip.domain.exhibit.web.dto.request.ExhibitFilterRequest;
 import org.atdev.artrip.domain.exhibitHall.data.QExhibitHall;
 import org.atdev.artrip.domain.favortie.data.QFavoriteExhibit;
 import org.atdev.artrip.domain.home.response.HomeListResponse;
-import org.atdev.artrip.domain.home.web.dto.RandomExhibitRequest;
+import org.atdev.artrip.domain.home.web.dto.request.RandomExhibitRequest;
 import org.atdev.artrip.domain.keyword.data.QKeyword;
 import org.springframework.data.domain.*;
 import org.springframework.stereotype.Repository;
 
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Set;
 
@@ -32,7 +31,7 @@ public class ExhibitRepositoryImpl implements ExhibitRepositoryCustom{
     private final JPAQueryFactory queryFactory;
 
     @Override
-    public Slice<Exhibit> findExhibitByFilters(ExhibitFilterRequestDto dto, Pageable pageable, Long cursorId) {
+    public Slice<Exhibit> findExhibitByFilters(ExhibitFilterRequest dto, Pageable pageable, Long cursorId) {
 
         QExhibit e = QExhibit.exhibit;
         QExhibitHall h = QExhibitHall.exhibitHall;
@@ -145,7 +144,7 @@ private BooleanExpression cursorCondition(Exhibit cursor,  long cursorFavoriteCo
         };
     }
 
-    private OrderSpecifier<?>[] sortFilter(ExhibitFilterRequestDto dto, QExhibit e, QFavoriteExhibit f) {
+    private OrderSpecifier<?>[] sortFilter(ExhibitFilterRequest dto, QExhibit e, QFavoriteExhibit f) {
 
         if (dto.getSortType() == null) {
             return new OrderSpecifier[]{e.createdAt.desc()};

src/main/java/org/atdev/artrip/domain/exhibit/web/controller/ExhibitController.java

@@ -4,23 +4,18 @@
 import lombok.RequiredArgsConstructor;
 import org.atdev.artrip.domain.exhibit.reponse.ExhibitDetailResponse;
 import org.atdev.artrip.domain.exhibit.service.ExhibitService;
-import org.atdev.artrip.domain.exhibit.web.dto.request.ExhibitFilterRequestDto;
+import org.atdev.artrip.domain.exhibit.web.dto.request.ExhibitFilterRequest;
 import org.atdev.artrip.domain.home.response.FilterResponse;
-import org.atdev.artrip.domain.home.response.HomeListResponse;
 import org.atdev.artrip.domain.home.service.HomeService;
 import org.atdev.artrip.global.apipayload.CommonResponse;
 import org.atdev.artrip.global.apipayload.code.status.CommonError;
 import org.atdev.artrip.global.apipayload.code.status.HomeError;
 import org.atdev.artrip.global.swagger.ApiErrorResponses;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.web.PageableDefault;
-import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.http.ResponseEntity;
-import org.springframework.security.core.annotation.AuthenticationPrincipal;
-import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.web.bind.annotation.*;
 
-import java.time.LocalDate;
 import java.util.List;
 
 @RestController
@@ -89,7 +84,7 @@ public ResponseEntity<CommonResponse<List<String>>> getDomestic(){
             home = {HomeError._HOME_INVALID_DATE_RANGE, HomeError._HOME_UNRECOGNIZED_REGION, HomeError._HOME_EXHIBIT_NOT_FOUND}
     )
     @PostMapping("/filter")
-    public ResponseEntity<FilterResponse> getDomesticFilter(@RequestBody ExhibitFilterRequestDto dto,
+    public ResponseEntity<FilterResponse> getDomesticFilter(@RequestBody ExhibitFilterRequest dto,
                                                             @RequestParam(required = false) Long cursor,
                                                             @PageableDefault(size = 20) Pageable pageable){
 

src/main/java/org/atdev/artrip/domain/exhibit/web/dto/request/ExhibitFilterRequestDto.java → src/main/java/org/atdev/artrip/domain/exhibit/web/dto/request/ExhibitFilterRequest.java

@@ -9,7 +9,7 @@
 
 @Builder
 @Data
-public class ExhibitFilterRequestDto {
+public class ExhibitFilterRequest {
 
     private LocalDate startDate;
     private LocalDate endDate;

src/main/java/org/atdev/artrip/domain/favortie/data/FavoriteExhibit.java

@@ -26,6 +26,7 @@ public class FavoriteExhibit {
     private User user;
 
     @Column(nullable = false)
+    @Builder.Default
     private boolean status = false;
 
     @ManyToOne(fetch = FetchType.LAZY)

src/main/java/org/atdev/artrip/domain/home/converter/HomeConverter.java

@@ -3,9 +3,9 @@
 import org.atdev.artrip.domain.Enum.KeywordType;
 import org.atdev.artrip.domain.exhibit.data.Exhibit;
 import org.atdev.artrip.domain.exhibit.reponse.ExhibitDetailResponse;
-import org.atdev.artrip.domain.home.web.dto.*;
 import org.atdev.artrip.domain.home.response.FilterResponse;
 import org.atdev.artrip.domain.home.response.HomeListResponse;
+import org.atdev.artrip.domain.home.web.dto.request.*;
 import org.atdev.artrip.domain.keyword.data.Keyword;
 import org.springframework.data.domain.Slice;
 import org.springframework.stereotype.Component;
@@ -75,7 +75,7 @@ public ExhibitDetailResponse toHomeExhibitResponse(Exhibit exhibit) {
     }
 
 
-    public RandomExhibitRequest from(PersonalizedRequestDto request, List<Keyword> keywords) {
+    public RandomExhibitRequest from(PersonalizedRequest request, List<Keyword> keywords) {
 
         Set<String> genres = keywords.stream()
                 .filter(k -> k.getType() == KeywordType.GENRE)
@@ -97,7 +97,7 @@ public RandomExhibitRequest from(PersonalizedRequestDto request, List<Keyword> k
                 .build();
     }
 
-    public RandomExhibitRequest from(ScheduleRandomRequestDto request) {
+    public RandomExhibitRequest from(ScheduleRandomRequest request) {
 
         return RandomExhibitRequest.builder()
                 .isDomestic(request.getIsDomestic())
@@ -108,15 +108,15 @@ public RandomExhibitRequest from(ScheduleRandomRequestDto request) {
                 .build();
     }
 
-    public RandomExhibitRequest fromToday(TodayRandomRequestDto request) {
+    public RandomExhibitRequest fromToday(TodayRandomRequest request) {
         return RandomExhibitRequest.builder()
                 .isDomestic(request.getIsDomestic())
                 .country(normalize(request.getCountry()))
                 .region(normalize(request.getRegion()))
                 .limit(3)
                 .build();
     }
-    public RandomExhibitRequest fromGenre(GenreRandomRequestDto request) {
+    public RandomExhibitRequest fromGenre(GenreRandomRequest request) {
         return RandomExhibitRequest.builder()
                 .isDomestic(request.getIsDomestic())
                 .country(normalize(request.getCountry()))

src/main/java/org/atdev/artrip/domain/home/service/HomeService.java

@@ -1,22 +1,19 @@
 package org.atdev.artrip.domain.home.service;
 
 import lombok.RequiredArgsConstructor;
-import org.atdev.artrip.domain.Enum.KeywordType;
 import org.atdev.artrip.domain.auth.repository.UserRepository;
 import org.atdev.artrip.domain.exhibit.data.Exhibit;
-import org.atdev.artrip.domain.exhibit.reponse.ExhibitDetailResponse;
-import org.atdev.artrip.domain.exhibit.web.dto.request.ExhibitFilterRequestDto;
-import org.atdev.artrip.domain.home.web.dto.*;
+import org.atdev.artrip.domain.exhibit.web.dto.request.ExhibitFilterRequest;
 import org.atdev.artrip.domain.exhibitHall.repository.ExhibitHallRepository;
 import org.atdev.artrip.domain.home.converter.HomeConverter;
 import org.atdev.artrip.domain.home.response.FilterResponse;
 
 import org.atdev.artrip.domain.exhibit.repository.ExhibitRepository;
 import org.atdev.artrip.domain.home.response.HomeListResponse;
+import org.atdev.artrip.domain.home.web.dto.request.*;
 import org.atdev.artrip.domain.keyword.data.Keyword;
 import org.atdev.artrip.domain.keyword.data.UserKeyword;
 import org.atdev.artrip.domain.keyword.repository.UserKeywordRepository;
-import org.atdev.artrip.global.apipayload.code.status.ExhibitError;
 import org.atdev.artrip.global.apipayload.code.status.UserError;
 import org.atdev.artrip.global.apipayload.exception.GeneralException;
 
@@ -25,10 +22,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.time.LocalDate;
 import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
 
 @Service
 @RequiredArgsConstructor
@@ -68,7 +62,7 @@ public List<String> getDomestic(){
 
 
     //필터 전체 조회
-    public FilterResponse getFilterExhibit(ExhibitFilterRequestDto dto, Pageable pageable, Long cursorId) {
+    public FilterResponse getFilterExhibit(ExhibitFilterRequest dto, Pageable pageable, Long cursorId) {
 
         Slice<Exhibit> slice = exhibitRepository.findExhibitByFilters(dto, pageable, cursorId);
 
@@ -77,7 +71,7 @@ public FilterResponse getFilterExhibit(ExhibitFilterRequestDto dto, Pageable pag
 
     // 사용자 맞춤 전시 랜덤 추천
     @Transactional
-    public List<HomeListResponse> getRandomPersonalized(Long userId, PersonalizedRequestDto request){
+    public List<HomeListResponse> getRandomPersonalized(Long userId, PersonalizedRequest request){
 
         if (!userRepository.existsById(userId)) {
             throw new GeneralException(UserError._USER_NOT_FOUND);
@@ -106,7 +100,7 @@ public List<HomeListResponse> getRandomPersonalized(Long userId, PersonalizedReq
     }
 
     // 이번주 랜덤 전시 추천
-    public List<HomeListResponse> getRandomSchedule(ScheduleRandomRequestDto request){
+    public List<HomeListResponse> getRandomSchedule(ScheduleRandomRequest request){
 
         RandomExhibitRequest filter = homeConverter.from(request);
         List<HomeListResponse> results = exhibitRepository.findRandomExhibits(filter);
@@ -122,7 +116,7 @@ public List<HomeListResponse> getRandomSchedule(ScheduleRandomRequestDto request
     }
 
     // 장르별 전시 랜덤 추천
-    public List<HomeListResponse> getRandomGenre(GenreRandomRequestDto request){
+    public List<HomeListResponse> getRandomGenre(GenreRandomRequest request){
 
         RandomExhibitRequest filter = homeConverter.fromGenre(request);
 
@@ -139,7 +133,7 @@ public List<HomeListResponse> getRandomGenre(GenreRandomRequestDto request){
     }
 
     // 오늘날 전시 랜덤 추천
-    public List<HomeListResponse> getRandomToday(TodayRandomRequestDto request){
+    public List<HomeListResponse> getRandomToday(TodayRandomRequest request){
 
         RandomExhibitRequest filter = homeConverter.fromToday(request);
 

src/main/java/org/atdev/artrip/domain/home/web/controller/HomeController.java

@@ -3,9 +3,12 @@
 import io.swagger.v3.oas.annotations.Operation;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
-import org.atdev.artrip.domain.home.web.dto.*;
 import org.atdev.artrip.domain.home.response.HomeListResponse;
 import org.atdev.artrip.domain.home.service.HomeService;
+import org.atdev.artrip.domain.home.web.dto.request.GenreRandomRequest;
+import org.atdev.artrip.domain.home.web.dto.request.PersonalizedRequest;
+import org.atdev.artrip.domain.home.web.dto.request.ScheduleRandomRequest;
+import org.atdev.artrip.domain.home.web.dto.request.TodayRandomRequest;
 import org.atdev.artrip.global.apipayload.CommonResponse;
 import org.atdev.artrip.global.apipayload.code.status.CommonError;
 import org.atdev.artrip.global.apipayload.code.status.HomeError;
@@ -47,7 +50,7 @@ public class HomeController {
     @PostMapping("/personalized/random")
     public ResponseEntity<CommonResponse<List<HomeListResponse>>> getRandomPersonalized(
             @AuthenticationPrincipal UserDetails userDetails,
-            @Valid @RequestBody PersonalizedRequestDto requestDto){
+            @Valid @RequestBody PersonalizedRequest requestDto){
 
         long userId = Long.parseLong(userDetails.getUsername());
 
@@ -78,7 +81,7 @@ public ResponseEntity<CommonResponse<List<HomeListResponse>>> getRandomPersonali
     )
     @PostMapping("/schedule")
     public ResponseEntity<CommonResponse<List<HomeListResponse>>> getRandomSchedule(
-            @Valid @RequestBody ScheduleRandomRequestDto request){
+            @Valid @RequestBody ScheduleRandomRequest request){
 
         List<HomeListResponse> exhibits= homeService.getRandomSchedule(request);
 
@@ -109,7 +112,7 @@ public ResponseEntity<CommonResponse<List<HomeListResponse>>> getRandomSchedule(
     )
     @PostMapping("/genre/random")
     public ResponseEntity<CommonResponse<List<HomeListResponse>>> getRandomExhibits(
-            @Valid @RequestBody GenreRandomRequestDto request){
+            @Valid @RequestBody GenreRandomRequest request){
 
         List<HomeListResponse> exhibits = homeService.getRandomGenre(request);
         return ResponseEntity.ok(CommonResponse.onSuccess(exhibits));
@@ -137,7 +140,7 @@ public ResponseEntity<CommonResponse<List<HomeListResponse>>> getRandomExhibits(
     )
     @PostMapping("recommend/today")
     public ResponseEntity<CommonResponse<List<HomeListResponse>>> getTodayRecommendations(
-            @Valid @RequestBody TodayRandomRequestDto request){
+            @Valid @RequestBody TodayRandomRequest request){
 
         List<HomeListResponse> exhibits = homeService.getRandomToday(request);
 

src/main/java/org/atdev/artrip/domain/home/web/dto/BaseRandomRequestDto.java → src/main/java/org/atdev/artrip/domain/home/web/dto/request/BaseRandomRequest.java

@@ -1,4 +1,4 @@
-package org.atdev.artrip.domain.home.web.dto;
+package org.atdev.artrip.domain.home.web.dto.request;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.AssertTrue;
@@ -12,7 +12,7 @@
 @Setter
 @NoArgsConstructor
 @AllArgsConstructor
-public class BaseRandomRequestDto {
+public class BaseRandomRequest {
 
     @NotNull
     protected Boolean isDomestic;