merge develop and resolve conflicts

packages/medusa-core-utils/src/validator.js

@@ -96,4 +96,33 @@ Joi.orderFilter = () => {
   })
 }
 
+Joi.productFilter = () => {
+  return Joi.object().keys({
+    id: Joi.string(),
+    q: Joi.string().allow(null, ""),
+    status: Joi.array()
+      .items(Joi.string().valid("proposed", "draft", "published", "rejected"))
+      .single(),
+    collection_id: Joi.array()
+      .items(Joi.string())
+      .single(),
+    tags: Joi.array()
+      .items(Joi.string())
+      .single(),
+    title: Joi.string(),
+    description: Joi.string(),
+    handle: Joi.string(),
+    is_giftcard: Joi.string(),
+    type: Joi.string(),
+    offset: Joi.string(),
+    limit: Joi.string(),
+    expand: Joi.string(),
+    fields: Joi.string(),
+    order: Joi.string().optional(),
+    created_at: Joi.dateFilter(),
+    updated_at: Joi.dateFilter(),
+    deleted_at: Joi.dateFilter(),
+  })
+}
+
 export default Joi