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.

Sign up for GitHub

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

프로필 이미지가 null일 경우 알림 전송에 실패하는 오류 해결 #412

Merged
merged 13 commits into from
Sep 19, 2023
Merged

프로필 이미지가 null일 경우 알림 전송에 실패하는 오류 해결 #412

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
a943870
feat: 로그인 시 프로필 이미지를 null이 아닌 기본이미지로 세팅하는 기능 추가
kwonyj1022 Sep 18, 2023
26cd088
feat: 사용자 엔티티의 프로필 이미지에 널 불가 제약조건 추가
kwonyj1022 Sep 18, 2023
24795f8
feat: 알림 dto에 `@NonNull` 제약 조건 추가
kwonyj1022 Sep 18, 2023
877764d
refactor: 알림 전송 성공 및 예외 발생 시 로그 추가
kwonyj1022 Sep 18, 2023
87d40f5
refactor: 기본 프로필 이미지 조회 시 이름으로 조회하도록 변경
kwonyj1022 Sep 18, 2023
8f2bcd5
ci: 충돌 해결
kwonyj1022 Sep 18, 2023
cc1785f
feat: 로그인 시 기본이미지를 찾을 수 없으면 예외가 발생하는 기능 추가
kwonyj1022 Sep 19, 2023
154cbe6
refactor: 프로필 이미지 경로 생성을 유틸 클래스에서 하도록 변경
kwonyj1022 Sep 19, 2023
efc1f55
refactor: 기본 프로필 이미지 이름을 엔티티에서 관리하도록 변경
kwonyj1022 Sep 19, 2023
0221291
fix: flyway 스크립트 수정
kwonyj1022 Sep 19, 2023
83f9e71
refactor: 알림 dto에서 사용하는 `@NonNull`을 롬복의 어노테이션을 사용하도록 변경
kwonyj1022 Sep 19, 2023
996290a
ci: 충돌 해결
kwonyj1022 Sep 19, 2023
42cf186
ci: 충돌 해결
kwonyj1022 Sep 19, 2023
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
12 changes: 5 additions & 7 deletions backend/ddang/src/main/java/com/ddang/ddang/chat/application/MessageService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
import com.ddang.ddang.chat.infrastructure.persistence.JpaChatRoomRepository;
import com.ddang.ddang.chat.infrastructure.persistence.JpaMessageRepository;
import com.ddang.ddang.chat.presentation.dto.request.ReadMessageRequest;
import com.ddang.ddang.image.application.util.ImageIdProcessor;
import com.ddang.ddang.image.domain.ProfileImage;
import com.ddang.ddang.image.presentation.util.ImageUrlCalculator;
import com.ddang.ddang.notification.application.NotificationService;
import com.ddang.ddang.notification.application.dto.CreateNotificationDto;
import com.ddang.ddang.notification.domain.NotificationType;
Expand Down Expand Up @@ -67,27 +68,24 @@ public Long create(final CreateMessageDto dto, final String baseUrl) {
}

private String sendNotification(final Message message, final String baseUrl) {
final ProfileImage writerProfileImage = message.getWriter().getProfileImage();

final CreateNotificationDto dto = new CreateNotificationDto(
NotificationType.MESSAGE,
message.getReceiver().getId(),
message.getWriter().getName(),
message.getContents(),
calculateRedirectUrl(message.getChatRoom().getId()),
calculateProfileImageUrl(message, baseUrl)
ImageUrlCalculator.calculateProfileImageUrl(writerProfileImage, baseUrl)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍🏻

);

return notificationService.send(dto);
}

private String calculateRedirectUrl(final Long id) {
return "/chattings/" + id;
}

private String calculateProfileImageUrl(final Message message, final String baseUrl) {
final Long profileImageId = ImageIdProcessor.process(message.getWriter().getProfileImage());
return baseUrl.concat(String.valueOf(profileImageId));
}

public List<ReadMessageDto> readAllByLastMessageId(final ReadMessageRequest request) {
if (!userRepository.existsById(request.userId())) {
throw new UserNotFoundException("지정한 아이디에 대한 사용자를 찾을 수 없습니다.");
Expand Down
8 changes: 8 additions & 0 deletions backend/ddang/src/main/java/com/ddang/ddang/image/presentation/util/ImageUrlCalculator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
package com.ddang.ddang.image.presentation.util;

import com.ddang.ddang.image.application.util.ImageIdProcessor;
import com.ddang.ddang.image.domain.ProfileImage;

public final class ImageUrlCalculator {

private ImageUrlCalculator() {
Expand All @@ -14,4 +17,9 @@ public static String calculate(final ImageBaseUrl imageBaseUrl, final Long id) {

return baseUrl.concat(String.valueOf(id));
}

public static String calculateProfileImageUrl(final ProfileImage profileImage, final String baseUrl) {
final Long profileImageId = ImageIdProcessor.process(profileImage);
return baseUrl.concat(String.valueOf(profileImageId));
}
}