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

feat: pet 엔티티 수정 및 생성과정 수정

Author: whale22

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

@@ -2,6 +2,8 @@
 
 import cmf.commitField.domain.pet.entity.Pet;
 import cmf.commitField.domain.pet.service.PetService;
+import cmf.commitField.domain.user.entity.User;
+import cmf.commitField.domain.user.service.CustomOAuth2UserService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
@@ -11,18 +13,20 @@
 
 @RestController
 @RequiredArgsConstructor
-@RequestMapping("/pets")
+@RequestMapping("/api/pets")
 public class PetController {
-
+    private final CustomOAuth2UserService userService;
     private final PetService petService;
 
     // 새로운 펫 추가
     @PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     public Pet createPet(
+            @RequestParam String email,
             @RequestParam String name,
             @RequestPart(value = "imageFile") MultipartFile imageFile
     ) throws Exception {
-        return petService.createPet(name, imageFile);
+        User user = userService.getUserByEmail(email).get();
+        return petService.createPet(name, imageFile, user);
     }
 
     // 모든 펫 조회

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

@@ -1,8 +1,8 @@
 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.Table;
+import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -17,6 +17,11 @@
 @SuperBuilder
 @Table(name = "pet")
 public class Pet extends BaseEntity {
+    private int type; // 펫 타입 넘버, 현재 1~3까지 존재
     private String name;
     private String imageUrl;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "user_id", nullable = false)
+    private User user;
 }

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

@@ -4,9 +4,11 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
 import java.util.Optional;
 
 @Repository
 public interface PetRepository extends JpaRepository<Pet, Long> {
     Optional<Pet> findById(Long id);
+    List<Pet> findByUserEmail(String email);
 }

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

@@ -2,6 +2,7 @@
 
 import cmf.commitField.domain.pet.entity.Pet;
 import cmf.commitField.domain.pet.repository.PetRepository;
+import cmf.commitField.domain.user.entity.User;
 import cmf.commitField.global.aws.s3.S3Service;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -10,6 +11,7 @@
 import java.io.IOException;
 import java.util.List;
 import java.util.Optional;
+import java.util.Random;
 
 @Service
 @RequiredArgsConstructor
