Merge pull request #3 from kaiiam/dev1

Dev1
kaiiam · Sep 7, 2023 · ffb3af4 · ffb3af4
2 parents c629d4a + 6164cfc
commit ffb3af4
Show file tree

Hide file tree

Showing 14 changed files with 1,401 additions and 524 deletions.
diff --git a/examples/Food-001.yaml b/examples/Food-001.yaml
@@ -1,6 +1,7 @@
 # Example data object
 ---
-id: example:Food001
-name: foo bar
-primary_email: foo.bar@example.com
-age_in_years: 33
+foods:
+- id: FDC:167512
+  primary_food_type: FOOD:11109
+  primary_food_type_label: Cabbage, raw
+  food_preparation_state: raw
diff --git a/project/excel/mifc.xlsx b/project/excel/mifc.xlsx
diff --git a/project/graphql/mifc.graphql b/project/graphql/mifc.graphql
@@ -1,23 +1,39 @@
-type Food
+type Component
   {
-    id: Uriorcurie!
-    name: String
-    description: String
-    primaryEmail: String
-    birthDate: Date
-    ageInYears: Integer
-    vitalStatus: PersonStatus
+    id: String!
+    measuredCompound: String
+    measuredCompoundValue: Float
+    measuredCompoundUnit: String
+    measuredCompoundDenominatorValue: Float
+    measuredCompoundDenominatorUnit: String
+    measuredCompoundDataPointsNumber: Integer
+    measuredCompoundRecordDate: String
+    measuredCompoundComment: String
+    measuredCompoundDerivationType: String
+    laboratorySampleAggregationMinimumMeasuredCompoundValue: Float
+    laboratorySampleAggregationMaximumMeasuredCompoundValue: Float
+    laboratorySampleAggregationMedianMeasuredCompoundValue: Float
+    laboratorySampleAggregationMeasuredCompoundStandardDeviation: Float
+    analyticalAnalysisMeasurementProtocolDoi: String
+    analyticalAnalysisMeasurementMethod: AnalyticalMeasurementMethod
   }
 
-type FoodCollection
+type Container
+  {
+    foods: [Food]
+    components: [Component]
+  }
+
+type Food
   {
-    entries: [Food]
+    id: String!
+    primaryFoodType: String
+    primaryFoodTypeLabel: String
+    foodPreparationState: FoodPreparationState
   }
 
-type NamedThing
+interface NamedThing
   {
-    id: Uriorcurie!
-    name: String
-    description: String
+    id: String!
   }
 
diff --git a/project/jsonld/mifc.context.jsonld b/project/jsonld/mifc.context.jsonld
@@ -1,10 +1,11 @@
 {
    "comments": {
       "description": "Auto generated by LinkML jsonld context generator",
-      "generation_date": "2023-03-29T11:11:00",
+      "generation_date": "2023-09-07T17:35:11",
       "source": "mifc.yaml"
    },
    "@context": {
+      "FDC": "https://fdc.nal.usda.gov/",
       "PATO": {
          "@id": "http://purl.obolibrary.org/obo/PATO_",
          "@prefix": true
@@ -16,36 +17,58 @@
       "schema": "http://schema.org/",
       "skos": "http://www.w3.org/2004/02/skos/core#",
       "@vocab": "https://w3id.org/kaiiam/mifc/",
-      "age_in_years": {
-         "@type": "xsd:integer"
-      },
-      "birth_date": {
-         "@type": "xsd:date",
-         "@id": "schema:birthDate"
-      },
-      "description": {
-         "@id": "schema:description"
+      "analytical_analysis_measurement_method": {
+         "@context": {
+            "@vocab": "@null",
+            "text": "skos:notation",
+            "description": "skos:prefLabel",
+            "meaning": "@id"
+         }
       },
-      "entries": {
+      "components": {
          "@type": "@id"
       },
-      "id": "@id",
-      "name": {
-         "@id": "schema:name"
-      },
-      "primary_email": {
-         "@id": "schema:email"
+      "foods": {
+         "@type": "@id"
       },
-      "vital_status": {
+      "food_preparation_state": {
          "@context": {
             "@vocab": "@null",
             "text": "skos:notation",
             "description": "skos:prefLabel",
             "meaning": "@id"
          }
       },
-      "NamedThing": {
-         "@id": "schema:Thing"
+      "id": "@id",
+      "laboratory_sample_aggregation_maximum_measured_compound_value": {
+         "@type": "xsd:float"
+      },
+      "laboratory_sample_aggregation_measured_compound_standard_deviation": {
+         "@type": "xsd:float"
+      },
+      "laboratory_sample_aggregation_median_measured_compound_value": {
+         "@type": "xsd:float"
+      },
+      "laboratory_sample_aggregation_minimum_measured_compound_value": {
+         "@type": "xsd:float"
+      },
+      "measured_compound_data_points_number": {
+         "@type": "xsd:integer"
+      },
+      "measured_compound_denominator_value": {
+         "@type": "xsd:float"
+      },
+      "measured_compound_value": {
+         "@type": "xsd:float"
+      },
+      "primary_food_type": {
+         "@id": "schema:name"
+      },
+      "Component": {
+         "@id": "schema:Component"
+      },
+      "Food": {
+         "@id": "schema:Food"
       }
    }
 }