Skip to content

Commit 1929c7f

Browse files
authored
Merge pull request #5 from PoolC/dev
fix:뱃지를 받은 적이 없는 경우에만 뱃지 부여
2 parents 6912726 + adf22fa commit 1929c7f

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

src/main/java/org/poolc/api/badge/service/BadgeService.java

+10-8
Original file line numberDiff line numberDiff line change
@@ -138,16 +138,18 @@ public Badge getBadgeByBadgeId(Long badgeId){
138138
return badgeRepository.findBadgeById(badgeId).get();
139139
}
140140

141-
//뱃지가 존재하는 경우에만 지급함.
141+
//뱃지가 존재하고, 해당 뱃지를 받은 적이 없을 경우에만 지급함
142142
public void badgeGiver(Member member, Long badgeId){
143143
if(duplicateBadgeLogCheck(badgeId, member)&&badgeRepository.findBadgeById(badgeId).isPresent()){
144-
Badge badge = getBadgeByBadgeId(badgeId);
145-
badgeLogRepository.save(BadgeLog.builder()
146-
.member(member)
147-
.date(LocalDate.now())
148-
.badge(badge)
149-
.build());
150-
notificationService.createBadgeNotification(member);
144+
if(badgeLogRepository.findBadgeLogByUUID(member.getUUID(),badgeId).isEmpty()) {
145+
Badge badge = getBadgeByBadgeId(badgeId);
146+
badgeLogRepository.save(BadgeLog.builder()
147+
.member(member)
148+
.date(LocalDate.now())
149+
.badge(badge)
150+
.build());
151+
notificationService.createBadgeNotification(member);
152+
}
151153
}
152154
}
153155
}

0 commit comments

Comments
 (0)