fix(bff): harmonize missionId type #181

MTES-MCT · Jun 5, 2024 · fe27d90 · fe27d90
1 parent f99a0d5
commit fe27d90
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 27 deletions.
diff --git a/backend/src/main/resources/graphql/action.graphqls b/backend/src/main/resources/graphql/action.graphqls
@@ -42,7 +42,7 @@ type Action {
 
 input ActionStatusInput {
   id: String
-  missionId: Int!
+  missionId: ID!
   startDateTimeUtc: String
   status: ActionStatusType!
   reason: ActionStatusReason
@@ -51,7 +51,7 @@ input ActionStatusInput {
 
 input ActionControlInput {
   id: String
-  missionId: Int!
+  missionId: ID!
   startDateTimeUtc: String
   endDateTimeUtc: String
   controlMethod: ControlMethod!
@@ -66,14 +66,14 @@ input ActionControlInput {
 
 input ActionFreeNoteInput {
   id: String
-  missionId: Int!
+  missionId: ID!
   startDateTimeUtc: String!
   observations: String
 }
 
 input ActionRescueInput {
   id: String
-  missionId: Int!
+  missionId: ID!
   startDateTimeUtc: String!
   endDateTimeUtc: String
   longitude: Float
@@ -95,23 +95,23 @@ input ActionRescueInput {
 
 input ActionNauticalEventInput {
   id: String
-  missionId: Int!
+  missionId: ID!
   startDateTimeUtc: String!
   endDateTimeUtc: String
   observations: String
 }
 
 input ActionVigimerInput {
   id: String
-  missionId: Int!
+  missionId: ID!
   startDateTimeUtc: String!
   endDateTimeUtc: String
   observations: String
 }
 
 input ActionAntiPollutionInput {
   id: String
-  missionId: Int!
+  missionId: ID!
   startDateTimeUtc: String!
   endDateTimeUtc: String
   observations: String
@@ -124,31 +124,31 @@ input ActionAntiPollutionInput {
 
 input ActionBAAEMPermanenceInput {
   id: String
-  missionId: Int!
+  missionId: ID!
   startDateTimeUtc: String!
   endDateTimeUtc: String
   observations: String
 }
 
 input ActionPublicOrderInput {
   id: String
-  missionId: Int!
+  missionId: ID!
   startDateTimeUtc: String!
   endDateTimeUtc: String
   observations: String
 }
 
 input ActionRepresentationInput {
   id: String
-  missionId: Int!
+  missionId: ID!
   startDateTimeUtc: String!
   endDateTimeUtc: String
   observations: String
 }
 
 input ActionIllegalImmigrationInput {
   id: String
-  missionId: Int!
+  missionId: ID!
   startDateTimeUtc: String!
   endDateTimeUtc: String
   observations: String
@@ -198,7 +198,7 @@ type NavActionFreeNote {
 
 type NavActionRescue {
   id: String!
-  missionId: String
+  missionId: ID
   startDateTimeUtc: String!
   endDateTimeUtc: String
   longitude: Float
@@ -221,23 +221,23 @@ type NavActionRescue {
 
 type NavActionNauticalEvent {
   id: String!
-  missionId: String!
+  missionId: ID!
   startDateTimeUtc: String!
   endDateTimeUtc: String
   observations: String
 }
 
 type NavActionVigimer {
   id: String!
-  missionId: String!
+  missionId: ID!
   startDateTimeUtc: String!
   endDateTimeUtc: String
   observations: String
 }
 
 type NavActionAntiPollution {
   id: String!
-  missionId: String!
+  missionId: ID!
   startDateTimeUtc: String!
   endDateTimeUtc: String
   observations: String
@@ -250,31 +250,31 @@ type NavActionAntiPollution {
 
 type NavActionBAAEMPermanence {
   id: String!
-  missionId: String!
+  missionId: ID!
   startDateTimeUtc: String!
   endDateTimeUtc: String
   observations: String
 }
 
 type NavActionPublicOrder {
   id: String!
-  missionId: String!
+  missionId: ID!
   startDateTimeUtc: String!
   endDateTimeUtc: String
   observations: String
 }
 
 type NavActionRepresentation {
   id: String!
-  missionId: String!
+  missionId: ID!
   startDateTimeUtc: String!
   endDateTimeUtc: String
   observations: String
 }
 
 type NavActionIllegalImmigration {
   id: String!
-  missionId: String!
+  missionId: ID!
   startDateTimeUtc: String!
   endDateTimeUtc: String
   observations: String

diff --git a/backend/src/main/resources/graphql/controls.graphqls b/backend/src/main/resources/graphql/controls.graphqls
@@ -73,7 +73,7 @@ type ControlGensDeMer {
 
 input ControlNavigationInput {
   id: String
-  missionId: String!
+  missionId: ID!
   actionControlId: String!
   amountOfControls: Int!
   unitShouldConfirm: Boolean
@@ -83,7 +83,7 @@ input ControlNavigationInput {
 
 input ControlSecurityInput {
   id: String
-  missionId: String!
+  missionId: ID!
   actionControlId: String!
   amountOfControls: Int!
   unitShouldConfirm: Boolean

diff --git a/backend/src/main/resources/graphql/crew.graphqls b/backend/src/main/resources/graphql/crew.graphqls
@@ -38,7 +38,7 @@ type MissionCrew {
 input MissionCrewInput {
   id: ID
   agent: AgentInput
-  missionId: Int!
+  missionId: ID!
   comment: String
   role: AgentRoleInput
 }

diff --git a/backend/src/main/resources/graphql/infraction.graphqls b/backend/src/main/resources/graphql/infraction.graphqls
@@ -60,7 +60,7 @@ enum FishInfractionType {
 
 input InfractionInput {
   id: String
-  missionId: String!
+  missionId: ID!
   actionId: String!
   controlId: String
   controlType: String!
@@ -71,7 +71,7 @@ input InfractionInput {
 
 input InfractionWithNewTargetInput {
   id: String
-  missionId: String!
+  missionId: ID!
   actionId: String!
   controlId: String
   controlType: String!

diff --git a/backend/src/main/resources/graphql/mission.graphqls b/backend/src/main/resources/graphql/mission.graphqls
@@ -68,7 +68,7 @@ type MissionGeneralInfo {
 
 input MissionGeneralInfoInput {
   id: String
-  missionId: String!
+  missionId: ID!
   distanceInNauticalMiles: Float
   consumedGOInLiters: Float
   consumedFuelInLiters: Float

diff --git a/frontend/src/pam/mission/crew/mission-crew.tsx b/frontend/src/pam/mission/crew/mission-crew.tsx
@@ -85,7 +85,7 @@ const MissionCrew: React.FC<MissionCrewProps> = () => {
 
   const handleSubmitForm = async (data: AddOrUpdateMissionCrewInput) => {
     if (!missionId) return
-    const crew = { ...data, missionId: Number(missionId) }
+    const crew = { ...data, missionId: missionId }
     await addOrUpdateCrew({ variables: { crew } })
     setOpenCrewForm(false)
   }

diff --git a/frontend/src/pam/mission/general-info/mission-distance-consumption.tsx b/frontend/src/pam/mission/general-info/mission-distance-consumption.tsx
@@ -22,7 +22,7 @@ const MissionDistanceAndConsumption: React.FC<MissionDistanceAndConsumptionProps
   const [mutate] = useAddOrUpdateDistanceConsumption()
 
   const onChange = async (field: string, value?: number) => {
-    const updatedValue = value !== undefined && value !== null ? value?.toString() : undefined
+    const updatedValue = value !== undefined && value !== null ? value : undefined
     setFormData({
       ...formData,
       [field]: updatedValue