* feat(medusa): Implement confirm batch job end point * feat(medusa): Implement confirm batch-job end point * feat(medusa): Add create batch job end point and implementation * feat(medusa): remove cancelled related * feat(medusa): Remove unrelated content for batch job creation * feat(medusa): Cleanup migration * feat(medusa): Cleanup context * fix(medusa): Batch-job service import * feat(medusa): Update migration * test(medusa): Fix batch job tests * feat(medusa): Start batch job end point * feat(medusa): Continue end points * feat(medusa): Continue end points * feat(medusa): Finalize batch-job end points * style(medusa): Lint * feat(medusa): Cleanup * feat(medusa): Fix list-batch-job endpoint column selection * feat(medusa): Batch-job feedback * feat(medusa): Update create-batch-job endpoint doc * test(integration-tests): Fix batch-job integration reguarding the response status code * feat(medusa): Finalize rebase from develop * feat(medusa): Extend batch job status with ready_at and failed_at * feat(medusa): Update migration and tests accordingly * feat(medusa): Update status order on batchJob * feat(medusa): Enhance batchJobService status update * style(medusa): Cleanup * style(medusa): Typo * style(medusa): Remove unnecessary comment * cleanup(medusa): Address feedback * test(integration-tests): Update naming and snapshots * fix(medusa): Update validator Co-authored-by: Philip Korsholm <88927411+pKorsholm@users.noreply.github.com> * Fix(medusa): update validator Co-authored-by: Philip Korsholm <88927411+pKorsholm@users.noreply.github.com> * test(intergration-tests): Fix creates batch job * test(integration-tests): Fix snapshot * feat(medusa): Re-work status * tests(integration-tests): Fix batch job * feat(medusa): Addresses feedback * fix(medusa): Revert package.json script * feat(medusa/batch-job-api): Improve status management * feat(medusa): Improve batch job status and remove some context validation from the service * feat(medusa): BatchJob api merge params * feat(medusa): Apply last changes on the batch job service * Update packages/medusa/src/services/batch-job.ts Co-authored-by: Oliver Windall Juhl <59018053+olivermrbl@users.noreply.github.com> * feat(medusa): BatchJobStrategy and loaders (#1434) * add batch job strategy interface * update plugin loaders * remove comment * make map async * ensure that only one of each strategy is registered * register strategies plural * add identifier and batchType properties * extend batch job strategy identification method * initial test * update loaders to accomodate different ways of accessing batch job strategies * identifier batch type field * redo merge in plugins * update interface and load only js files * use switches instead of elif * remove comments * use static properties for strategy registration * update tests * fix unit tests * update test names * update isBatchJobStrategy method * add check for TransactionBaseService in services for plugins * update interfaces export * update batchjob strategy interface with a prepare script * update loaders * update batchjob strategy interface * remove everything but public interface methods from batchJobStrategy * add default implementation to prepareBathJobForProcessing * remove unused import * docs: Add Services reference (#1548) * added events reference * add upgrade guide for 1.3.0 * Update 1-3-0.md * merge 1.3.0 with 1.3.1 * rename to 1.3.0 * added paypal documentation * Improve storefront quickstart documents * chore(deps): bump sqlite3 from 5.0.2 to 5.0.3 (#1453) Bumps [sqlite3](https://github.com/TryGhost/node-sqlite3) from 5.0.2 to 5.0.3. - [Release notes](https://github.com/TryGhost/node-sqlite3/releases) - [Changelog](https://github.com/TryGhost/node-sqlite3/blob/master/CHANGELOG.md) - [Commits](https://github.com/TryGhost/node-sqlite3/compare/v5.0.2...v5.0.3) * fix: Issue with cache in CI pipeline Co-authored-by: Philip Korsholm <88927411+pKorsholm@users.noreply.github.com> Co-authored-by: Oliver Windall Juhl <59018053+olivermrbl@users.noreply.github.com> Co-authored-by: Shahed Nasser <shahednasser@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
285 lines
7.3 KiB
JavaScript
285 lines
7.3 KiB
JavaScript
const path = require("path")
|
|
|
|
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 userSeeder = require("../../helpers/user-seeder")
|
|
|
|
const { simpleBatchJobFactory } = require("../../factories")
|
|
|
|
jest.setTimeout(50000)
|
|
|
|
const adminReqConfig = {
|
|
headers: {
|
|
Authorization: "Bearer test_token",
|
|
},
|
|
}
|
|
|
|
const setupJobDb = async (dbConnection) => {
|
|
try {
|
|
await adminSeeder(dbConnection)
|
|
await userSeeder(dbConnection)
|
|
|
|
await simpleBatchJobFactory(dbConnection, {
|
|
id: "job_1",
|
|
type: "batch_1",
|
|
created_by: "admin_user",
|
|
})
|
|
await simpleBatchJobFactory(dbConnection, {
|
|
id: "job_2",
|
|
type: "batch_2",
|
|
ready_at: new Date(),
|
|
created_by: "admin_user",
|
|
})
|
|
await simpleBatchJobFactory(dbConnection, {
|
|
id: "job_3",
|
|
type: "batch_2",
|
|
ready_at: new Date(),
|
|
created_by: "admin_user",
|
|
})
|
|
await simpleBatchJobFactory(dbConnection, {
|
|
id: "job_4",
|
|
type: "batch_1",
|
|
ready_at: new Date(),
|
|
created_by: "member-user",
|
|
})
|
|
} catch (err) {
|
|
console.log(err)
|
|
throw err
|
|
}
|
|
}
|
|
|
|
describe("/admin/batch-jobs", () => {
|
|
let medusaProcess
|
|
let dbConnection
|
|
|
|
beforeAll(async () => {
|
|
const cwd = path.resolve(path.join(__dirname, "..", ".."))
|
|
dbConnection = await initDb({ cwd })
|
|
medusaProcess = await setupServer({ cwd, verbose: false })
|
|
})
|
|
|
|
afterAll(async () => {
|
|
const db = useDb()
|
|
await db.shutdown()
|
|
|
|
medusaProcess.kill()
|
|
})
|
|
|
|
describe("GET /admin/batch-jobs", () => {
|
|
beforeEach(async () => {
|
|
await setupJobDb(dbConnection)
|
|
})
|
|
|
|
afterEach(async () => {
|
|
const db = useDb()
|
|
await db.teardown()
|
|
})
|
|
|
|
it("lists batch jobs created by the user", async () => {
|
|
const api = useApi()
|
|
const response = await api.get("/admin/batch-jobs", adminReqConfig)
|
|
|
|
expect(response.status).toEqual(200)
|
|
expect(response.data.batch_jobs.length).toEqual(3)
|
|
expect(response.data).toMatchSnapshot({
|
|
batch_jobs: [
|
|
{
|
|
created_at: expect.any(String),
|
|
updated_at: expect.any(String),
|
|
created_by: "admin_user"
|
|
},
|
|
{
|
|
created_at: expect.any(String),
|
|
updated_at: expect.any(String),
|
|
created_by: "admin_user"
|
|
},
|
|
{
|
|
created_at: expect.any(String),
|
|
updated_at: expect.any(String),
|
|
created_by: "admin_user"
|
|
},
|
|
],
|
|
})
|
|
})
|
|
})
|
|
|
|
describe("GET /admin/batch-jobs/:id", () => {
|
|
beforeEach(async () => {
|
|
await setupJobDb(dbConnection)
|
|
})
|
|
|
|
afterEach(async () => {
|
|
const db = useDb()
|
|
await db.teardown()
|
|
})
|
|
|
|
it("return batch job created by the user", async () => {
|
|
const api = useApi()
|
|
const response = await api.get("/admin/batch-jobs/job_1", adminReqConfig)
|
|
|
|
expect(response.status).toEqual(200)
|
|
expect(response.data.batch_job).toEqual(expect.objectContaining({
|
|
created_at: expect.any(String),
|
|
updated_at: expect.any(String),
|
|
created_by: "admin_user"
|
|
}))
|
|
})
|
|
|
|
it("should fail on batch job created by other user", async () => {
|
|
const api = useApi()
|
|
await api.get("/admin/batch-jobs/job_4", adminReqConfig)
|
|
.catch((err) => {
|
|
expect(err.response.status).toEqual(400)
|
|
expect(err.response.data.type).toEqual("not_allowed")
|
|
expect(err.response.data.message).toEqual(
|
|
"Cannot access a batch job that does not belong to the logged in user"
|
|
)
|
|
})
|
|
})
|
|
})
|
|
|
|
describe("POST /admin/batch-jobs/", () => {
|
|
beforeEach(async() => {
|
|
try {
|
|
await adminSeeder(dbConnection)
|
|
} catch (err) {
|
|
console.log(err)
|
|
throw err
|
|
}
|
|
})
|
|
|
|
afterEach(async() => {
|
|
const db = useDb()
|
|
await db.teardown()
|
|
})
|
|
|
|
it("Creates a batch job", async() => {
|
|
const api = useApi()
|
|
|
|
const response = await api.post(
|
|
"/admin/batch-jobs",
|
|
{
|
|
type: "batch_1",
|
|
context: {},
|
|
},
|
|
adminReqConfig
|
|
)
|
|
|
|
expect(response.status).toEqual(201)
|
|
expect(response.data.batch_job).toMatchSnapshot({
|
|
created_by: "admin_user",
|
|
status: "created",
|
|
id: expect.any(String),
|
|
created_at: expect.any(String),
|
|
updated_at: expect.any(String),
|
|
})
|
|
})
|
|
})
|
|
|
|
describe("POST /admin/batch-jobs/:id/confirm", () => {
|
|
beforeEach(async () => {
|
|
await setupJobDb(dbConnection)
|
|
})
|
|
|
|
afterEach(async () => {
|
|
const db = useDb()
|
|
await db.teardown()
|
|
})
|
|
|
|
it("Fails to confirm a batch job created by a different user", async () => {
|
|
const api = useApi()
|
|
|
|
const jobId = "job_4"
|
|
|
|
api
|
|
.post(`/admin/batch-jobs/${jobId}/confirm`, {}, adminReqConfig)
|
|
.catch((err) => {
|
|
expect(err.response.status).toEqual(400)
|
|
expect(err.response.data.type).toEqual("not_allowed")
|
|
expect(err.response.data.message).toEqual(
|
|
"Cannot access a batch job that does not belong to the logged in user"
|
|
)
|
|
})
|
|
})
|
|
})
|
|
|
|
describe("POST /admin/batch-jobs/:id/cancel", () => {
|
|
beforeEach(async () => {
|
|
try {
|
|
await setupJobDb(dbConnection)
|
|
await simpleBatchJobFactory(dbConnection, {
|
|
id: "job_complete",
|
|
type: "batch_1",
|
|
created_by: "admin_user",
|
|
completed_at: new Date(),
|
|
})
|
|
} catch (e) {
|
|
console.log(e)
|
|
throw e
|
|
}
|
|
})
|
|
|
|
afterEach(async () => {
|
|
const db = useDb()
|
|
await db.teardown()
|
|
})
|
|
|
|
it("Cancels batch job created by the user", async () => {
|
|
const api = useApi()
|
|
|
|
const jobId = "job_1"
|
|
|
|
const response = await api.post(
|
|
`/admin/batch-jobs/${jobId}/cancel`,
|
|
{},
|
|
adminReqConfig
|
|
)
|
|
|
|
expect(response.status).toEqual(200)
|
|
expect(response.data.batch_job).toMatchSnapshot({
|
|
created_at: expect.any(String),
|
|
updated_at: expect.any(String),
|
|
canceled_at: expect.any(String),
|
|
status: "canceled",
|
|
})
|
|
})
|
|
|
|
it("Fails to cancel a batch job created by a different user", async () => {
|
|
expect.assertions(3)
|
|
const api = useApi()
|
|
|
|
const jobId = "job_4"
|
|
|
|
api
|
|
.post(`/admin/batch-jobs/${jobId}/cancel`, {}, adminReqConfig)
|
|
.catch((err) => {
|
|
expect(err.response.status).toEqual(400)
|
|
expect(err.response.data.type).toEqual("not_allowed")
|
|
expect(err.response.data.message).toEqual(
|
|
"Cannot access a batch job that does not belong to the logged in user"
|
|
)
|
|
})
|
|
})
|
|
|
|
it("Fails to cancel a batch job that is already complete", async () => {
|
|
expect.assertions(3)
|
|
const api = useApi()
|
|
|
|
const jobId = "job_complete"
|
|
|
|
await api
|
|
.post(`/admin/batch-jobs/${jobId}/cancel`, {}, adminReqConfig)
|
|
.catch((err) => {
|
|
expect(err.response.status).toEqual(400)
|
|
expect(err.response.data.type).toEqual("not_allowed")
|
|
expect(err.response.data.message).toEqual(
|
|
"Cannot cancel completed batch job"
|
|
)
|
|
})
|
|
})
|
|
})
|
|
})
|