asyavee/medusa-store
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix: allows shipping option filters in return (#202)

Browse Source 
* fix: allows shipping option filters in return

* fix: test

* chore: update fixtures

* docs: update openapi
This commit is contained in:
Sebastian Rindom
2021-03-12 14:23:03 +01:00
committed by GitHub
parent dd7b306333
commit 7c7f86e8e8
12 changed files with 864 additions and 973 deletions
Download Patch File Download Diff File Expand all files Collapse all files

134
integration-tests/api/__tests__/store/shipping-options.js Normal file
View File

@@ -0,0 +1,134 @@
const { dropDatabase } = require("pg-god");
const path = require("path");
const { Region, ShippingProfile, ShippingOption } = require("@medusajs/medusa");
const setupServer = require("../../../helpers/setup-server");
const { useApi } = require("../../../helpers/use-api");
const { initDb } = require("../../../helpers/use-db");
jest.setTimeout(30000);
describe("/store/shipping-options", () => {
let medusaProcess;
let dbConnection;
beforeAll(async () => {
const cwd = path.resolve(path.join(__dirname, "..", ".."));
dbConnection = await initDb({ cwd });
medusaProcess = await setupServer({ cwd });
});
afterAll(async () => {
dbConnection.close();
await dropDatabase({ databaseName: "medusa-integration" });
medusaProcess.kill();
});
describe("POST /store/shipping-options", () => {
beforeEach(async () => {
const manager = dbConnection.manager;
await manager.query(
`ALTER SEQUENCE order_display_id_seq RESTART WITH 111`
);
await manager.insert(Region, {
id: "region",
name: "Test Region",
currency_code: "usd",
tax_rate: 0,
});
await manager.insert(Region, {
id: "region2",
name: "Test Region 2",
currency_code: "usd",
tax_rate: 0,
});
const defaultProfile = await manager.findOne(ShippingProfile, {
type: "default",
});
await manager.insert(ShippingOption, {
id: "test-out",
name: "Test out",
profile_id: defaultProfile.id,
region_id: "region",
provider_id: "test-ful",
data: {},
price_type: "flat_rate",
amount: 2000,
is_return: false,
});
await manager.insert(ShippingOption, {
id: "test-return",
name: "Test ret",
profile_id: defaultProfile.id,
region_id: "region",
provider_id: "test-ful",
data: {},
price_type: "flat_rate",
amount: 1000,
is_return: true,
});
await manager.insert(ShippingOption, {
id: "test-region2",
name: "Test region 2",
profile_id: defaultProfile.id,
region_id: "region2",
provider_id: "test-ful",
data: {},
price_type: "flat_rate",
amount: 1000,
is_return: false,
});
});
afterEach(async () => {
const manager = dbConnection.manager;
await manager.query(`DELETE FROM "shipping_option"`);
await manager.query(`DELETE FROM "region"`);
});
it("retrieves all shipping options", async () => {
const api = useApi();
const response = await api.get("/store/shipping-options").catch((err) => {
return err.response;
});
expect(response.status).toEqual(200);
expect(response.data.shipping_options.length).toEqual(3);
});
it("creates a return with shipping method", async () => {
const api = useApi();
const response = await api
.get("/store/shipping-options?is_return=true")
.catch((err) => {
return err.response;
});
expect(response.status).toEqual(200);
expect(response.data.shipping_options.length).toEqual(1);
expect(response.data.shipping_options[0].id).toEqual("test-return");
});
it("creates a return with shipping method", async () => {
const api = useApi();
const response = await api
.get("/store/shipping-options?region_id=region2")
.catch((err) => {
return err.response;
});
expect(response.status).toEqual(200);
expect(response.data.shipping_options.length).toEqual(1);
expect(response.data.shipping_options[0].id).toEqual("test-region2");
});
});
});

6
integration-tests/api/package.json
View File

@@ -8,15 +8,15 @@
"build": "babel src -d dist --extensions \".ts,.js\""
},
"dependencies": {
"@medusajs/medusa": "1.1.11-dev-1615544779907",
"medusa-interfaces": "1.1.1-dev-1615544779907",
"@medusajs/medusa": "1.1.11-dev-1615546159319",
"medusa-interfaces": "1.1.1-dev-1615546159319",
"typeorm": "^0.2.31"
},
"devDependencies": {
"@babel/cli": "^7.12.10",
"@babel/core": "^7.12.10",
"@babel/node": "^7.12.10",
"babel-preset-medusa-package": "1.1.0-dev-1615544779907",
"babel-preset-medusa-package": "1.1.0-dev-1615546159319",
"jest": "^26.6.3"
}
}

