Merge pull request #67 from CommitField/feat/#65

Feat/#65

Author: whale22

src/main/java/cmf/commitField/domain/pet/controller/PetController.java

@@ -0,0 +1,40 @@
+package cmf.commitField.domain.pet.controller;
+
+import cmf.commitField.domain.pet.entity.Pet;
+import cmf.commitField.domain.pet.service.PetService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/pets")
+public class PetController {
+
+    private final PetService petService;
+
+    // 새로운 펫 추가
+    @PostMapping
+    public Pet createPet(@RequestParam String name, @RequestParam String imageUrl) {
+        return petService.createPet(name, imageUrl);
+    }
+
+    // 모든 펫 조회
+    @GetMapping
+    public List<Pet> getAllPets() {
+        return petService.getAllPets();
+    }
+
+    // 특정 펫 조회
+    @GetMapping("/{petId}")
+    public Pet getPetById(@PathVariable Long petId) {
+        return petService.getPetById(petId);
+    }
+
+    // 펫 삭제
+    @DeleteMapping("/{petId}")
+    public void deletePet(@PathVariable Long petId) {
+        petService.deletePet(petId);
+    }
+}

src/main/java/cmf/commitField/domain/pet/controller/UserPetController.java

@@ -0,0 +1,40 @@
+package cmf.commitField.domain.pet.controller;
+
+
+import cmf.commitField.domain.pet.dto.UserPetDto;
+import cmf.commitField.domain.pet.entity.Pet;
+import cmf.commitField.domain.pet.service.PetService;
+import cmf.commitField.domain.pet.service.UserPetService;
+import cmf.commitField.domain.user.entity.User;
+import cmf.commitField.domain.user.service.CustomOAuth2UserService;
+import cmf.commitField.global.globalDto.GlobalResponse;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/user-pets")
+@RequiredArgsConstructor
+public class UserPetController {
+
+    private final UserPetService userPetService;
+    private final CustomOAuth2UserService customOAuth2UserService;
+    private final PetService petService;
+
+    // 유저가 펫을 부화
+    @PostMapping("/hatch")
+    public GlobalResponse<UserPetDto> hatchPet(@RequestParam Long userId, @RequestParam Long petId) {
+        User user = customOAuth2UserService.getUserById(userId).orElse(null);
+        Pet pet = petService.getPetById(petId);
+        UserPetDto userPetDto = new UserPetDto(userPetService.hatchPet(user, pet));
+        return GlobalResponse.success(userPetDto);
+    }
+
+    // 유저의 도감 조회 (보유한 펫 목록)
+    @GetMapping("/collection/{userId}")
+    public GlobalResponse<List<Pet>> getUserPetCollection(@PathVariable Long userId) {
+        User user = customOAuth2UserService.getUserById(userId).orElse(null);
+        return GlobalResponse.success(userPetService.getUserPetCollection(user));
+    }
+}

src/main/java/cmf/commitField/domain/pet/dto/UserPetDto.java

@@ -0,0 +1,21 @@
+package cmf.commitField.domain.pet.dto;
+
+import cmf.commitField.domain.pet.entity.UserPet;
+import lombok.Getter;
+
+@Getter
+public class UserPetDto {
+    private Long userId;
+    private String username;
+    private Long petId;
+    private String petName;
+    private boolean isHatched;
+
+    public UserPetDto(UserPet userPet) {
+        this.userId = userPet.getUser().getId();
+        this.username = userPet.getUser().getUsername();
+        this.petId = userPet.getPet().getId();
+        this.petName = userPet.getPet().getName();
+        this.isHatched = userPet.isHatched();
+    }
+}

src/main/java/cmf/commitField/domain/pet/entity/Pet.java

@@ -0,0 +1,22 @@
+package cmf.commitField.domain.pet.entity;
+
+import cmf.commitField.global.jpa.BaseEntity;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.experimental.SuperBuilder;
+
+@Entity
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@SuperBuilder
+@Table(name = "pet")
+public class Pet extends BaseEntity {
+    private String name;
+    private String imageUrl;
+}

src/main/java/cmf/commitField/domain/pet/entity/UserPet.java

