Skip to content

Commit 9db21f0

Browse files
committed
Revert "feat: 병합을 위한 임시 컴시"
This reverts commit ad70c4a.
1 parent ad70c4a commit 9db21f0

File tree

3 files changed

+1
-9
lines changed

3 files changed

+1
-9
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public Pet(String name, User user){
3939
break;
4040
}
4141
this.name = name;
42-
this.exp = 0; //10, 20, 30마다 성장한다고 가정함.
42+
this.exp = 0;
4343
this.grow = Grow.EGG;
4444
this.user = user;
4545
}

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ public class User extends BaseEntity {
2929
private String avatarUrl; //아바타
3030
private Boolean status; //로그인 true, 로그아웃 false
3131
private LocalDateTime lastCommitted; // 마지막 커밋 시간
32-
private long lastCommitCount; // 마지막으로 반영한 커밋 개수
3332

3433
@Enumerated(EnumType.STRING) // DB에 저장될 때 String 형태로 저장됨
3534
private Role role;
@@ -61,7 +60,6 @@ public User(String username, String email, String nickname, String avatarUrl, Bo
6160
this.userChatRooms = ucr;
6261
this.chatMsgs = cmsg;
6362
this.lastCommitted = LocalDateTime.now();
64-
this.lastCommitCount = 0; // 반영 커밋 개수, 0으로 시작
6563
}
6664

6765
public void addPets(Pet pet){

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
package cmf.commitField.domain.user.service;
22

33
import cmf.commitField.domain.commit.sinceCommit.service.CommitCacheService;
4-
import cmf.commitField.domain.commit.totalCommit.service.TotalCommitService;
54
import cmf.commitField.domain.pet.entity.Pet;
65
import cmf.commitField.domain.pet.repository.PetRepository;
76
import cmf.commitField.domain.user.entity.CustomOAuth2User;
87
import cmf.commitField.domain.user.entity.User;
98
import cmf.commitField.domain.user.repository.UserRepository;
109
import jakarta.servlet.http.HttpServletRequest;
1110
import jakarta.servlet.http.HttpSession;
12-
import jakarta.transaction.Transactional;
1311
import lombok.RequiredArgsConstructor;
1412
import org.springframework.security.oauth2.client.userinfo.DefaultOAuth2UserService;
1513
import org.springframework.security.oauth2.client.userinfo.OAuth2UserRequest;
@@ -29,10 +27,8 @@ public class CustomOAuth2UserService extends DefaultOAuth2UserService {
2927
private final CommitCacheService commitCacheService;
3028

3129
@Override
32-
@Transactional
3330
public OAuth2User loadUser(OAuth2UserRequest userRequest) {
3431
OAuth2User oauthUser = super.loadUser(userRequest);
35-
TotalCommitService totalCommitService = new TotalCommitService();
3632

3733
Map<String, Object> attributes = oauthUser.getAttributes();
3834
String username = (String) attributes.get("login"); // GitHub ID
@@ -66,8 +62,6 @@ public OAuth2User loadUser(OAuth2UserRequest userRequest) {
6662
petRepository.save(pet);
6763

6864
user.addPets(pet);
69-
user.setLastCommitCount(totalCommitService.getTotalCommitCount(user.getUsername()).getTotalCommitContributions());
70-
// 가입 시점의 전체 커밋 수를 계산
7165

7266
// 회원가입한 유저는 커밋 기록에 상관없이 Redis에 입력해둔다.
7367
commitCacheService.updateCachedCommitCount(user.getUsername(),0);

0 commit comments

Comments
 (0)