Skip to content

Commit

Permalink
[Mission] Diverses corrections (#3181)
Browse files Browse the repository at this point in the history
## Linked issues

- Resolve #3095
- Resolve #3135
- Resolve #3136
- Resolve #2983 

----

- [ ] Tests E2E (Cypress)
  • Loading branch information
louptheron authored May 9, 2024
2 parents 34f142d + 56cca48 commit 4a2f28d
Show file tree
Hide file tree
Showing 63 changed files with 412 additions and 285 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ data class Mission(
val id: Int,
val missionTypes: List<MissionType>,
val openBy: String? = null,
val closedBy: String? = null,
val completedBy: String? = null,
val observationsCacem: String? = null,
val observationsCnsp: String? = null,
val facade: String? = null,
Expand All @@ -23,7 +23,6 @@ data class Mission(
val endDateTimeUtc: ZonedDateTime? = null,
val isGeometryComputedFromControls: Boolean,
val missionSource: MissionSource,
val isClosed: Boolean,
val hasMissionOrder: Boolean? = false,
val isUnderJdp: Boolean? = false,
val controlUnits: List<ControlUnit> = listOf(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ data class MissionWithActionsDataOutput(
val id: Int,
val missionTypes: List<MissionType>,
val openBy: String? = null,
val closedBy: String? = null,
val completedBy: String? = null,
val observationsCacem: String? = null,
val observationsCnsp: String? = null,
val facade: String? = null,
Expand All @@ -23,7 +23,6 @@ data class MissionWithActionsDataOutput(
val endDateTimeUtc: ZonedDateTime? = null,
val isGeometryComputedFromControls: Boolean,
val missionSource: MissionSource,
val isClosed: Boolean,
val hasMissionOrder: Boolean? = false,
val isUnderJdp: Boolean? = false,
val controlUnits: List<ControlUnit> = listOf(),
Expand All @@ -34,7 +33,7 @@ data class MissionWithActionsDataOutput(
id = missionAndActions.mission.id,
missionTypes = missionAndActions.mission.missionTypes,
openBy = missionAndActions.mission.openBy,
closedBy = missionAndActions.mission.closedBy,
completedBy = missionAndActions.mission.completedBy,
observationsCacem = missionAndActions.mission.observationsCacem,
observationsCnsp = missionAndActions.mission.observationsCnsp,
facade = missionAndActions.mission.facade,
Expand All @@ -47,7 +46,6 @@ data class MissionWithActionsDataOutput(
endDateTimeUtc = missionAndActions.mission.endDateTimeUtc,
isGeometryComputedFromControls = missionAndActions.mission.isGeometryComputedFromControls,
missionSource = missionAndActions.mission.missionSource,
isClosed = missionAndActions.mission.isClosed,
hasMissionOrder = missionAndActions.mission.hasMissionOrder,
isUnderJdp = missionAndActions.mission.isUnderJdp,
controlUnits = missionAndActions.mission.controlUnits,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ data class MissionDataResponse(
val controlUnits: List<ControlUnit> = listOf(),
val missionTypes: List<MissionType>,
val openBy: String? = null,
val closedBy: String? = null,
val completedBy: String? = null,
val observationsCacem: String? = null,
val observationsCnsp: String? = null,
val facade: String? = null,
Expand All @@ -26,7 +26,6 @@ data class MissionDataResponse(
val endDateTimeUtc: String? = null,
val isGeometryComputedFromControls: Boolean,
val missionSource: MissionSource,
val isClosed: Boolean,
val hasMissionOrder: Boolean? = false,
val isUnderJdp: Boolean? = false,
) {
Expand All @@ -35,7 +34,7 @@ data class MissionDataResponse(
controlUnits = controlUnits,
missionTypes = missionTypes,
openBy = openBy,
closedBy = closedBy,
completedBy = completedBy,
observationsCacem = observationsCacem,
observationsCnsp = observationsCnsp,
facade = facade,
Expand All @@ -44,7 +43,6 @@ data class MissionDataResponse(
endDateTimeUtc = endDateTimeUtc?.let { ZonedDateTime.parse(endDateTimeUtc) },
isGeometryComputedFromControls = isGeometryComputedFromControls,
missionSource = missionSource,
isClosed = isClosed,
hasMissionOrder = hasMissionOrder,
isUnderJdp = isUnderJdp,
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ class GetMissionUTests {
startDateTimeUtc = ZonedDateTime.now(),
isGeometryComputedFromControls = false,
missionSource = MissionSource.MONITORFISH,
isClosed = false,
envActions = listOf(
EnvMissionAction(
id = UUID.randomUUID(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ object TestUtils {
startDateTimeUtc = ZonedDateTime.now(),
isGeometryComputedFromControls = false,
missionSource = MissionSource.MONITORFISH,
isClosed = false,
)
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,6 @@ class GetActivityReportsUTests {
1,
missionTypes = listOf(MissionType.LAND),
missionSource = MissionSource.MONITORFISH,
isClosed = false,
isUnderJdp = false,
isGeometryComputedFromControls = false,
startDateTimeUtc = ZonedDateTime.of(2020, 5, 5, 3, 4, 5, 3, ZoneOffset.UTC),
Expand All @@ -133,7 +132,6 @@ class GetActivityReportsUTests {
2,
missionTypes = listOf(MissionType.SEA),
missionSource = MissionSource.MONITORFISH,
isClosed = false,
isUnderJdp = true,
isGeometryComputedFromControls = false,
startDateTimeUtc = ZonedDateTime.of(2020, 5, 5, 3, 4, 5, 3, ZoneOffset.UTC),
Expand All @@ -142,7 +140,6 @@ class GetActivityReportsUTests {
2,
missionTypes = listOf(MissionType.SEA),
missionSource = MissionSource.MONITORFISH,
isClosed = false,
isUnderJdp = false,
isGeometryComputedFromControls = false,
startDateTimeUtc = ZonedDateTime.of(2020, 5, 5, 3, 4, 5, 3, ZoneOffset.UTC),
Expand Down Expand Up @@ -256,7 +253,6 @@ class GetActivityReportsUTests {
1,
missionTypes = listOf(MissionType.LAND),
missionSource = MissionSource.MONITORFISH,
isClosed = false,
isUnderJdp = false,
isGeometryComputedFromControls = false,
startDateTimeUtc = ZonedDateTime.of(2020, 5, 5, 3, 4, 5, 3, ZoneOffset.UTC),
Expand All @@ -265,7 +261,6 @@ class GetActivityReportsUTests {
3,
missionTypes = listOf(MissionType.SEA),
missionSource = MissionSource.MONITORFISH,
isClosed = false,
isUnderJdp = false,
isGeometryComputedFromControls = false,
startDateTimeUtc = ZonedDateTime.of(2020, 5, 5, 3, 4, 5, 3, ZoneOffset.UTC),
Expand Down Expand Up @@ -363,7 +358,6 @@ class GetActivityReportsUTests {
3,
missionTypes = listOf(MissionType.SEA),
missionSource = MissionSource.MONITORFISH,
isClosed = false,
isUnderJdp = false,
isGeometryComputedFromControls = false,
startDateTimeUtc = ZonedDateTime.of(2020, 5, 5, 3, 4, 5, 3, ZoneOffset.UTC),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ class MissionsControllerITests {
123,
missionTypes = listOf(MissionType.SEA),
missionSource = MissionSource.MONITORFISH,
isClosed = false,
isGeometryComputedFromControls = false,
startDateTimeUtc = ZonedDateTime.of(2020, 5, 5, 3, 4, 5, 3, ZoneOffset.UTC),
),
Expand Down Expand Up @@ -134,7 +133,6 @@ class MissionsControllerITests {
123,
missionTypes = listOf(MissionType.SEA),
missionSource = MissionSource.MONITORFISH,
isClosed = false,
isGeometryComputedFromControls = false,
startDateTimeUtc = ZonedDateTime.of(2020, 5, 5, 3, 4, 5, 3, ZoneOffset.UTC),
),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ class APIMissionRepositoryITest {
}
],
"openBy": "Steve Snyder",
"closedBy": "Jacob Martin",
"completedBy": "Jacob Martin",
"observationsCacem": "Surface different shoulder interview. Job together area probably. Of alone class capital determine machine always.",
"observationsCnsp": null,
"facade": "MEMN",
Expand Down Expand Up @@ -129,7 +129,6 @@ class APIMissionRepositoryITest {
],
"isGeometryComputedFromControls": false,
"missionSource": "MONITORENV",
"isClosed": false,
"isUnderJdp": false
}""",
),
Expand Down
Loading

0 comments on commit 4a2f28d

Please sign in to comment.