diff --git a/src/main/java/com/petlog/pet/controller/PetController.java b/src/main/java/com/petlog/pet/controller/PetController.java index 138f3a7..81e46b5 100644 --- a/src/main/java/com/petlog/pet/controller/PetController.java +++ b/src/main/java/com/petlog/pet/controller/PetController.java @@ -80,6 +80,8 @@ public ResponseEntity> createFeedingRecord( @PathVariable final Long groupId, @RequestBody final CreateFeedingRecordRequestDto request ) { + petService.createFeedingRecord(memberId, groupId, request.memo()); + return ResponseEntity.ok( ApiResponse.success(CREATE_FEEDING_RECORD) ); @@ -91,6 +93,8 @@ public ResponseEntity> createWateringRecord( @PathVariable final Long groupId, @RequestBody final CreateWateringRecordRequestDto request ) { + petService.createWateringRecord(memberId, groupId, request.memo()); + return ResponseEntity.ok( ApiResponse.success(CREATE_WATERING_RECORD) ); @@ -102,6 +106,8 @@ public ResponseEntity> createPoopRecord( @PathVariable final Long groupId, @RequestBody final CreatePoopRecordRequestDto request ) { + petService.createPoopRecord(memberId, groupId, request.memo()); + return ResponseEntity.ok( ApiResponse.success(CREATE_POOP_RECORD) ); diff --git a/src/main/java/com/petlog/pet/entity/FeedingDailyRecord.java b/src/main/java/com/petlog/pet/entity/FeedingDailyRecord.java index 3f241fc..ad18fd7 100644 --- a/src/main/java/com/petlog/pet/entity/FeedingDailyRecord.java +++ b/src/main/java/com/petlog/pet/entity/FeedingDailyRecord.java @@ -44,7 +44,6 @@ public class FeedingDailyRecord extends BaseEntity { public FeedingDailyRecord( final PetProfile petProfile, final Member member, - final LocalDateTime time, final String memo ) { this.petProfile = petProfile; diff --git a/src/main/java/com/petlog/pet/entity/PoopDailyRecord.java b/src/main/java/com/petlog/pet/entity/PoopDailyRecord.java index 0b26d09..e361bfe 100644 --- a/src/main/java/com/petlog/pet/entity/PoopDailyRecord.java +++ b/src/main/java/com/petlog/pet/entity/PoopDailyRecord.java @@ -44,7 +44,6 @@ public class PoopDailyRecord extends BaseEntity { public PoopDailyRecord( final PetProfile petProfile, final Member member, - final LocalDateTime time, final String memo ) { this.petProfile = petProfile; diff --git a/src/main/java/com/petlog/pet/entity/WateringDailyRecord.java b/src/main/java/com/petlog/pet/entity/WateringDailyRecord.java index f075aac..3836a11 100644 --- a/src/main/java/com/petlog/pet/entity/WateringDailyRecord.java +++ b/src/main/java/com/petlog/pet/entity/WateringDailyRecord.java @@ -44,7 +44,6 @@ public class WateringDailyRecord extends BaseEntity { public WateringDailyRecord( final PetProfile petProfile, final Member member, - final LocalDateTime time, final String memo ) { this.petProfile = petProfile; diff --git a/src/main/java/com/petlog/pet/service/PetService.java b/src/main/java/com/petlog/pet/service/PetService.java index c4ad0e0..10be12d 100644 --- a/src/main/java/com/petlog/pet/service/PetService.java +++ b/src/main/java/com/petlog/pet/service/PetService.java @@ -145,4 +145,51 @@ public void updatePetProfile(final Long memberId, final Long groupId, final Upda dto.gender() ); } + + @Transactional + public void createFeedingRecord(final Long memberId, final Long groupId, final String memo) { + final Member member = getMember(memberId); + final PetGroup petGroup = getPetGroup(groupId); + getPetGroupMember(member, petGroup); + + final PetProfile petProfile = petProfileRepository.findByPetGroupId(groupId); + + final FeedingDailyRecord record = new FeedingDailyRecord( + petProfile, + member, + memo + ); + feedingDailyRecordRepository.save(record); + } + + @Transactional + public void createWateringRecord(final Long memberId, final Long groupId, final String memo) { + final Member member = getMember(memberId); + final PetGroup petGroup = getPetGroup(groupId); + getPetGroupMember(member, petGroup); + + final PetProfile petProfile = petProfileRepository.findByPetGroupId(groupId); + + final WateringDailyRecord record = new WateringDailyRecord( + petProfile, + member, + memo + ); + wateringDailyRecordRepository.save(record); + } + + public void createPoopRecord(Long memberId, final Long groupId, final String memo) { + final Member member = getMember(memberId); + final PetGroup petGroup = getPetGroup(groupId); + getPetGroupMember(member, petGroup); + + final PetProfile petProfile = petProfileRepository.findByPetGroupId(groupId); + + final PoopDailyRecord record = new PoopDailyRecord( + petProfile, + member, + memo + ); + poopDailyRecordRepository.save(record); + } } diff --git a/src/main/java/com/petlog/petgroup/service/PetGroupService.java b/src/main/java/com/petlog/petgroup/service/PetGroupService.java index bb1afcd..c47e264 100644 --- a/src/main/java/com/petlog/petgroup/service/PetGroupService.java +++ b/src/main/java/com/petlog/petgroup/service/PetGroupService.java @@ -61,7 +61,6 @@ public void createPetGroup(final Long memberId, final CreatePetGroupDto dto) { final FeedingDailyRecord feedingDailyRecord = new FeedingDailyRecord( petProfile, member, - dto.lastFeedingTime(), null ); feedingDailyRecordRepository.save(feedingDailyRecord); @@ -69,7 +68,6 @@ public void createPetGroup(final Long memberId, final CreatePetGroupDto dto) { final WateringDailyRecord wateringDailyRecord = new WateringDailyRecord( petProfile, member, - dto.lastWateringTime(), null ); wateringDailyRecordRepository.save(wateringDailyRecord);