Skip to content

Commit

Permalink
Merge pull request #85 from AndLetgo/develop
Browse files Browse the repository at this point in the history 
🚀 [DEPLOY]: QA 및 추가 수정 사항 반영 배포
  • Loading branch information
@gyehwan24
gyehwan24 authored Jan 16, 2024
2 parents 599f958 + 7d7fd93 commit 9186119
Show file tree
Hide file tree
Showing 13 changed files with 146 additions and 46 deletions.
28 changes: 20 additions & 8 deletions src/main/java/depth/jeonsilog/domain/alarm/application/AlarmService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,9 +162,11 @@ public void makeReviewAlarm(Review review) throws IOException {
List<Follow> follows = followRepository.findAllByFollow(review.getUser());
for (Follow follow : follows) {
User receiver = follow.getUser();
User sender = follow.getFollow();

Alarm alarm = Alarm.builder()
.user(receiver)
.senderId(follow.getFollow().getId())
.senderId(sender.getId())
.alarmType(AlarmType.REVIEW)
.targetId(review.getId())
.clickId(review.getId())
Expand All @@ -173,7 +175,7 @@ public void makeReviewAlarm(Review review) throws IOException {
alarmRepository.save(alarm);

if (!receiver.getIsRecvActive() || receiver.getFcmToken() == null) return;
fcmService.makeActiveAlarm(receiver.getFcmToken(), follow.getFollow().getNickname() + " 님이 감상평을 남겼어요");
fcmService.makeActiveAlarm(receiver.getFcmToken(), sender.getNickname() + " 님이 감상평을 남겼어요");
}
}

Expand All @@ -183,9 +185,11 @@ public void makeRatingAlarm(Rating rating) throws IOException {
List<Follow> follows = followRepository.findAllByFollow(rating.getUser());
for (Follow follow : follows) {
User receiver = follow.getUser();
User sender = follow.getFollow();

Alarm alarm = Alarm.builder()
.user(receiver)
.senderId(follow.getFollow().getId())
.senderId(sender.getId())
.alarmType(AlarmType.RATING)
.targetId(rating.getId())
.clickId(rating.getExhibition().getId())
Expand All @@ -194,17 +198,23 @@ public void makeRatingAlarm(Rating rating) throws IOException {
alarmRepository.save(alarm);

if (!receiver.getIsRecvActive() || receiver.getFcmToken() == null) return;
fcmService.makeActiveAlarm(receiver.getFcmToken(), follow.getFollow().getNickname() + " 님이 별점을 남겼어요");
fcmService.makeActiveAlarm(receiver.getFcmToken(), sender.getNickname() + " 님이 별점을 남겼어요");
}
}

// TODO: 나의 감상평에 달린 댓글 -> 알림 생성
@Transactional
public void makeReplyAlarm(Reply reply) throws IOException {
User receiver = reply.getReview().getUser();
User sender = reply.getUser();
if (receiver.equals(sender)) {
log.info("알림의 sender와 receiver가 동일 인물입니다.");
return;
}

Alarm alarm = Alarm.builder()
.user(receiver)
.senderId(reply.getUser().getId())
.senderId(sender.getId())
.alarmType(AlarmType.REPLY)
.targetId(reply.getId())
.clickId(reply.getReview().getId())
Expand All @@ -213,16 +223,18 @@ public void makeReplyAlarm(Reply reply) throws IOException {
alarmRepository.save(alarm);

if (!receiver.getIsRecvActive() || receiver.getFcmToken() == null) return;
fcmService.makeActiveAlarm(receiver.getFcmToken(), reply.getUser().getNickname() + " 님이 댓글을 남겼어요");
fcmService.makeActiveAlarm(receiver.getFcmToken(), sender.getNickname() + " 님이 댓글을 남겼어요");
}

// TODO: 나를 팔로우 -> 알림 생성
@Transactional
public void makeFollowAlarm(Follow follow) throws IOException {
User receiver = follow.getFollow();
User sender = follow.getUser();

Alarm alarm = Alarm.builder()
.user(receiver)
.senderId(follow.getUser().getId())
.senderId(sender.getId())
.alarmType(AlarmType.FOLLOW)
.targetId(follow.getId())
.clickId(follow.getUser().getId())
Expand All @@ -231,7 +243,7 @@ public void makeFollowAlarm(Follow follow) throws IOException {
alarmRepository.save(alarm);

if (!receiver.getIsRecvActive() || receiver.getFcmToken() == null) return;
fcmService.makeActiveAlarm(receiver.getFcmToken(), follow.getUser().getNickname() + " 님이 나를 팔로우해요");
fcmService.makeActiveAlarm(receiver.getFcmToken(), sender.getNickname() + " 님이 나를 팔로우해요");
}

// TODO: 관심 전시회 시작 전 -> 알림 생성
Expand Down
40 changes: 28 additions & 12 deletions src/main/java/depth/jeonsilog/domain/openApi/application/AddService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,9 +153,14 @@ public ResponseEntity<?> addExhibitionAndPlace() {
// Description : place 있는 지 확인
String placeName = placeDetail.getResponse().getMsgBody().getPlaceInfo().getCulName();
String placeAddr = placeDetail.getResponse().getMsgBody().getPlaceInfo().getCulAddr();

Optional<Place> placeByName = placeRepository.findByName(placeName);
Optional<Place> placeByAddr = placeRepository.findByAddress(placeAddr);
Optional<Place> placeByName = Optional.empty();
Optional<Place> placeByAddr = Optional.empty();
if (placeName != null) {
placeByName = placeRepository.findByName(placeName);
}
if (placeAddr != null) {
placeByAddr = placeRepository.findByAddress(placeAddr);
}

Place place = null;

Expand All @@ -167,15 +172,26 @@ public ResponseEntity<?> addExhibitionAndPlace() {
place = placeByAddr.get();

} else {
// Description : Place 최초 저장
place = Place.builder()
.name(placeDetail.getResponse().getMsgBody().getPlaceInfo().getCulName())
.address(placeDetail.getResponse().getMsgBody().getPlaceInfo().getCulAddr())
.homePage(placeDetail.getResponse().getMsgBody().getPlaceInfo().getCulHomeUrl())
.tel(placeDetail.getResponse().getMsgBody().getPlaceInfo().getCulTel())
.build();

placeRepository.save(place);
if (placeName == null || placeAddr == null) {
place = Place.builder()
.name(null)
.address(null)
.homePage(null)
.tel(null)
.build();

placeRepository.save(place);
}else {
// Description : Place 최초 저장
place = Place.builder()
.name(placeDetail.getResponse().getMsgBody().getPlaceInfo().getCulName())
.address(placeDetail.getResponse().getMsgBody().getPlaceInfo().getCulAddr())
.homePage(placeDetail.getResponse().getMsgBody().getPlaceInfo().getCulHomeUrl())
.tel(placeDetail.getResponse().getMsgBody().getPlaceInfo().getCulTel())
.build();

placeRepository.save(place);
}
}

PriceKeyword priceKeyword = null;
Expand Down
49 changes: 29 additions & 20 deletions src/main/java/depth/jeonsilog/domain/openApi/application/SaveService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,24 +77,17 @@ public ResponseEntity<?> saveExhibitionAndPlace() {
} catch (IOException e) {
e.printStackTrace();
}

// XML To JSON
JSONObject jsonObject = XML.toJSONObject(listXml);

// JSON To String
String listJsonStr = jsonObject.toString();

// Jackson Objectmapper 객체 생성
ObjectMapper objectMapper = new ObjectMapper();

// JSON의 모든 데이터를 파싱하는 것이 아닌 내가 필요로 하는 데이터만, 즉, 내가 필드로 선언한 데이터들만 파싱할 수 있다
objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);

ExhibitionListDTO exhibitionList = null;
try {
// Description : JSON String -> ExhibitionListDTO (Object)
exhibitionList = objectMapper.readValue(listJsonStr, ExhibitionListDTO.class);

} catch (JsonProcessingException e) {
e.printStackTrace();

Expand Down Expand Up @@ -169,9 +162,14 @@ public ResponseEntity<?> saveExhibitionAndPlace() {
// Description : place 있는 지 확인
String placeName = placeDetail.getResponse().getMsgBody().getPlaceInfo().getCulName();
String placeAddr = placeDetail.getResponse().getMsgBody().getPlaceInfo().getCulAddr();

Optional<Place> placeByName = placeRepository.findByName(placeName);
Optional<Place> placeByAddr = placeRepository.findByAddress(placeAddr);
Optional<Place> placeByName = Optional.empty();
Optional<Place> placeByAddr = Optional.empty();
if (placeName != null) {
placeByName = placeRepository.findByName(placeName);
}
if (placeAddr != null) {
placeByAddr = placeRepository.findByAddress(placeAddr);
}

Place place = null;

Expand All @@ -183,15 +181,26 @@ public ResponseEntity<?> saveExhibitionAndPlace() {
place = placeByAddr.get();

} else {
// Description : Place 최초 저장
place = Place.builder()
.name(placeDetail.getResponse().getMsgBody().getPlaceInfo().getCulName())
.address(placeDetail.getResponse().getMsgBody().getPlaceInfo().getCulAddr())
.homePage(placeDetail.getResponse().getMsgBody().getPlaceInfo().getCulHomeUrl())
.tel(placeDetail.getResponse().getMsgBody().getPlaceInfo().getCulTel())
.build();

placeRepository.save(place);
if (placeName == null || placeAddr == null) {
place = Place.builder()
.name(null)
.address(null)
.homePage(null)
.tel(null)
.build();

placeRepository.save(place);
} else {
// Description : Place 최초 저장
place = Place.builder()
.name(placeDetail.getResponse().getMsgBody().getPlaceInfo().getCulName())
.address(placeDetail.getResponse().getMsgBody().getPlaceInfo().getCulAddr())
.homePage(placeDetail.getResponse().getMsgBody().getPlaceInfo().getCulHomeUrl())
.tel(placeDetail.getResponse().getMsgBody().getPlaceInfo().getCulTel())
.build();

placeRepository.save(place);
}
}

PriceKeyword priceKeyword = null;
Expand All @@ -210,7 +219,7 @@ public ResponseEntity<?> saveExhibitionAndPlace() {
* - 시작 전 : startDate가 now보다 더 미래
* - 전시 중 : now가 startDate보다 더 미래 && endDate가 now보다 더 미래
*/

LocalDate now = LocalDate.now();
LocalDate startDate = LocalDate.parse(exhibitionDetail.getResponse().getMsgBody().getPerforInfo().getStartDate(), formatter);
LocalDate endDate = LocalDate.parse(exhibitionDetail.getResponse().getMsgBody().getPerforInfo().getEndDate(), formatter);
Expand Down
12 changes: 12 additions & 0 deletions src/main/java/depth/jeonsilog/domain/reply/application/ReplyService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,21 @@ public ResponseEntity<?> deleteReply(UserPrincipal userPrincipal, Long replyId)
return ResponseEntity.ok(apiResponse);
}

// Description : 댓글 존재 여부 조회
public ResponseEntity<?> existReply(Long replyId) {

Boolean isExist = replyRepository.existsById(replyId);

ReplyResponseDto.ExistReplyRes existReplyRes = ReplyConverter.toExistReplyRes(replyId, isExist);
ApiResponse apiResponse = ApiResponse.toApiResponse(existReplyRes);

return ResponseEntity.ok(apiResponse);
}

public Reply validateReplyById(Long replyId) {
Optional<Reply> reply = replyRepository.findById(replyId);
DefaultAssert.isTrue(reply.isPresent(), "댓글 정보가 올바르지 않습니다.");
return reply.get();
}

}
7 changes: 7 additions & 0 deletions src/main/java/depth/jeonsilog/domain/reply/converter/ReplyConverter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,11 @@ public static Reply toReply(Review review, User user, ReplyRequestDto.CreateRepl
.contents(createReplyReq.getContents())
.build();
}

public static ReplyResponseDto.ExistReplyRes toExistReplyRes(Long replyId, Boolean isExist) {
return ReplyResponseDto.ExistReplyRes.builder()
.replyId(replyId)
.isExist(isExist)
.build();
}
}
4 changes: 4 additions & 0 deletions src/main/java/depth/jeonsilog/domain/reply/domain/repository/ReplyRepository.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,8 @@ public interface ReplyRepository extends JpaRepository<Reply, Long> {
@Query(value = "SELECT * FROM reply WHERE user_id = :userId", nativeQuery = true)
List<Reply> findAllRepliesByUserId(@Param("userId") Long userId);

@Query(value = "SELECT * FROM reply WHERE id = :replyId", nativeQuery = true)
Reply findReplyByReplyId(@Param("replyId") Long replyId);


}
13 changes: 13 additions & 0 deletions src/main/java/depth/jeonsilog/domain/reply/dto/ReplyResponseDto.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,10 @@ public class ReplyResponseDto {
@Builder
public static class ReplyRes {

@Schema(type = "long", example = "1", description = "댓글 ID를 출력합니다.")
private Long replyId;

@Schema(type = "string", example = "앵무는 앵무의 말을 하고", description = "댓글 내용을 출력합니다.")
private String contents;

// 수정 없으므로 생성 시간
Expand All @@ -36,4 +38,15 @@ public static class ReplyResListWithPaging {
private List<ReplyResponseDto.ReplyRes> data;
}

@Data
@Builder
public static class ExistReplyRes {

@Schema(type = "long", example = "1", description = "댓글 ID를 출력합니다.")
private Long replyId;

@Schema(type = "boolean", example = "true", description = "댓글이 존재하는지 출력합니다. 삭제되었으면 false.")
private Boolean isExist;
}

}
15 changes: 14 additions & 1 deletion src/main/java/depth/jeonsilog/domain/reply/presentation/ReplyController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public class ReplyController {
@ApiResponse(responseCode = "200", description = "댓글 목록 조회 성공", content = {@Content(mediaType = "application/json", schema = @Schema(implementation = ReplyResponseDto.ReplyResListWithPaging.class))}),
@ApiResponse(responseCode = "400", description = "댓글 목록 조회 실패", content = {@Content(mediaType = "application/json", schema = @Schema(implementation = ErrorResponse.class))}),
})
@GetMapping("/{reviewId}")
@GetMapping("/reviews/{reviewId}")
public ResponseEntity<?> findReplyList(
@Parameter(description = "댓글 목록을 페이지별로 조회합니다. **Page는 0부터 시작합니다!**", required = true) @RequestParam(value = "page") Integer page,
@Parameter(description = "감상평 Id를 입력해주세요.", required = true) @PathVariable(value = "reviewId") Long reviewId
Expand Down Expand Up @@ -69,4 +69,17 @@ public ResponseEntity<?> deleteReply(
) {
return replyService.deleteReply(userPrincipal, replyId);
}

// Description : 댓글 존재 여부 조회
@Operation(summary = "댓글 존재 여부 조회", description = "댓글 존재 여부를 조회합니다.")
@ApiResponses(value = {
@ApiResponse(responseCode = "200", description = "조회 성공", content = {@Content(mediaType = "application/json", schema = @Schema(implementation = ReplyResponseDto.ExistReplyRes.class))}),
@ApiResponse(responseCode = "400", description = "조회 실패", content = {@Content(mediaType = "application/json", schema = @Schema(implementation = ErrorResponse.class))}),
})
@GetMapping("/{replyId}")
public ResponseEntity<?> existReply(
@Parameter(description = "댓글 Id를 입력해주세요.", required = true) @PathVariable(value = "replyId") Long replyId
) {
return replyService.existReply(replyId);
}
}
4 changes: 2 additions & 2 deletions src/main/java/depth/jeonsilog/domain/report/application/ReportService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,8 @@ private List<Object> createTargetList(List<Report> reports) {
Object target = new Object();

switch (report.getReportType()) {
case REVIEW -> target = reviewService.validateReviewById(report.getReportedId());
case REPLY -> target = replyService.validateReplyById(report.getReportedId());
case REVIEW -> target = reviewRepository.findReviewByReviewId(report.getReportedId());
case REPLY -> target = replyRepository.findReplyByReplyId(report.getReportedId());
case EXHIBITION -> target = exhibitionService.validateExhibitionById(report.getReportedId());
}
targetList.add(target);
Expand Down
12 changes: 10 additions & 2 deletions src/main/java/depth/jeonsilog/domain/report/converter/ReportConverter.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package depth.jeonsilog.domain.report.converter;

import depth.jeonsilog.domain.common.Status;
import depth.jeonsilog.domain.exhibition.domain.Exhibition;
import depth.jeonsilog.domain.reply.domain.Reply;
import depth.jeonsilog.domain.reply.dto.ReplyResponseDto;
Expand Down Expand Up @@ -33,28 +34,35 @@ public static List<ReportResponseDto.ReportRes> toReportResList(List<Report> rep
String name = "";
Report report = reports.get(i);
Object target = targetList.get(i);
Long clickId = null;

if (target instanceof Review) {
Review review = (Review) target;
if (review.getStatus().equals(Status.DELETE))
continue;
User user = review.getUser();
name = user.getNickname();
clickId = review.getId();

} else if (target instanceof Reply) {
Reply reply = (Reply) target;
if (reply.getStatus().equals(Status.DELETE))
continue;
User user = reply.getUser();
name = user.getNickname();

clickId = reply.getReview().getId();

} else if (target instanceof Exhibition) {
Exhibition exhibition = (Exhibition) target;
name = exhibition.getName();

clickId = exhibition.getId();
}
ReportResponseDto.ReportRes reportRes = ReportResponseDto.ReportRes.builder()
.reportId(report.getId())
.name(name) // 신고된 유저 혹은 전시회 이름
.reportType(report.getReportType())
.reportedId(report.getReportedId())
.clickId(clickId)
.isChecked(report.getIsChecked())
.build();

Expand Down
3 changes: 3 additions & 0 deletions src/main/java/depth/jeonsilog/domain/report/dto/ReportResponseDto.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ public static class ReportRes {
@Schema(type = "Long", example = "1", description = "신고된 감상평, 댓글 혹은 전시회 ID를 출력합니다.")
private Long reportedId;

@Schema(type = "Long", example = "1", description = "클릭 시 이동할 페이지를 위한 ID입니다. Exhibition, Review는 Exhibition, Review ID와 같으며, Reply의 경우 clickId는 작성된 Review의 ID입니다.")
private Long clickId;

@Schema(type = "boolean", example = "true", description = "신고를 확인했는지 출력합니다.")
private Boolean isChecked;
}
Expand Down
Loading

0 comments on commit 9186119

Please sign in to comment.