diff --git a/src/main/java/com/mpnp/baechelin/admin/controller/AdminController.java b/src/main/java/com/mpnp/baechelin/admin/controller/AdminController.java index 8d602bd..969c676 100644 --- a/src/main/java/com/mpnp/baechelin/admin/controller/AdminController.java +++ b/src/main/java/com/mpnp/baechelin/admin/controller/AdminController.java @@ -1,9 +1,25 @@ package com.mpnp.baechelin.admin.controller; +import com.mpnp.baechelin.admin.dto.AdminResponseDto; +import com.mpnp.baechelin.admin.service.AdminService; import lombok.RequiredArgsConstructor; +import org.springframework.security.core.annotation.AuthenticationPrincipal; +import org.springframework.security.core.userdetails.User; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + @RestController @RequiredArgsConstructor +@RequestMapping("/admin") public class AdminController { + + private final AdminService adminService; + + @GetMapping("/approval") + public List getUserRegisterStore() { + return adminService.getUserRegisterStore(); + } } diff --git a/src/main/java/com/mpnp/baechelin/admin/dto/AdminResponseDto.java b/src/main/java/com/mpnp/baechelin/admin/dto/AdminResponseDto.java index b31b77c..0dd30e1 100644 --- a/src/main/java/com/mpnp/baechelin/admin/dto/AdminResponseDto.java +++ b/src/main/java/com/mpnp/baechelin/admin/dto/AdminResponseDto.java @@ -1,11 +1,14 @@ package com.mpnp.baechelin.admin.dto; +import com.mpnp.baechelin.store.domain.UserRegisterStore; +import com.mpnp.baechelin.store.domain.UserRegisterStoreImg; import com.mpnp.baechelin.store.dto.userRegisterStore.UserRegisterStoreImgDto; import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; import java.util.List; +import java.util.stream.Collectors; @Getter @NoArgsConstructor @@ -20,20 +23,15 @@ public class AdminResponseDto { @Builder public AdminResponseDto( - String name, - String address, - String elevator, - String toilet, - String heightDifferent, - String approach, - List userRegisterStoreImageList + UserRegisterStore userRegisterStore ) { - this.name = name; - this.address = address; - this.elevator = elevator; - this.toilet = toilet; - this.heightDifferent = heightDifferent; - this.approach = approach; - this.userRegisterStoreImageList = userRegisterStoreImageList; + this.name = userRegisterStore.getName(); + this.address = userRegisterStore.getAddress(); + this.elevator = userRegisterStore.getElevator(); + this.toilet = userRegisterStore.getToilet(); + this.heightDifferent = userRegisterStore.getHeightDifferent(); + this.approach = userRegisterStore.getApproach(); + this.userRegisterStoreImageList = userRegisterStore.getUserRegisterStoreImgList().parallelStream() + .map(UserRegisterStoreImgDto::new).collect(Collectors.toList()); } } diff --git a/src/main/java/com/mpnp/baechelin/admin/repository/AdminRepository.java b/src/main/java/com/mpnp/baechelin/admin/repository/AdminRepository.java deleted file mode 100644 index b390970..0000000 --- a/src/main/java/com/mpnp/baechelin/admin/repository/AdminRepository.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.mpnp.baechelin.admin.repository; - -import com.mpnp.baechelin.store.domain.UserRegisterStore; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -@Repository -public interface AdminRepository extends JpaRepository { -} diff --git a/src/main/java/com/mpnp/baechelin/admin/service/AdminService.java b/src/main/java/com/mpnp/baechelin/admin/service/AdminService.java index 7bb0819..2ee781e 100644 --- a/src/main/java/com/mpnp/baechelin/admin/service/AdminService.java +++ b/src/main/java/com/mpnp/baechelin/admin/service/AdminService.java @@ -1,9 +1,27 @@ package com.mpnp.baechelin.admin.service; +import com.mpnp.baechelin.admin.dto.AdminResponseDto; +import com.mpnp.baechelin.store.domain.UserRegisterStore; +import com.mpnp.baechelin.store.dto.StoreCardResponseDto; +import com.mpnp.baechelin.store.repository.UserRegisterStoreRepository; import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; + @Service @RequiredArgsConstructor public class AdminService { + + private final UserRegisterStoreRepository userRegisterStoreRepository; + + public List getUserRegisterStore() { + Page foundUserRegisterStores = userRegisterStoreRepository.findAll(Pageable.ofSize(5)); + + return foundUserRegisterStores.stream().map(AdminResponseDto::new).collect(Collectors.toList()); + } } diff --git a/src/main/java/com/mpnp/baechelin/store/dto/userRegisterStore/UserRegisterStoreImgDto.java b/src/main/java/com/mpnp/baechelin/store/dto/userRegisterStore/UserRegisterStoreImgDto.java index 93d6028..ffd2da6 100644 --- a/src/main/java/com/mpnp/baechelin/store/dto/userRegisterStore/UserRegisterStoreImgDto.java +++ b/src/main/java/com/mpnp/baechelin/store/dto/userRegisterStore/UserRegisterStoreImgDto.java @@ -1,13 +1,20 @@ package com.mpnp.baechelin.store.dto.userRegisterStore; +import com.mpnp.baechelin.store.domain.UserRegisterStoreImg; import lombok.Getter; +import lombok.NoArgsConstructor; import lombok.Setter; @Getter +@NoArgsConstructor public class UserRegisterStoreImgDto { private String userRegisterStoreImageUrl; public UserRegisterStoreImgDto(String userRegisterStoreImageUrl) { this.userRegisterStoreImageUrl = userRegisterStoreImageUrl; } + + public UserRegisterStoreImgDto(UserRegisterStoreImg userRegisterStoreImg) { + this.userRegisterStoreImageUrl = userRegisterStoreImg.getUserRegisterStoreImageUrl(); + } } diff --git a/src/main/java/com/mpnp/baechelin/store/repository/UserRegisterStoreRepository.java b/src/main/java/com/mpnp/baechelin/store/repository/UserRegisterStoreRepository.java index c18e952..1da5d61 100644 --- a/src/main/java/com/mpnp/baechelin/store/repository/UserRegisterStoreRepository.java +++ b/src/main/java/com/mpnp/baechelin/store/repository/UserRegisterStoreRepository.java @@ -1,9 +1,10 @@ package com.mpnp.baechelin.store.repository; import com.mpnp.baechelin.store.domain.UserRegisterStore; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; -@Repository public interface UserRegisterStoreRepository extends JpaRepository { + Page findAll(Pageable pageable); }