@@ -0,0 +1,33 @@
+package cmf.commitField.domain.pet.entity;
+
+import cmf.commitField.domain.user.entity.User;
+import cmf.commitField.global.jpa.BaseEntity;
+import jakarta.persistence.Entity;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.experimental.SuperBuilder;
+
+@Entity
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@SuperBuilder
+@Table(name = "user_pet")
+public class UserPet extends BaseEntity {
+
+    @ManyToOne
+    @JoinColumn(name = "user_id", nullable = false)
+    private User user;
+
+    @ManyToOne
+    @JoinColumn(name = "pet_id", nullable = false)
+    private Pet pet;
+
+    private boolean isHatched;  // 부화 여부
+}

src/main/java/cmf/commitField/domain/pet/repository/PetRepository.java

@@ -0,0 +1,12 @@
+package cmf.commitField.domain.pet.repository;
+
+import cmf.commitField.domain.pet.entity.Pet;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import java.util.Optional;
+
+@Repository
+public interface PetRepository extends JpaRepository<Pet, Long> {
+    Optional<Pet> findById(Long id);
+}

src/main/java/cmf/commitField/domain/pet/repository/UserPetRepository.java

@@ -0,0 +1,15 @@
+package cmf.commitField.domain.pet.repository;
+
+import cmf.commitField.domain.pet.entity.Pet;
+import cmf.commitField.domain.pet.entity.UserPet;
+import cmf.commitField.domain.user.entity.User;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface UserPetRepository extends JpaRepository<UserPet, Long> {
+    List<UserPet> findByUser(User user);
+    boolean existsByUserAndPet(User user, Pet pet);
+}

src/main/java/cmf/commitField/domain/pet/service/PetService.java

@@ -0,0 +1,39 @@
+package cmf.commitField.domain.pet.service;
+
+import cmf.commitField.domain.pet.entity.Pet;
+import cmf.commitField.domain.pet.repository.PetRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Optional;
+
+@Service
+@RequiredArgsConstructor
+public class PetService {
+
+    private final PetRepository petRepository;
+
+    // 새로운 펫 생성
+    public Pet createPet(String name, String imageUrl) {
+        Pet pet = new Pet(name, imageUrl);
+        return petRepository.save(pet);
+    }
+
+    // 모든 펫 조회
+    public List<Pet> getAllPets() {
+        return petRepository.findAll();
+    }
+
+    // 특정 펫 조회
+    public Pet getPetById(Long petId) {
+        Optional<Pet> pet = petRepository.findById(petId);
+        return pet.orElse(null);
+    }
+
+    // 펫 삭제
+    public void deletePet(Long petId) {
+        petRepository.deleteById(petId);
+    }
+
+}

src/main/java/cmf/commitField/domain/pet/service/UserPetService.java

@@ -0,0 +1,38 @@
+package cmf.commitField.domain.pet.service;
+
+import cmf.commitField.domain.pet.entity.Pet;
+import cmf.commitField.domain.pet.entity.UserPet;
+import cmf.commitField.domain.pet.repository.UserPetRepository;
+import cmf.commitField.domain.user.entity.User;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Service
+@RequiredArgsConstructor
+public class UserPetService {
+
+    private final UserPetRepository userPetRepository;
+
+    // 유저가 펫을 부화
+    public UserPet hatchPet(User user, Pet pet) {
+        // 기존에 같은 펫을 부화한 적이 있는지 확인
+        boolean alreadyHatched = userPetRepository.existsByUserAndPet(user, pet);
+
+        if (!alreadyHatched) {
+            UserPet userPet = new UserPet(user, pet, true);
+            return userPetRepository.save(userPet);
+        }
+        return null;  // 이미 부화한 펫이면 저장하지 않음
+    }
+
+    // 유저의 도감 조회 (보유한 펫 목록)
+    public List<Pet> getUserPetCollection(User user) {
+        List<UserPet> userPets = userPetRepository.findByUser(user);
+        return userPets.stream()
+                .map(UserPet::getPet)  // UserPet에서 Pet만 추출
+                .collect(Collectors.toList());
+    }
+}

src/main/java/cmf/commitField/domain/user/repository/UserRepository.java

@@ -7,4 +7,5 @@
 
 public interface UserRepository extends JpaRepository<User, Long> {
     Optional<User> findByUsername(String username);
+    Optional<User> findById(Long id);
 }