-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #17 from TEAM-ALOM/6-feat-러닝-기능을-구현합니다
6 feat 러닝 기능 구현
- Loading branch information
Showing
13 changed files
with
367 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
rootProject.name = 'dorundorun-Be' | ||
//rootProject.name = 'dorundorun-BE' |
69 changes: 69 additions & 0 deletions
69
.../generated/com/alom/dorundorunbe/domain/RunningRecord/mapper/RunningRecordMapperImpl.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,69 @@ | ||
package com.alom.dorundorunbe.domain.RunningRecord.mapper; | ||
|
||
import com.alom.dorundorunbe.domain.RunningRecord.domain.RunningRecord; | ||
import com.alom.dorundorunbe.domain.RunningRecord.dto.RunningRecordEndRequestDto; | ||
import com.alom.dorundorunbe.domain.RunningRecord.dto.RunningRecordResponseDto; | ||
import com.alom.dorundorunbe.domain.RunningRecord.dto.RunningRecordStartRequestDto; | ||
import javax.annotation.processing.Generated; | ||
import org.springframework.stereotype.Component; | ||
|
||
@Generated( | ||
value = "org.mapstruct.ap.MappingProcessor", | ||
date = "2024-11-19T21:28:17+0900", | ||
comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.13 (Amazon.com Inc.)" | ||
) | ||
@Component | ||
public class RunningRecordMapperImpl implements RunningRecordMapper { | ||
|
||
@Override | ||
public RunningRecordResponseDto toResponseDto(RunningRecord runningRecord) { | ||
if ( runningRecord == null ) { | ||
return null; | ||
} | ||
|
||
RunningRecordResponseDto.RunningRecordResponseDtoBuilder runningRecordResponseDto = RunningRecordResponseDto.builder(); | ||
|
||
runningRecordResponseDto.id( runningRecord.getId() ); | ||
runningRecordResponseDto.date( runningRecord.getDate() ); | ||
runningRecordResponseDto.startTime( runningRecord.getStartTime() ); | ||
runningRecordResponseDto.endTime( runningRecord.getEndTime() ); | ||
runningRecordResponseDto.distance( runningRecord.getDistance() ); | ||
runningRecordResponseDto.cadence( runningRecord.getCadence() ); | ||
runningRecordResponseDto.elapsedTime( runningRecord.getElapsedTime() ); | ||
runningRecordResponseDto.speed( runningRecord.getSpeed() ); | ||
|
||
return runningRecordResponseDto.build(); | ||
} | ||
|
||
@Override | ||
public RunningRecord toEntityFromStartRequestDto(RunningRecordStartRequestDto startRequestDto) { | ||
if ( startRequestDto == null ) { | ||
return null; | ||
} | ||
|
||
RunningRecord.RunningRecordBuilder runningRecord = RunningRecord.builder(); | ||
|
||
runningRecord.date( startRequestDto.getDate() ); | ||
runningRecord.startTime( startRequestDto.getStartTime() ); | ||
|
||
return runningRecord.build(); | ||
} | ||
|
||
@Override | ||
public RunningRecord toEntityFromEndRequestDto(RunningRecordEndRequestDto endRequestDto) { | ||
if ( endRequestDto == null ) { | ||
return null; | ||
} | ||
|
||
RunningRecord.RunningRecordBuilder runningRecord = RunningRecord.builder(); | ||
|
||
runningRecord.id( endRequestDto.getId() ); | ||
runningRecord.endTime( endRequestDto.getEndTime() ); | ||
runningRecord.distance( endRequestDto.getDistance() ); | ||
runningRecord.cadence( endRequestDto.getCadence() ); | ||
runningRecord.elapsedTime( endRequestDto.getElapsedTime() ); | ||
runningRecord.speed( endRequestDto.getSpeed() ); | ||
|
||
return runningRecord.build(); | ||
} | ||
} |
74 changes: 74 additions & 0 deletions
74
...n/java/com/alom/dorundorunbe/domain/RunningRecord/controller/RunningRecordController.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,74 @@ | ||
package com.alom.dorundorunbe.domain.RunningRecord.controller; | ||
|
||
import com.alom.dorundorunbe.domain.RunningRecord.dto.ResponseDto; | ||
import com.alom.dorundorunbe.domain.RunningRecord.dto.RunningRecordEndRequestDto; | ||
import com.alom.dorundorunbe.domain.RunningRecord.dto.RunningRecordResponseDto; | ||
import com.alom.dorundorunbe.domain.RunningRecord.dto.RunningRecordStartRequestDto; | ||
import com.alom.dorundorunbe.domain.RunningRecord.service.RunningRecordService; | ||
import lombok.AllArgsConstructor; | ||
import org.springframework.data.domain.Page; | ||
import org.springframework.data.domain.PageRequest; | ||
import org.springframework.data.domain.Pageable; | ||
import org.springframework.http.HttpStatus; | ||
import org.springframework.http.ResponseEntity; | ||
import org.springframework.web.bind.annotation.*; | ||
|
||
@RestController | ||
@AllArgsConstructor | ||
@RequestMapping("/records") | ||
public class RunningRecordController { | ||
private final RunningRecordService runningRecordService; | ||
|
||
@PostMapping | ||
public ResponseEntity<ResponseDto<RunningRecordResponseDto>> createStartRunningRecord(RunningRecordStartRequestDto startRequestDto){ | ||
RunningRecordResponseDto result = runningRecordService.saveStartRecord(startRequestDto); | ||
ResponseDto<RunningRecordResponseDto> response = new ResponseDto<>(); | ||
response.setSuccess(true); | ||
response.setCode(HttpStatus.CREATED.value()); | ||
response.setMessage("러닝 시작 시간이 성공적으로 저장되었습니다."); | ||
response.setResult(result); | ||
|
||
return new ResponseEntity<>(response, HttpStatus.CREATED); | ||
} | ||
|
||
@PostMapping("/end") | ||
public ResponseEntity<ResponseDto<RunningRecordResponseDto>> createEndRunningRecord(RunningRecordEndRequestDto endRequestDto){ | ||
RunningRecordResponseDto result = runningRecordService.saveEndRecord(endRequestDto); | ||
ResponseDto<RunningRecordResponseDto> response = new ResponseDto<>(); | ||
response.setSuccess(true); | ||
response.setCode(HttpStatus.CREATED.value()); | ||
response.setMessage("러닝 기록이 성공적으로 생성되었습니다."); | ||
response.setResult(result); | ||
|
||
return new ResponseEntity<>(response, HttpStatus.CREATED); | ||
} | ||
|
||
@GetMapping("/{id}") | ||
public ResponseEntity<ResponseDto<RunningRecordResponseDto>> fetchRunningRecord(@PathVariable Long id){ | ||
RunningRecordResponseDto result = runningRecordService.findRunningRecord(id); | ||
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<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); | ||
// } | ||
|
||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
15 changes: 15 additions & 0 deletions
15
src/main/java/com/alom/dorundorunbe/domain/RunningRecord/dto/ResponseDto.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
package com.alom.dorundorunbe.domain.RunningRecord.dto; | ||
|
||
import lombok.*; | ||
|
||
@Getter | ||
@Setter | ||
@Builder | ||
@AllArgsConstructor | ||
@NoArgsConstructor | ||
public class ResponseDto<T> { | ||
private boolean isSuccess; | ||
private int code; | ||
private String message; | ||
private T result; | ||
} |
26 changes: 26 additions & 0 deletions
26
src/main/java/com/alom/dorundorunbe/domain/RunningRecord/dto/RunningRecordEndRequestDto.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
package com.alom.dorundorunbe.domain.RunningRecord.dto; | ||
|
||
import jakarta.persistence.Entity; | ||
import lombok.*; | ||
|
||
import java.time.LocalDateTime; | ||
|
||
|
||
@Getter | ||
@Setter | ||
@Builder | ||
@AllArgsConstructor | ||
@NoArgsConstructor | ||
public class RunningRecordEndRequestDto { | ||
private Long id; | ||
|
||
private double distance; | ||
|
||
private int cadence; | ||
|
||
private long elapsedTime; | ||
|
||
private LocalDateTime endTime; | ||
|
||
private double speed; | ||
} |
30 changes: 30 additions & 0 deletions
30
src/main/java/com/alom/dorundorunbe/domain/RunningRecord/dto/RunningRecordResponseDto.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
package com.alom.dorundorunbe.domain.RunningRecord.dto; | ||
|
||
import lombok.*; | ||
|
||
import java.time.LocalDateTime; | ||
|
||
@Getter | ||
@Setter | ||
@Builder | ||
@AllArgsConstructor | ||
@NoArgsConstructor | ||
public class RunningRecordResponseDto { | ||
private Long id; | ||
|
||
private LocalDateTime date; | ||
|
||
private LocalDateTime startTime; | ||
|
||
private LocalDateTime endTime; | ||
|
||
private double distance; | ||
|
||
private int cadence; | ||
|
||
private long elapsedTime; | ||
|
||
private double speed; | ||
|
||
private boolean isFinished; | ||
} |
18 changes: 18 additions & 0 deletions
18
...ain/java/com/alom/dorundorunbe/domain/RunningRecord/dto/RunningRecordStartRequestDto.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
package com.alom.dorundorunbe.domain.RunningRecord.dto; | ||
|
||
import lombok.*; | ||
|
||
import java.time.LocalDateTime; | ||
|
||
@Getter | ||
@Setter | ||
@Builder | ||
@AllArgsConstructor | ||
@NoArgsConstructor | ||
public class RunningRecordStartRequestDto { | ||
private Long userId; | ||
|
||
private LocalDateTime date; | ||
|
||
private LocalDateTime startTime; | ||
} |
17 changes: 17 additions & 0 deletions
17
src/main/java/com/alom/dorundorunbe/domain/RunningRecord/mapper/RunningRecordMapper.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
package com.alom.dorundorunbe.domain.RunningRecord.mapper; | ||
|
||
import com.alom.dorundorunbe.domain.RunningRecord.domain.RunningRecord; | ||
import com.alom.dorundorunbe.domain.RunningRecord.dto.RunningRecordEndRequestDto; | ||
import com.alom.dorundorunbe.domain.RunningRecord.dto.RunningRecordResponseDto; | ||
import com.alom.dorundorunbe.domain.RunningRecord.dto.RunningRecordStartRequestDto; | ||
import org.mapstruct.Mapper; | ||
import org.mapstruct.Mapping; | ||
|
||
@Mapper(componentModel = "spring") | ||
public interface RunningRecordMapper { | ||
RunningRecordResponseDto toResponseDto(RunningRecord runningRecord); | ||
@Mapping(target = "id", ignore = true) | ||
RunningRecord toEntityFromStartRequestDto(RunningRecordStartRequestDto startRequestDto); | ||
RunningRecord toEntityFromEndRequestDto(RunningRecordEndRequestDto endRequestDto); | ||
|
||
} |
13 changes: 13 additions & 0 deletions
13
...n/java/com/alom/dorundorunbe/domain/RunningRecord/repository/RunningRecordRepository.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
package com.alom.dorundorunbe.domain.RunningRecord.repository; | ||
|
||
import com.alom.dorundorunbe.domain.RunningRecord.domain.RunningRecord; | ||
import com.alom.dorundorunbe.domain.user.domain.User; | ||
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 RunningRecordRepository extends JpaRepository<RunningRecord, Long> { | ||
Page<RunningRecord> findByUser(User user, Pageable pageable); | ||
} |
44 changes: 44 additions & 0 deletions
44
src/main/java/com/alom/dorundorunbe/domain/RunningRecord/service/RunningRecordService.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
package com.alom.dorundorunbe.domain.RunningRecord.service; | ||
|
||
import com.alom.dorundorunbe.domain.RunningRecord.domain.RunningRecord; | ||
import com.alom.dorundorunbe.domain.RunningRecord.dto.RunningRecordEndRequestDto; | ||
import com.alom.dorundorunbe.domain.RunningRecord.dto.RunningRecordResponseDto; | ||
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 lombok.AllArgsConstructor; | ||
import org.springframework.stereotype.Service; | ||
|
||
@Service | ||
@AllArgsConstructor | ||
public class RunningRecordService { | ||
private final RunningRecordRepository runningRecordRepository; | ||
private final RunningRecordMapper runningRecordMapper; | ||
// private final UserRepository userRepository; | ||
|
||
public RunningRecordResponseDto saveStartRecord(RunningRecordStartRequestDto startRequestDto){ | ||
// User user = userRepository.findById(startRequestDto.getUserId()); | ||
RunningRecord runningRecord = runningRecordMapper.toEntityFromStartRequestDto(startRequestDto); | ||
// runningRecord.setUser(user); | ||
return runningRecordMapper.toResponseDto(runningRecordRepository.save(runningRecord)); | ||
} | ||
|
||
public RunningRecordResponseDto saveEndRecord(RunningRecordEndRequestDto endRequestDto){ | ||
RunningRecord runningRecord = runningRecordMapper.toEntityFromEndRequestDto(endRequestDto); | ||
runningRecord.setFinished(true); | ||
return runningRecordMapper.toResponseDto(runningRecord); | ||
} | ||
|
||
// 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 RunningRecordResponseDto findRunningRecord(Long id){ | ||
return runningRecordMapper.toResponseDto(runningRecordRepository.findById(id) | ||
.orElseThrow(() -> new IllegalStateException("Running record with id "+id+" does not exist"))); | ||
} | ||
} |
Oops, something went wrong.