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

feat: Received form list API #61

Merged
merged 1 commit into from
Feb 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Expand Up @@ -11,6 +11,7 @@
import com.fullcar.core.exception.CustomException;
import com.fullcar.core.response.ErrorCode;
import com.fullcar.member.domain.member.Member;
import com.fullcar.member.domain.member.MemberRepository;
import lombok.AccessLevel;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
Expand All @@ -27,6 +28,7 @@
public class FormService {
private final FormRepository formRepository;
private final CarpoolRepository carpoolRepository;
private final MemberRepository memberRepository; //TODO: Event 기반으로 변경 필요.
private final FormMapper formMapper;

@Transactional
Expand Down Expand Up @@ -66,7 +68,18 @@ public List<FormResponseDto> readSentForm(Member member) {
false
).stream()
.map(form -> formMapper.toDto(form, member))
.collect(Collectors.toList());
.toList();
}

@Transactional(readOnly = true)
public List<FormResponseDto> readReceivedForm(Member member) {
return formRepository.findReceivedForm(member.getId().getId())
.stream()
.map(form -> formMapper.toDto(
form,
memberRepository.findByIdAndIsDeletedOrThrow(form.getPassenger().getMemberId(), false)) // TODO: N+1 문제 해결 필요.
)
.toList();
}

}
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
package com.fullcar.carpool.domain.form;

import com.fullcar.carpool.domain.carpool.CarpoolId;
import com.fullcar.member.domain.member.MemberId;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import org.springframework.stereotype.Repository;

import java.util.List;
Expand All @@ -11,4 +14,8 @@
public interface FormRepository extends JpaRepository<Form, FormId> {
List<Form> findAllByPassengerAndIsDeletedOrderByCreatedAtDesc(Passenger passenger, boolean isDeleted);
Optional<Form> findByPassengerAndCarpoolIdAndIsDeleted(Passenger passenger, CarpoolId carpoolId, boolean isDeleted);
@Query("select f from Form f join Carpool c on f.carpoolId.id = c.carpoolId.id where c.driver.memberId.id = :memberId order by f.createdAt desc")
List<Form> findReceivedForm(
@Param("memberId") Long memberId
);
}
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,23 @@ public ApiResponse<List<FormResponseDto>> getSentForm(
@CurrentMember Member member
) {
return ApiResponse.success(
SuccessCode.REGISTER_SUCCESS,
SuccessCode.READ_SUCCESS,
formService.readSentForm(member)
);
}

@Operation(summary = "받은 신청서 목록 조회 API")
@ApiResponses({
@io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "조회 성공")
})
@GetMapping("/received-forms")
public ApiResponse<List<FormResponseDto>> getReceivedForm(
@Parameter(hidden = true)
@CurrentMember Member member
) {
return ApiResponse.success(
SuccessCode.READ_SUCCESS,
formService.readReceivedForm(member)
);
}
}
Loading