Skip to content
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 @@ -46,6 +46,10 @@ public List<MissionResponse> findAll() {
return MissionResponse.listOf(missionRepository.findAll());
}

public List<MissionResponse> findAllBySessionId(final long sessionId) {
return MissionResponse.listOf(missionRepository.findBySessionId(sessionId));
}

public Mission findById(Long id) {
return missionRepository.findById(id)
.orElseThrow(() -> new BadRequestException(MISSION_NOT_FOUND));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,6 @@ public interface MissionRepository extends JpaRepository<Mission, Long> {
Optional<Mission> findByName(String name);

List<Mission> findBySessionIdIn(List<Long> sessionIds);

List<Mission> findBySessionId(long sessionId);
}
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package wooteco.prolog.session.ui;

import java.util.List;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import wooteco.prolog.login.aop.MemberOnly;
import wooteco.prolog.login.domain.AuthMemberPrincipal;
Expand All @@ -14,6 +14,8 @@
import wooteco.prolog.session.application.dto.MissionRequest;
import wooteco.prolog.session.application.dto.MissionResponse;

import java.util.List;

@RestController
@RequestMapping("/missions")
public class MissionController {
Expand All @@ -25,9 +27,14 @@ public MissionController(MissionService missionService) {
}

@GetMapping
public ResponseEntity<List<MissionResponse>> showMissions() {
List<MissionResponse> responses = missionService.findAll();
return ResponseEntity.ok(responses);
public ResponseEntity<List<MissionResponse>> showMissions(
@RequestParam(required = false) final Long sessionId
) {
if (sessionId == null) {
return ResponseEntity.ok(missionService.findAll());
} else {
return ResponseEntity.ok(missionService.findAllBySessionId(sessionId));
}
}

@MemberOnly
Expand Down
Loading