Skip to content

Commit bbec31c

Browse files
author
khlee
committed
fix: 인사이트 조회 오류 해결
1 parent 40c342c commit bbec31c

File tree

12 files changed

+28
-13
lines changed

12 files changed

+28
-13
lines changed

common/common-domain/common-application-service/src/main/java/com/project/imdang/common/domain/event/DomainEventMessageListener.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ public abstract class DomainEventMessageListener<E extends DomainEventMessage> {
66

77
public abstract void process(E domainEventMessage);
88

9-
@EventListener
9+
1010
public void handle(E domainEventMessage) {
1111
try {
1212
process(domainEventMessage);

imdang-container/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ dependencies {
1919
implementation project(':insight-service:insight-domain:insight-domain-core')
2020

2121
implementation project(':member-service:member-application')
22+
implementation project(':member-service:member-messaging:listener')
2223
implementation project(':member-service:member-persistence')
2324
implementation project(':member-service:member-domain:member-application-service')
2425
implementation project(':member-service:member-domain:member-domain-core')

insight-service/insight-domain/insight-application-service/src/main/java/com/project/imdang/insight/domain/dto/insight/detail/InsightDetailResult.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ public class InsightDetailResult {
3131

3232
private InsightId insightId; //인사이트ID
3333

34-
private List<String> mainImage; //메인 이미지
35-
//TODO : 추가 이미지
3634
private String title; //제목
3735

3836
private Address address; //단지 주소
@@ -53,7 +51,7 @@ public class InsightDetailResult {
5351
private Long accusedCount; //신고수
5452
private Long viewCount; //조회수
5553

56-
// private Integer score;
54+
5755
private ZonedDateTime createdAt;
5856
private Boolean createdByMe;
5957
private List<String> images; // image URL 리스트

insight-service/insight-domain/insight-application-service/src/main/java/com/project/imdang/insight/domain/handler/insight/DetailInsightQueryHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public InsightDetailResult detailInsight(DetailInsightQuery detailInsightQuery)
4848
.orElseThrow(() -> new MemberNotFoundException(requestedBy));
4949

5050
// 작성한 인사이트가 없거나, 최신 작성 날짜가 한달 이상인 경우
51-
if (requestMember.getInsightCount() < 1 || requestMember.getLatestInsightCreateDate().isBefore(LocalDate.now().minusDays(30))) {
51+
if (requestMember.getLatestInsightCreateDate() == null || requestMember.getLatestInsightCreateDate().isBefore(LocalDate.now().minusDays(30))) {
5252
throw new InsightDomainException("Latest insight create Date is before one month");
5353
}
5454

insight-service/insight-persistence/src/main/java/com/project/imdang/insight/persistence/repository/DistrictJpaRepository.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,15 @@
55
import org.springframework.data.domain.Pageable;
66
import org.springframework.data.jpa.repository.JpaRepository;
77
import org.springframework.data.jpa.repository.Query;
8+
import org.springframework.data.repository.query.Param;
89

910
public interface DistrictJpaRepository extends JpaRepository<DistrictEntity, String> {
1011

1112
@Query("select distinct d.code, d.siDo, d.siGunGu from DistrictEntity d " +
1213
"where d.siDo = :siDo and d.siGunGu <> '' and d.eupMyeonDong = '' and d.deletedAt is null")
13-
Page<Object[]> findAllSiGunGuBySiDo(String siDo, Pageable pageable);
14+
Page<Object[]> findAllSiGunGuBySiDo(@Param("siDo") String siDo, Pageable pageable);
1415

1516
@Query("select distinct d.code, d.siDo, d.siGunGu, d.eupMyeonDong from DistrictEntity d " +
1617
"where d.siDo = :siDo and d.siGunGu = :siGunGu and d.eupMyeonDong <> '' and d.deletedAt is null")
17-
Page<Object[]> findAllEupMyeonDongBySiDoAndSiGunGu(String siDo, String siGunGu, Pageable pageable);
18+
Page<Object[]> findAllEupMyeonDongBySiDoAndSiGunGu(@Param("siDo") String siDo, @Param("siGunGu") String siGunGu, Pageable pageable);
1819
}

insight-service/insight-persistence/src/main/java/com/project/imdang/insight/persistence/repository/InsightJpaRepository.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ List<Object[]> findAllApartmentComplexAndInsightCountByMemberIdAndDistrict(@Para
6969
"where i.member_id = :memberId " +
7070
"and i.complex_name = :apartmentComplexName",
7171
nativeQuery = true)
72-
Page<InsightEntity> findAllByMemberIdAndApartmentComplexAndOnlyMine(String memberId, String apartmentComplexName, PageRequest pageRequest);
72+
Page<InsightEntity> findAllByMemberIdAndApartmentComplexAndOnlyMine(@Param("memberId") String memberId, @Param("apartmentComplexName") String apartmentComplexName, PageRequest pageRequest);
7373

7474
@Query(value = "select i.* from insight i left join recommend r on i.id = r.recommended_insight_id " +
7575
"where (i.member_id = :memberId or r.recommend_member_id = :memberId) " +
@@ -78,7 +78,7 @@ List<Object[]> findAllApartmentComplexAndInsightCountByMemberIdAndDistrict(@Para
7878
"where (i.member_id = :memberId or r.recommend_member_id = :memberId) " +
7979
"and i.complex_id = :apartmentComplexName",
8080
nativeQuery = true)
81-
Page<InsightEntity> findAllByMemberIdAndApartmentComplex(String memberId, String apartmentComplexName, PageRequest pageRequest);
81+
Page<InsightEntity> findAllByMemberIdAndApartmentComplex(@Param("memberId") String memberId, @Param("apartmentComplexName") String apartmentComplexName, PageRequest pageRequest);
8282

8383
@Query(value = "select i.* from insight i " +
8484
"where i.member_id = :memberId " +

member-service/member-domain/member-application-service/src/main/java/com/project/imdang/member/domain/handler/member/UpdateMemberCommandHandler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ public class UpdateMemberCommandHandler {
2121
@Transactional
2222
public Boolean update(MemberId memberId) {
2323
Member member = memberHelper.get(memberId);
24-
Member accusedMember = memberDomainService.updateMember(member);
25-
memberHelper.save(accusedMember);
24+
Member updatedMember = memberDomainService.updateMember(member);
25+
memberHelper.save(updatedMember);
2626
return true;
2727
}
2828
}

member-service/member-messaging/listener/src/main/java/com/project/imdang/member/messaging/listener/InsightAccusedEventMessageListener.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import com.project.imdang.insight.messaging.message.InsightAccusedEventMessage;
66
import com.project.imdang.member.domain.ports.input.service.MemberApplicationService;
77
import lombok.extern.slf4j.Slf4j;
8+
import org.springframework.context.event.EventListener;
89
import org.springframework.stereotype.Component;
910

1011
@Slf4j
@@ -17,6 +18,11 @@ public InsightAccusedEventMessageListener(MemberApplicationService memberApplica
1718
this.memberApplicationService = memberApplicationService;
1819
}
1920

21+
@EventListener
22+
public void handle(InsightAccusedEventMessage event) {
23+
super.handle(event);
24+
}
25+
2026
@Override
2127
public void process(InsightAccusedEventMessage domainEventMessage) {
2228
MemberId accusedMemberId = new MemberId(domainEventMessage.accusedMemberId());

member-service/member-messaging/listener/src/main/java/com/project/imdang/member/messaging/listener/InsightCreatedEventMessageListener.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
import com.project.imdang.common.domain.event.DomainEventMessageListener;
44
import com.project.imdang.common.domain.valueobject.MemberId;
5-
import com.project.imdang.insight.messaging.message.InsightAccusedEventMessage;
65
import com.project.imdang.insight.messaging.message.InsightCreatedEventMessage;
76
import com.project.imdang.member.domain.ports.input.service.MemberApplicationService;
87
import lombok.extern.slf4j.Slf4j;
8+
import org.springframework.context.event.EventListener;
99
import org.springframework.stereotype.Component;
1010

1111
@Slf4j
@@ -17,6 +17,12 @@ public class InsightCreatedEventMessageListener extends DomainEventMessageListen
1717
public InsightCreatedEventMessageListener(MemberApplicationService memberApplicationService) {
1818
this.memberApplicationService = memberApplicationService;
1919
}
20+
21+
@EventListener
22+
public void handle(InsightCreatedEventMessage event) {
23+
super.handle(event);
24+
}
25+
2026
@Override
2127
public void process(InsightCreatedEventMessage domainEventMessage) {
2228
//인사이트 생성 시 유저 정보 업데이트 (가장 최근 인사이트 작성 일시)

member-service/member-service-client/member-service-client-api-impl/src/main/java/com/project/imdang/member/domain/client/MemberInfoResolverImpl.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ public Optional<MemberData> resolve(MemberId memberId) {
3030
.gender(entity.getGender().name())
3131
.deviceToken(entity.getDeviceToken())
3232
.accusedCount(entity.getAccusedCount())
33+
.latestInsightCreateDate(entity.getLatestInsightCreateDate())
3334
.build());
3435
}
3536

@@ -46,6 +47,7 @@ public List<MemberData> resolve(List<MemberId> memberIds) {
4647
.gender(entity.getGender().name())
4748
.deviceToken(entity.getDeviceToken())
4849
.accusedCount(entity.getAccusedCount())
50+
.latestInsightCreateDate(entity.getLatestInsightCreateDate())
4951
.build())
5052
.collect(Collectors.toList());
5153
}

0 commit comments

Comments
 (0)