Skip to content

Commit

Permalink
1
Browse files Browse the repository at this point in the history
  • Loading branch information
woojin065 committed Feb 21, 2024
1 parent 5a93675 commit 053c15b
Show file tree
Hide file tree
Showing 5 changed files with 46 additions and 57 deletions.
25 changes: 25 additions & 0 deletions src/main/java/com/example/scbaby/Bean/BabyBean/GetParentsBean.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
package com.example.scbaby.Bean.BabyBean;

import com.example.scbaby.Model.DAO.BabyDAO;
import com.example.scbaby.Model.DAO.UserDAO;
import com.example.scbaby.Model.DTO.User.Res.UserGetRes;
import com.example.scbaby.Repository.BabyRepository;
import com.example.scbaby.Repository.UserRepository;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Component;

import java.util.List;
import java.util.stream.Collectors;

@Component
@RequiredArgsConstructor
public class GetParentsBean {
private final BabyRepository babyRepository;
private final UserRepository userRepository;

public List<UserGetRes> exec(Long babyId) {
BabyDAO babyDAO = babyRepository.findById(babyId).get();
List<UserDAO> userDAOList = userRepository.findByBaby(babyDAO);
return userDAOList.stream().map(UserGetRes::of).collect(Collectors.toList());
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,15 @@
import com.example.scbaby.Model.DTO.Baby.Req.BabyUpdateReq;
import com.example.scbaby.Model.DTO.Baby.Res.BabyGetRes;
import com.example.scbaby.Model.DTO.StateRes;
import com.example.scbaby.Model.DTO.User.Res.UserGetRes;
import com.example.scbaby.Service.BabyService;
import io.swagger.v3.oas.annotations.Operation;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import java.io.IOException;
import java.util.List;

@RestController
@RequiredArgsConstructor
Expand All @@ -35,4 +37,10 @@ public BabyGetRes getBaby(@PathVariable Long babyId) {
public StateRes updateBaby(@PathVariable Long babyId, @RequestBody BabyUpdateReq babyUpdateReq) throws IOException {
return babyService.updateBaby(babyId, babyUpdateReq);
}

@Operation(summary = "BabyId로 공동양육자 조회")
@GetMapping("/baby/{babyId}/parents")
public List<UserGetRes> getParents(@PathVariable Long babyId) {
return babyService.getParents(babyId);
}
}
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
package com.example.scbaby.Repository;

import com.example.scbaby.Model.DAO.BabyDAO;
import com.example.scbaby.Model.DAO.UserDAO;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;

import java.util.List;

@Repository
public interface UserRepository extends JpaRepository<UserDAO, String>{

List<UserDAO> findByBaby(BabyDAO babyDAO);
}
9 changes: 9 additions & 0 deletions src/main/java/com/example/scbaby/Service/BabyService.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,27 @@
import com.example.scbaby.Bean.BabyBean.BabyGetBean;
import com.example.scbaby.Bean.BabyBean.BabyRegistBean;
import com.example.scbaby.Bean.BabyBean.BabyUpdateBean;
import com.example.scbaby.Bean.BabyBean.GetParentsBean;
import com.example.scbaby.Model.DTO.Baby.Req.BabyRegistReq;
import com.example.scbaby.Model.DTO.Baby.Req.BabyUpdateReq;
import com.example.scbaby.Model.DTO.Baby.Res.BabyGetRes;
import com.example.scbaby.Model.DTO.StateRes;
import com.example.scbaby.Model.DTO.User.Res.UserGetRes;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;

import java.io.IOException;
import java.util.List;

@Service
@RequiredArgsConstructor
public class BabyService {
private final BabyRegistBean babyRegistBean;
private final BabyGetBean babyGetBean;
private final BabyUpdateBean babyUpdateBean;
private final GetParentsBean getParentsBean;

@Transactional
public StateRes registerBaby(BabyRegistReq babyRegistReq) throws IOException {
Expand All @@ -35,4 +39,9 @@ public BabyGetRes getBaby(Long babyId) {
public StateRes updateBaby(Long babyId, BabyUpdateReq babyUpdateReq) throws IOException {
return babyUpdateBean.exec(babyId, babyUpdateReq);
}

@Transactional(readOnly = true)
public List<UserGetRes> getParents(Long babyId) {
return getParentsBean.exec(babyId);
}
}
57 changes: 0 additions & 57 deletions src/test/java/com/example/scbaby/TestData.java

This file was deleted.

0 comments on commit 053c15b

Please sign in to comment.