@@ -19,15 +21,15 @@ public class PetService {
     private final S3Service s3Service;
 
     // 새로운 펫 생성
-    public Pet createPet(String name, MultipartFile imageFile) throws IOException {
+    public Pet createPet(String name, MultipartFile imageFile, User user) throws IOException {
 
         // ✅ S3 업로드 로직 추가
         String imageUrl = null;
         if (imageFile != null && !imageFile.isEmpty()) {
             imageUrl = s3Service.uploadFile(imageFile, "pet-images");
         }
-
-        Pet pet = new Pet(name, imageUrl);
+        Random random = new Random();
+        Pet pet = new Pet(random.nextInt(3), name, imageUrl, user);
         return petRepository.save(pet);
     }
 

src/main/java/cmf/commitField/domain/season/controller/ApiV1SeasonController.java

@@ -4,9 +4,11 @@
 import cmf.commitField.domain.season.service.SeasonService;
 import cmf.commitField.global.scheduler.SeasonScheduler;
 import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
-import javax.swing.*;
 import java.time.LocalDateTime;
 
 @RestController
@@ -20,7 +22,7 @@ public class ApiV1SeasonController {
     @PostMapping
     public Season createSeason() {
         String name = "2025 1분기";
-        LocalDateTime start = LocalDateTime.of(2025, 1, 1, 0, 0, 0);
+        LocalDateTime start = LocalDateTime.of(2024, 12, 1, 0, 0, 0);
         LocalDateTime end = LocalDateTime.of(2025, 2, 28, 23, 59, 59);
 
         return seasonService.createNewSeason(name, start, end);

src/main/java/cmf/commitField/domain/user/controller/LogoutController.java

@@ -15,13 +15,12 @@ public class LogoutController {
     public void logout(HttpServletRequest request, HttpServletResponse response) throws IOException {
         // 세션 만료
         request.getSession().invalidate();
-
+        System.out.println("로그아웃 성공!");
         // 세션 쿠키 삭제
         Cookie cookie = new Cookie("JSESSIONID", null);
         cookie.setPath("/");  // 기본 경로 설정
         cookie.setMaxAge(0);  // 쿠키 만료 시간 설정
         response.addCookie(cookie);
-
         // CORS 대응을 위해 상태 코드만 반환하고, 프론트에서 리디렉션 처리하도록 함
         response.setStatus(HttpServletResponse.SC_OK);
     }

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

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

src/main/java/cmf/commitField/domain/user/service/CustomOAuth2UserService.java

@@ -1,8 +1,11 @@
 package cmf.commitField.domain.user.service;
 
+import cmf.commitField.domain.pet.entity.Pet;
+import cmf.commitField.domain.pet.repository.PetRepository;
 import cmf.commitField.domain.user.entity.CustomOAuth2User;
 import cmf.commitField.domain.user.entity.User;
 import cmf.commitField.domain.user.repository.UserRepository;
+import lombok.RequiredArgsConstructor;
 import org.springframework.security.oauth2.client.userinfo.DefaultOAuth2UserService;
 import org.springframework.security.oauth2.client.userinfo.OAuth2UserRequest;
 import org.springframework.security.oauth2.core.user.OAuth2User;
@@ -11,14 +14,13 @@
 import java.util.ArrayList;
 import java.util.Map;
 import java.util.Optional;
+import java.util.Random;
 
 @Service
+@RequiredArgsConstructor
 public class CustomOAuth2UserService extends DefaultOAuth2UserService {
     private final UserRepository userRepository;
-
-    public CustomOAuth2UserService(UserRepository userRepository) {
-        this.userRepository = userRepository;
-    }
+    private final PetRepository petRepository;
 
     @Override
     public OAuth2User loadUser(OAuth2UserRequest userRequest) {
@@ -36,14 +38,23 @@ public OAuth2User loadUser(OAuth2UserRequest userRequest) {
         }
 
         Optional<User> existingUser = userRepository.findByUsername(username);
+
         User user;
+        Pet pet;
         if (existingUser.isPresent()) {
+            //유저 정보가 있다면 유저 정보를 얻어온다.
             user = existingUser.get();
             user.setAvatarUrl(avatarUrl);
-            user.setEmail(email);  // GitHub에서 이메일이 변경될 수도 있으니 업데이트\
+            user.setEmail(email);  // GitHub에서 이메일이 변경될 수도 있으니 업데이트
         } else {
+            //유저 정보가 db에 존재하지 않을 경우 회원가입 시킨다.
+            //유저 생성 및 펫 생성
             user = new User(username, email, name, avatarUrl, User.Role.USER, new ArrayList<>(), new ArrayList<>(), new ArrayList<>());
             userRepository.save(user);
+
+            Random random = new Random(); //펫 랜덤 생성
+            pet = new Pet(random.nextInt(3), "알알", "temp-Url", user); // 변경 필요
+            petRepository.save(pet);
         }
 
         return new CustomOAuth2User(oauthUser, user);
@@ -53,4 +64,9 @@ public OAuth2User loadUser(OAuth2UserRequest userRequest) {
     public Optional<User> getUserById(Long userId) {
         return userRepository.findById(userId);
     }
+
+    // email로 user 조회
+    public Optional<User> getUserByEmail(String email) {
+        return userRepository.findByEmail(email);
+    }
 }

src/main/java/cmf/commitField/global/config/CustomWebMvcConfig.java

@@ -19,7 +19,6 @@ public class RedisConfig {
     @Value("${spring.redis.port}")
     public int port;
 
-
     @Bean
     public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory connectionFactory) {
         RedisTemplate<String, Object> redisTemplate = new RedisTemplate<>();
@@ -43,5 +42,4 @@ public StringRedisTemplate stringRedisTemplate(RedisConnectionFactory redisConne
         template.setConnectionFactory(redisConnectionFactory);
         return template;
     }
-
 }