Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Server] 카테고리 리마인드 푸쉬 알림 스케쥴링을 구현한다 #177

Merged
merged 29 commits into from
Oct 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
9024dd2
Chore: Redis 설정 credentials 추가
JeongHeumChoi Jul 28, 2024
f865a57
Merge branch 'S-KEEP:dev' into dev
JeongHeumChoi Jul 28, 2024
e19950a
Merge branch 'S-KEEP:dev' into dev
JeongHeumChoi Jul 29, 2024
6745094
Merge branch 'S-KEEP:dev' into dev
JeongHeumChoi Jul 31, 2024
0a3aa8a
Chore: merge
JeongHeumChoi Aug 6, 2024
0402fa9
Merge branch 'S-KEEP:dev' into dev
JeongHeumChoi Aug 7, 2024
9f3685c
Merge branch 'S-KEEP:dev' into dev
JeongHeumChoi Aug 7, 2024
fea016f
Merge branch 'S-KEEP:dev' into dev
JeongHeumChoi Aug 8, 2024
6d86f3d
Merge branch 'S-KEEP:dev' into dev
JeongHeumChoi Aug 10, 2024
ccfbdf2
Merge branch 'S-KEEP:dev' into dev
JeongHeumChoi Aug 12, 2024
7ccdb48
Merge branch 'S-KEEP:dev' into dev
JeongHeumChoi Aug 13, 2024
5d40fb5
Merge branch 'S-KEEP:dev' into dev
JeongHeumChoi Aug 13, 2024
1c99a93
Merge branch 'S-KEEP:dev' into dev
JeongHeumChoi Aug 14, 2024
853c4b8
Merge branch 'S-KEEP:dev' into dev
JeongHeumChoi Aug 17, 2024
96f8e4d
Merge branch 'S-KEEP:dev' into dev
JeongHeumChoi Aug 17, 2024
b7b65e2
Merge branch 'S-KEEP:dev' into dev
JeongHeumChoi Aug 19, 2024
c038ec2
Merge branch 'S-KEEP:dev' into dev
JeongHeumChoi Aug 23, 2024
725b329
Merge branch 'S-KEEP:dev' into dev
JeongHeumChoi Aug 25, 2024
714dae6
Merge branch 'S-KEEP:dev' into dev
JeongHeumChoi Sep 3, 2024
4088478
Merge branch 'S-KEEP:dev' into dev
JeongHeumChoi Sep 9, 2024
c6f038a
Merge branch 'S-KEEP:dev' into dev
JeongHeumChoi Sep 16, 2024
5cb1318
Merge branch 'S-KEEP:dev' into dev
JeongHeumChoi Sep 18, 2024
4b46ed5
Merge branch 'S-KEEP:dev' into dev
JeongHeumChoi Sep 19, 2024
cfa1c41
Merge branch 'S-KEEP:dev' into dev
JeongHeumChoi Sep 20, 2024
ec9df24
Merge branch 'S-KEEP:dev' into dev
JeongHeumChoi Sep 20, 2024
9e0fba9
Merge branch 'S-KEEP:dev' into dev
JeongHeumChoi Sep 29, 2024
1c50ebf
Merge branch 'S-KEEP:dev' into dev
JeongHeumChoi Sep 29, 2024
483eaaa
Merge branch 'S-KEEP:dev' into dev
JeongHeumChoi Oct 2, 2024
c5b1601
Feat: UserCategory 푸시 알림 구현
JeongHeumChoi Oct 2, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package Skeep.backend.category.domain;

