Merge branch 'develop' into fix/avoid-dev-cli-auth

medusajs · Oct 11, 2022 · 5764ada · 5764ada
2 parents 6d3bf21 + c717442
commit 5764ada
Show file tree

Hide file tree

Showing 22 changed files with 455 additions and 188 deletions.
diff --git a/.changeset/brown-cups-draw.md b/.changeset/brown-cups-draw.md
@@ -0,0 +1,5 @@
+---
+"@medusajs/medusa": patch
+---
+
+feat(medusa): Allow to filter collections by discount condition id
diff --git a/.changeset/perfect-beers-notice.md b/.changeset/perfect-beers-notice.md
@@ -0,0 +1,5 @@
+---
+"@medusajs/medusa": patch
+---
+
+feat(medusa): Allow to query product tags by condition id
diff --git a/integration-tests/api/__tests__/admin/__snapshots__/product-tag.js.snap b/integration-tests/api/__tests__/admin/__snapshots__/product-tag.js.snap
@@ -4,9 +4,9 @@ exports[`/admin/product-tags GET /admin/product-tags returns a list of product t
 Array [
   Object {
     "created_at": Any<String>,
-    "id": "tag1",
+    "id": "tag4",
     "updated_at": Any<String>,
-    "value": "123",
+    "value": "1234",
   },
   Object {
     "created_at": Any<String>,
@@ -16,9 +16,9 @@ Array [
   },
   Object {
     "created_at": Any<String>,
-    "id": "tag4",
+    "id": "tag1",
     "updated_at": Any<String>,
-    "value": "1234",
+    "value": "123",
   },
 ]
 `;
@@ -27,9 +27,9 @@ exports[`/admin/product-tags GET /admin/product-tags returns a list of product t
 Array [
   Object {
     "created_at": Any<String>,
-    "id": "tag1",
+    "id": "tag4",
     "updated_at": Any<String>,
-    "value": "123",
+    "value": "1234",
   },
   Object {
     "created_at": Any<String>,
@@ -39,9 +39,9 @@ Array [
   },
   Object {
     "created_at": Any<String>,
-    "id": "tag4",
+    "id": "tag1",
     "updated_at": Any<String>,
-    "value": "1234",
+    "value": "123",
   },
 ]
 `;
diff --git a/integration-tests/api/__tests__/admin/colllections.js b/integration-tests/api/__tests__/admin/colllections.js
@@ -5,8 +5,23 @@ const { initDb, useDb } = require("../../../helpers/use-db")
 
 const productSeeder = require("../../helpers/product-seeder")
 const adminSeeder = require("../../helpers/admin-seeder")
+const {
+  DiscountRuleType,
+  AllocationType,
+  DiscountConditionType,
+  DiscountConditionOperator,
+} = require("@medusajs/medusa")
+const { IdMap } = require("medusa-test-utils")
+const { simpleDiscountFactory } = require("../../factories")
 
 jest.setTimeout(30000)
+
+const adminReqConfig = {
+  headers: {
+    Authorization: "Bearer test_token",
+  },
+}
+
 describe("/admin/collections", () => {
   let medusaProcess
   let dbConnection
@@ -334,5 +349,82 @@ describe("/admin/collections", () => {
         offset: 0,
       })
     })
+
+    it("returns a list of collections filtered by discount condition id", async () => {
+      const api = useApi()
+
+      const resCollections = await api.get("/admin/collections", adminReqConfig)
+
+      const collection1 = resCollections.data.collections[0]
+      const collection2 = resCollections.data.collections[1]
+
+      const buildDiscountData = (code, conditionId, collections) => {
+        return {
+          code,
+          rule: {
+            type: DiscountRuleType.PERCENTAGE,
+            value: 10,
+            allocation: AllocationType.TOTAL,
+            conditions: [
+              {
+                id: conditionId,
+                type: DiscountConditionType.PRODUCT_COLLECTIONS,
+                operator: DiscountConditionOperator.IN,
+                product_collections: collections,
+              },
+            ],
+          },
+        }
+      }
+
+      const discountConditionId = IdMap.getId("discount-condition-type-1")
+      await simpleDiscountFactory(
+        dbConnection,
+        buildDiscountData("code-1", discountConditionId, [collection1.id])
+      )
+
+      const discountConditionId2 = IdMap.getId("discount-condition-type-2")
+      await simpleDiscountFactory(
+        dbConnection,
+        buildDiscountData("code-2", discountConditionId2, [collection2.id])
+      )
+
+      let res = await api.get(
+        `/admin/collections?discount_condition_id=${discountConditionId}`,
+        adminReqConfig
+      )
+
+      expect(res.status).toEqual(200)
+      expect(res.data.collections).toHaveLength(1)
+      expect(res.data.collections).toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({ id: collection1.id }),
+        ])
+      )
+
+      res = await api.get(
+        `/admin/collections?discount_condition_id=${discountConditionId2}`,
+        adminReqConfig
+      )
+
+      expect(res.status).toEqual(200)
+      expect(res.data.collections).toHaveLength(1)
+      expect(res.data.collections).toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({ id: collection2.id }),
+        ])
+      )
+
+      res = await api.get(`/admin/collections`, adminReqConfig)
+
+      expect(res.status).toEqual(200)
+      expect(res.data.collections).toHaveLength(3)
+      expect(res.data.collections).toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({ id: collection1.id }),
+          expect.objectContaining({ id: collection2.id }),
+        ])
+      )
+    })
   })
 })
