Skip to content

Commit

Permalink
[Tech] fix missionType type
Browse files Browse the repository at this point in the history
  • Loading branch information
@claire2212
claire2212 committed May 9, 2024
1 parent c034f36 commit 890a18f
Show file tree
Hide file tree
Showing 3 changed files with 89 additions and 75 deletions.
156 changes: 85 additions & 71 deletions ...nd/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/model/MissionModel.kt
View file
Expand Up @@ -31,73 +31,117 @@ import java.time.ZoneOffset.UTC
@Entity
@NamedEntityGraph(
name = "MissionModel.fullLoad",
attributeNodes = [
attributeNodes =
[
NamedAttributeNode("envActions", subgraph = "subgraph.envActions"),
NamedAttributeNode("attachedReportings", subgraph = "subgraph.attachedReportings"),
NamedAttributeNode("controlResources", subgraph = "subgraph.missionControlResources"),
NamedAttributeNode("controlUnits", subgraph = "subgraph.missionControlUnits"),
NamedAttributeNode(
"attachedReportings",
subgraph = "subgraph.attachedReportings",
),
NamedAttributeNode(
"controlResources",
subgraph = "subgraph.missionControlResources",
),
NamedAttributeNode(
"controlUnits",
subgraph = "subgraph.missionControlUnits",
),
],
subgraphs = [
subgraphs =
[
NamedSubgraph(
name = "subgraph.envActions",
attributeNodes = [
attributeNodes =
[
NamedAttributeNode("controlPlanThemes"),
NamedAttributeNode("controlPlanSubThemes", subgraph = "subgraph.linkedControlPlanSubThemes"),
NamedAttributeNode("controlPlanTags", subgraph = "subgraph.linkedControlPlanTags"),
NamedAttributeNode(
"controlPlanSubThemes",
subgraph =
"subgraph.linkedControlPlanSubThemes",
),
NamedAttributeNode(
"controlPlanTags",
subgraph = "subgraph.linkedControlPlanTags",
),
NamedAttributeNode("attachedReporting"),
],
),
NamedSubgraph(
name = "subgraph.attachedReportings",
attributeNodes = [
NamedAttributeNode("controlPlanSubThemes", subgraph = "subgraph.linkedControlPlanSubThemes"),
attributeNodes =
[
NamedAttributeNode(
"controlPlanSubThemes",
subgraph =
"subgraph.linkedControlPlanSubThemes",
),
],
),
NamedSubgraph(
name = "subgraph.linkedControlPlanSubThemes",
attributeNodes = [
NamedAttributeNode("controlPlanSubTheme", subgraph = "subgraph.controlPlanSubThemes"),
attributeNodes =
[
NamedAttributeNode(
"controlPlanSubTheme",
subgraph = "subgraph.controlPlanSubThemes",
),
],
),
NamedSubgraph(
name = "subgraph.controlPlanSubThemes",
attributeNodes = [
attributeNodes =
[
NamedAttributeNode("controlPlanTheme"),
],
),
NamedSubgraph(
name = "subgraph.linkedControlPlanTags",
attributeNodes = [
NamedAttributeNode("controlPlanTag", subgraph = "subgraph.controlPlanTags"),
attributeNodes =
[
NamedAttributeNode(
"controlPlanTag",
subgraph = "subgraph.controlPlanTags",
),
],
),
NamedSubgraph(
name = "subgraph.controlPlanTags",
attributeNodes = [
attributeNodes =
[
NamedAttributeNode("controlPlanTheme"),
],
),
NamedSubgraph(
name = "subgraph.missionControlResources",
attributeNodes = [
NamedAttributeNode("resource", subgraph = "subgraph.controlResource"),
attributeNodes =
[
NamedAttributeNode(
"resource",
subgraph = "subgraph.controlResource",
),
],
),
NamedSubgraph(
name = "subgraph.missionControlUnits",
attributeNodes = [
NamedAttributeNode("unit", subgraph = "subgraph.controlUnit"),
attributeNodes =
[
NamedAttributeNode(
"unit",
subgraph = "subgraph.controlUnit",
),
],
),
NamedSubgraph(
name = "subgraph.controlUnit",
attributeNodes = [
attributeNodes =
[
NamedAttributeNode("administration"),
],
),
NamedSubgraph(
name = "subgraph.controlResource",
attributeNodes = [
attributeNodes =
[
NamedAttributeNode("station"),
],
),
Expand All @@ -110,13 +154,11 @@ class MissionModel(
@Basic(optional = false)
@Column(name = "id", unique = true, nullable = false)
val id: Int? = null,

@OneToMany(mappedBy = "mission", fetch = FetchType.EAGER)
@JsonManagedReference
@Fetch(value = FetchMode.SUBSELECT)
@OrderBy("id")
val attachedReportings: MutableSet<ReportingModel>? = LinkedHashSet(),

@OneToMany(
mappedBy = "mission",
cascade = [CascadeType.ALL],
Expand All @@ -127,7 +169,6 @@ class MissionModel(
@Fetch(value = FetchMode.SUBSELECT)
@OrderBy("id")
val controlResources: MutableSet<MissionControlResourceModel>? = LinkedHashSet(),

@OneToMany(
mappedBy = "mission",
cascade = [CascadeType.ALL],
Expand All @@ -138,14 +179,10 @@ class MissionModel(
@Fetch(value = FetchMode.SUBSELECT)
@OrderBy("id")
val controlUnits: MutableSet<MissionControlUnitModel>? = LinkedHashSet(),

@Column(name = "completed_by")
val completedBy: String? = null,

@Column(name = "completed_by") val completedBy: String? = null,
@Column(name = "created_at_utc", updatable = false)
@CreationTimestamp
val createdAtUtc: Instant? = null,

@OneToMany(
mappedBy = "mission",
cascade = [CascadeType.ALL],
Expand All @@ -156,62 +193,37 @@ class MissionModel(
@Fetch(value = FetchMode.SUBSELECT)
@OrderBy("id")
val envActions: MutableSet<EnvActionModel>? = LinkedHashSet(),

@Column(name = "end_datetime_utc")
val endDateTimeUtc: Instant? = null,

@Column(name = "facade")
val facade: String? = null,

@Column(name = "end_datetime_utc") val endDateTimeUtc: Instant? = null,
@Column(name = "facade") val facade: String? = null,
@JsonSerialize(using = GeometrySerializer::class)
@JsonDeserialize(contentUsing = GeometryDeserializer::class)
@Column(name = "geom")
val geom: MultiPolygon? = null,

@Column(name = "has_mission_order", nullable = false)
val hasMissionOrder: Boolean,

@Column(name = "deleted", nullable = false)
val isDeleted: Boolean,

@Column(name = "has_mission_order", nullable = false) val hasMissionOrder: Boolean,
@Column(name = "deleted", nullable = false) val isDeleted: Boolean,
@Column(name = "is_geometry_computed_from_controls", nullable = false)
val isGeometryComputedFromControls: Boolean,

@Column(name = "is_under_jdp", nullable = false)
val isUnderJdp: Boolean,

@Column(name = "is_under_jdp", nullable = false) val isUnderJdp: Boolean,
@Column(name = "mission_source", nullable = false, columnDefinition = "mission_source_type")
@Enumerated(EnumType.STRING)
@JdbcType(PostgreSQLEnumJdbcType::class)
val missionSource: MissionSourceEnum,

@Column(name = "mission_types", columnDefinition = "text[]")
@Enumerated(EnumType.STRING)
val missionTypes: List<MissionTypeEnum>,

@Column(name = "observations_cacem")
val observationsCacem: String? = null,

@Column(name = "observations_cnsp")
val observationsCnsp: String? = null,

@Column(name = "open_by")
val openBy: String? = null,

@Column(name = "start_datetime_utc")
val startDateTimeUtc: Instant,

@Column(name = "updated_at_utc")
@UpdateTimestamp
val updatedAtUtc: Instant? = null,

@Column(name = "observations_cacem") val observationsCacem: String? = null,
@Column(name = "observations_cnsp") val observationsCnsp: String? = null,
@Column(name = "open_by") val openBy: String? = null,
@Column(name = "start_datetime_utc") val startDateTimeUtc: Instant,
@Column(name = "updated_at_utc") @UpdateTimestamp val updatedAtUtc: Instant? = null,
) {
fun toMissionEntity(objectMapper: ObjectMapper): MissionEntity {
val mappedControlUnits =
controlUnits?.map { missionControlUnitModel ->
val mappedControlUnitResources =
controlResources
?.map { it.toLegacyControlUnitResource() }
?.filter { it.controlUnitId == missionControlUnitModel.unit.id }
controlResources?.map { it.toLegacyControlUnitResource() }?.filter {
it.controlUnitId == missionControlUnitModel.unit.id
}

missionControlUnitModel
.unit
Expand Down Expand Up @@ -343,8 +355,10 @@ class MissionModel(
EnvActionModel.fromEnvActionEntity(
action = it,
mission = missionModel,
controlPlanThemesReferenceModelMap = controlPlanThemesReferenceModelMap,
controlPlanSubThemesReferenceModelMap = controlPlanSubThemesReferenceModelMap,
controlPlanThemesReferenceModelMap =
controlPlanThemesReferenceModelMap,
controlPlanSubThemesReferenceModelMap =
controlPlanSubThemesReferenceModelMap,
controlPlanTagsReferenceModelMap = controlPlanTagsReferenceModelMap,
mapper = mapper,
),
Expand Down
6 changes: 3 additions & 3 deletions .../cacem/monitorenv/infrastructure/database/repositories/interfaces/IDBMissionRepository.kt
View file
Expand Up @@ -35,11 +35,11 @@ interface IDBMissionRepository : JpaRepository<MissionModel, Int> {
AND
((:missionTypeAIR = FALSE AND :missionTypeLAND = FALSE AND :missionTypeSEA = FALSE)
OR (
(:missionTypeAIR = TRUE AND ( CAST(mission.missionTypes as String) like '%AIR%'))
(:missionTypeAIR = TRUE AND (CAST(mission.missionTypes as String) like '%AIR%'))
OR
(:missionTypeLAND = TRUE AND ( CAST(mission.missionTypes as String) like '%LAND%'))
(:missionTypeLAND = TRUE AND (CAST(mission.missionTypes as String) like '%LAND%'))
OR
(:missionTypeSEA = TRUE AND ( CAST(mission.missionTypes as String) like '%SEA%'))
(:missionTypeSEA = TRUE AND (CAST(mission.missionTypes as String) like '%SEA%'))
))
AND
(
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/domain/use_cases/missions/saveMission.ts
View file
Expand Up @@ -61,7 +61,7 @@ export const saveMission =
// wait for the mission to be updated in the form before displaying the banner
setTimeout(async () => {
await dispatch(missionFormsActions.setShowCreatedBanner({ id: missionUpdated.id, showBanner: true }))
}, 250)
}, 350)
} else {
// for a mission already created we want to update the `updatedAt` value with the new one
const mission = selectedMissions[values.id]
Expand Down

0 comments on commit 890a18f

Please sign in to comment.