fix: Merge conflicts with master

packages/inventory/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @medusajs/inventory
 
+## 1.0.6
+
+### Patch Changes
+
+- Updated dependencies [[`370bd472e`](https://github.com/medusajs/medusa/commit/370bd472ed8c9038f66defd012a886e0f83c32cf)]:
+  - @medusajs/medusa@1.7.9
+
 ## 1.0.5
 
 ### Patch Changes

packages/inventory/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@medusajs/inventory",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "description": "Inventory Module for Medusa",
   "main": "dist/index.js",
   "repository": {
@@ -35,7 +35,7 @@
     "test:unit": "jest --passWithNoTests"
   },
   "peerDependencies": {
-    "@medusajs/medusa": "1.7.8",
+    "@medusajs/medusa": "1.7.9",
     "typeorm": "^0.3.11"
   }
 }

packages/medusa/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## 1.7.9
+
+### Patch Changes
+
+- [#3335](https://github.com/medusajs/medusa/pull/3335) [`370bd472e`](https://github.com/medusajs/medusa/commit/370bd472ed8c9038f66defd012a886e0f83c32cf) Thanks [@pepijn-vanvlaanderen](https://github.com/pepijn-vanvlaanderen)! - fix(medusa): Fix regression in job scheduler service
+
 ## 1.7.8
 
 ### Patch Changes

packages/medusa/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@medusajs/medusa",
-  "version": "1.7.8",
+  "version": "1.7.9",
   "description": "E-commerce for JAMstack",
   "main": "dist/index.js",
   "bin": "./cli.js",

packages/medusa/src/services/__tests__/job-scheduler.js

@@ -53,6 +53,15 @@ describe("JobSchedulerService", () => {
 
       it("added the handler to the job queue", () => {
         expect(jobScheduler.handlers_.get("eventName").length).toEqual(1)
+        expect(jobScheduler.queue_.add).toHaveBeenCalledWith(
+          {
+            eventName: "eventName",
+            data: { data: "test" },
+          },
+          {
+            repeat: { cron: "* * * * *" },
+          }
+        )
       })
     })
 

packages/medusa/src/services/job-scheduler.ts

@@ -123,7 +123,7 @@ export default class JobSchedulerService {
     const repeatOpts = { repeat: { cron: schedule } }
 
     if (options?.keepExisting) {
-      return await this.queue_.add(eventName, jobToCreate, repeatOpts)
+      return await this.queue_.add(jobToCreate, repeatOpts)
     }
 
     const existingJobs = (await this.queue_.getRepeatableJobs()) ?? []
@@ -134,6 +134,6 @@ export default class JobSchedulerService {
       await this.queue_.removeRepeatableByKey(existingJob.key)
     }
 
-    return await this.queue_.add(eventName, jobToCreate, repeatOpts)
+    return await this.queue_.add(jobToCreate, repeatOpts)
   }
 }