feat: 병합을 위한 임시 컴시

Author: whale22

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

@@ -39,7 +39,7 @@ public Pet(String name, User user){
                 break;
         }
         this.name = name;
-        this.exp = 0;
+        this.exp = 0; //10, 20, 30마다 성장한다고 가정함. 
         this.grow = Grow.EGG;
         this.user = user;
     }

src/main/java/cmf/commitField/domain/user/entity/User.java

@@ -29,6 +29,7 @@ public class User extends BaseEntity {
     private String avatarUrl; //아바타
     private Boolean status; //로그인 true, 로그아웃 false
     private LocalDateTime lastCommitted; // 마지막 커밋 시간
+    private long lastCommitCount; // 마지막으로 반영한 커밋 개수
 
     @Enumerated(EnumType.STRING)  // DB에 저장될 때 String 형태로 저장됨
     private Role role;
@@ -60,6 +61,7 @@ public User(String username, String email, String nickname, String avatarUrl, Bo
         this.userChatRooms = ucr;
         this.chatMsgs = cmsg;
         this.lastCommitted = LocalDateTime.now();
+        this.lastCommitCount = 0; // 반영 커밋 개수, 0으로 시작
     }
 
     public void addPets(Pet pet){

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

@@ -1,13 +1,15 @@
 package cmf.commitField.domain.user.service;
 
 import cmf.commitField.domain.commit.sinceCommit.service.CommitCacheService;
+import cmf.commitField.domain.commit.totalCommit.service.TotalCommitService;
 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 jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpSession;
+import jakarta.transaction.Transactional;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.oauth2.client.userinfo.DefaultOAuth2UserService;
 import org.springframework.security.oauth2.client.userinfo.OAuth2UserRequest;
@@ -27,8 +29,10 @@ public class CustomOAuth2UserService extends DefaultOAuth2UserService {
     private final CommitCacheService commitCacheService;
 
     @Override
+    @Transactional
     public OAuth2User loadUser(OAuth2UserRequest userRequest) {
         OAuth2User oauthUser = super.loadUser(userRequest);
+        TotalCommitService totalCommitService = new TotalCommitService();
 
         Map<String, Object> attributes = oauthUser.getAttributes();
         String username = (String) attributes.get("login");  // GitHub ID
@@ -62,6 +66,8 @@ public OAuth2User loadUser(OAuth2UserRequest userRequest) {
             petRepository.save(pet);
 
             user.addPets(pet);
+            user.setLastCommitCount(totalCommitService.getTotalCommitCount(user.getUsername()).getTotalCommitContributions());
+            // 가입 시점의 전체 커밋 수를 계산
 
             // 회원가입한 유저는 커밋 기록에 상관없이 Redis에 입력해둔다.
             commitCacheService.updateCachedCommitCount(user.getUsername(),0);