diff --git a/integration-tests/api/__tests__/admin/product-tag.js b/integration-tests/api/__tests__/admin/product-tag.js
@@ -1,14 +1,28 @@
 const path = require("path")
 
+const { IdMap } = require("medusa-test-utils")
+
 const setupServer = require("../../../helpers/setup-server")
 const { useApi } = require("../../../helpers/use-api")
 const { initDb, useDb } = require("../../../helpers/use-db")
 
 const adminSeeder = require("../../helpers/admin-seeder")
 const productSeeder = require("../../helpers/product-seeder")
+const {
+  DiscountConditionType,
+  DiscountConditionOperator,
+} = require("@medusajs/medusa")
+const { simpleDiscountFactory } = require("../../factories")
+const { DiscountRuleType, AllocationType } = require("@medusajs/medusa/dist")
 
 jest.setTimeout(50000)
 
+const adminReqConfig = {
+  headers: {
+    Authorization: "Bearer test_token",
+  },
+}
+
 describe("/admin/product-tags", () => {
   let medusaProcess
   let dbConnection
@@ -28,8 +42,8 @@ describe("/admin/product-tags", () => {
 
   describe("GET /admin/product-tags", () => {
     beforeEach(async () => {
-      await productSeeder(dbConnection)
       await adminSeeder(dbConnection)
+      await productSeeder(dbConnection)
     })
 
     afterEach(async () => {
@@ -41,11 +55,7 @@ describe("/admin/product-tags", () => {
       const api = useApi()
 
       const res = await api
-        .get("/admin/product-tags", {
-          headers: {
-            Authorization: "Bearer test_token",
-          },
-        })
+        .get("/admin/product-tags", adminReqConfig)
         .catch((err) => {
           console.log(err)
         })
@@ -68,11 +78,7 @@ describe("/admin/product-tags", () => {
       const api = useApi()
 
       const res = await api
-        .get("/admin/product-tags?q=123", {
-          headers: {
-            Authorization: "Bearer test_token",
-          },
-        })
+        .get("/admin/product-tags?q=123", adminReqConfig)
         .catch((err) => {
           console.log(err)
         })
@@ -95,5 +101,78 @@ describe("/admin/product-tags", () => {
         tagMatch,
       ])
     })
+
+    it("returns a list of product tags filtered by discount condition id", async () => {
+      const api = useApi()
+
+      const resTags = await api.get("/admin/product-tags", adminReqConfig)
+
+      const tag1 = resTags.data.product_tags[0]
+      const tag2 = resTags.data.product_tags[2]
+
+      const buildDiscountData = (code, conditionId, tags) => {
+        return {
+          code,
+          rule: {
+            type: DiscountRuleType.PERCENTAGE,
+            value: 10,
+            allocation: AllocationType.TOTAL,
+            conditions: [
+              {
+                id: conditionId,
+                type: DiscountConditionType.PRODUCT_TAGS,
+                operator: DiscountConditionOperator.IN,
+                product_tags: tags,
+              },
+            ],
+          },
+        }
+      }
+
+      const discountConditionId = IdMap.getId("discount-condition-tag-1")
+      await simpleDiscountFactory(
+        dbConnection,
+        buildDiscountData("code-1", discountConditionId, [tag1.id])
+      )
+
+      const discountConditionId2 = IdMap.getId("discount-condition-tag-2")
+      await simpleDiscountFactory(
+        dbConnection,
+        buildDiscountData("code-2", discountConditionId2, [tag2.id])
+      )
+
+      let res = await api.get(
+        `/admin/product-tags?discount_condition_id=${discountConditionId}`,
+        adminReqConfig
+      )
+
+      expect(res.status).toEqual(200)
+      expect(res.data.product_tags).toHaveLength(1)
+      expect(res.data.product_tags).toEqual(
+        expect.arrayContaining([expect.objectContaining({ id: tag1.id })])
+      )
+
+      res = await api.get(
+        `/admin/product-tags?discount_condition_id=${discountConditionId2}`,
+        adminReqConfig
+      )
+
+      expect(res.status).toEqual(200)
+      expect(res.data.product_tags).toHaveLength(1)
+      expect(res.data.product_tags).toEqual(
+        expect.arrayContaining([expect.objectContaining({ id: tag2.id })])
+      )
+
+      res = await api.get(`/admin/product-tags`, adminReqConfig)
+
+      expect(res.status).toEqual(200)
+      expect(res.data.product_tags).toHaveLength(3)
+      expect(res.data.product_tags).toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({ id: tag1.id }),
+          expect.objectContaining({ id: tag2.id }),
+        ])
+      )
+    })
   })
 })
diff --git a/integration-tests/api/__tests__/store/__snapshots__/collections.js.snap b/integration-tests/api/__tests__/store/__snapshots__/collections.js.snap
@@ -6,10 +6,10 @@ Object {
     Object {
       "created_at": Any<String>,
       "deleted_at": null,
-      "handle": "test-collection",
-      "id": "test-collection",
+      "handle": "test-collection2",
+      "id": "test-collection2",
       "metadata": null,
-      "title": "Test collection",
+      "title": "Test collection 2",
       "updated_at": Any<String>,
     },
     Object {
@@ -24,10 +24,10 @@ Object {
     Object {
       "created_at": Any<String>,
       "deleted_at": null,
-      "handle": "test-collection2",
-      "id": "test-collection2",
+      "handle": "test-collection",
+      "id": "test-collection",
       "metadata": null,
-      "title": "Test collection 2",
+      "title": "Test collection",
       "updated_at": Any<String>,
     },
   ],

diff --git a/integration-tests/api/__tests__/store/collections.js b/integration-tests/api/__tests__/store/collections.js
@@ -66,7 +66,7 @@ describe("/store/collections", () => {
       expect(response.data).toMatchSnapshot({
         collections: [
           {
-            id: "test-collection",
+            id: "test-collection2",
             created_at: expect.any(String),
             updated_at: expect.any(String),
           },
@@ -76,7 +76,7 @@ describe("/store/collections", () => {
             updated_at: expect.any(String),
           },
           {
-            id: "test-collection2",
+            id: "test-collection",
             created_at: expect.any(String),
             updated_at: expect.any(String),
           },