Skip to content

Commit 16d4f42

Browse files
authored
Merge pull request #147 from CommitField/feat/#139
fix: ๋™๊ธฐํ™” ์˜ค๋ฅ˜ ์ˆ˜์ •
2 parents a4ce6e5 + f5bc029 commit 16d4f42

File tree

3 files changed

+11
-5
lines changed

3 files changed

+11
-5
lines changed

โ€Žsrc/main/java/cmf/commitField/domain/commit/scheduler/CommitUpdateService.javaโ€Ž

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import cmf.commitField.domain.user.entity.User;
88
import cmf.commitField.domain.user.repository.UserRepository;
99
import lombok.RequiredArgsConstructor;
10-
import org.springframework.messaging.simp.SimpMessagingTemplate;
1110
import org.springframework.stereotype.Service;
1211

1312
import java.time.LocalDateTime;

โ€Žsrc/main/java/cmf/commitField/domain/user/service/UserService.javaโ€Ž

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,17 @@ public UserInfoDto showUserInfo(String username) {
111111
// ์œ ์ € ์„ฑ์žฅ
112112
public boolean getExpUser(String username, long commitCount) {
113113
User user = userRepository.findByUsername(username).get();
114+
long seasonCommitCount = totalCommitService.getSeasonCommits(
115+
user.getUsername(),
116+
LocalDateTime.of(2025,03,01,00,00),
117+
LocalDateTime.of(2025,05,31,23,59)
118+
).getTotalCommitContributions();
119+
120+
// ๊ฒฝํ—˜์น˜ ๋™๊ธฐํ™”๊ฐ€ ์ œ๋Œ€๋กœ ๋˜์–ด ์žˆ์ง€ ์•Š์œผ๋ฉด ๋™๊ธฐํ™”ํ•ด์ค€๋‹ค.
121+
if(user.getSeasonCommitCount() != seasonCommitCount){
122+
user.setSeasonCommitCount(seasonCommitCount);
123+
}
124+
114125
// ๊ฒฝํ—˜์น˜ ์ฆ๊ฐ€ ํ›„, ๋งŒ์•ฝ ๋ ˆ๋ฒจ์—…ํ•œ๋‹ค๋ฉด ๋ ˆ๋ฒจ์—… ์‹œํ‚จ๋‹ค.
115126
user.addExp(commitCount);
116127
userRepository.save(user);

โ€Žsrc/main/java/cmf/commitField/global/websocket/CommitWebSockerHandler.javaโ€Ž

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
ย (0)