From e9388219a62d5f19ec2eac7d2811cb03d0368bca Mon Sep 17 00:00:00 2001 From: Hwangseoeun Date: Sun, 30 Nov 2025 14:20:47 +0900 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=EB=B0=A5=20=EC=A4=80=20=EA=B8=B0?= =?UTF-8?q?=EB=A1=9D=20=EB=93=B1=EB=A1=9D=20API=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/petlog/pet/controller/PetController.java | 2 ++ .../petlog/pet/entity/FeedingDailyRecord.java | 1 - .../java/com/petlog/pet/service/PetService.java | 16 ++++++++++++++++ .../petlog/petgroup/service/PetGroupService.java | 1 - 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/petlog/pet/controller/PetController.java b/src/main/java/com/petlog/pet/controller/PetController.java index 138f3a7..cba87c8 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) ); 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/service/PetService.java b/src/main/java/com/petlog/pet/service/PetService.java index c4ad0e0..799efb0 100644 --- a/src/main/java/com/petlog/pet/service/PetService.java +++ b/src/main/java/com/petlog/pet/service/PetService.java @@ -145,4 +145,20 @@ 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); + } } diff --git a/src/main/java/com/petlog/petgroup/service/PetGroupService.java b/src/main/java/com/petlog/petgroup/service/PetGroupService.java index bb1afcd..771f37a 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); From 44609358e984e4596c85b0c3460e2cf7758c910f Mon Sep 17 00:00:00 2001 From: Hwangseoeun Date: Sun, 30 Nov 2025 14:24:54 +0900 Subject: [PATCH 2/3] =?UTF-8?q?feat:=20=EB=AC=BC=20=EC=A4=80=20=EA=B8=B0?= =?UTF-8?q?=EB=A1=9D=20=EB=93=B1=EB=A1=9D=20API=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/petlog/pet/controller/PetController.java | 2 ++ .../petlog/pet/entity/WateringDailyRecord.java | 1 - .../java/com/petlog/pet/service/PetService.java | 16 ++++++++++++++++ .../petlog/petgroup/service/PetGroupService.java | 1 - 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/petlog/pet/controller/PetController.java b/src/main/java/com/petlog/pet/controller/PetController.java index cba87c8..d75b4ef 100644 --- a/src/main/java/com/petlog/pet/controller/PetController.java +++ b/src/main/java/com/petlog/pet/controller/PetController.java @@ -93,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) ); 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 799efb0..9fd9ae5 100644 --- a/src/main/java/com/petlog/pet/service/PetService.java +++ b/src/main/java/com/petlog/pet/service/PetService.java @@ -161,4 +161,20 @@ public void createFeedingRecord(final Long memberId, final Long groupId, final S ); 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); + } } diff --git a/src/main/java/com/petlog/petgroup/service/PetGroupService.java b/src/main/java/com/petlog/petgroup/service/PetGroupService.java index 771f37a..c47e264 100644 --- a/src/main/java/com/petlog/petgroup/service/PetGroupService.java +++ b/src/main/java/com/petlog/petgroup/service/PetGroupService.java @@ -68,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); From 8e4aeea416c0c8ea8e3d5dda94d77ef4f5a222cb Mon Sep 17 00:00:00 2001 From: Hwangseoeun Date: Sun, 30 Nov 2025 14:28:52 +0900 Subject: [PATCH 3/3] =?UTF-8?q?feat:=20=EB=B0=B0=EB=B3=80=20=EA=B8=B0?= =?UTF-8?q?=EB=A1=9D=20=EB=93=B1=EB=A1=9D=20API=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/petlog/pet/controller/PetController.java | 2 ++ .../com/petlog/pet/entity/PoopDailyRecord.java | 1 - .../java/com/petlog/pet/service/PetService.java | 15 +++++++++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/petlog/pet/controller/PetController.java b/src/main/java/com/petlog/pet/controller/PetController.java index d75b4ef..81e46b5 100644 --- a/src/main/java/com/petlog/pet/controller/PetController.java +++ b/src/main/java/com/petlog/pet/controller/PetController.java @@ -106,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/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/service/PetService.java b/src/main/java/com/petlog/pet/service/PetService.java index 9fd9ae5..10be12d 100644 --- a/src/main/java/com/petlog/pet/service/PetService.java +++ b/src/main/java/com/petlog/pet/service/PetService.java @@ -177,4 +177,19 @@ public void createWateringRecord(final Long memberId, final Long groupId, final ); 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); + } }