48
integration-tests/api/yarn.lock
View File

@@ -1369,10 +1369,10 @@
"@types/yargs" "^15.0.0"
chalk "^4.0.0"
"@medusajs/medusa@1.1.11-dev-1615544779907":
version "1.1.11-dev-1615544779907"
resolved "http://localhost:4873/@medusajs%2fmedusa/-/medusa-1.1.11-dev-1615544779907.tgz#0c8e51d9d23c6825380b0fac5428298178441fce"
integrity sha512-LIgWdzNjszEUVqQrGqJxsqs7mG3FDRhJvxopQNCKEy3+zb//u0soXdr8erydIuIk5a4sHQNu874BhrV1MsWODQ==
"@medusajs/medusa@1.1.11-dev-1615546159319":
version "1.1.11-dev-1615546159319"
resolved "http://localhost:4873/@medusajs%2fmedusa/-/medusa-1.1.11-dev-1615546159319.tgz#88d494cd9f765d69cfa8450aad1c459e3f358c2c"
integrity sha512-0REuafQjwykR6zbjjuIq151S3nLWdHBIFcy7fzKcR7Yhs2XkHMDFToUD01/uY2d/GqmKGvn/HsDLPx2a7Sj4SQ==
dependencies:
"@babel/plugin-transform-classes" "^7.9.5"
"@hapi/joi" "^16.1.8"
@@ -1394,8 +1394,8 @@
joi "^17.3.0"
joi-objectid "^3.0.1"
jsonwebtoken "^8.5.1"
medusa-core-utils "1.1.0-dev-1615544779907"
medusa-test-utils "1.1.3-dev-1615544779907"
medusa-core-utils "1.1.0-dev-1615546159319"
medusa-test-utils "1.1.3-dev-1615546159319"
morgan "^1.9.1"
multer "^1.4.2"
passport "^0.4.0"
@@ -1884,10 +1884,10 @@ babel-preset-jest@^26.6.2:
babel-plugin-jest-hoist "^26.6.2"
babel-preset-current-node-syntax "^1.0.0"
babel-preset-medusa-package@1.1.0-dev-1615544779907:
version "1.1.0-dev-1615544779907"
resolved "http://localhost:4873/babel-preset-medusa-package/-/babel-preset-medusa-package-1.1.0-dev-1615544779907.tgz#81e49a5a3109447ceae7b115da45ed979b88e1ef"
integrity sha512-CZA2poMKpYusH+97J+WQ3SQh6JbIGF41BCVVhvVft/QnioRBka+IYr6E+9rntha+jYPVeHSDxvPOGrpcfQwWsA==
babel-preset-medusa-package@1.1.0-dev-1615546159319:
version "1.1.0-dev-1615546159319"
resolved "http://localhost:4873/babel-preset-medusa-package/-/babel-preset-medusa-package-1.1.0-dev-1615546159319.tgz#eaaa8908d9b04487cbfbd90cd5422c8ade611506"
integrity sha512-IS60RphbSYg+PQA5ywdjba2eL+pyHaHAUm93658fAMezSKnRaDEvtle42DK63EifQC35K1pQc0j7YUbgg8ZODg==
dependencies:
"@babel/plugin-proposal-class-properties" "^7.12.1"
"@babel/plugin-proposal-decorators" "^7.12.1"
@@ -4493,28 +4493,28 @@ media-typer@0.3.0:
resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
medusa-core-utils@1.1.0-dev-1615544779907:
version "1.1.0-dev-1615544779907"
resolved "http://localhost:4873/medusa-core-utils/-/medusa-core-utils-1.1.0-dev-1615544779907.tgz#6f91b2dba621ca53f410091b9ce4bcd08983f9a6"
integrity sha512-+X/UCUEC/15xZ0kpp0oLJI0yA/7mAS2sV/QViAiPIyDb+YF+YjaFZEvNtc/aKjNeX4RlGgiD8B6RW/J4b8T6IQ==
medusa-core-utils@1.1.0-dev-1615546159319:
version "1.1.0-dev-1615546159319"
resolved "http://localhost:4873/medusa-core-utils/-/medusa-core-utils-1.1.0-dev-1615546159319.tgz#34147e32463b002c51b815f7329e88881a0fbec2"
integrity sha512-t/QeZmHaFdBmn1wC+StZDq+tJescILybCSNIOFLSUlOaUaOPGwZ0UhYN/MNeMrBwAoQq9ZO5QjJsNNbQK33gWA==
dependencies:
joi "^17.3.0"
joi-objectid "^3.0.1"
medusa-interfaces@1.1.1-dev-1615544779907:
version "1.1.1-dev-1615544779907"
resolved "http://localhost:4873/medusa-interfaces/-/medusa-interfaces-1.1.1-dev-1615544779907.tgz#833be0be4682bb3fcf07e3b6b03d68cfd6c44f7d"
integrity sha512-xKsL7BSFnVcKwpt90Irv6qnmR7h0Q6nmkpfcKOzZ9PBbWeQwO9aavrFK71zzMiYxmyqwE4bboT4QyRD4qVxaGw==
medusa-interfaces@1.1.1-dev-1615546159319:
version "1.1.1-dev-1615546159319"
resolved "http://localhost:4873/medusa-interfaces/-/medusa-interfaces-1.1.1-dev-1615546159319.tgz#a75e2841a9c68b26bc688706d59fccfd655c8f41"
integrity sha512-BqE+ARKvJgmLHABuAGfCSquNa1XPF8+ll/dB6XMMjPAPzlGF9kV/GhQIsjq8fzoZ8ZvrLBD0ak5ndOK/BH/NEA==
dependencies:
medusa-core-utils "1.1.0-dev-1615544779907"
medusa-core-utils "1.1.0-dev-1615546159319"
medusa-test-utils@1.1.3-dev-1615544779907:
version "1.1.3-dev-1615544779907"
resolved "http://localhost:4873/medusa-test-utils/-/medusa-test-utils-1.1.3-dev-1615544779907.tgz#39e3c38298eb2100be1e21466d5715b0e068850e"
integrity sha512-OAcJ/tG9Lq3g1ITwhMen54+rYQupq0TXYZCACcKuCRJF6IiROU+wXA51yIcvQLxGv7yzmOzAblS/giMkmAyZkQ==
medusa-test-utils@1.1.3-dev-1615546159319:
version "1.1.3-dev-1615546159319"
resolved "http://localhost:4873/medusa-test-utils/-/medusa-test-utils-1.1.3-dev-1615546159319.tgz#912b4bf83e03c247bc189ebc315c9db4200f3a71"
integrity sha512-hW8xwrf52a5PAzZDL/kOk9Mlv4Jdpgfx+IPUz/F2D3D8ky3OwikwonXKvPvaRC5JaCdjI/xipPaSWUkJeb1dzg==
dependencies:
"@babel/plugin-transform-classes" "^7.9.5"
medusa-core-utils "1.1.0-dev-1615544779907"
medusa-core-utils "1.1.0-dev-1615546159319"
randomatic "^3.1.1"
merge-descriptors@1.0.1: