Skip to content

Commit

Permalink
Merge pull request #144 from Team-Motivoo/fix/#143-goal_step_count_api
Browse files Browse the repository at this point in the history
[FIX] User-UserMission 커밋 오류 해결
  • Loading branch information
jun02160 authored Mar 21, 2024
2 parents 7c3102a + 491ca85 commit aba4505
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,7 @@ private String generateSuccessMessage(SuccessType successType) {
private String generateSignInMessage() {
sb.setLength(0);
sb.append("*[🧾유저 가입 정보]*" + NEW_LINE);
sb.append(userRepository.count() + "번째 유저가 모티부와 가족이 되었어요👨‍👩‍👧‍👦");

sb.append(userRepository.findCurrentUserId().intValue() + "번째 유저가 모티부와 가족이 되었어요👨‍👩‍👧‍👦");
return sb.toString();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,23 @@
import java.util.List;

import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;

import lombok.RequiredArgsConstructor;
import sopt.org.motivoo.domain.mission.entity.Mission;
import sopt.org.motivoo.domain.mission.entity.MissionQuest;
import sopt.org.motivoo.domain.mission.entity.UserMission;
import sopt.org.motivoo.domain.mission.exception.MissionException;
import sopt.org.motivoo.domain.user.entity.User;
import sopt.org.motivoo.domain.user.repository.UserRepository;

@Component
@RequiredArgsConstructor
public class UserMissionRetriever {

private final UserMissionRepository userMissionRepository;
private final UserMissionJdbcRepository userMissionJdbcRepository;
private final UserRepository userRepository;

//== READ ==//
public List<UserMission> getUserMissionsByCreatedDt(LocalDate date) {
Expand Down Expand Up @@ -64,7 +67,9 @@ public void saveAll(List<UserMission> userMissions) {
userMissionRepository.saveAll(userMissions);
}

@Transactional
public void bulkSaveInitUserMission(List<User> users, LocalDate date, Mission mission, MissionQuest quest) {
userMissionJdbcRepository.bulkSave(users, date, mission, quest);
userRepository.saveAll(users);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ public OnboardingResult onboardInput(Long userId, OnboardingCommand request){
// Slack 신규 유저 알림 전송
sendSlackUserEntry();

// TODO 온보딩을 마친 유저의 걸음 수 데이터 DB에 추가 (Firebase 연동)
try {
log.error("온보딩 입력 완료 후 FB에 데이터 추가 - 성공!");
firebaseService.updateFBData(userId);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,10 @@ public interface UserRepository extends JpaRepository<User, Long> {
@Query("SELECT u FROM User u WHERE u.deleted=false")
List<User> findAll();

@Query(value = "SELECT user_id FROM `user` ORDER BY user_id DESC LIMIT 1", nativeQuery = true)
Long findCurrentUserId();



//== DELETE ==//
@Query("select u from User u where u.deletedAt < now()")
Expand Down

0 comments on commit aba4505

Please sign in to comment.