Merge pull request #87 from sine-fdn/enum-serde

fix: remove wrong serde(untagged) from enums

Author: zeitgeist

gen/schemas/shipment-footprint.json

@@ -129,40 +129,19 @@
       "type": "string"
     },
     "Incoterms": {
-      "anyOf": [
-        {
-          "type": "null"
-        },
-        {
-          "type": "null"
-        },
-        {
-          "type": "null"
-        },
-        {
-          "type": "null"
-        },
-        {
-          "type": "null"
-        },
-        {
-          "type": "null"
-        },
-        {
-          "type": "null"
-        },
-        {
-          "type": "null"
-        },
-        {
-          "type": "null"
-        },
-        {
-          "type": "null"
-        },
-        {
-          "type": "null"
-        }
+      "type": "string",
+      "enum": [
+        "EXW",
+        "FCA",
+        "CPT",
+        "CIP",
+        "DAP",
+        "DPU",
+        "DDP",
+        "FAS",
+        "FOB",
+        "CFR",
+        "CIF"
       ]
     },
     "Location": {

gen/schemas/toc.json

@@ -108,13 +108,10 @@
   },
   "definitions": {
     "AirShippingOption": {
-      "anyOf": [
-        {
-          "type": "null"
-        },
-        {
-          "type": "null"
-        }
+      "type": "string",
+      "enum": [
+        "belly freight",
+        "freighter"
       ]
     },
     "Decimal": {
@@ -217,13 +214,10 @@
       ]
     },
     "FlightLength": {
-      "anyOf": [
-        {
-          "type": "null"
-        },
-        {
-          "type": "null"
-        }
+      "type": "string",
+      "enum": [
+        "short-haul",
+        "long-haul"
       ]
     },
     "GlecDataQualityIndex": {

gen/src/lib.rs

@@ -71,7 +71,7 @@ pub struct Tce {
 }
 
 #[derive(Debug, Serialize, Deserialize, Clone, JsonSchema, PartialEq)]
-#[serde(untagged, rename_all = "UPPERCASE")]
+#[serde(rename_all = "UPPERCASE")]
 pub enum Incoterms {
     Exw,
     Fca,
@@ -141,15 +141,15 @@ pub enum TruckLoadingSequence {
 }
 
 #[derive(Debug, Serialize, Deserialize, JsonSchema, PartialEq, Clone)]
-#[serde(rename_all = "camelCase", untagged)]
+#[serde(rename_all = "camelCase")]
 pub enum AirShippingOption {
     #[serde(rename = "belly freight")]
     BellyFreight,
     Freighter,
 }
 
 #[derive(Debug, Serialize, Deserialize, JsonSchema, PartialEq, Clone)]
-#[serde(rename_all = "camelCase", untagged)]
+#[serde(rename_all = "camelCase")]
 pub enum FlightLength {
     #[serde(rename = "short-haul")]
     ShortHaul,