From 3dacd352058c100547ecc41d1837a2c32d0ede0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kerem=20G=C3=B6rkem=20G=C3=B6rg=C3=BCl=C3=BC?= Date: Sun, 31 Dec 2023 22:21:38 +0300 Subject: [PATCH] Another bugfix for update method of the pet entity. --- .../com/production/ehayvanbackendapi/Mappers/PetMapper.java | 2 ++ .../production/ehayvanbackendapi/Mappers/ScheduleMapper.java | 1 + .../production/ehayvanbackendapi/Services/PetService.java | 5 +++++ 3 files changed, 8 insertions(+) diff --git a/src/main/java/com/production/ehayvanbackendapi/Mappers/PetMapper.java b/src/main/java/com/production/ehayvanbackendapi/Mappers/PetMapper.java index 5b1b2f5..abd53f9 100644 --- a/src/main/java/com/production/ehayvanbackendapi/Mappers/PetMapper.java +++ b/src/main/java/com/production/ehayvanbackendapi/Mappers/PetMapper.java @@ -21,6 +21,8 @@ public PetMapper(ModelMapper modelMapper) { mapper -> { mapper.skip(src -> src.getPetOwnerID(), (dest, val) -> dest.getPetOwnerID().setPetOwnerID((Integer) val)); + mapper.skip(src -> src.getPetTypeID(), + (dest, val) -> dest.getPetTypeID().setPetTypeID((Integer) val)); mapper.skip(src -> src.getPetTypeID(), (dest, val) -> dest.getPetTypeID().setType((String) val)); } diff --git a/src/main/java/com/production/ehayvanbackendapi/Mappers/ScheduleMapper.java b/src/main/java/com/production/ehayvanbackendapi/Mappers/ScheduleMapper.java index 592f432..f948b3d 100644 --- a/src/main/java/com/production/ehayvanbackendapi/Mappers/ScheduleMapper.java +++ b/src/main/java/com/production/ehayvanbackendapi/Mappers/ScheduleMapper.java @@ -2,6 +2,7 @@ import com.production.ehayvanbackendapi.DTO.CustomerDTO; import com.production.ehayvanbackendapi.DTO.ScheduleDTO; +import com.production.ehayvanbackendapi.DTO.request.CreateOrUpdateScheduleDTO; import com.production.ehayvanbackendapi.Entities.Customer; import com.production.ehayvanbackendapi.Entities.Schedule; import org.modelmapper.ModelMapper; diff --git a/src/main/java/com/production/ehayvanbackendapi/Services/PetService.java b/src/main/java/com/production/ehayvanbackendapi/Services/PetService.java index e646305..7e875c5 100644 --- a/src/main/java/com/production/ehayvanbackendapi/Services/PetService.java +++ b/src/main/java/com/production/ehayvanbackendapi/Services/PetService.java @@ -55,6 +55,11 @@ public PetDTO postPet(CreateOrUpdatePetDTO newPetDto){ ownerOfPet.setPetOwnerID(newPetDto.getPetOwnerID()); newPet.setPetOwnerID(ownerOfPet); + // Set the petType of newly created pet. + PetType petType = new PetType(); + petType.setPetTypeID(newPetDto.getPetTypeID()); + newPet.setPetTypeID(petType); + try{ petRepository.save(newPet); return petMapper.convertToDto(newPet);