public interface UserCategoryMostUserLocationProjection {
Long getUserCategoryId();
String getUserCategoryName();
Long getUserLocationCount();
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,16 @@ public interface UserCategoryRepository extends JpaRepository<UserCategory, Long
@Modifying
@Query("DELETE FROM UserCategory uc WHERE uc.user = :user")
void deleteAllByUser(@Param(value = "user") User user);

@Query(
value = "SELECT uc.id as userCategoryId, uc.name as userCategoryName, COUNT(ul.id) as userLocationCount " +
"FROM users_category uc " +
"LEFT JOIN users_location ul ON ul.users_category_id = uc.id " +
"WHERE uc.user_id = :userId " +
"GROUP BY uc.id, uc.name " +
"ORDER BY userLocationCount DESC " +
"LIMIT 1",
nativeQuery = true
)
Optional<UserCategoryMostUserLocationProjection> findTopCategoryWithMostUserLocations(Long userId);
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package Skeep.backend.category.service;

import Skeep.backend.category.domain.UserCategory;
import Skeep.backend.category.domain.UserCategoryMostUserLocationProjection;
import Skeep.backend.category.domain.UserCategoryRepository;
import Skeep.backend.category.dto.response.UserCategoryList;
import Skeep.backend.category.exception.UserCategoryErrorCode;
Expand All @@ -11,6 +12,7 @@
import org.springframework.transaction.annotation.Transactional;

import java.util.List;
import java.util.Optional;

@Service
@Transactional(readOnly = true)
Expand Down Expand Up @@ -41,4 +43,8 @@ public UserCategory findByUserAndName(User user,String name) {
public List<UserCategory> findAllByUser(User user) {
return userCategoryRepository.findAllByUserId(user.getId());
}

public Optional<UserCategoryMostUserLocationProjection> findTopCategoryWithMostUserLocations(User user) {
return userCategoryRepository.findTopCategoryWithMostUserLocations(user.getId());
}
}
Original file line number Diff line number Diff line change
@@ -1,51 +1,64 @@
package Skeep.backend.notification.service;

import Skeep.backend.category.domain.UserCategory;
import Skeep.backend.category.domain.UserCategoryMostUserLocationProjection;
import Skeep.backend.category.service.UserCategoryRetriever;
import Skeep.backend.location.userLocation.service.UserLocationRetriever;
import Skeep.backend.fcm.constant.FcmConstants;
import Skeep.backend.fcm.service.FcmService;
import Skeep.backend.user.domain.User;
import Skeep.backend.user.service.UserFindService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.scheduling.annotation.Async;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;

import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;

@Slf4j
@Component
@RequiredArgsConstructor
public class NotificationScheduleService {
private final FcmService fcmService;
private final UserFindService userFindService;
private final UserCategoryRetriever userCategoryRetriever;
private final UserLocationRetriever userLocationRetriever;

@Async
@Scheduled(cron = "0 0 9 * * *")
public void sendCategoryNotification() {
List<User> userList = userFindService.findAllByFcmTokenIsNotNull();
for (User user : userList) {
List<UserCategory> userCategoryList = userCategoryRetriever.findAllByUser(user);
List<Map<String, Long>> userCategoryLocationMapList
= userCategoryList.stream().map(userCategory -> {
Map<String, Long> tempMap = new HashMap<>();
Long count = userLocationRetriever.countByUserCategory(userCategory);

tempMap.put(userCategory.getName(), count);
return tempMap;
}).toList();
log.info("userList : {}", userList);

// userCategoryLocationMapList.stream().max(
// Comparator.comparingLong(obj -> obj.)
// )
userList.forEach(user -> {
Optional<UserCategoryMostUserLocationProjection> userCategoryWithMostUserLocation
= userCategoryRetriever.findTopCategoryWithMostUserLocations(user);
if (userCategoryWithMostUserLocation.isEmpty())
return;
UserCategoryMostUserLocationProjection userCategoryNameAndUserLocationCount
= userCategoryWithMostUserLocation.get();

if (userCategoryNameAndUserLocationCount.getUserLocationCount() <= 0)
return;
String userCategoryName = userCategoryNameAndUserLocationCount.getUserCategoryName();

String title = user.getName() + FcmConstants.CATEGORY_TITLE_1
+ userCategoryName + FcmConstants.CATEGORY_TITLE_2;
String body = FcmConstants.CATEGORY_BODY;
String url = FcmConstants.CATEGORY_URL
+ userCategoryNameAndUserLocationCount.getUserCategoryId().toString();

}


log.info("user : {} fcm 호출", user.getName());
fcmService.sendNotification(
Boolean.TRUE,
user.getFcmToken(),
title,
body,
userCategoryNameAndUserLocationCount.getUserCategoryId(),
"category",
url
);
log.info("user : {} fcm 끝", user.getName());
});
}


}