Skip to content

Commit

Permalink
Merge branch 'develop_back_core' into fix/rabbitmq_batch_friend_reque…
Browse files Browse the repository at this point in the history
…sts-B-core-#625
  • Loading branch information
seokho-1116 authored Aug 11, 2024
2 parents c44db9c + 67bcd8c commit f88b13d
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ public interface AuthApi {
로그인된 사용자만 가능하다.
""",
security = {@SecurityRequirement(name = "user_token")},
tags = {"auth"}
)
@ApiResponses(value = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,13 @@

import java.time.ZoneOffset;
import java.time.ZonedDateTime;
import java.util.Collections;
import java.util.List;
import lombok.RequiredArgsConstructor;
import org.locationtech.jts.geom.Point;
import org.springframework.data.domain.Slice;
import org.springframework.data.domain.SliceImpl;
import org.springframework.security.core.parameters.P;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import site.timecapsulearchive.core.domain.capsule.data.dto.CapsuleBasicInfoDto;
Expand Down Expand Up @@ -199,6 +202,10 @@ public Slice<GroupCapsuleDto> findGroupCapsuleSlice(
) {
final List<Long> groupIds = memberGroupRepository.findGroupIdsByMemberId(memberId);

if (groupIds.isEmpty()) {
return new SliceImpl<>(Collections.emptyList());
}

return groupCapsuleQueryRepository.findGroupCapsuleSlice(size, lastCapsuleId,
groupIds);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,7 @@ ResponseEntity<ApiSpec<String>> updateMemberPhoneSearchAvailable(
description = """
가입한 사용자가 회원을 탈퇴한다.
""",
security = {@SecurityRequirement(name = "user_token")},
tags = {"member"}
)
@ApiResponses(value = {
Expand Down
2 changes: 1 addition & 1 deletion backend/core/src/main/resources/config

0 comments on commit f88b13d

Please sign in to comment.