Move labtests to MaterialsData (from ProductContent)

dymecard · Oct 16, 2021 · dbb47b3 · dbb47b3
1 parent 8675b46
commit dbb47b3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/opencannabis/content/BUILD.bazel b/opencannabis/content/BUILD.bazel
@@ -39,6 +39,7 @@ proto(
         "//opencannabis/structs:Shelf",
         "//opencannabis/structs:Species",
         "//opencannabis/structs:Genetics",
+        "//opencannabis/labtesting:TestResults",
         "//opencannabis/products/distribution:DistributionChannel"
     ],
 )
@@ -66,7 +67,6 @@ proto(
         "//opencannabis/structs:ProductFlags",
         "//opencannabis/temporal:Instant",
         "//opencannabis/structs/pricing:PricingDescriptor",
-        "//opencannabis/labtesting:TestResults",
         "//opencannabis/core:Datamodel"
     ],
 )

diff --git a/opencannabis/content/MaterialsData.proto b/opencannabis/content/MaterialsData.proto
@@ -19,6 +19,8 @@ import "opencannabis/structs/Shelf.proto";
 import "opencannabis/structs/Species.proto";
 import "opencannabis/structs/Genetics.proto";
 
+import "opencannabis/labtesting/TestResults.proto";
+
 import "opencannabis/products/distribution/DistributionChannel.proto";
 
 
@@ -148,4 +150,7 @@ message MaterialsData {
 
   // Describes subjective test results, including tasting notes, feelings, etc.
   SubjectiveTesting subjective_tests = 6;
+
+  // Quantitative/qualitative tests performed by a certified lab.
+  opencannabis.labtesting.TestResults lab_tests = 7;
 }
diff --git a/opencannabis/content/ProductContent.proto b/opencannabis/content/ProductContent.proto
@@ -23,7 +23,6 @@ import "opencannabis/temporal/Instant.proto";
 import "opencannabis/media/MediaKey.proto";
 
 import "opencannabis/structs/ProductFlags.proto";
-import "opencannabis/labtesting/TestResults.proto";
 import "opencannabis/structs/pricing/PricingDescriptor.proto";
 
 
@@ -70,12 +69,9 @@ message ProductContent {
   // Pricing specification for this product, regardless of pricing type (i.e. weighted or unit-style pricing).
   opencannabis.structs.pricing.ProductPricing pricing = 7;
 
-  // Lab testing information concerning this product.
-  opencannabis.labtesting.TestResults tests = 8;
-
   // Product flags attached to this content.
-  repeated opencannabis.structs.ProductFlag flags = 9;
+  repeated opencannabis.structs.ProductFlag flags = 8;
 
   // Timestamps for this product.
-  ProductTimestamps ts = 10;
+  ProductTimestamps ts = 99;
 }