Skip to content

Commit

Permalink
#26 [Update] 관리자용 유저 등록 업장 조회 구현 중
Browse files Browse the repository at this point in the history
  • Loading branch information
Anna-Jin committed Jul 18, 2022
1 parent 88a5f41 commit 0ff3877
Show file tree
Hide file tree
Showing 6 changed files with 56 additions and 25 deletions.
Original file line number Diff line number Diff line change
@@ -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<AdminResponseDto> getUserRegisterStore() {
return adminService.getUserRegisterStore();
}
}
26 changes: 12 additions & 14 deletions src/main/java/com/mpnp/baechelin/admin/dto/AdminResponseDto.java
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -20,20 +23,15 @@ public class AdminResponseDto {

@Builder
public AdminResponseDto(
String name,
String address,
String elevator,
String toilet,
String heightDifferent,
String approach,
List<UserRegisterStoreImgDto> 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());
}
}

This file was deleted.

18 changes: 18 additions & 0 deletions src/main/java/com/mpnp/baechelin/admin/service/AdminService.java
Original file line number Diff line number Diff line change
@@ -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<AdminResponseDto> getUserRegisterStore() {
Page<UserRegisterStore> foundUserRegisterStores = userRegisterStoreRepository.findAll(Pageable.ofSize(5));

return foundUserRegisterStores.stream().map(AdminResponseDto::new).collect(Collectors.toList());
}
}
Original file line number Diff line number Diff line change
@@ -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();
}
}
Original file line number Diff line number Diff line change
@@ -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<UserRegisterStore, Integer> {
Page<UserRegisterStore> findAll(Pageable pageable);
}

0 comments on commit 0ff3877

Please sign in to comment.