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.

Sign up for GitHub

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

feat: 반려견 사진 등록시 기본 이미지 제공 기능 #280

Merged
merged 9 commits into from
Aug 16, 2023
Merged

feat: 반려견 사진 등록시 기본 이미지 제공 기능 #280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8606be0
feat: 견종 정보 조회 구현
iamjooon2 Aug 16, 2023
9b39efd
chore: resolve conflicts
iamjooon2 Aug 16, 2023
5715954
test: Controller Test 및 API 문서 작성
iamjooon2 Aug 16, 2023
293b850
refactor: 견종 정보 조회시 믹스견을 반환하도록 변경
iamjooon2 Aug 16, 2023
80c5c5c
refactor: final 제거
iamjooon2 Aug 16, 2023
5b3a351
chore: 개행 추가
iamjooon2 Aug 16, 2023
66b1bea
hotfix: 기본이미지 등록 플로우 변경
iamjooon2 Aug 16, 2023
da564be
chore: resolve conflict
iamjooon2 Aug 16, 2023
8a8af3e
feat: 이미지 `@NotBlank` 옵션 추가
iamjooon2 Aug 16, 2023
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
15 changes: 13 additions & 2 deletions backend/src/main/java/zipgo/pet/application/PetService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
@RequiredArgsConstructor
public class PetService {

private static final String DEFAULT_PET_IMAGE = "https://image.zipgo.pet/dev/pet-image/dog_icon.svg";

private final PetRepository petRepository;
private final MemberRepository memberRepository;
private final BreedsRepository breedsRepository;
Expand All @@ -31,8 +33,16 @@ public Long createPet(Long memberId, CreatePetRequest request) {
PetSize petSize = petSizeRepository.getByName(request.petSize());
Breeds breeds = breedsRepository.getByNameAndPetSizeId(request.breed(), petSize.getId());

Pet pet = petRepository.save(request.toEntity(owner, breeds));
return pet.getId();
Pet pet = request.toEntity(owner, breeds);
updateDefaultImage(pet);

return petRepository.save(pet).getId();
}

private void updateDefaultImage(Pet pet) {
if ("".equals(pet.getImageUrl())) {
pet.updateImageUrl(DEFAULT_PET_IMAGE);
}
}

public void updatePet(Long memberId, Long petId, UpdatePetRequest request) {
Expand All @@ -49,6 +59,7 @@ public void updatePet(Long memberId, Long petId, UpdatePetRequest request) {
private void update(UpdatePetRequest request, Pet pet, Breeds breeds) {
pet.updateName(request.name());
pet.updateImageUrl(request.image());
updateDefaultImage(pet);
pet.updateBreeds(breeds);
pet.updateBirthYear(request.calculateBirthYear());
pet.updateWeight(request.weight());
Expand Down
1 change: 0 additions & 1 deletion backend/src/main/java/zipgo/pet/presentation/PetController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,5 +52,4 @@ public ResponseEntity<BreedsResponses> readBreeds() {
return ResponseEntity.ok(BreedsResponses.from(breeds));
}


}
2 changes: 2 additions & 0 deletions backend/src/main/java/zipgo/pet/presentation/dto/request/CreatePetRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ public record CreatePetRequest (
@NotBlank(message = "Null 또는 공백이 포함될 수 없습니다. 올바른 값인지 확인해주세요.")
String gender,

@NotBlank(message = "Null 또는 공백이 포함될 수 없습니다. 올바른 값인지 확인해주세요.")
String image,

@Max(20)
Expand All @@ -38,6 +39,7 @@ public Pet toEntity(Member owner, Breeds breeds) {
return Pet.builder()
.birthYear(Year.of(birthYear))
.owner(owner)
.imageUrl(image)
.name(name)
.gender(Gender.from(gender))
.breeds(breeds)
Expand Down
1 change: 1 addition & 0 deletions backend/src/main/java/zipgo/pet/presentation/dto/request/UpdatePetRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ public record UpdatePetRequest(
@NotBlank(message = "Null 또는 공백이 포함될 수 없습니다. 올바른 값인지 확인해주세요.")
String gender,

@NotBlank(message = "Null 또는 공백이 포함될 수 없습니다. 올바른 값인지 확인해주세요.")
String image,

@Max(20)
Expand Down