Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

6 feat 러닝 기능 구현 #24

Merged
merged 3 commits into from
Nov 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@ out/
.vscode/

### Application.yml ###
/src/main/resources/application-dev.yml
/src/main/resources/application-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,20 +55,20 @@ public ResponseEntity<ResponseDto<RunningRecordResponseDto>> fetchRunningRecord(
return new ResponseEntity<>(response, HttpStatus.OK);
}

// @GetMapping("/{userId}")
// public ResponseEntity<ResponseDto<RunningRecordResponseDto>> fetchRunningRecords(@PathVariable Long userId,
// @RequestParam(defaultValue = "0") int page,
// @RequestParam(defaultValue = "5") int size){
// Pageable pageable = PageRequest.of(page, size);
// Page<RunningRecordResponseDto> result = runningRecordService.findRunningRecords(userId, pageable);
// ResponseDto<RunningRecordResponseDto> response = new ResponseDto<>();
// response.setSuccess(true);
// response.setCode(HttpStatus.OK.value());
// response.setMessage("요청에 성공하였습니다.");
// response.setResult(result);
//
// return new ResponseEntity<>(response, HttpStatus.OK);
// }
@GetMapping("/{userId}")
public ResponseEntity<ResponseDto<Page<RunningRecordResponseDto>>> fetchRunningRecords(@PathVariable Long userId,
@RequestParam(defaultValue = "0") int page,
@RequestParam(defaultValue = "5") int size){
Pageable pageable = PageRequest.of(page, size);
Page<RunningRecordResponseDto> result = runningRecordService.findRunningRecords(userId, pageable);
ResponseDto<Page<RunningRecordResponseDto>> response = new ResponseDto<>();
response.setSuccess(true);
response.setCode(HttpStatus.OK.value());
response.setMessage("요청에 성공하였습니다.");
response.setResult(result);

return new ResponseEntity<>(response, HttpStatus.OK);
}


}
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,24 @@
import com.alom.dorundorunbe.domain.RunningRecord.dto.RunningRecordStartRequestDto;
import com.alom.dorundorunbe.domain.RunningRecord.mapper.RunningRecordMapper;
import com.alom.dorundorunbe.domain.RunningRecord.repository.RunningRecordRepository;
import com.alom.dorundorunbe.domain.user.domain.User;
import com.alom.dorundorunbe.domain.user.service.UserService;
import lombok.AllArgsConstructor;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;

@Service
@AllArgsConstructor
public class RunningRecordService {
private final RunningRecordRepository runningRecordRepository;
private final RunningRecordMapper runningRecordMapper;
// private final UserRepository userRepository;
private final UserService userService;

public RunningRecordResponseDto saveStartRecord(RunningRecordStartRequestDto startRequestDto){
// User user = userRepository.findById(startRequestDto.getUserId());
User user = userService.findById(startRequestDto.getUserId());
RunningRecord runningRecord = runningRecordMapper.toEntityFromStartRequestDto(startRequestDto);
// runningRecord.setUser(user);
runningRecord.setUser(user);
return runningRecordMapper.toResponseDto(runningRecordRepository.save(runningRecord));
}

Expand All @@ -30,11 +34,11 @@ public RunningRecordResponseDto saveEndRecord(RunningRecordEndRequestDto endRequ
}

// user별 최신순 특정 개수의 기록 조회
// public Page<RunningRecordResponseDto> findRunningRecords(Long userId, Pageable pageable){
// User user = userRepository.findById(userId);
// Page<RunningRecord> records = runningRecordRepository.findByUser(user, pageable);
// return records.map(runningRecordMapper::toResponseDto);
// }
public Page<RunningRecordResponseDto> findRunningRecords(Long userId, Pageable pageable){
User user = userService.findById(userId);
Page<RunningRecord> records = runningRecordRepository.findByUser(user, pageable);
return records.map(runningRecordMapper::toResponseDto);
}

// 특정 기록의 상세 조회
public RunningRecordResponseDto findRunningRecord(Long id){
Expand Down