Skip to content

Commit

Permalink
#26 [Update] 관리자용 유저 등록 업장 조회
Browse files Browse the repository at this point in the history
- 이미지 리스트를 빼고, responseDto의 id 필드 이름 변경 및 생성자에 추가
- 페이징 추가
  • Loading branch information
Anna-Jin committed Jul 20, 2022
1 parent 7b2129b commit 5b41bb5
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.mpnp.baechelin.admin.dto.AdminResponseDto;
import com.mpnp.baechelin.admin.service.AdminService;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.security.core.annotation.AuthenticationPrincipal;
import org.springframework.security.core.userdetails.User;
Expand All @@ -18,6 +19,7 @@ public class AdminController {

private final AdminService adminService;

@ApiOperation(value = "유저가 등록한 업장을 관리자 페이지에서 조회하는 메소드")
@GetMapping("/approval")
public List<AdminResponseDto> getUserRegisterStore() {
return adminService.getUserRegisterStore();
Expand Down
10 changes: 2 additions & 8 deletions src/main/java/com/mpnp/baechelin/admin/dto/AdminResponseDto.java
Original file line number Diff line number Diff line change
@@ -1,37 +1,31 @@
package com.mpnp.baechelin.admin.dto;

import com.mpnp.baechelin.store.domain.UserRegisterStore;
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
public class AdminResponseDto {
private int id;
private int registerStoreId;
private String name;
private String address;
private String elevator;
private String toilet;
private String heightDifferent;
private String approach;
private List<UserRegisterStoreImgDto> userRegisterStoreImageList;

@Builder
public AdminResponseDto(
UserRegisterStore userRegisterStore
) {
this.registerStoreId = userRegisterStore.getId();
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());
}
}
11 changes: 8 additions & 3 deletions src/main/java/com/mpnp/baechelin/admin/service/AdminService.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
import com.mpnp.baechelin.store.domain.UserRegisterStore;
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 javax.transaction.Transactional;
Expand All @@ -17,13 +19,16 @@ public class AdminService {

private final UserRegisterStoreRepository userRegisterStoreRepository;

/**
* 유저가 등록한 업장 조회
* @return
*/
public List<AdminResponseDto> getUserRegisterStore() {
// Page<UserRegisterStore> foundUserRegisterStores = userRegisterStoreRepository.findAll(Pageable.ofSize(5));
Page<UserRegisterStore> foundUserRegisterStores = userRegisterStoreRepository.findAll(Pageable.ofSize(5));

List<UserRegisterStore> foundUserRegisterStores = userRegisterStoreRepository.findAll();
List<AdminResponseDto> result = new ArrayList<>();

for (UserRegisterStore foundUserRegisterStore : foundUserRegisterStores) {
for (UserRegisterStore foundUserRegisterStore : foundUserRegisterStores.getContent()) {
AdminResponseDto adminResponseDto = new AdminResponseDto(foundUserRegisterStore);
result.add(adminResponseDto);
}
Expand Down

0 comments on commit 5b41bb5

Please sign in to comment.