-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add public MissionActions controller
- Loading branch information
1 parent
dd9259d
commit 6a798e1
Showing
7 changed files
with
104 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
30 changes: 30 additions & 0 deletions
30
.../fr/gouv/cnsp/monitorfish/infrastructure/api/public_api/PublicMissionActionsController.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| package fr.gouv.cnsp.monitorfish.infrastructure.api.public_api | ||
|
|
||
| import fr.gouv.cnsp.monitorfish.domain.use_cases.mission_actions.GetMissionActions | ||
| import fr.gouv.cnsp.monitorfish.infrastructure.api.outputs.MissionActionDataOutput | ||
| import io.swagger.v3.oas.annotations.Operation | ||
| import io.swagger.v3.oas.annotations.Parameter | ||
| import io.swagger.v3.oas.annotations.tags.Tag | ||
| import org.springframework.web.bind.annotation.GetMapping | ||
| import org.springframework.web.bind.annotation.RequestMapping | ||
| import org.springframework.web.bind.annotation.RequestParam | ||
| import org.springframework.web.bind.annotation.RestController | ||
|
|
||
| @RestController | ||
| @RequestMapping("/api/v1/mission_actions") | ||
| @Tag(name = "APIs for mission actions") | ||
| class PublicMissionActionsController( | ||
| private val getMissionActions: GetMissionActions, | ||
| ) { | ||
|
|
||
| @GetMapping("") | ||
| @Operation(summary = "Get mission actions of specified mission") | ||
| fun getMissionActions( | ||
| @Parameter(description = "Mission id") | ||
| @RequestParam(name = "missionId") | ||
| missionId: Int, | ||
| ): List<MissionActionDataOutput> { | ||
| return getMissionActions.execute(missionId).map { MissionActionDataOutput.fromMissionAction(it) } | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
68 changes: 68 additions & 0 deletions
68
...uv/cnsp/monitorfish/infrastructure/api/public_api/PublicMissionActionsControllerITests.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| package fr.gouv.cnsp.monitorfish.infrastructure.api.public_api | ||
|
|
||
| import com.nhaarman.mockitokotlin2.any | ||
| import fr.gouv.cnsp.monitorfish.config.OIDCProperties | ||
| import fr.gouv.cnsp.monitorfish.config.SecurityConfig | ||
| import fr.gouv.cnsp.monitorfish.config.SentryConfig | ||
| import fr.gouv.cnsp.monitorfish.domain.entities.mission_actions.MissionAction | ||
| import fr.gouv.cnsp.monitorfish.domain.entities.mission_actions.MissionActionType | ||
| import fr.gouv.cnsp.monitorfish.domain.use_cases.mission_actions.GetMissionActions | ||
| import kotlinx.coroutines.runBlocking | ||
| import org.hamcrest.Matchers.equalTo | ||
| import org.junit.jupiter.api.Test | ||
| import org.mockito.BDDMockito | ||
| import org.mockito.Mockito | ||
| import org.springframework.beans.factory.annotation.Autowired | ||
| import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest | ||
| import org.springframework.boot.test.mock.mockito.MockBean | ||
| import org.springframework.context.annotation.Import | ||
| import org.springframework.test.web.servlet.MockMvc | ||
| import org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get | ||
| import org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath | ||
| import org.springframework.test.web.servlet.result.MockMvcResultMatchers.status | ||
| import java.time.ZonedDateTime | ||
|
|
||
| @Import(SecurityConfig::class, OIDCProperties::class, SentryConfig::class) | ||
| @WebMvcTest(value = [(PublicMissionActionsController::class)]) | ||
| class PublicMissionActionsControllerITests { | ||
|
|
||
| @Autowired | ||
| private lateinit var api: MockMvc | ||
|
|
||
| @MockBean | ||
| private lateinit var getMissionActions: GetMissionActions | ||
|
|
||
| private fun <T> givenSuspended(block: suspend () -> T) = BDDMockito.given(runBlocking { block() })!! | ||
|
|
||
| @Test | ||
| fun `Should get all mission actions for a mission`() { | ||
| // Given | ||
| givenSuspended { this.getMissionActions.execute(any()) }.willReturn( | ||
| listOf( | ||
| MissionAction( | ||
| 123, | ||
| 1, | ||
| 1, | ||
| actionType = MissionActionType.SEA_CONTROL, | ||
| actionDatetimeUtc = ZonedDateTime.parse("2020-10-06T16:25Z"), | ||
| isDeleted = false, | ||
| hasSomeGearsSeized = false, | ||
| hasSomeSpeciesSeized = false, | ||
| isFromPoseidon = true, | ||
| ), | ||
| ), | ||
| ) | ||
|
|
||
| // When | ||
| api.perform(get("/api/v1/mission_actions?missionId=123")) | ||
| // Then | ||
| .andExpect(status().isOk) | ||
| .andExpect(jsonPath("$.length()", equalTo(1))) | ||
| .andExpect(jsonPath("$[0].actionDatetimeUtc", equalTo("2020-10-06T16:25:00Z"))) | ||
|
|
||
| runBlocking { | ||
| Mockito.verify(getMissionActions).execute(123) | ||
| } | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters