Skip to content
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
6 changes: 6 additions & 0 deletions src/main/java/com/petlog/pet/controller/PetController.java
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@ public ResponseEntity<ApiResponse<Void>> createFeedingRecord(
@PathVariable final Long groupId,
@RequestBody final CreateFeedingRecordRequestDto request
) {
petService.createFeedingRecord(memberId, groupId, request.memo());

return ResponseEntity.ok(
ApiResponse.success(CREATE_FEEDING_RECORD)
);
Expand All @@ -91,6 +93,8 @@ public ResponseEntity<ApiResponse<Void>> createWateringRecord(
@PathVariable final Long groupId,
@RequestBody final CreateWateringRecordRequestDto request
) {
petService.createWateringRecord(memberId, groupId, request.memo());

return ResponseEntity.ok(
ApiResponse.success(CREATE_WATERING_RECORD)
);
Expand All @@ -102,6 +106,8 @@ public ResponseEntity<ApiResponse<Void>> createPoopRecord(
@PathVariable final Long groupId,
@RequestBody final CreatePoopRecordRequestDto request
) {
petService.createPoopRecord(memberId, groupId, request.memo());

return ResponseEntity.ok(
ApiResponse.success(CREATE_POOP_RECORD)
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion src/main/java/com/petlog/pet/entity/PoopDailyRecord.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
47 changes: 47 additions & 0 deletions src/main/java/com/petlog/pet/service/PetService.java
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,13 @@ public void createPetGroup(final Long memberId, final CreatePetGroupDto dto) {
final FeedingDailyRecord feedingDailyRecord = new FeedingDailyRecord(
petProfile,
member,
dto.lastFeedingTime(),
null
);
feedingDailyRecordRepository.save(feedingDailyRecord);

final WateringDailyRecord wateringDailyRecord = new WateringDailyRecord(
petProfile,
member,
dto.lastWateringTime(),
null
);
wateringDailyRecordRepository.save(wateringDailyRecord);
Expand Down
Loading