Forráskód Böngészése

Update FDC DataType models.

Thomas Flucke 2 éve
szülő
commit
2ab8ac7cb6

+ 2 - 0
fdc/shared/src/main/scala/gov/usda/nal/fdc/models/DataType.scala

@@ -7,6 +7,7 @@ object DataType extends Enumeration {
   val Foundation = Value
   val Survey = Value("Survey (FNDDS)")
   val SRLegacy = Value("SR Legacy")
+  // val Experimental = Value
 
   import play.api.libs.json.{Reads,Writes}
 
@@ -22,6 +23,7 @@ object FullDataType extends Enumeration {
   val Survey = Value("Survey (FNDDS)")
   val SRLegacy = Value("SR Legacy")
   val Sample = Value
+  // val Experimental = Value
 
   import play.api.libs.json.{Reads,Writes}
 

+ 2 - 1
fdc/shared/src/main/scala/gov/usda/nal/fdc/models/FoodSearchCriteria.scala

@@ -2,10 +2,11 @@ package gov.usda.nal.fdc.models
 
 import gov.usda.nal.fdc.models.SortCriteria.SortCriteria
 import gov.usda.nal.fdc.models.SortOrder.SortOrder
+import gov.usda.nal.fdc.models.DataType.DataType
 
 case class FoodSearchCriteria(
   val query: String,
-  //val dataType: Seq[DataType] = Nil,
+  val dataType: Seq[DataType] = Nil,
   val brandOwner: Option[String] = None,
   val pageSize: Option[Short] = None,
   val pageNumber: Option[Long] = None,